Add new variables to elementInfoKeys

aux1, aux2, aux3, aux4
See:
https://qelectrotech.org/forum/viewtopic.php?pid=20558#p20558

sources/autoNum/assignvariables.cpp

@@ -223,7 +223,44 @@ namespace autonum
 		str.replace("%{quantity}", dc.value("quantity").toString());
 		str.replace("%{unity}", dc.value("unity").toString());
 				str.replace("%{auxiliary1}", dc.value("auxiliary1").toString());
+		str.replace("%{description_auxiliary1}", dc.value("description_auxiliary1").toString());
+		str.replace("%{designation_auxiliary1}", dc.value("designation_auxiliary1").toString());
+		str.replace("%{manufacturer_auxiliary1}", dc.value("manufacturer_auxiliary1").toString());
+		str.replace("%{manufacturer_reference_auxiliary1}", dc.value("manufacturer_reference_auxiliary1").toString());
+		str.replace("%{supplier_auxiliary1}", dc.value("supplier_auxiliary1").toString());
+		str.replace("%{quantity_auxiliary1}", dc.value("quantity_auxiliary1").toString());
+		str.replace("%{unity_auxiliary1}", dc.value("unity_auxiliary1").toString());
+		
 		str.replace("%{auxiliary2}", dc.value("auxiliary2").toString());
+		str.replace("%{description_auxiliary2}", dc.value("description_auxiliary2").toString());
+		str.replace("%{designation_auxiliary2}", dc.value("designation_auxiliary2").toString());
+		str.replace("%{manufacturer_auxiliary2}", dc.value("manufacturer_auxiliary2").toString());
+		str.replace("%{manufacturer_reference_auxiliary2}", dc.value("manufacturer_reference_auxiliary2").toString());
+		str.replace("%{supplier_auxiliary2}", dc.value("supplier_auxiliary2").toString());
+		str.replace("%{quantity_auxiliary2}", dc.value("quantity_auxiliary2").toString());
+		str.replace("%{unity_auxiliary2}", dc.value("unity_auxiliary2").toString());
+		
+		
+		str.replace("%{auxiliary3}", dc.value("auxiliary3").toString());
+		str.replace("%{description_auxiliary3}", dc.value("description_auxiliary3").toString());
+		str.replace("%{designation_auxiliary3}", dc.value("designation_auxiliary3").toString());
+		str.replace("%{manufacturer_auxiliary3}", dc.value("manufacturer_auxiliary3").toString());
+		str.replace("%{manufacturer_reference_auxiliary3}", dc.value("manufacturer_reference_auxiliary3").toString());
+		str.replace("%{supplier_auxiliary3}", dc.value("supplier_auxiliary3").toString());
+		str.replace("%{quantity_auxiliary3}", dc.value("quantity_auxiliary3").toString());
+		str.replace("%{unity_auxiliary3}", dc.value("unity_auxiliary3").toString());
+		
+		
+		str.replace("%{auxiliary4}", dc.value("auxiliary4").toString());
+		str.replace("%{description_auxiliary4}", dc.value("description_auxiliary4").toString());
+		str.replace("%{designation_auxiliary4}", dc.value("designation_auxiliary4").toString());
+		str.replace("%{manufacturer_auxiliary4}", dc.value("manufacturer_auxiliary4").toString());
+		str.replace("%{manufacturer_reference_auxiliary4}", dc.value("manufacturer_reference_auxiliary4").toString());
+		str.replace("%{supplier_auxiliary4}", dc.value("supplier_auxiliary4").toString());
+		str.replace("%{quantity_auxiliary4}", dc.value("quantity_auxiliary4").toString());
+		str.replace("%{unity_auxiliary4}", dc.value("unity_auxiliary4").toString());
+		
+		
 		str.replace("%{machine_manufacturer_reference}",
 			    dc.value("machine_manufacturer_reference").toString());
 		str.replace("%{location}", dc.value("location").toString());

sources/dataBase/projectdatabase.cpp

@@ -336,8 +336,6 @@ void projectDataBase::createElementNomenclatureView()
 						 "ei.location AS location,"
 						 "ei.comment AS comment,"
 						 "ei.function AS function,"
