Element : variable assignement of label is now managed by an external class instead of the element itself

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4772 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-11-09 16:06:04 +00:00
parent 2b952f4189
commit bb2fff7e5f
14 changed files with 315 additions and 175 deletions

View File

@@ -61,9 +61,10 @@ void SimpleElement::initLink(QETProject *project) {
* @brief SimpleElement::folioIdChange
* Use to update the label of this item when the foio id change
*/
void SimpleElement::folioIdChange() {
void SimpleElement::folioIdChange()
{
DiagramContext dc =elementInformations();
setTaggedText("label", assignVariables(dc["label"].toString(), this), true);
setTaggedText("label", autonum::AssignVariables::formulaToLabel(dc["label"].toString(), m_autoNum_seq, diagram(), this));
}
/**
@@ -82,10 +83,9 @@ void SimpleElement::changeElementInfo(){
* @brief SimpleElement::updateLabel
* update label of this element
*/
void SimpleElement::updateLabel(DiagramContext old_info, DiagramContext new_info) {
QString label = new_info["label"].toString();
Element *elmt = this;
label = assignVariables(label,elmt);
void SimpleElement::updateLabel(DiagramContext old_info, DiagramContext new_info)
{
QString label = autonum::AssignVariables::formulaToLabel(new_info["label"].toString(), m_autoNum_seq, diagram(), this);
//Label of element
if (old_info["label"].toString() != label) {