realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-14 20:33:05 +02:00
Code Packages Releases 1 Activity

some clean-up for "elementInformations" in element-file

Browse Source 
- for some time now and for whatever reason, element-editor
  sometimes adds element-information without content –> do not
  save info-lines without any content
- sort element-information alphabetically by name in element-file
- use trimmed strings for element-information to remove leading
  and trailing whitestpace
This commit is contained in:
plc-user 2025-02-05 13:11:37 +01:00
parent b0324bd6e8
commit 408481a023
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sources/diagramcontext.cpp
View File

@ -151,10 +151,14 @@ bool DiagramContext::operator!=(const DiagramContext &dc) const
void DiagramContext::toXml(QDomElement &e, const QString &tag_name) const void DiagramContext::toXml(QDomElement &e, const QString &tag_name) const
{ {
foreach (QString key, keys()) { foreach (QString key, keys()) {
if (m_content[key].toString().trimmed().isEmpty()) { continue; }
QDomElement property = e.ownerDocument().createElement(tag_name); QDomElement property = e.ownerDocument().createElement(tag_name);
property.setAttribute("name", key); // try to sort attributes by removing and re-adding
property.removeAttribute("show");
property.removeAttribute("name");
property.setAttribute("show", m_content_show[key]); property.setAttribute("show", m_content_show[key]);
QDomText value = e.ownerDocument().createTextNode(m_content[key].toString()); property.setAttribute("name", key);
QDomText value = e.ownerDocument().createTextNode(m_content[key].toString().trimmed());
property.appendChild(value); property.appendChild(value);
e.appendChild(property); e.appendChild(property);
} }

2
sources/diagramcontext.h
View File

@ -99,7 +99,7 @@ class DiagramContext
void add(DiagramContext other); void add(DiagramContext other);
void remove(const QString &key); void remove(const QString &key);
QList<QString> keys(KeyOrder = None) const; QList<QString> keys(KeyOrder = Alphabetical) const;
bool contains(const QString &) const; bool contains(const QString &) const;
const QVariant operator[](const QString &) const; const QVariant operator[](const QString &) const;
bool addValue(const QString &, const QVariant &, bool show = true); bool addValue(const QString &, const QVariant &, bool show = true);