-						 "ei.auxiliary1 AS auxiliary1,"
-						 "ei.auxiliary2 AS auxiliary2,"
 						 "ei.description AS description,"
 						 "ei.designation AS designation,"
 						 "ei.manufacturer AS manufacturer,"
@@ -346,6 +344,47 @@ void projectDataBase::createElementNomenclatureView()
 						 "ei.supplier AS supplier,"
 						 "ei.quantity AS quantity,"
 						 "ei.unity AS unity,"
+						 "ei.auxiliary1 AS auxiliary1,"
+						 "ei.description_auxiliary1 AS description_auxiliary1,"
+						 "ei.designation_auxiliary1 AS designation_auxiliary1,"
+						 "ei.manufacturer_auxiliary1 AS manufacturer_auxiliary1,"
+						 "ei.manufacturer_reference_auxiliary1 AS manufacturer_reference_auxiliary1,"
+						 "ei.machine_manufacturer_reference_auxiliary1 AS machine_manufacturer_reference_auxiliary1,"
+						 "ei.supplier_auxiliary1 AS supplier_auxiliary1,"
+						 "ei.quantity_auxiliary1 AS quantity_auxiliary1,"
+						 "ei.unity_auxiliary1 AS unity_auxiliary1,"
+						 
+						 "ei.auxiliary2 AS auxiliary2,"
+						 "ei.description_auxiliary2 AS description_auxiliary2,"
+						 "ei.designation_auxiliary2 AS designation_auxiliary2,"
+						 "ei.manufacturer_auxiliary2 AS manufacturer_auxiliary2,"
+						 "ei.manufacturer_reference_auxiliary2 AS manufacturer_reference_auxiliary2,"
+						 "ei.machine_manufacturer_reference_auxiliary2 AS machine_manufacturer_reference_auxiliary2,"
+						 "ei.supplier_auxiliary2 AS supplier_auxiliary2,"
+						 "ei.quantity_auxiliary2 AS quantity_auxiliary2,"
+						 "ei.unity_auxiliary2 AS unity_auxiliary2,"
+						 
+						 "ei.auxiliary3 AS auxiliary3,"
+						 "ei.description_auxiliary3 AS description_auxiliary3,"
+						 "ei.designation_auxiliary3 AS designation_auxiliary3,"
+						 "ei.manufacturer_auxiliary3 AS manufacturer_auxiliary3,"
+						 "ei.manufacturer_reference_auxiliary3 AS manufacturer_reference_auxiliary3,"
+						 "ei.machine_manufacturer_reference_auxiliary3 AS machine_manufacturer_reference_auxiliary3,"
+						 "ei.supplier_auxiliary3 AS supplier_auxiliary3,"
+						 "ei.quantity_auxiliary3 AS quantity_auxiliary3,"
+						 "ei.unity_auxiliary3 AS unity_auxiliary3,"
+						 
+						 "ei.auxiliary4 AS auxiliary4,"
+						 "ei.description_auxiliary4 AS description_auxiliary4,"
+						 "ei.designation_auxiliary4 AS designation_auxiliary4,"
+						 "ei.manufacturer_auxiliary4 AS manufacturer_auxiliary4,"
+						 "ei.manufacturer_reference_auxiliary4 AS manufacturer_reference_auxiliary4,"
+						 "ei.machine_manufacturer_reference_auxiliary4 AS machine_manufacturer_reference_auxiliary4,"
+						 "ei.supplier_auxiliary4 AS supplier_auxiliary4,"
+						 "ei.quantity_auxiliary4 AS quantity_auxiliary4,"
+						 "ei.unity_auxiliary4 AS unity_auxiliary4,"
+						 
+						
 						 "d.pos AS diagram_position,"
 						 "e.type AS element_type,"
 						 "e.sub_type AS element_sub_type,"

sources/diagramcontext.h

@@ -45,7 +45,42 @@
  * quantity                       -> quantity of the element
  * unity                          -> unity of the element
  * auxiliary1                     -> auxiliary 1 of element
+ * description_auxiliary1
+ * designation_auxiliary1
+ * manufacturer_auxiliary1
+ * manufacturer_reference_auxiliary1
+ * machine_manufacturer_reference_auxiliary1
+ * supplier_auxiliary1
+ * quantity_auxiliary1
+ * unity_auxiliary1
  * auxiliary2                     -> auxiliary 2 of element
