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

go on with the work

Browse Source
This commit is contained in:
Martin Marmsoler
2020-08-25 20:14:38 +02:00
parent a10709157d
commit c5f1705745
40 changed files with 520 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sources/qetgraphicsitem/terminal.cpp
View File

@@ -735,21 +735,21 @@ QDomElement Terminal::toXml(QDomDocument &doc) const {
@param terminal Le QDomElement a analyser
@return true si le QDomElement passe en parametre est une borne, false sinon
*/
bool Terminal::valideXml(QDomElement &terminal) const {
bool Terminal::valideXml(QDomElement &terminal) {
if (terminal.tagName() != "terminal") return(false);
if (!propertyString(terminal, "number", nullptr))
if (propertyString(terminal, "number"))
return false;
if (!propertyString(terminal, "name", nullptr))
if (propertyString(terminal, "name"))
return false;
if (!propertyBool(terminal, "nameHidden", nullptr))
if (propertyBool(terminal, "nameHidden"))
return false;
if (!propertyDouble(terminal, "x", nullptr))
if (propertyDouble(terminal, "x"))
return false;
if (!propertyDouble(terminal, "y", nullptr))
if (propertyDouble(terminal, "y"))
return false;
QString o;
@@ -776,23 +776,23 @@ bool Terminal::valideXml(QDomElement &terminal) const {
(memes coordonnes, meme orientation), false sinon
*/
bool Terminal::fromXml(const QDomElement &terminal) {
if (!propertyString(terminal, "number", &number_terminal_))
if (propertyString(terminal, "number", &number_terminal_))
return false;
if (!propertyString(terminal, "name", &name_terminal_))
if (propertyString(terminal, "name", &name_terminal_))
return false;
if (!propertyBool(terminal, "nameHidden", &name_terminal_hidden))
if (propertyBool(terminal, "nameHidden", &name_terminal_hidden))
return false;
double x, y;
if (!propertyDouble(terminal, "x", &x))
if (propertyDouble(terminal, "x", &x))
return false;
if (!propertyDouble(terminal, "y", &y))
if (propertyDouble(terminal, "y", &y))
return false;
QString o;
if (!propertyString(terminal, "orientation", &o))
if (propertyString(terminal, "orientation", &o))
return false;
return (