From 3905371da61d7c000a7a691aea0524ae99c8953a Mon Sep 17 00:00:00 2001 From: Claveau Joshua Date: Sun, 3 May 2020 20:29:55 +0200 Subject: [PATCH] Fix wrong element text value when loading from xml --- sources/qetgraphicsitem/dynamicelementtextitem.cpp | 7 +++++-- sources/qetgraphicsitem/element.cpp | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sources/qetgraphicsitem/dynamicelementtextitem.cpp b/sources/qetgraphicsitem/dynamicelementtextitem.cpp index f887d005a..dcf87dccb 100644 --- a/sources/qetgraphicsitem/dynamicelementtextitem.cpp +++ b/sources/qetgraphicsitem/dynamicelementtextitem.cpp @@ -190,9 +190,12 @@ void DynamicElementTextItem::fromXml(const QDomElement &dom_elmt) //Text QDomElement dom_text = dom_elmt.firstChildElement("text"); - if (!dom_text.isNull()) + //Clear the current text. + setPlainText(""); + if (!dom_text.isNull()) { setText(dom_text.text()); - + } + //Info name QDomElement dom_info_name = dom_elmt.firstChildElement("info_name"); if(!dom_info_name.isNull()) diff --git a/sources/qetgraphicsitem/element.cpp b/sources/qetgraphicsitem/element.cpp index 0871c6afc..decd4d468 100644 --- a/sources/qetgraphicsitem/element.cpp +++ b/sources/qetgraphicsitem/element.cpp @@ -537,8 +537,6 @@ bool Element::parseInput(const QDomElement &dom_element) m_converted_text_from_xml_description.insert(deti, p); return true; } - - return false; } /**