+ * description_auxiliary2
+ * designation_auxiliary2
+ * manufacturer_auxiliary2
+ * manufacturer_reference_auxiliary2
+ * machine_manufacturer_reference_auxiliary2
+ * supplier_auxiliary2
+ * quantity_auxiliary2
+ * unity_auxiliary2
+ * auxiliary3                     -> auxiliary 1 of element
+ * description_auxiliary3
+ * designation_auxiliary3
+ * manufacturer_auxiliary3
+ * manufacturer_reference_auxiliary3
+ * machine_manufacturer_reference_auxiliary3
+ * supplier_auxiliary3
+ * quantity_auxiliary3
+ * unity_auxiliary3
+ * auxiliary4                     -> auxiliary 1 of element
+ * description_auxiliary4
+ * designation_auxiliary4
+ * manufacturer_auxiliary4
+ * manufacturer_reference_auxiliary4
+ * machine_manufacturer_reference_auxiliary4
+ * supplier_auxiliary4
+ * quantity_auxiliary4
+ * unity_auxiliary4
+ * 
  * machine_manufacturer_reference -> reference of the machine manufacturer
  * supplier                       -> the supplier of the element
  * function                       -> the function of element

sources/qetinformation.cpp

@@ -146,8 +146,6 @@ QStringList QETInformation::elementInfoKeys()
 						 ELMT_LOCATION,
 						 ELMT_COMMENT,
 						 ELMT_FUNCTION,
-						 ELMT_AUX1,
-						 ELMT_AUX2,
 						 ELMT_DESCRIPTION,
 						 ELMT_DESIGNATION,
 						 ELMT_MANUFACTURER,
@@ -155,7 +153,43 @@ QStringList QETInformation::elementInfoKeys()
 						 ELMT_MACHINE_MANUFACTURER_REF,
 						 ELMT_SUPPLIER,
 						 ELMT_QUANTITY,
-						 ELMT_UNITY };
+						 ELMT_UNITY, 
+						 ELMT_AUX1,
+						 ELMT_DESCRIPTION_AUX1,
+						 ELMT_DESIGNATION_AUX1,
+						 ELMT_MANUFACTURER_AUX1,
+						 ELMT_MANUFACTURER_REF_AUX1,
+						 ELMT_MACHINE_MANUFACTURER_REF_AUX1,
+						 ELMT_SUPPLIER_AUX1,
+						 ELMT_QUANTITY_AUX1,
+						 ELMT_UNITY_AUX1,
+						 ELMT_AUX2,
+						 ELMT_DESCRIPTION_AUX2,
+						 ELMT_DESIGNATION_AUX2,
+						 ELMT_MANUFACTURER_AUX2,
+						 ELMT_MANUFACTURER_REF_AUX2,
+						 ELMT_MACHINE_MANUFACTURER_REF_AUX2,
+						 ELMT_SUPPLIER_AUX2,
+						 ELMT_QUANTITY_AUX2,
+						 ELMT_UNITY_AUX2,
+						 ELMT_AUX3,
+						 ELMT_DESCRIPTION_AUX3,
+						 ELMT_DESIGNATION_AUX3,
+						 ELMT_MANUFACTURER_AUX3,
+						 ELMT_MANUFACTURER_REF_AUX3,
+						 ELMT_MACHINE_MANUFACTURER_REF_AUX3,
+						 ELMT_SUPPLIER_AUX3,
+						 ELMT_QUANTITY_AUX3,
+						 ELMT_UNITY_AUX3,
+						 ELMT_AUX4,
+						 ELMT_DESCRIPTION_AUX4,
+						 ELMT_DESIGNATION_AUX4,
+						 ELMT_MANUFACTURER_AUX4,
+						 ELMT_MANUFACTURER_REF_AUX4,
+						 ELMT_MACHINE_MANUFACTURER_REF_AUX4,
+						 ELMT_SUPPLIER_AUX4,
+						 ELMT_QUANTITY_AUX4,
+						 ELMT_UNITY_AUX4, };
 	return list;
 }
 
@@ -220,8 +254,6 @@ QString QETInformation::translatedInfoKey(const QString &info)
 	else if (info == ELMT_LABEL)                       return QObject::tr("Label");
 	else if (info == ELMT_COMMENT)                     return QObject::tr("Commentaire");
 	else if (info == ELMT_FUNCTION)                    return QObject::tr("Fonction");
