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

Minor

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5330 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2018-04-12 16:01:00 +00:00
parent 7b9fbb3382
commit ad7f52997d
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sources/qetgraphicsitem/dynamicelementtextitem.cpp
View File

@@ -985,15 +985,20 @@ 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)
if (m_text_from == ElementInfo && m_info_name == "label")
{
Element *elmt = m_other_report.data();
QString label = m_report_formula;
label = autonum::AssignVariables::formulaToLabel(label, elmt->rSequenceStruct(), elmt->diagram(), elmt);
setPlainText(label);
if(m_other_report)
{
Element *elmt = m_other_report.data();
QString label = m_report_formula;
label = autonum::AssignVariables::formulaToLabel(label, elmt->rSequenceStruct(), elmt->diagram(), elmt);
setPlainText(label);
}
else
{
setPlainText("");
}
}
else if (m_text_from == CompositeText) {
setPlainText(reportReplacedCompositeText());