diff --git a/elements/10_electric/qet_labels.xml b/elements/10_electric/qet_labels.xml index 7d90d76d1..92adec373 100644 --- a/elements/10_electric/qet_labels.xml +++ b/elements/10_electric/qet_labels.xml @@ -273,6 +273,7 @@ + @@ -320,6 +321,7 @@ + @@ -513,6 +515,7 @@ + @@ -571,6 +574,6 @@ - 361 + 364 diff --git a/sources/qetgraphicsitem/customelement.cpp b/sources/qetgraphicsitem/customelement.cpp index 70ce84b9a..2cf06e0fa 100644 --- a/sources/qetgraphicsitem/customelement.cpp +++ b/sources/qetgraphicsitem/customelement.cpp @@ -288,7 +288,7 @@ void CustomElement::parseLabels() { } // Only Electric labels created so far - if (current_location.fileName() != "10_electric") return; + //if (current_location.fileName() != "10_electric") QString qet_labels = "10_electric/qet_labels.xml"; QString filepath = QETApp::commonElementsDir().append(qet_labels); QFile file(filepath); @@ -335,6 +335,16 @@ void CustomElement::parseLabels() { } rxml.readNext(); } + if (prefix == "") { + if (!(location().project()->elementAutoNumCurrentFormula().isEmpty()) && (location().project()->elementAutoNumCurrentFormula() != "") && + (this->linkType()!=Element::Slave) && (this->linkType()!=Element::Terminale)) { + QString formula = location().project()->elementAutoNumCurrentFormula(); + this->setPrefix(prefix); + DiagramContext &dc = this->rElementInformations(); + dc.addValue("label", formula); + this->setTaggedText("label",formula); + } + } } //apply formula to specific label - This condition specify elements which have different labels e.g KM //that are already specified in the element label (inside .elmt file). This method is not called if elements