-	else if (info == ELMT_AUX1)                        return QObject::tr("Bloc auxiliaire 1");
-	else if (info == ELMT_AUX2)                        return QObject::tr("Bloc auxiliaire 2");
 	else if (info == ELMT_DESCRIPTION)                 return QObject::tr("Description textuelle");
 	else if (info == ELMT_DESIGNATION)                 return QObject::tr("Numéro d'article");
 	else if (info == ELMT_MANUFACTURER)                return QObject::tr("Fabricant");
@@ -237,6 +269,42 @@ QString QETInformation::translatedInfoKey(const QString &info)
 	else if (info == COND_SECTION)                     return QObject::tr("Section du fil");
 	else if (info == COND_TEXT)                        return QObject::tr("Texte");
 	else if (info == COND_FORMULA)                     return QObject::tr("Formule du texte");
+	else if (info == ELMT_AUX1)                        return QObject::tr("Bloc auxiliaire 1");
+	else if (info == ELMT_DESCRIPTION_AUX1)                 return QObject::tr("Description textuelle auxiliaire 1");
+	else if (info == ELMT_DESIGNATION_AUX1)                 return QObject::tr("Numéro d'article auxiliaire 1");
+	else if (info == ELMT_MANUFACTURER_AUX1)                return QObject::tr("Fabricant auxiliaire 1");
+	else if (info == ELMT_MANUFACTURER_REF_AUX1)            return QObject::tr("Numéro de commande auxiliaire 1");
+	else if (info == ELMT_MACHINE_MANUFACTURER_REF_AUX1)    return QObject::tr("Numéro interne auxiliaire 1");
+	else if (info == ELMT_SUPPLIER_AUX1)                    return QObject::tr("Fournisseur auxiliaire 1");
+	else if (info == ELMT_QUANTITY_AUX1)                    return QObject::tr("Quantité auxiliaire 1");
+	else if (info == ELMT_UNITY_AUX1)                       return QObject::tr("Unité auxiliaire 1");
+	else if (info == ELMT_AUX2)                        return QObject::tr("Bloc auxiliaire 2");
+	else if (info == ELMT_DESCRIPTION_AUX2)                 return QObject::tr("Description textuelle auxiliaire 2");
+	else if (info == ELMT_DESIGNATION_AUX2)                 return QObject::tr("Numéro d'article auxiliaire 2");
+	else if (info == ELMT_MANUFACTURER_AUX2)                return QObject::tr("Fabricant auxiliaire 2");
+	else if (info == ELMT_MANUFACTURER_REF_AUX2)            return QObject::tr("Numéro de commande auxiliaire 2");
+	else if (info == ELMT_MACHINE_MANUFACTURER_REF_AUX2)    return QObject::tr("Numéro interne auxiliaire 2");
+	else if (info == ELMT_SUPPLIER_AUX2)                    return QObject::tr("Fournisseur auxiliaire 2");
+	else if (info == ELMT_QUANTITY_AUX2)                    return QObject::tr("Quantité auxiliaire 2");
+	else if (info == ELMT_UNITY_AUX2)                       return QObject::tr("Unité auxiliaire 2");
+	else if (info == ELMT_AUX3)                        return QObject::tr("Bloc auxiliaire 3");
+	else if (info == ELMT_DESCRIPTION_AUX3)                 return QObject::tr("Description textuelle auxiliaire 3");
+	else if (info == ELMT_DESIGNATION_AUX3)                 return QObject::tr("Numéro d'article auxiliaire 3");
+	else if (info == ELMT_MANUFACTURER_AUX3)                return QObject::tr("Fabricant auxiliaire 3");
+	else if (info == ELMT_MANUFACTURER_REF_AUX3)            return QObject::tr("Numéro de commande auxiliaire 3");
+	else if (info == ELMT_MACHINE_MANUFACTURER_REF_AUX3)    return QObject::tr("Numéro interne auxiliaire 3");
+	else if (info == ELMT_SUPPLIER_AUX3)                    return QObject::tr("Fournisseur auxiliaire 3");
+	else if (info == ELMT_QUANTITY_AUX3)                    return QObject::tr("Quantité auxiliaire 3");
+	else if (info == ELMT_UNITY_AUX3)                       return QObject::tr("Unité auxiliaire 3");
+	else if (info == ELMT_AUX4)                        return QObject::tr("Bloc auxiliaire 4");
+	else if (info == ELMT_DESCRIPTION_AUX4)                 return QObject::tr("Description textuelle auxiliaire 4");
+	else if (info == ELMT_DESIGNATION_AUX4)                 return QObject::tr("Numéro d'article auxiliaire 4");
+	else if (info == ELMT_MANUFACTURER_AUX4)                return QObject::tr("Fabricant auxiliaire 4");
+	else if (info == ELMT_MANUFACTURER_REF_AUX4)            return QObject::tr("Numéro de commande auxiliaire 4");
+	else if (info == ELMT_MACHINE_MANUFACTURER_REF_AUX4)    return QObject::tr("Numéro interne auxiliaire 4");
+	else if (info == ELMT_SUPPLIER_AUX4)                    return QObject::tr("Fournisseur auxiliaire 4");
+	else if (info == ELMT_QUANTITY_AUX4)                    return QObject::tr("Quantité auxiliaire 4");
+	else if (info == ELMT_UNITY_AUX4)                       return QObject::tr("Unité auxiliaire 4");
 	else return QString();
 }
 
