diff --git a/sources/nomenclature.cpp b/sources/nomenclature.cpp index feb117f1c..7a48e51a1 100644 --- a/sources/nomenclature.cpp +++ b/sources/nomenclature.cpp @@ -121,7 +121,7 @@ QString nomenclature::getNomenclature() * @param elmt : the element to getinfo * @return : QString with information about element formated to csv file */ -QString nomenclature::getElementInfo(const Element *elmt) { +QString nomenclature::getElementInfo(Element *elmt) { QString info; Diagram *diagram = elmt -> diagram(); @@ -132,16 +132,15 @@ QString nomenclature::getElementInfo(const Element *elmt) { info += diagram -> border_and_titleblock.folio() + ";"; info += elmt -> name() + ";"; info += elmt-> diagram()-> convertPosition(elmt -> scenePos()).toString() + ";"; - info += elmt_info["label"].toString() + ";"; - info += elmt_info["designation"].toString() + ";"; - info += elmt_info["comment"].toString() + ";"; - info += elmt_info["manufacturer"].toString() + ";"; - info += elmt_info["manufacturer-reference"].toString() + ";"; - info += elmt_info["auxiliary1"].toString() + ";"; - info += elmt_info["auxiliary2"].toString() + ";"; - info += elmt_info["machine-manufacturer-reference"].toString() + ";"; - info += elmt_info["location"].toString() + ";"; - info += elmt_info["function"].toString() + "\n"; - + info += elmt->assignVariables(elmt_info["label"].toString(), elmt) + ";"; + info += elmt->assignVariables(elmt_info["designation"].toString(), elmt) + ";"; + info += elmt->assignVariables(elmt_info["comment"].toString(), elmt) + ";"; + info += elmt->assignVariables(elmt_info["manufacturer"].toString(), elmt) + ";"; + info += elmt->assignVariables(elmt_info["manufacturer-reference"].toString(), elmt) + ";"; + info += elmt->assignVariables(elmt_info["auxiliary1"].toString(), elmt) + ";"; + info += elmt->assignVariables(elmt_info["auxiliary2"].toString(), elmt) + ";"; + info += elmt->assignVariables(elmt_info["machine-manufacturer-reference"].toString(), elmt) + ";"; + info += elmt->assignVariables(elmt_info["location"].toString(), elmt) + ";"; + info += elmt->assignVariables(elmt_info["function"].toString(), elmt) + "\n"; return info; } diff --git a/sources/nomenclature.h b/sources/nomenclature.h index 4a041ba60..f44c02a9d 100644 --- a/sources/nomenclature.h +++ b/sources/nomenclature.h @@ -56,7 +56,7 @@ class nomenclature private: QString getNomenclature (); - QString getElementInfo (const Element *elmt); + QString getElementInfo (Element *elmt); }; diff --git a/sources/qetgraphicsitem/crossrefitem.cpp b/sources/qetgraphicsitem/crossrefitem.cpp index a2a4ac2e7..01a0356d3 100644 --- a/sources/qetgraphicsitem/crossrefitem.cpp +++ b/sources/qetgraphicsitem/crossrefitem.cpp @@ -535,7 +535,7 @@ void CrossRefItem::fillCrossRef(QPainter &painter) { */ void CrossRefItem::AddExtraInfo(QPainter &painter) { - QString comment = m_element -> elementInformations()["comment"].toString(); + QString comment = m_element -> assignVariables(m_element -> elementInformations()["comment"].toString(), m_element); bool must_show = m_element -> elementInformations().keyMustShow("comment"); if (!comment.isEmpty() && must_show) diff --git a/sources/qetgraphicsitem/customelement.cpp b/sources/qetgraphicsitem/customelement.cpp index 8d68100fc..bcd0dd8b8 100644 --- a/sources/qetgraphicsitem/customelement.cpp +++ b/sources/qetgraphicsitem/customelement.cpp @@ -987,11 +987,3 @@ ElementTextItem* CustomElement::taggedText(const QString &tagg) const { } return NULL; } - -QString CustomElement::assignVariables(QString label, Element *elmt){ - label.replace("%f", QString::number(elmt->diagram()->folioIndex()+1)); - label.replace("%F", elmt->diagram() -> border_and_titleblock.folio()); - label.replace("%c", QString::number(elmt->diagram() -> convertPosition(elmt -> scenePos()).number())); - label.replace("%l", elmt->diagram() -> convertPosition(elmt -> scenePos()).letter()); - return label; -} diff --git a/sources/qetgraphicsitem/customelement.h b/sources/qetgraphicsitem/customelement.h index 2e332b847..53305de33 100644 --- a/sources/qetgraphicsitem/customelement.h +++ b/sources/qetgraphicsitem/customelement.h @@ -93,7 +93,6 @@ class CustomElement : public FixedElement virtual bool validOrientationAttribute(const QDomElement &); virtual void setPainterStyle(QDomElement &, QPainter &); ElementTextItem* setTaggedText(const QString &tagg, const QString &newstr, const bool noeditable=false); - QString assignVariables (QString, Element *); }; /** diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp index d92e086b1..dfa07645a 100644 --- a/sources/qetgraphicsitem/element.cpp +++ b/sources/qetgraphicsitem/element.cpp @@ -635,3 +635,17 @@ void Element::hoverLeaveEvent(QGraphicsSceneHoverEvent *e) { m_mouse_over = false; update(); } + +/** + * @brief Element::assignVariables() + * Assign variables values + * @param label, string to be changed + * @param elmt, element to extract variables values + */ +QString Element::assignVariables(QString label, Element *elmt){ + label.replace("%f", QString::number(elmt->diagram()->folioIndex()+1)); + label.replace("%F", elmt->diagram() -> border_and_titleblock.folio()); + label.replace("%c", QString::number(elmt->diagram() -> convertPosition(elmt -> scenePos()).number())); + label.replace("%l", elmt->diagram() -> convertPosition(elmt -> scenePos()).letter()); + return label; +} diff --git a/sources/qetgraphicsitem/element.h b/sources/qetgraphicsitem/element.h index 2fc00ac03..a6a773743 100644 --- a/sources/qetgraphicsitem/element.h +++ b/sources/qetgraphicsitem/element.h @@ -131,6 +131,7 @@ class Element : public QetGraphicsItem { DiagramContext kindInformations () const {return kind_informations_;} //@kind_information_ is used to store more information //about the herited class like contactelement for know // kind of contact (simple tempo) or number of contact show by the element. + QString assignVariables (QString, Element *); //ATTRIBUTES protected: