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

Conductor text item : minor bug fix

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3555 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2014-12-14 21:30:58 +00:00
parent 3c94d9a054
commit 0e9dc51879
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/diagram.cpp
View File

@@ -624,8 +624,8 @@ bool Diagram::fromXml(QDomElement &document, QPointF position, bool consider_inf
} }
if (can_add_conductor) { if (can_add_conductor) {
Conductor *c = new Conductor(table_adr_id.value(id_p1), table_adr_id.value(id_p2)); Conductor *c = new Conductor(table_adr_id.value(id_p1), table_adr_id.value(id_p2));
c -> fromXml(f);
addItem(c); addItem(c);
c -> fromXml(f);
added_conductors << c; added_conductors << c;
} }
} }
@@ -747,6 +747,7 @@ void Diagram::addItem(Conductor *conductor) {
QGraphicsScene::addItem(conductor); QGraphicsScene::addItem(conductor);
conductor -> terminal1 -> addConductor(conductor); conductor -> terminal1 -> addConductor(conductor);
conductor -> terminal2 -> addConductor(conductor); conductor -> terminal2 -> addConductor(conductor);
conductor -> calculateTextItemPosition();
} }
} }

4
sources/qetgraphicsitem/conductor.cpp
View File

@@ -92,7 +92,6 @@ Conductor::Conductor(Terminal *p1, Terminal* p2) :
// ajout du champ de texte editable // ajout du champ de texte editable
text_item = new ConductorTextItem(properties_.text, this); text_item = new ConductorTextItem(properties_.text, this);
text_item -> setFlag(QGraphicsItem::ItemStacksBehindParent); text_item -> setFlag(QGraphicsItem::ItemStacksBehindParent);
calculateTextItemPosition();
connect( connect(
text_item, text_item,
SIGNAL(diagramTextChanged(DiagramTextItem *, const QString &, const QString &)), SIGNAL(diagramTextChanged(DiagramTextItem *, const QString &, const QString &)),
@@ -1337,8 +1336,11 @@ void Conductor::setText(const QString &t) {
* @param p : properties * @param p : properties
*/ */
void Conductor::setProperties(const ConductorProperties &p) { void Conductor::setProperties(const ConductorProperties &p) {
if (properties_ != p)
{
properties_ = p; properties_ = p;
readProperties(); readProperties();
}
} }
/** /**