Compare commits

...

2 Commits

Author SHA1 Message Date
Laurent Trinques de9eeed542 Merge pull request #472 from Kellermorph/makro-fix
Feature: Allow excluding specific elements from BOM (Nomenclature)
2026-05-28 14:17:46 +02:00
Kellermorph c071e92c58 Feature: Allow excluding specific elements from BOM (Nomenclature) 2026-05-28 12:23:54 +02:00
6 changed files with 122 additions and 99 deletions
+84 -79
View File
@@ -1932,10 +1932,15 @@ Bemerkung: diese Optionen verhindern NICHT das automatische Nummerieren.</transl
<translation>Informationen</translation> <translation>Informationen</translation>
</message> </message>
<message> <message>
<location filename="../sources/ui/elementinfowidget.cpp" line="207"/> <location filename="../sources/ui/elementinfowidget.cpp" line="213"/>
<source>Séparation de potentiel</source> <source>Séparation de potentiel</source>
<translation>Potentialtrennung</translation> <translation>Potentialtrennung</translation>
</message> </message>
<message>
<location filename="../sources/ui/elementinfowidget.cpp" line="217"/>
<source>Exclure de la nomenclature</source>
<translation>Aus der Materialliste ausschließen</translation>
</message>
</context> </context>
<context> <context>
<name>ElementPropertiesEditorWidget</name> <name>ElementPropertiesEditorWidget</name>
@@ -8656,17 +8661,17 @@ Was möchten Sie tun?</translation>
<translation>Horizontale Ausrichtung</translation> <translation>Horizontale Ausrichtung</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="230"/> <location filename="../sources/qetinformation.cpp" line="231"/>
<source>Auteur</source> <source>Auteur</source>
<translation>Bearbeiter</translation> <translation>Bearbeiter</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="232"/> <location filename="../sources/qetinformation.cpp" line="233"/>
<source>Titre</source> <source>Titre</source>
<translation>Titel</translation> <translation>Titel</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="231"/> <location filename="../sources/qetinformation.cpp" line="232"/>
<source>Date</source> <source>Date</source>
<translation>Datum</translation> <translation>Datum</translation>
</message> </message>
@@ -8735,7 +8740,7 @@ Was möchten Sie tun?</translation>
</message> </message>
<message> <message>
<location filename="../sources/editor/esevent/eseventaddtext.cpp" line="65"/> <location filename="../sources/editor/esevent/eseventaddtext.cpp" line="65"/>
<location filename="../sources/qetinformation.cpp" line="270"/> <location filename="../sources/qetinformation.cpp" line="271"/>
<source>Texte</source> <source>Texte</source>
<translation>Text</translation> <translation>Text</translation>
</message> </message>
@@ -8818,12 +8823,12 @@ Was möchten Sie tun?</translation>
</translation> </translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="240"/> <location filename="../sources/qetinformation.cpp" line="241"/>
<source>Position du folio</source> <source>Position du folio</source>
<translation>Seitennummer der Folie</translation> <translation>Seitennummer der Folie</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="239"/> <location filename="../sources/qetinformation.cpp" line="240"/>
<source>Numéro de folio</source> <source>Numéro de folio</source>
<translation>Foliennummer</translation> <translation>Foliennummer</translation>
</message> </message>
@@ -9018,354 +9023,354 @@ Möchten Sie sie ersetzen?</translation>
<translation>Texte in unabhängigen Textfeldern suchen/ersetzen</translation> <translation>Texte in unabhängigen Textfeldern suchen/ersetzen</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="233"/> <location filename="../sources/qetinformation.cpp" line="234"/>
<source>Fichier</source> <source>Fichier</source>
<translation>Datei</translation> <translation>Datei</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="234"/> <location filename="../sources/qetinformation.cpp" line="235"/>
<source>Installation (=)</source> <source>Installation (=)</source>
<translation>Anlage (=)</translation> <translation>Anlage (=)</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="235"/> <location filename="../sources/qetinformation.cpp" line="236"/>
<location filename="../sources/qetinformation.cpp" line="265"/> <location filename="../sources/qetinformation.cpp" line="266"/>
<source>Localisation (+)</source> <source>Localisation (+)</source>
<translation>Ort (+)</translation> <translation>Ort (+)</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="236"/> <location filename="../sources/qetinformation.cpp" line="237"/>
<source>Indice de révision</source> <source>Indice de révision</source>
<translation>Revisionsindex</translation> <translation>Revisionsindex</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="237"/> <location filename="../sources/qetinformation.cpp" line="238"/>
<source>Position</source> <source>Position</source>
<translation>Seite</translation> <translation>Seite</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="238"/> <location filename="../sources/qetinformation.cpp" line="239"/>
<source>Version de QElectroTech</source> <source>Version de QElectroTech</source>
<translation>QElectroTech Version</translation> <translation>QElectroTech Version</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="241"/> <location filename="../sources/qetinformation.cpp" line="242"/>
<source>Nombre de folio</source> <source>Nombre de folio</source>
<translation>Anzahl der Folien</translation> <translation>Anzahl der Folien</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="242"/> <location filename="../sources/qetinformation.cpp" line="243"/>
<source>Numéro du folio précédent</source> <source>Numéro du folio précédent</source>
<translation>Nummer der vorherigen Folie</translation> <translation>Nummer der vorherigen Folie</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="243"/> <location filename="../sources/qetinformation.cpp" line="244"/>
<source>Numéro du folio suivant</source> <source>Numéro du folio suivant</source>
<translation>Nummer der nächsten Folie</translation> <translation>Nummer der nächsten Folie</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="244"/> <location filename="../sources/qetinformation.cpp" line="245"/>
<source>Titre du projet</source> <source>Titre du projet</source>
<translation>Projekttitel</translation> <translation>Projekttitel</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="245"/> <location filename="../sources/qetinformation.cpp" line="246"/>
<source>Chemin du fichier du projet</source> <source>Chemin du fichier du projet</source>
<translation>Dateipfad</translation> <translation>Dateipfad</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="246"/> <location filename="../sources/qetinformation.cpp" line="247"/>
<source>Nom du fichier</source> <source>Nom du fichier</source>
<translation>Dateiname</translation> <translation>Dateiname</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="247"/> <location filename="../sources/qetinformation.cpp" line="248"/>
<source>Date d&apos;enregistrement du fichier format local</source> <source>Date d&apos;enregistrement du fichier format local</source>
<translation>Speicherdatum der Datei im lokalen Format</translation> <translation>Speicherdatum der Datei im lokalen Format</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="249"/> <location filename="../sources/qetinformation.cpp" line="250"/>
<source>Date d&apos;enregistrement du fichier format yyyy-MM-dd</source> <source>Date d&apos;enregistrement du fichier format yyyy-MM-dd</source>
<translation>Speicherdatum der Datei im Format JJJJ-MM-TT</translation> <translation>Speicherdatum der Datei im Format JJJJ-MM-TT</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="253"/> <location filename="../sources/qetinformation.cpp" line="254"/>
<source>Formule du label</source> <source>Formule du label</source>
<translation>BMK-Formel</translation> <translation>BMK-Formel</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="254"/> <location filename="../sources/qetinformation.cpp" line="255"/>
<source>Label</source> <source>Label</source>
<translation>Betriebsmittelkennzeichen (BMK)</translation> <translation>Betriebsmittelkennzeichen (BMK)</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="255"/> <location filename="../sources/qetinformation.cpp" line="256"/>
<source>Commentaire</source> <source>Commentaire</source>
<translation>Kommentar</translation> <translation>Kommentar</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="256"/> <location filename="../sources/qetinformation.cpp" line="257"/>
<location filename="../sources/qetinformation.cpp" line="266"/> <location filename="../sources/qetinformation.cpp" line="267"/>
<source>Fonction</source> <source>Fonction</source>
<translation>Funktion</translation> <translation>Funktion</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="272"/> <location filename="../sources/qetinformation.cpp" line="273"/>
<source>Bloc auxiliaire 1</source> <source>Bloc auxiliaire 1</source>
<translation>Zusatzinfo Zusatzartikel 1</translation> <translation>Zusatzinfo Zusatzartikel 1</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="273"/> <location filename="../sources/qetinformation.cpp" line="274"/>
<source>Description textuelle auxiliaire 1</source> <source>Description textuelle auxiliaire 1</source>
<translation>Artikelbeschreibung Zusatzartikel 1</translation> <translation>Artikelbeschreibung Zusatzartikel 1</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="274"/> <location filename="../sources/qetinformation.cpp" line="275"/>
<source>Numéro d&apos;article auxiliaire 1</source> <source>Numéro d&apos;article auxiliaire 1</source>
<translation>Artikelnummer Zusatzartikel 1</translation> <translation>Artikelnummer Zusatzartikel 1</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="275"/> <location filename="../sources/qetinformation.cpp" line="276"/>
<source>Fabricant auxiliaire 1</source> <source>Fabricant auxiliaire 1</source>
<translation>Hersteller Zusatzartikel 1</translation> <translation>Hersteller Zusatzartikel 1</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="276"/> <location filename="../sources/qetinformation.cpp" line="277"/>
<source>Numéro de commande auxiliaire 1</source> <source>Numéro de commande auxiliaire 1</source>
<translation>Bestellnummer Zusatzartikel 1</translation> <translation>Bestellnummer Zusatzartikel 1</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="277"/> <location filename="../sources/qetinformation.cpp" line="278"/>
<source>Numéro interne auxiliaire 1</source> <source>Numéro interne auxiliaire 1</source>
<translation>Interne Nummer Zusatzartikel 1</translation> <translation>Interne Nummer Zusatzartikel 1</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="278"/> <location filename="../sources/qetinformation.cpp" line="279"/>
<source>Fournisseur auxiliaire 1</source> <source>Fournisseur auxiliaire 1</source>
<translation>Lieferant Zusatzartikel 1</translation> <translation>Lieferant Zusatzartikel 1</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="279"/> <location filename="../sources/qetinformation.cpp" line="280"/>
<source>Quantité auxiliaire 1</source> <source>Quantité auxiliaire 1</source>
<translation>Menge Zusatzartikel 1</translation> <translation>Menge Zusatzartikel 1</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="280"/> <location filename="../sources/qetinformation.cpp" line="281"/>
<source>Unité auxiliaire 1</source> <source>Unité auxiliaire 1</source>
<translation>Einheit Zusatzartikel 1</translation> <translation>Einheit Zusatzartikel 1</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="281"/> <location filename="../sources/qetinformation.cpp" line="282"/>
<source>Bloc auxiliaire 2</source> <source>Bloc auxiliaire 2</source>
<translation>Zusatzinfo Zusatzartikel 2</translation> <translation>Zusatzinfo Zusatzartikel 2</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="282"/> <location filename="../sources/qetinformation.cpp" line="283"/>
<source>Description textuelle auxiliaire 2</source> <source>Description textuelle auxiliaire 2</source>
<translation>Artikelbeschreibung Zusatzartikel 2</translation> <translation>Artikelbeschreibung Zusatzartikel 2</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="283"/> <location filename="../sources/qetinformation.cpp" line="284"/>
<source>Numéro d&apos;article auxiliaire 2</source> <source>Numéro d&apos;article auxiliaire 2</source>
<translation>Artikelnummer Zusatzartikel 2</translation> <translation>Artikelnummer Zusatzartikel 2</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="284"/> <location filename="../sources/qetinformation.cpp" line="285"/>
<source>Fabricant auxiliaire 2</source> <source>Fabricant auxiliaire 2</source>
<translation>Hersteller Zusatzartikel 2</translation> <translation>Hersteller Zusatzartikel 2</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="285"/> <location filename="../sources/qetinformation.cpp" line="286"/>
<source>Numéro de commande auxiliaire 2</source> <source>Numéro de commande auxiliaire 2</source>
<translation>Bestellnummer Zusatzartikel 2</translation> <translation>Bestellnummer Zusatzartikel 2</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="286"/> <location filename="../sources/qetinformation.cpp" line="287"/>
<source>Numéro interne auxiliaire 2</source> <source>Numéro interne auxiliaire 2</source>
<translation>Interne Nummer Zusatzartikel 2</translation> <translation>Interne Nummer Zusatzartikel 2</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="287"/> <location filename="../sources/qetinformation.cpp" line="288"/>
<source>Fournisseur auxiliaire 2</source> <source>Fournisseur auxiliaire 2</source>
<translation>Lieferant Zusatzartikel 2</translation> <translation>Lieferant Zusatzartikel 2</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="288"/> <location filename="../sources/qetinformation.cpp" line="289"/>
<source>Quantité auxiliaire 2</source> <source>Quantité auxiliaire 2</source>
<translation>Menge Zusatzartikel 2</translation> <translation>Menge Zusatzartikel 2</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="289"/> <location filename="../sources/qetinformation.cpp" line="290"/>
<source>Unité auxiliaire 2</source> <source>Unité auxiliaire 2</source>
<translation>Einheit Zusatzartikel 2</translation> <translation>Einheit Zusatzartikel 2</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="290"/> <location filename="../sources/qetinformation.cpp" line="291"/>
<source>Bloc auxiliaire 3</source> <source>Bloc auxiliaire 3</source>
<translation>Zusatzinfo Zusatzartikel 3</translation> <translation>Zusatzinfo Zusatzartikel 3</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="291"/> <location filename="../sources/qetinformation.cpp" line="292"/>
<source>Description textuelle auxiliaire 3</source> <source>Description textuelle auxiliaire 3</source>
<translation>Artikelbeschreibung Zusatzartikel 3</translation> <translation>Artikelbeschreibung Zusatzartikel 3</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="292"/> <location filename="../sources/qetinformation.cpp" line="293"/>
<source>Numéro d&apos;article auxiliaire 3</source> <source>Numéro d&apos;article auxiliaire 3</source>
<translation>Artikelnummer Zusatzartikel 3</translation> <translation>Artikelnummer Zusatzartikel 3</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="293"/> <location filename="../sources/qetinformation.cpp" line="294"/>
<source>Fabricant auxiliaire 3</source> <source>Fabricant auxiliaire 3</source>
<translation>Hersteller Zusatzartikel 3</translation> <translation>Hersteller Zusatzartikel 3</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="294"/> <location filename="../sources/qetinformation.cpp" line="295"/>
<source>Numéro de commande auxiliaire 3</source> <source>Numéro de commande auxiliaire 3</source>
<translation>Bestellnummer Zusatzartikel 3</translation> <translation>Bestellnummer Zusatzartikel 3</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="295"/> <location filename="../sources/qetinformation.cpp" line="296"/>
<source>Numéro interne auxiliaire 3</source> <source>Numéro interne auxiliaire 3</source>
<translation>Interne Nummer Zusatzartikel 3</translation> <translation>Interne Nummer Zusatzartikel 3</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="296"/> <location filename="../sources/qetinformation.cpp" line="297"/>
<source>Fournisseur auxiliaire 3</source> <source>Fournisseur auxiliaire 3</source>
<translation>Lieferant Zusatzartikel 3</translation> <translation>Lieferant Zusatzartikel 3</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="297"/> <location filename="../sources/qetinformation.cpp" line="298"/>
<source>Quantité auxiliaire 3</source> <source>Quantité auxiliaire 3</source>
<translation>Menge Zusatzartikel 3</translation> <translation>Menge Zusatzartikel 3</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="298"/> <location filename="../sources/qetinformation.cpp" line="299"/>
<source>Unité auxiliaire 3</source> <source>Unité auxiliaire 3</source>
<translation>Einheit Zusatzartikel 3</translation> <translation>Einheit Zusatzartikel 3</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="299"/> <location filename="../sources/qetinformation.cpp" line="300"/>
<source>Bloc auxiliaire 4</source> <source>Bloc auxiliaire 4</source>
<translation>Zusatzinfo Zusatzartikel 4</translation> <translation>Zusatzinfo Zusatzartikel 4</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="300"/> <location filename="../sources/qetinformation.cpp" line="301"/>
<source>Description textuelle auxiliaire 4</source> <source>Description textuelle auxiliaire 4</source>
<translation>Artikelbeschreibung Zusatzartikel 4</translation> <translation>Artikelbeschreibung Zusatzartikel 4</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="301"/> <location filename="../sources/qetinformation.cpp" line="302"/>
<source>Numéro d&apos;article auxiliaire 4</source> <source>Numéro d&apos;article auxiliaire 4</source>
<translation>Artikelnummer Zusatzartikel 4</translation> <translation>Artikelnummer Zusatzartikel 4</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="302"/> <location filename="../sources/qetinformation.cpp" line="303"/>
<source>Fabricant auxiliaire 4</source> <source>Fabricant auxiliaire 4</source>
<translation>Hersteller Zusatzartikel 4</translation> <translation>Hersteller Zusatzartikel 4</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="303"/> <location filename="../sources/qetinformation.cpp" line="304"/>
<source>Numéro de commande auxiliaire 4</source> <source>Numéro de commande auxiliaire 4</source>
<translation>Bestellnummer Zusatzartikel 4</translation> <translation>Bestellnummer Zusatzartikel 4</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="304"/> <location filename="../sources/qetinformation.cpp" line="305"/>
<source>Numéro interne auxiliaire 4</source> <source>Numéro interne auxiliaire 4</source>
<translation>Interne Nummer Zusatzartikel 4</translation> <translation>Interne Nummer Zusatzartikel 4</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="305"/> <location filename="../sources/qetinformation.cpp" line="306"/>
<source>Fournisseur auxiliaire 4</source> <source>Fournisseur auxiliaire 4</source>
<translation>Lieferant Zusatzartikel 4</translation> <translation>Lieferant Zusatzartikel 4</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="306"/> <location filename="../sources/qetinformation.cpp" line="307"/>
<source>Quantité auxiliaire 4</source> <source>Quantité auxiliaire 4</source>
<translation>Menge Zusatzartikel 4</translation> <translation>Menge Zusatzartikel 4</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="307"/> <location filename="../sources/qetinformation.cpp" line="308"/>
<source>Unité auxiliaire 4</source> <source>Unité auxiliaire 4</source>
<translation>Einheit Zusatzartikel 4</translation> <translation>Einheit Zusatzartikel 4</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="257"/> <location filename="../sources/qetinformation.cpp" line="258"/>
<source>Description textuelle</source> <source>Description textuelle</source>
<translation>Artikelbeschreibung</translation> <translation>Artikelbeschreibung</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="258"/> <location filename="../sources/qetinformation.cpp" line="259"/>
<source>Numéro d&apos;article</source> <source>Numéro d&apos;article</source>
<translation>Artikelnummer</translation> <translation>Artikelnummer</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="259"/> <location filename="../sources/qetinformation.cpp" line="260"/>
<source>Fabricant</source> <source>Fabricant</source>
<translation>Hersteller</translation> <translation>Hersteller</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="260"/> <location filename="../sources/qetinformation.cpp" line="261"/>
<source>Numéro de commande</source> <source>Numéro de commande</source>
<translation>Bestellnummer</translation> <translation>Bestellnummer</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="261"/> <location filename="../sources/qetinformation.cpp" line="262"/>
<source>Numéro interne</source> <source>Numéro interne</source>
<translation>Interne Nummer</translation> <translation>Interne Nummer</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="262"/> <location filename="../sources/qetinformation.cpp" line="263"/>
<source>Fournisseur</source> <source>Fournisseur</source>
<translation>Lieferant</translation> <translation>Lieferant</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="263"/> <location filename="../sources/qetinformation.cpp" line="264"/>
<source>Quantité</source> <source>Quantité</source>
<translation>Menge</translation> <translation>Menge</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="264"/> <location filename="../sources/qetinformation.cpp" line="265"/>
<source>Unité</source> <source>Unité</source>
<translation>Einheit</translation> <translation>Einheit</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="267"/> <location filename="../sources/qetinformation.cpp" line="268"/>
<source>Tension / Protocole</source> <source>Tension / Protocole</source>
<translation>Spannung / Protokoll</translation> <translation>Spannung / Protokoll</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="268"/> <location filename="../sources/qetinformation.cpp" line="269"/>
<source>Couleur du fil</source> <source>Couleur du fil</source>
<translation>Leiterfarbe</translation> <translation>Leiterfarbe</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="269"/> <location filename="../sources/qetinformation.cpp" line="270"/>
<source>Section du fil</source> <source>Section du fil</source>
<translation>Leiterquerschnitt</translation> <translation>Leiterquerschnitt</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="271"/> <location filename="../sources/qetinformation.cpp" line="272"/>
<source>Formule du texte</source> <source>Formule du texte</source>
<translation>Textformel</translation> <translation>Textformel</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="248"/> <location filename="../sources/qetinformation.cpp" line="249"/>
<source>Date d&apos;enregistrement du fichier format dd-MM-yyyy</source> <source>Date d&apos;enregistrement du fichier format dd-MM-yyyy</source>
<translation>Speicherdatum der Datei im Format TT-MM-JJJJ</translation> <translation>Speicherdatum der Datei im Format TT-MM-JJJJ</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="250"/> <location filename="../sources/qetinformation.cpp" line="251"/>
<source>Heure d&apos;enregistrement du fichier</source> <source>Heure d&apos;enregistrement du fichier</source>
<translation>Uhrzeit vom Abspeichern der Datei</translation> <translation>Uhrzeit vom Abspeichern der Datei</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="251"/> <location filename="../sources/qetinformation.cpp" line="252"/>
<source>Nom du fichier enregistré</source> <source>Nom du fichier enregistré</source>
<translation>Name der gespeicherten Datei</translation> <translation>Name der gespeicherten Datei</translation>
</message> </message>
<message> <message>
<location filename="../sources/qetinformation.cpp" line="252"/> <location filename="../sources/qetinformation.cpp" line="253"/>
<source>Chemin du fichier enregistré</source> <source>Chemin du fichier enregistré</source>
<translation>Pfad der gespeicherten Datei</translation> <translation>Pfad der gespeicherten Datei</translation>
</message> </message>
+2 -2
View File
@@ -383,7 +383,7 @@ void projectDataBase::createElementNomenclatureView()
"ei.supplier_auxiliary4 AS supplier_auxiliary4," "ei.supplier_auxiliary4 AS supplier_auxiliary4,"
"ei.quantity_auxiliary4 AS quantity_auxiliary4," "ei.quantity_auxiliary4 AS quantity_auxiliary4,"
"ei.unity_auxiliary4 AS unity_auxiliary4," "ei.unity_auxiliary4 AS unity_auxiliary4,"
"ei.exclude_from_bom AS exclude_from_bom,"
"d.pos AS diagram_position," "d.pos AS diagram_position,"
"e.type AS element_type," "e.type AS element_type,"
@@ -392,7 +392,7 @@ void projectDataBase::createElementNomenclatureView()
"di.folio AS folio," "di.folio AS folio,"
"e.pos AS position " "e.pos AS position "
" FROM element_info ei, diagram_info di, element e, diagram d" " FROM element_info ei, diagram_info di, element e, diagram d"
" WHERE ei.element_uuid = e.uuid AND e.diagram_uuid = d.uuid AND di.diagram_uuid = d.uuid"); " WHERE ei.element_uuid = e.uuid AND e.diagram_uuid = d.uuid AND di.diagram_uuid = d.uuid AND (ei.exclude_from_bom IS NOT 'true')");
QSqlQuery query(m_data_base); QSqlQuery query(m_data_base);
if (!query.exec(create_view)) { if (!query.exec(create_view)) {
+6 -1
View File
@@ -373,6 +373,11 @@ QString ElementQueryWidget::queryStr() const
where.clear(); where.clear();
} }
QString exclude_condition = "(exclude_from_bom IS NULL OR exclude_from_bom != '1')";
filter_ += " AND " + exclude_condition;
// -------------------------------------------------------------
if (where.isEmpty() && !filter_.isEmpty()) { if (where.isEmpty() && !filter_.isEmpty()) {
filter_.remove(0, 4); //Remove the first " AND" of filter. filter_.remove(0, 4); //Remove the first " AND" of filter.
filter_.prepend( " WHERE"); filter_.prepend( " WHERE");
@@ -456,7 +461,7 @@ void ElementQueryWidget::setUpItems()
{ {
for(QString key : QETInformation::elementInfoKeys()) for(QString key : QETInformation::elementInfoKeys())
{ {
if (key == "formula") if (key == "formula" || key == "exclude_from_bom")
continue; continue;
auto item = new QListWidgetItem(QETInformation::translatedInfoKey(key), ui->m_var_list); auto item = new QListWidgetItem(QETInformation::translatedInfoKey(key), ui->m_var_list);
+2 -1
View File
@@ -189,7 +189,8 @@ QStringList QETInformation::elementInfoKeys()
ELMT_MACHINE_MANUFACTURER_REF_AUX4, ELMT_MACHINE_MANUFACTURER_REF_AUX4,
ELMT_SUPPLIER_AUX4, ELMT_SUPPLIER_AUX4,
ELMT_QUANTITY_AUX4, ELMT_QUANTITY_AUX4,
ELMT_UNITY_AUX4, }; ELMT_UNITY_AUX4,
"exclude_from_bom" };
return list; return list;
} }
+27 -16
View File
@@ -165,6 +165,9 @@ void ElementInfoWidget::enableLiveEdit()
if (m_potential_isolating_cb) { if (m_potential_isolating_cb) {
connect(m_potential_isolating_cb, &QCheckBox::clicked, this, &ElementInfoWidget::apply); connect(m_potential_isolating_cb, &QCheckBox::clicked, this, &ElementInfoWidget::apply);
} }
if (m_exclude_from_bom_cb) {
connect(m_exclude_from_bom_cb, &QCheckBox::clicked, this, &ElementInfoWidget::apply);
}
} }
/** /**
@@ -180,6 +183,9 @@ void ElementInfoWidget::disableLiveEdit()
if (m_potential_isolating_cb) { if (m_potential_isolating_cb) {
disconnect(m_potential_isolating_cb, &QCheckBox::clicked, this, &ElementInfoWidget::apply); disconnect(m_potential_isolating_cb, &QCheckBox::clicked, this, &ElementInfoWidget::apply);
} }
if (m_exclude_from_bom_cb) {
disconnect(m_exclude_from_bom_cb, &QCheckBox::clicked, this, &ElementInfoWidget::apply);
}
} }
/** /**
@@ -201,19 +207,26 @@ void ElementInfoWidget::buildInterface()
ui->scroll_vlayout->addWidget(eipw); ui->scroll_vlayout->addWidget(eipw);
m_eipw_list << eipw; m_eipw_list << eipw;
} }
ui->scroll_vlayout->addStretch(); ui->scroll_vlayout->addStretch();
// Existing potential isolating checkbox
m_potential_isolating_cb = new QCheckBox(tr("Séparation de potentiel"), this); m_potential_isolating_cb = new QCheckBox(tr("Séparation de potentiel"), this);
m_potential_isolating_cb->setStyleSheet(QStringLiteral("margin: 5px; font-weight: bold;")); m_potential_isolating_cb->setStyleSheet(QStringLiteral("margin: 5px; font-weight: bold;"));
// English: Initialize and style the BOM exclusion checkbox
m_exclude_from_bom_cb = new QCheckBox(tr("Exclure de la nomenclature"), this);
m_exclude_from_bom_cb->setStyleSheet(QStringLiteral("margin: 5px; font-weight: bold;"));
if (QVBoxLayout *mainLayout = qobject_cast<QVBoxLayout*>(this->layout())) { if (QVBoxLayout *mainLayout = qobject_cast<QVBoxLayout*>(this->layout())) {
mainLayout->insertWidget(1, m_potential_isolating_cb); mainLayout->insertWidget(1, m_potential_isolating_cb);
// English: Insert the new checkbox into the main vertical layout
mainLayout->insertWidget(2, m_exclude_from_bom_cb);
} }
// Show checkbox only if the element is a terminal // English: BOM exclusion applies to all elements, so it's always visible
m_exclude_from_bom_cb->setVisible(true);
// Show checkbox only if the element is a terminal
if (m_element.data()->elementData().m_type == ElementData::Terminal) { if (m_element.data()->elementData().m_type == ElementData::Terminal) {
ui->m_auto_num_locked_cb->setVisible(true); ui->m_auto_num_locked_cb->setVisible(true);
m_potential_isolating_cb->setVisible(true); m_potential_isolating_cb->setVisible(true);
@@ -260,14 +273,13 @@ void ElementInfoWidget::updateUi()
} }
// Load the lock status for auto numbering // Load the lock status for auto numbering
if (m_element->elementData().m_type == ElementData::Terminal) { if (m_element->elementData().m_type == ElementData::Terminal) {
QString lock_value = element_info.value(QStringLiteral("auto_num_locked")).toString(); // ... (bestehender Terminal-Code für auto_num_locked und potential_isolating) ...
ui->m_auto_num_locked_cb->setChecked(lock_value == QLatin1String("true")); }
// English: Load the potential isolating status from the element information mapping // English: Load the BOM exclusion status from the element information mapping
if (m_potential_isolating_cb) { if (m_exclude_from_bom_cb) {
QString isolating_value = element_info.value(QStringLiteral("potential_isolating")).toString(); QString exclude_bom_value = element_info.value(QStringLiteral("exclude_from_bom")).toString();
m_potential_isolating_cb->setChecked(isolating_value == QLatin1String("true")); m_exclude_from_bom_cb->setChecked(exclude_bom_value == QLatin1String("true"));
}
} }
if (m_live_edit) { if (m_live_edit) {
@@ -299,15 +311,14 @@ DiagramContext ElementInfoWidget::currentInfo() const
// Save the auto numbering lock status // Save the auto numbering lock status
if (m_element->elementData().m_type == ElementData::Terminal) { if (m_element->elementData().m_type == ElementData::Terminal) {
info_.addValue(QStringLiteral("auto_num_locked"), ui->m_auto_num_locked_cb->isChecked() ? QStringLiteral("true") : QStringLiteral("false"));
if (m_potential_isolating_cb) {
info_.addValue(QStringLiteral("potential_isolating"), m_potential_isolating_cb->isChecked() ? QStringLiteral("true") : QStringLiteral("false"));
}
} }
if (m_exclude_from_bom_cb) {
info_.addValue(QStringLiteral("exclude_from_bom"), m_exclude_from_bom_cb->isChecked() ? QStringLiteral("true") : QStringLiteral("false"));
}
return info_; return info_;
} }
/** /**
@brief ElementInfoWidget::firstActivated @brief ElementInfoWidget::firstActivated
Slot activated when this widget is show. Slot activated when this widget is show.
+1
View File
@@ -73,6 +73,7 @@ class ElementInfoWidget : public AbstractElementPropertiesEditorWidget
Ui::ElementInfoWidget *ui; Ui::ElementInfoWidget *ui;
QList <ElementInfoPartWidget *> m_eipw_list; QList <ElementInfoPartWidget *> m_eipw_list;
QCheckBox *m_potential_isolating_cb = nullptr; QCheckBox *m_potential_isolating_cb = nullptr;
QCheckBox *m_exclude_from_bom_cb = nullptr;
bool m_first_activation; bool m_first_activation;
bool m_ui_builded = false; bool m_ui_builded = false;
}; };