kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-15 01:54:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Number terminals and export wire numbers without building every folio (stage D5)

Browse Source 
Terminal numbering builds only the folios holding a terminal. The wire
numbers export reads the wires of the folios not built from the project
database, and walks a built folio's own wires instead of a
DiagramContent, which followed their potentials through folio reports
and built the folios at the other end. The wiring list export names a
folio from its title block, which a folio not built has; it still
builds every folio, writing the whole project out (toXml()).

tst_lazyfolios: wire numbers exported as when built, from a .qet and a
.qetz, building no folio (fails with DiagramContent: 27 built);
terminal numbering builds 7 folios, those with a terminal (fails with
diagrams(): 47); the wiring list as when built. ctest 96/96 eager and
lazy; 342 corpus projects save the same in all four arms.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-12 10:37:27 +13:00
parent e7fd820db6
commit b972dbec4b
6 changed files with 108 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/qttest/lazy_folios_probe.cpp
+39
View File
@@ -29,6 +29,9 @@
#include "../../sources/TerminalStrip/terminalstrip.h"
#include "../../sources/ui/elementpropertieswidget.h"
#include "../../sources/conductorautonumerotation.h"
#include "../../sources/conductornumexport.h"
#include "../../sources/wiringlistexport.h"
#include "../../sources/ui/terminalnumberingdialog.h"
#include "../../sources/diagramcontent.h"
#include "../../sources/diagramview.h"
#include "../../sources/diagramevent/diagrameventaddpaste.h"
@@ -376,6 +379,15 @@ int main(int argc, char **argv)
for (const QString &title : titles)
check(gaps(numbered, title) == gaps(eager, title), "a scheme's gaps as when built");
check(numbered.unloadedFolioCount() == folios.size() - strip_folios.size(), "numbering read without building");
{
//Wire numbers exported from the database filled from the
//document, as when built (D5)
QETProject exported(path);
check(ConductorNumExport(&exported).wiresNum() == ConductorNumExport(&eager).wiresNum(),
"wire numbers of a .qet exported as when built");
check(exported.unloadedFolioCount() == folios.size() - strip_folios.size(),
"exporting a .qet's wire numbers builds no folio");
}
//A symbol placed on a folio, numbered by a scheme others follow
QString location, title;
int folio = -1;
@@ -695,6 +707,13 @@ int main(int argc, char **argv)
++continued;
}
check(continued > 0, "a folio whose table continues another");
{
//The wiring list export writes the whole project out
//(toXml()), building every folio: as when built
QETProject exported(zipped);
check(WiringListExport(&exported).toCsvString() == WiringListExport(&eager).toCsvString(),
"wiring list exported as when built");
}
//Numbering, the searches for symbols and the unused symbols
//are answered from the database: no folio file is read
@@ -780,6 +799,26 @@ int main(int argc, char **argv)
check(listed.unloadedFolioCount() > 0, "listing the tables does not build every folio");
}
//The wire numbers export and the terminal
//numbering dialog: as when built, building only the folios
//holding a terminal (D5)
{
QETProject exported(zipped);
const int unbuilt = exported.unloadedFolioCount();
check(ConductorNumExport(&exported).wiresNum() == ConductorNumExport(&eager).wiresNum(),
"wire numbers exported as when built");
check(exported.unloadedFolioCount() == unbuilt, "exporting wire numbers builds no folio");
{ TerminalNumberingDialog dialog(nullptr, &exported); }
int with_terminals = 0;
for (Diagram *folio : folios)
for (Element *element : folio->elements())
if (element->elementData().m_type == ElementData::Terminal) { ++with_terminals; break; }
std::printf(".qetz terminal numbering: %d folios built, %d hold a terminal\n",
unbuilt - exported.unloadedFolioCount(), with_terminals);
check(exported.folios().size() - exported.unloadedFolioCount() <= with_terminals + (folios.size() - unbuilt),
"terminal numbering builds only the folios holding a terminal");
}
//Saved as a .qetz without building the folios not touched
//(D4): their parts and rows copied as they were
QETProject untouched(zipped);