kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 22:00:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

read terminal uuid in Terminal and do not write terminal uuid from TerminalData, because Terminal just reads it, only PartTerminal writes the uuid

Browse Source
This commit is contained in:
Martin Marmsoler
2021-03-13 18:57:01 +01:00
parent ba0faa7122
commit d805fb9ced
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/editor/graphicspart/partterminal.cpp
View File

@@ -72,6 +72,9 @@ bool PartTerminal::fromXmlPriv(const QDomElement &xml_elmt) {
*/ */
void PartTerminal::toXmlPriv(QDomElement& e) const { void PartTerminal::toXmlPriv(QDomElement& e) const {
if (!d->m_uuid.isNull())
e.setAttribute("uuid", d->m_uuid.toString());
d->m_pos = pos(); d->m_pos = pos();
QDomDocument doc = e.ownerDocument(); QDomDocument doc = e.ownerDocument();

2
sources/properties/terminaldata.cpp
View File

@@ -98,8 +98,6 @@ void TerminalData::toXmlPriv(QDomElement& xml_element) const
xml_element.setAttribute("x", m_pos.x()); xml_element.setAttribute("x", m_pos.x());
xml_element.setAttribute("y", m_pos.y()); xml_element.setAttribute("y", m_pos.y());
if (!m_uuid.isNull())
xml_element.setAttribute("uuid", m_uuid.toString());
xml_element.setAttribute("name", m_name); xml_element.setAttribute("name", m_name);
xml_element.setAttribute("orientation", xml_element.setAttribute("orientation",

2
sources/qetgraphicsitem/terminal.cpp
View File

@@ -809,8 +809,8 @@ bool Terminal::valideXml(const QDomElement &terminal)
*/ */
bool Terminal::fromXmlPriv(const QDomElement &terminal) { bool Terminal::fromXmlPriv(const QDomElement &terminal) {
QETXML::propertyString(terminal, "number", &number_terminal_); QETXML::propertyString(terminal, "number", &number_terminal_);
QETXML::propertyBool(terminal, "nameHidden", &name_terminal_hidden); QETXML::propertyBool(terminal, "nameHidden", &name_terminal_hidden);
QETXML::propertyUuid(terminal, "uuid", &d->m_uuid);
if(!d->fromXml(terminal)) if(!d->fromXml(terminal))
return false; return false;