kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove previous commits

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4912 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2017-02-13 20:49:31 +00:00
parent 75140b63a4
commit 7a62fe8356
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sources/autoNum/assignvariables.cpp
View File

@@ -462,30 +462,17 @@ namespace autonum
} }
// Only Electric labels created so far // Only Electric labels created so far
if (current_location.fileName() != "10_electric"){ //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();
}
if (current_location.fileName() == "10_electric"){
QString qet_labels = "10_electric/qet_labels.xml"; QString qet_labels = "10_electric/qet_labels.xml";
QString filepath = QETApp::commonElementsDir().append(qet_labels); QString filepath = QETApp::commonElementsDir().append(qet_labels);
QFile file(filepath); QFile file(filepath);
file.isReadable(); file.isReadable();
if (!file.open(QFile::ReadOnly | QFile::Text)) if (!file.open(QFile::ReadOnly | QFile::Text))
return QString(); return QString();
rxml.setDevice(&file); rxml.setDevice(&file);
rxml.readNext(); rxml.readNext();
}
while(!rxml.atEnd()) while(!rxml.atEnd())
{ {