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

Add options to leave junctions and contact blocks out of the parts list (#1178)

Browse Source 
Since #849 the parts list has a row for every contact block (slave) and
terminal-type element. Users who draw the dots and bends where wires
branch as terminal-type symbols (114_connections) get one empty row per
junction: 109 of 151 rows on one reported cabinet.

Two options, both off by default so existing exports are unchanged:
- leave out the contact blocks: --no-slaves, "no_slaves" in qet_export,
  or uncheck the new "Contacts esclaves" element type in the dialog;
- leave out the junctions: terminal-type elements with no label,
  designation, manufacturer or manufacturer reference. --no-junctions,
  "no_junctions", or "Laisser de côté les jonctions" in the dialog.
  A terminal block with a label or a part number stays.

The element type filter had no box for slaves, so every query it built
left them out: the export dialog never listed contact blocks, although
the command line has since #849. The dialog now checks the new box by
default and gives the same rows as --export-bom. The box is unchecked by
default elsewhere, so nomenclature tables keep their rows.

docs/smart-device-bom.md still said slaves and terminals were excluded;
corrected.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-05 22:08:44 +13:00
parent 32f7b94594
commit 8434b88eb8
17 changed files with 273 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/bomexport.cpp
+34 -4
View File
@@ -57,7 +57,32 @@ QStringList BomExport::defaultColumns()
};
}
QString BomExport::defaultQuery()
/**
@brief BomExport::junctionFilter
@return a condition true for every row that is not a junction: a
terminal-type element with no label and no part data. Some users draw
the dots and bends where wires branch as their own terminal-type
symbols, and each one became an empty row of the parts list (#1178).
A terminal block with a label or a part number is kept.
*/
QString BomExport::junctionFilter()
{
return QStringLiteral("NOT (element_type = 'terminal' "
"AND IFNULL(label, '') = '' "
"AND IFNULL(designation, '') = '' "
"AND IFNULL(manufacturer, '') = '' "
"AND IFNULL(manufacturer_reference, '') = '')");
}
/**
@brief BomExport::defaultQuery
@param include_slaves : false leaves out the contact blocks (slave
elements), which otherwise appear as rows of their own
@param include_junctions : false leaves out the junctions, see
junctionFilter()
@return the query of the parts list
*/
QString BomExport::defaultQuery(bool include_slaves, bool include_junctions)
{
//Slaves and terminals are included because both are routinely
//separately orderable hardware. A circuit breaker can carry ten or
@@ -77,11 +102,16 @@ QString BomExport::defaultQuery()
//and the conductor definition stay out because they are not hardware.
//
//See discussion #847.
const QString types = include_slaves
? QStringLiteral("'simple', 'master', 'slave', 'terminal'")
: QStringLiteral("'simple', 'master', 'terminal'");
const QString junctions = include_junctions
? QString()
: QStringLiteral(" AND ") + junctionFilter();
return QStringLiteral("SELECT %1 FROM element_nomenclature_view "
"WHERE element_type IN "
"('simple', 'master', 'slave', 'terminal') "
"WHERE element_type IN (%2)%3 "
"ORDER BY diagram_position, position, label")
.arg(defaultColumns().join(QStringLiteral(", ")));
.arg(defaultColumns().join(QStringLiteral(", ")), types, junctions);
}
QByteArray BomExport::toCsv(QSqlQuery &query, const QStringList &headers,