From 70b047a101c325d419f92106f9987ff8dc569346 Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Mon, 13 Feb 2017 11:40:33 +0000 Subject: [PATCH] Element autonumbering. Add autonumbering menu to assign formulas to custom element label. (~/.qet/elements/qet_labels.xml) git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4909 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/autoNum/assignvariables.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sources/autoNum/assignvariables.cpp b/sources/autoNum/assignvariables.cpp index a4e8c9d03..2a4bd9bd7 100644 --- a/sources/autoNum/assignvariables.cpp +++ b/sources/autoNum/assignvariables.cpp @@ -467,9 +467,20 @@ namespace autonum 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); + QFile file(customfilepath); + file.isReadable(); + if (!file.open(QFile::ReadOnly | QFile::Text)) + return QString(); + } + + + rxml.setDevice(&file); rxml.readNext();