[qet] [3887] Nomenclature add field "Location"

[subversion@xxxxxxxxxxxxx]

Revision: 3887
Author:   scorpio810
Date:     2015-04-02 17:48:04 +0200 (Thu, 02 Apr 2015)
Log Message:
-----------
Nomenclature add field "Location"

Modified Paths:
--------------
    trunk/sources/nomenclature.cpp
    trunk/sources/qetapp.cpp

Modified: trunk/sources/nomenclature.cpp
===================================================================
--- trunk/sources/nomenclature.cpp	2015-04-02 08:52:22 UTC (rev 3886)
+++ trunk/sources/nomenclature.cpp	2015-04-02 15:48:04 UTC (rev 3887)
@@ -81,8 +81,9 @@
 QString nomenclature::getNomenclature() {
 	//Process...
 	QString data = tr("NOMENCLATURE : ") + m_project -> title() + "\n\n";
-    data += tr("N° de folio") +";"+ tr("Titre de folio") +";"+ tr("Désignation qet")+";"+ tr("Label") +";"+ tr("Désignation")+";"+ tr("Commentaire") +";"+ tr("Fabricant") +";"+ tr("Reference") +";"+ tr("Machine-reference")+"\n";
+	data += tr("N° de folio") +";"+ tr("Titre de folio") +";"+ tr("Désignation qet")+";"+ tr("Label") +";"+ tr("Désignation")+";"+ tr("Commentaire") +";"+ tr("Fabricant") +";"+ tr("Reference") +";"+ tr("Machine-reference") +";"+tr("Localisation")+"\n";
 
+
 	if(m_list_diagram.isEmpty()) return data;
 
 	foreach (Diagram *d, m_list_diagram) {
@@ -119,7 +120,8 @@
 	info += elmt_info["comment"].toString() + ";";
 	info += elmt_info["manufacturer"].toString() + ";";
 	info += elmt_info["manufacturer-reference"].toString() + ";";
-	info += elmt_info["machine-manufacturer-reference"].toString() + "\n";
+	info += elmt_info["machine-manufacturer-reference"].toString() + ";";
+	info += elmt_info["location"].toString() + "\n";
 
 	return info;
 }

Modified: trunk/sources/qetapp.cpp
===================================================================
--- trunk/sources/qetapp.cpp	2015-04-02 08:52:22 UTC (rev 3886)
+++ trunk/sources/qetapp.cpp	2015-04-02 15:48:04 UTC (rev 3887)
@@ -349,7 +349,8 @@
 			  << "designation"
 			  << "manufacturer"
 			  << "manufacturer-reference"
-			  << "machine-manufacturer-reference";
+			  << "machine-manufacturer-reference"
+			  << "location";
 	return info_list;
 }
 
@@ -367,6 +368,7 @@
 	else if (info == "manufacturer") return tr("Fabricant");
 	else if (info == "manufacturer-reference") return tr("Référence fabricant");
 	else if (info == "machine-manufacturer-reference") return tr("Référence fabricant machine");
+	else if (info == "location") return tr("Localisation");
 	return (info);
 }