From b94ed5674c2216a51ccb38fab9b5186cf43bd1af Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Thu, 1 Mar 2018 13:36:18 +0000 Subject: [PATCH] Fix element mixed with link report properties on new dynamic text grouping conversion. git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5248 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetgraphicsitem/element.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp index 41156b55b..df81e43b9 100644 --- a/sources/qetgraphicsitem/element.cpp +++ b/sources/qetgraphicsitem/element.cpp @@ -676,6 +676,8 @@ bool Element::fromXml(QDomElement &e, QHash &table_id_adr, bool //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 @@ bool Element::fromXml(QDomElement &e, QHash &table_id_adr, bool } //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 @@ bool Element::fromXml(QDomElement &e, QHash &table_id_adr, bool } 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);