From 75140b63a40552c2f64eb8e2e7e3fd5342dd7fa1 Mon Sep 17 00:00:00 2001
From: scorpio810
 <scorpio810@r995  scorpio810  2010-05-20 11:17:04 +0200 (jeu. 20 mai 2010)>
Date: Mon, 13 Feb 2017 19:26:09 +0000
Subject: [PATCH] Improve autonumbering to assign formulas to custom element
 label.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4911 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 sources/autoNum/assignvariables.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/sources/autoNum/assignvariables.cpp b/sources/autoNum/assignvariables.cpp
index c69f23885..1923f01a0 100644
--- a/sources/autoNum/assignvariables.cpp
+++ b/sources/autoNum/assignvariables.cpp
@@ -462,14 +462,6 @@ namespace autonum
 		}
 
 		// Only Electric labels created so far
-		//if (current_location.fileName() != "10_electric")
-		QString qet_labels = "10_electric/qet_labels.xml";
-		QString filepath = QETApp::commonElementsDir().append(qet_labels);
-		QFile file(filepath);
-		file.isReadable();
-		if (!file.open(QFile::ReadOnly | QFile::Text))
-			return QString();
-		
 		if (current_location.fileName() != "10_electric"){
 		QString custom_labels = "qet_labels.xml";
 		QString customfilepath = QETApp::customElementsDir().append(custom_labels);
@@ -477,10 +469,23 @@ namespace autonum
 		file.isReadable();
 		if (!file.open(QFile::ReadOnly | QFile::Text))
 			return QString();
-		}
 		
 		rxml.setDevice(&file);
 		rxml.readNext();
+		}
+		
+		if (current_location.fileName() == "10_electric"){
+		QString qet_labels = "10_electric/qet_labels.xml";
+		QString filepath = QETApp::commonElementsDir().append(qet_labels);
+		QFile file(filepath);
+		file.isReadable();
+		if (!file.open(QFile::ReadOnly | QFile::Text))
+			return QString();
+		
+		rxml.setDevice(&file);
+		rxml.readNext();
+		}
+	
 
 		while(!rxml.atEnd())
 		{