revert and merge rev 4823.

Fix : in old projects without the conductors formula, the conductors texts aren't loaded and displayed
Fix it in method void Conductor::refreshText()


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4825 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-12-28 10:03:47 +00:00
parent 52f911887d
commit 14f02d4ed1
10 changed files with 189 additions and 95 deletions

View File

@@ -121,9 +121,8 @@ void ConductorAutoNumerotation::numeratePotential()
ConductorProperties cp = m_conductor -> properties();
cp.text = text_list.first();
cp.m_formula = formula_list.first();
m_conductor->setProperties(cp);
m_conductor->rSequenceNum() = conductor_list.first()->sequenceNum();
m_conductor->setText(text_list.first());
m_conductor->setProperties(cp);
}
//the texts isn't identicals
else