@@ -245,14 +313,53 @@ QStringList QETInformation::elementEditorElementInfoKeys()
 	QStringList list = { ELMT_LABEL,
 						 ELMT_PLANT,
 						 ELMT_COMMENT,
+						 ELMT_FUNCTION,
 						 ELMT_DESCRIPTION,
 						 ELMT_DESIGNATION,
 						 ELMT_MANUFACTURER,
 						 ELMT_MANUFACTURER_REF,
+						 ELMT_MACHINE_MANUFACTURER_REF,
 						 ELMT_SUPPLIER,
 						 ELMT_QUANTITY,
 						 ELMT_UNITY,
-						 ELMT_MACHINE_MANUFACTURER_REF};
+						 ELMT_LOCATION,
+						 ELMT_PLANT,
+						 ELMT_AUX1,
+						 ELMT_DESCRIPTION_AUX1,
+						 ELMT_DESIGNATION_AUX1,
+						 ELMT_MANUFACTURER_AUX1,
+						 ELMT_MANUFACTURER_REF_AUX1,
+						 ELMT_MACHINE_MANUFACTURER_REF_AUX1,
+						 ELMT_SUPPLIER_AUX1,
+						 ELMT_QUANTITY_AUX1,
+						 ELMT_UNITY_AUX1,
+						 ELMT_AUX2,
+						 ELMT_DESCRIPTION_AUX2,
+						 ELMT_DESIGNATION_AUX2,
+						 ELMT_MANUFACTURER_AUX2,
+						 ELMT_MANUFACTURER_REF_AUX2,
+						 ELMT_MACHINE_MANUFACTURER_REF_AUX2,
+						 ELMT_SUPPLIER_AUX2,
+						 ELMT_QUANTITY_AUX2,
+						 ELMT_UNITY_AUX2,
+						 ELMT_AUX3,
+						 ELMT_DESCRIPTION_AUX3,
+						 ELMT_DESIGNATION_AUX3,
+						 ELMT_MANUFACTURER_AUX3,
+						 ELMT_MANUFACTURER_REF_AUX3,
+						 ELMT_MACHINE_MANUFACTURER_REF_AUX3,
+						 ELMT_SUPPLIER_AUX3,
+						 ELMT_QUANTITY_AUX3,
+						 ELMT_UNITY_AUX3,
+						 ELMT_AUX4,
+						 ELMT_DESCRIPTION_AUX4,
+						 ELMT_DESIGNATION_AUX4,
+						 ELMT_MANUFACTURER_AUX4,
+						 ELMT_MANUFACTURER_REF_AUX4,
+						 ELMT_MACHINE_MANUFACTURER_REF_AUX4,
+						 ELMT_SUPPLIER_AUX4,
+						 ELMT_QUANTITY_AUX4,
+						 ELMT_UNITY_AUX4 };
 	return list;
 }
 

sources/qetinformation.h

@@ -37,8 +37,6 @@ namespace QETInformation
 	static QString ELMT_FORMULA                      = "formula";
 	static QString ELMT_COMMENT                      = "comment";
 	static QString ELMT_FUNCTION                     = "function";
