[qet] qet/qet: [5248] Fix element mixed with link report properties on new dynamic text

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


Revision: 5248
Author:   scorpio810
Date:     2018-03-01 14:36:18 +0100 (Thu, 01 Mar 2018)
Log Message:
-----------
Fix element mixed with link report properties on new dynamic text
grouping conversion.

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

Modified: trunk/sources/qetgraphicsitem/element.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/element.cpp	2018-02-26 15:35:10 UTC (rev 5247)
+++ trunk/sources/qetgraphicsitem/element.cpp	2018-03-01 13:36:18 UTC (rev 5248)
@@ -676,6 +676,8 @@
 						
 							//Create the comment item
 						DynamicElementTextItem *comment_text = nullptr;
+						if (m_link_type !=PreviousReport || m_link_type !=NextReport)
+							return(true);
 						if(!comment.isEmpty() && c)
 						{
 							comment_text = new DynamicElementTextItem(this);
@@ -690,6 +692,8 @@
 						}
 							//create the location item
 						DynamicElementTextItem *location_text = nullptr;
+						if (m_link_type !=PreviousReport || m_link_type !=NextReport)
+							return(true);
 						if(!location.isEmpty() && lo)
 						{
 							location_text = new DynamicElementTextItem(this);
@@ -703,6 +707,8 @@
 						}
 						
 						QPointF pos = deti->pos();
+						if (m_link_type !=PreviousReport || m_link_type !=NextReport)
+							return(true);
 							//Create the group
 						ElementTextItemGroup *group = addTextGroup(tr("Label + commentaire"));
 						addTextToGroup(deti, group);


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