mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-09-14 20:33:05 +02:00
Merge pull request #297 from plc-user/master
add terminal-names to connection in qet-file
This commit is contained in:
commit
fda314d585
@ -1048,6 +1048,7 @@ QDomElement Conductor::toXml(QDomDocument &dom_document,
|
|||||||
} else {
|
} else {
|
||||||
dom_element.setAttribute("element1", terminal1->parentElement()->uuid().toString());
|
dom_element.setAttribute("element1", terminal1->parentElement()->uuid().toString());
|
||||||
dom_element.setAttribute("terminal1", terminal1->uuid().toString());
|
dom_element.setAttribute("terminal1", terminal1->uuid().toString());
|
||||||
|
dom_element.setAttribute("terminalname1", terminal1->name());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (terminal2->uuid().isNull()) {
|
if (terminal2->uuid().isNull()) {
|
||||||
@ -1056,6 +1057,7 @@ QDomElement Conductor::toXml(QDomDocument &dom_document,
|
|||||||
} else {
|
} else {
|
||||||
dom_element.setAttribute("element2", terminal2->parentElement()->uuid().toString());
|
dom_element.setAttribute("element2", terminal2->parentElement()->uuid().toString());
|
||||||
dom_element.setAttribute("terminal2", terminal2->uuid().toString());
|
dom_element.setAttribute("terminal2", terminal2->uuid().toString());
|
||||||
|
dom_element.setAttribute("terminalname2", terminal2->name());
|
||||||
}
|
}
|
||||||
dom_element.setAttribute("freezeLabel", m_freeze_label? "true" : "false");
|
dom_element.setAttribute("freezeLabel", m_freeze_label? "true" : "false");
|
||||||
|
|
||||||
|
@ -744,6 +744,11 @@ QUuid Terminal::uuid() const
|
|||||||
return d->m_uuid;
|
return d->m_uuid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString Terminal::name() const
|
||||||
|
{
|
||||||
|
return d->m_name;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@brief Conductor::relatedPotentialTerminal
|
@brief Conductor::relatedPotentialTerminal
|
||||||
Return terminal at the same potential from the same
|
Return terminal at the same potential from the same
|
||||||
|
@ -74,6 +74,7 @@ class Terminal : public QGraphicsObject
|
|||||||
Diagram *diagram () const;
|
Diagram *diagram () const;
|
||||||
Element *parentElement () const;
|
Element *parentElement () const;
|
||||||
QUuid uuid () const;
|
QUuid uuid () const;
|
||||||
|
QString name () const;
|
||||||
|
|
||||||
QList<Conductor *> conductors() const;
|
QList<Conductor *> conductors() const;
|
||||||
Qet::Orientation orientation() const;
|
Qet::Orientation orientation() const;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user