-	static QString ELMT_AUX1                         = "auxiliary1";
-	static QString ELMT_AUX2                         = "auxiliary2";
 	static QString ELMT_DESCRIPTION                  = "description";
 	static QString ELMT_DESIGNATION                  = "designation";
 	static QString ELMT_MANUFACTURER                 = "manufacturer";
@@ -49,6 +47,43 @@ namespace QETInformation
 	static QString ELMT_UNITY                        = "unity";
 	static QString ELMT_PLANT                        = "plant";
 	static QString ELMT_LOCATION                     = "location";
+	static QString ELMT_AUX1                         = "auxiliary1";
+	static QString ELMT_DESCRIPTION_AUX1                 = "description_auxiliary1";
+	static QString ELMT_DESIGNATION_AUX1                  = "designation_auxiliary1 ";
+	static QString ELMT_MANUFACTURER_AUX1                 = "manufacturer_auxiliary1";
+	static QString ELMT_MANUFACTURER_REF_AUX1             = "manufacturer_reference_auxiliary1";
+	static QString ELMT_MACHINE_MANUFACTURER_REF_AUX1     = "machine_manufacturer_reference_auxiliary1 ";
+	static QString ELMT_SUPPLIER_AUX1                     = "supplier_auxiliary1 ";
+	static QString ELMT_QUANTITY_AUX1                     = "quantity_auxiliary1 ";
+	static QString ELMT_UNITY_AUX1                        = "unity_auxiliary1";
+	static QString ELMT_AUX2                         = "auxiliary2";
+	static QString ELMT_DESCRIPTION_AUX2                 = "description_auxiliary2";
+	static QString ELMT_DESIGNATION_AUX2                  = "designation_auxiliary2 ";
+	static QString ELMT_MANUFACTURER_AUX2                 = "manufacturer_auxiliary2";
+	static QString ELMT_MANUFACTURER_REF_AUX2             = "manufacturer_reference_auxiliary2";
+	static QString ELMT_MACHINE_MANUFACTURER_REF_AUX2     = "machine_manufacturer_reference_auxiliary2";
+	static QString ELMT_SUPPLIER_AUX2                     = "supplier_auxiliary2 ";
+	static QString ELMT_QUANTITY_AUX2                     = "quantity_auxiliary2 ";
+	static QString ELMT_UNITY_AUX2                        = "unity_auxiliary2";
+	static QString ELMT_AUX3                         = "auxiliary3";
+	static QString ELMT_DESCRIPTION_AUX3                 = "description_auxiliary3";
+	static QString ELMT_DESIGNATION_AUX3                  = "designation_auxiliary3 ";
+	static QString ELMT_MANUFACTURER_AUX3                 = "manufacturer_auxiliary3";
+	static QString ELMT_MANUFACTURER_REF_AUX3             = "manufacturer_reference_auxiliary3";
+	static QString ELMT_MACHINE_MANUFACTURER_REF_AUX3     = "machine_manufacturer_reference_auxiliary3 ";
+	static QString ELMT_SUPPLIER_AUX3                     = "supplier_auxiliary3 ";
+	static QString ELMT_QUANTITY_AUX3                     = "quantity_auxiliary3 ";
+	static QString ELMT_UNITY_AUX3                        = "unity_auxiliary3";
+	static QString ELMT_AUX4                         = "auxiliary4";
+	static QString ELMT_DESCRIPTION_AUX4                 = "description_auxiliary4";
+	static QString ELMT_DESIGNATION_AUX4                  = "designation_auxiliary4 ";
+	static QString ELMT_MANUFACTURER_AUX4                 = "manufacturer_auxiliary4";
+	static QString ELMT_MANUFACTURER_REF_AUX4             = "manufacturer_reference_auxiliary4";
+	static QString ELMT_MACHINE_MANUFACTURER_REF_AUX4     = "machine_manufacturer_reference_auxiliary4 ";
+	static QString ELMT_SUPPLIER_AUX4                     = "supplier_auxiliary4 ";
+	static QString ELMT_QUANTITY_AUX4                     = "quantity_auxiliary4 ";
+	static QString ELMT_UNITY_AUX4                        = "unity_auxiliary4";
+
 
 	/** Default information related to conductor **/
 	static QString COND_FUNCTION             = "function";