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

Revert last commits

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5624 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2018-12-01 12:55:05 +00:00
parent 10e889bae5
commit 58fb59491b
26 changed files with 48 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sources/autoNum/assignvariables.cpp
View File

@@ -187,7 +187,6 @@ namespace autonum
str.replace("%{auxiliary1}", dc.value("auxiliary1").toString());
str.replace("%{auxiliary2}", dc.value("auxiliary2").toString());
str.replace("%{machine-manufacturer-reference}", dc.value("machine-manufacturer-reference").toString());
str.replace("%{function-group}", dc.value("function-group").toString());
str.replace("%{location}", dc.value("location").toString());
str.replace("%{function}", dc.value("function").toString());
str.replace("%{void}", QString());
@@ -211,7 +210,6 @@ namespace autonum
m_assigned_label.replace("%id", QString::number(m_diagram->folioIndex()+1));
m_assigned_label.replace("%total", QString::number(m_diagram->border_and_titleblock.folioTotal()));
m_assigned_label.replace("%M", m_diagram -> border_and_titleblock.machine());
m_assigned_label.replace("%FG",m_diagram ->border_and_titleblock.funcgroup());
m_assigned_label.replace("%LM", m_diagram -> border_and_titleblock.locmach());
QSettings settings;
@@ -428,9 +426,6 @@ namespace autonum
else if (type == "machine") {
formula.append("%M");
}
else if (type == "funcgroup") {
formula.append("%FG");
}
else if (type == "locmach") {
formula.append("%LM");
}