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

@@ -1158,8 +1158,7 @@ void Diagram::updateLabels() {
elmt->updateLabel();
}
foreach (Conductor *cnd, content().conductors()) {
if (cnd->properties().text.contains("%F"))
cnd->setText(cnd->properties().text);
cnd->refreshText();
}
}