[qet] qet/qet: [5330] Minor

[ Thread Index | Date Index | More lists.tuxfamily.org/qet Archives ]


Revision: 5330
Author:   blacksun
Date:     2018-04-12 18:01:00 +0200 (Thu, 12 Apr 2018)
Log Message:
-----------
Minor

Modified Paths:
--------------
    trunk/sources/qetgraphicsitem/dynamicelementtextitem.cpp

Modified: trunk/sources/qetgraphicsitem/dynamicelementtextitem.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/dynamicelementtextitem.cpp	2018-04-11 17:47:45 UTC (rev 5329)
+++ trunk/sources/qetgraphicsitem/dynamicelementtextitem.cpp	2018-04-12 16:01:00 UTC (rev 5330)
@@ -985,15 +985,20 @@
 {
 	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());


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/