kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-03-16 15:09:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix element mixed with link report properties on new dynamic text

Browse Source 
grouping conversion.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5248 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2018-03-01 13:36:18 +00:00
parent 85a8a32106
commit b94ed5674c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/qetgraphicsitem/element.cpp
View File

@@ -676,6 +676,8 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
//Create the comment item //Create the comment item
DynamicElementTextItem *comment_text = nullptr; DynamicElementTextItem *comment_text = nullptr;
if (m_link_type !=PreviousReport || m_link_type !=NextReport)
return(true);
if(!comment.isEmpty() && c) if(!comment.isEmpty() && c)
{ {
comment_text = new DynamicElementTextItem(this); comment_text = new DynamicElementTextItem(this);
@@ -690,6 +692,8 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
} }
//create the location item //create the location item
DynamicElementTextItem *location_text = nullptr; DynamicElementTextItem *location_text = nullptr;
if (m_link_type !=PreviousReport || m_link_type !=NextReport)
return(true);
if(!location.isEmpty() && lo) if(!location.isEmpty() && lo)
{ {
location_text = new DynamicElementTextItem(this); location_text = new DynamicElementTextItem(this);
@@ -703,6 +707,8 @@ bool Element::fromXml(QDomElement &e, QHash<int, Terminal *> &table_id_adr, bool
} }
QPointF pos = deti->pos(); QPointF pos = deti->pos();
if (m_link_type !=PreviousReport || m_link_type !=NextReport)
return(true);
//Create the group //Create the group
ElementTextItemGroup *group = addTextGroup(tr("Label + commentaire")); ElementTextItemGroup *group = addTextGroup(tr("Label + commentaire"));
addTextToGroup(deti, group); addTextToGroup(deti, group);