kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-20 08:10:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

dynamic element text item : "label" is not updated when report are unlinked, or when a folio is removed.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5329 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2018-04-11 17:47:45 +00:00
parent 60341b2207
commit 7b9fbb3382
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sources/qetgraphicsitem/dynamicelementtextitem.cpp
View File

@@ -882,7 +882,10 @@ void DynamicElementTextItem::setConnectionForReportFormula(const QString &formul
} }
if (other_diagram && (string.contains("%f") || string.contains("%id"))) if (other_diagram && (string.contains("%f") || string.contains("%id")))
{
connect(other_diagram->project(), &QETProject::projectDiagramsOrderChanged, this, &DynamicElementTextItem::updateReportText); connect(other_diagram->project(), &QETProject::projectDiagramsOrderChanged, this, &DynamicElementTextItem::updateReportText);
connect(other_diagram->project(), &QETProject::diagramRemoved, this, &DynamicElementTextItem::updateReportText);
}
if (string.contains("%l")) if (string.contains("%l"))
connect(other_elmt, &Element::yChanged, this, &DynamicElementTextItem::updateReportText); connect(other_elmt, &Element::yChanged, this, &DynamicElementTextItem::updateReportText);
if (string.contains("%c")) if (string.contains("%c"))
@@ -945,7 +948,10 @@ void DynamicElementTextItem::setupFormulaConnection()
} }
if (diagram && (formula.contains("%f") || formula.contains("%id"))) 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::projectDiagramsOrderChanged, this, &DynamicElementTextItem::updateLabel);
m_formula_connection << connect(diagram->project(), &QETProject::diagramRemoved, this, &DynamicElementTextItem::updateLabel);
}
if (formula.contains("%l")) if (formula.contains("%l"))
m_formula_connection << connect(element, &Element::yChanged, this, &DynamicElementTextItem::updateLabel); m_formula_connection << connect(element, &Element::yChanged, this, &DynamicElementTextItem::updateLabel);
if (formula.contains("%c")) if (formula.contains("%c"))
@@ -979,6 +985,8 @@ void DynamicElementTextItem::updateReportText()
{ {
if(!(m_parent_element.data()->linkType() & Element::AllReport)) if(!(m_parent_element.data()->linkType() & Element::AllReport))
return; return;
if(!m_other_report)
setPlainText("_");
if (m_text_from == ElementInfo && m_info_name == "label" && m_other_report) if (m_text_from == ElementInfo && m_info_name == "label" && m_other_report)
{ {