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

Revamp struct sequenceStruct to class sequentialNumbers.

Browse Source 
Element now use methods (toXml and fromXml) of sequentialNumbers to store and load sequential.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4803 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-12-08 15:06:46 +00:00
parent 18df62cea1
commit 9f014d55af
11 changed files with 196 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/conductorautonumerotation.cpp
View File

@@ -122,7 +122,7 @@ void ConductorAutoNumerotation::numeratePotential()
cp.text = text_list.first();
cp.m_formula = formula_list.first();
m_conductor->setProperties(cp);
m_conductor->setOthersSequential(conductor_list.first());
m_conductor->rSequenceNum() = conductor_list.first()->sequenceNum();
m_conductor->setText(text_list.first());
}
//the texts isn't identicals
@@ -153,10 +153,10 @@ void ConductorAutoNumerotation::numerateNewConductor()
cp.m_formula = formula;
m_conductor->setProperties(cp);
autonum::setSequential(formula, m_conductor->rSequenceStruct(), context, m_diagram, autoNum_name);
autonum::setSequential(formula, m_conductor->rSequenceNum(), context, m_diagram, autoNum_name);
NumerotationContextCommands ncc (context, m_diagram);
m_diagram->project()->addConductorAutoNum(autoNum_name, ncc.next());
applyText(autonum::AssignVariables::formulaToLabel(formula, m_conductor->rSequenceStruct(), m_diagram));
applyText(autonum::AssignVariables::formulaToLabel(formula, m_conductor->rSequenceNum(), m_diagram));
}