[qet] [3923] Nomenclature add field "Function"

[subversion@xxxxxxxxxxxxx]

Revision: 3923
Author:   scorpio810
Date:     2015-04-29 16:27:31 +0200 (Wed, 29 Apr 2015)
Log Message:
-----------
Nomenclature add field "Function"

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

Modified: trunk/sources/nomenclature.cpp
===================================================================
--- trunk/sources/nomenclature.cpp	2015-04-27 19:58:23 UTC (rev 3922)
+++ trunk/sources/nomenclature.cpp	2015-04-29 14:27:31 UTC (rev 3923)
@@ -81,7 +81,17 @@
 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") +";"+tr("Localisation")+"\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") +";"
+	""+ tr("Fonction") +"\n";
 
 
 	if(m_list_diagram.isEmpty()) return data;
@@ -121,7 +131,8 @@
 	info += elmt_info["manufacturer"].toString() + ";";
 	info += elmt_info["manufacturer-reference"].toString() + ";";
 	info += elmt_info["machine-manufacturer-reference"].toString() + ";";
-	info += elmt_info["location"].toString() + "\n";
+	info += elmt_info["location"].toString() + ";";
+	info += elmt_info["function"].toString() + "\n";
 
 	return info;
 }

Modified: trunk/sources/qetapp.cpp
===================================================================
--- trunk/sources/qetapp.cpp	2015-04-27 19:58:23 UTC (rev 3922)
+++ trunk/sources/qetapp.cpp	2015-04-29 14:27:31 UTC (rev 3923)
@@ -350,7 +350,8 @@
 			  << "manufacturer"
 			  << "manufacturer-reference"
 			  << "machine-manufacturer-reference"
-			  << "location";
+			  << "location"
+			  << "function";
 	return info_list;
 }
 
@@ -369,6 +370,7 @@
 	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");
+	else if (info == "function") return tr("Fonction");
 	return (info);
 }