From 7b9fbb33829ca30aed8e27b1198d1bf43d2b5000 Mon Sep 17 00:00:00 2001 From: blacksun Date: Wed, 11 Apr 2018 17:47:45 +0000 Subject: [PATCH] dynamic element text item : "label" is not updated when report are unlinked, or when a folio is removed. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5329 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetgraphicsitem/dynamicelementtextitem.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sources/qetgraphicsitem/dynamicelementtextitem.cpp b/sources/qetgraphicsitem/dynamicelementtextitem.cpp index 79f1dba85..e21c09f1e 100644 --- a/sources/qetgraphicsitem/dynamicelementtextitem.cpp +++ b/sources/qetgraphicsitem/dynamicelementtextitem.cpp @@ -882,7 +882,10 @@ void DynamicElementTextItem::setConnectionForReportFormula(const QString &formul } if (other_diagram && (string.contains("%f") || string.contains("%id"))) + { connect(other_diagram->project(), &QETProject::projectDiagramsOrderChanged, this, &DynamicElementTextItem::updateReportText); + connect(other_diagram->project(), &QETProject::diagramRemoved, this, &DynamicElementTextItem::updateReportText); + } if (string.contains("%l")) connect(other_elmt, &Element::yChanged, this, &DynamicElementTextItem::updateReportText); if (string.contains("%c")) @@ -945,7 +948,10 @@ void DynamicElementTextItem::setupFormulaConnection() } if (diagram && (formula.contains("%f") || formula.contains("%id"))) + { m_formula_connection << connect(diagram->project(), &QETProject::projectDiagramsOrderChanged, this, &DynamicElementTextItem::updateLabel); + m_formula_connection << connect(diagram->project(), &QETProject::diagramRemoved, this, &DynamicElementTextItem::updateLabel); + } if (formula.contains("%l")) m_formula_connection << connect(element, &Element::yChanged, this, &DynamicElementTextItem::updateLabel); if (formula.contains("%c")) @@ -979,6 +985,8 @@ void DynamicElementTextItem::updateReportText() { if(!(m_parent_element.data()->linkType() & Element::AllReport)) return; + if(!m_other_report) + setPlainText("_"); if (m_text_from == ElementInfo && m_info_name == "label" && m_other_report) {