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

Merge pull request #344 from plc-user/master

Browse Source 
some clean-up for element-file and in code
This commit is contained in:
Laurent Trinques
2025-02-05 19:26:24 +01:00
committed by GitHub
parent d1c6fb7e3c 408481a023
commit 7466793e71
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/ElementsCollection/elementslocation.cpp
View File

@@ -870,7 +870,7 @@ QIcon ElementsLocation::icon() const
/** /**
@brief ElementLocation::name @brief ElementLocation::name
@return The name of the represented element in the current local @return The name of the represented element in the current locale
*/ */
QString ElementsLocation::name() const QString ElementsLocation::name() const
{ {

23
sources/NameList/nameslist.cpp
View File

@@ -111,11 +111,15 @@ const QString NamesList::operator[](const QString &lang) const
/** /**
Loads the list of names from an XML element. This element is assumed to be
the parent of a ‘names’ element, which itself contains the ‘names’. The
names previously contained in the list are not deleted, but can be overwritten.
French:
Charge la liste de noms depuis un element XML. Cet element est sense etre Charge la liste de noms depuis un element XML. Cet element est sense etre
le parent d'un element "names", qui contient lui meme les "name". le parent d'un element "names", qui contient lui meme les "name".
Les noms precedemment contenus dans la liste ne sont pas effaces mais Les noms precedemment contenus dans la liste ne sont pas effaces mais
peuvent etre ecrases. peuvent etre ecrases.
@param xml_element L'element XML a analyser @param xml_element L'element XML a analyser / The XML element to be parsed
@param xml_options A set of options related to XML parsing. @param xml_options A set of options related to XML parsing.
@see getXmlOptions() @see getXmlOptions()
*/ */
@@ -190,14 +194,15 @@ QDomElement NamesList::toXml(QDomDocument &xml_document, const QHash<QString, QS
name_elmt.setAttribute(xml_opt["LanguageAttribute"], "en"); name_elmt.setAttribute(xml_opt["LanguageAttribute"], "en");
name_elmt.appendChild(xml_document.createTextNode("NoName")); name_elmt.appendChild(xml_document.createTextNode("NoName"));
names_elmt.appendChild(name_elmt); names_elmt.appendChild(name_elmt);
} } else {
QMapIterator<QString, QString> names_iterator(map_names); QMapIterator<QString, QString> names_iterator(map_names);
while (names_iterator.hasNext()) { while (names_iterator.hasNext()) {
names_iterator.next(); names_iterator.next();
QDomElement name_elmt = xml_document.createElement(xml_opt["TagName"]); QDomElement name_elmt = xml_document.createElement(xml_opt["TagName"]);
name_elmt.setAttribute(xml_opt["LanguageAttribute"], names_iterator.key()); name_elmt.setAttribute(xml_opt["LanguageAttribute"], names_iterator.key());
name_elmt.appendChild(xml_document.createTextNode(names_iterator.value().trimmed())); name_elmt.appendChild(xml_document.createTextNode(names_iterator.value().trimmed()));
names_elmt.appendChild(name_elmt); names_elmt.appendChild(name_elmt);
}
} }
return(names_elmt); return(names_elmt);
} }

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);
// try to sort attributes by removing and re-adding
property.removeAttribute("show");
property.removeAttribute("name");
property.setAttribute("show", m_content_show[key]);
property.setAttribute("name", key); property.setAttribute("name", key);
property.setAttribute("show",m_content_show[key]); QDomText value = e.ownerDocument().createTextNode(m_content[key].toString().trimmed());
QDomText value = e.ownerDocument().createTextNode(m_content[key].toString());
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);