kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-21 08:40:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rapatriement dans la branche 0.3 des revisions 870 a 903.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@904 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2010-03-28 16:27:48 +00:00
parent 815a2ea3e8
commit c3563a8307
261 changed files with 23264 additions and 2797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sources/conductor.cpp
View File

@@ -42,6 +42,7 @@ Conductor::Conductor(Terminal *p1, Terminal* p2, Element *parent, QGraphicsScene
terminal1(p1),
terminal2(p2),
destroyed(false),
text_item(0),
segments(NULL),
moving_point(false),
moving_segment(false),
@@ -750,6 +751,9 @@ QVariant Conductor::itemChange(GraphicsItemChange change, const QVariant &value)
// le conducteur vient de se faire deselectionner
setZValue(previous_z_value);
}
} else if (change == QGraphicsItem::ItemSceneHasChanged || change == QGraphicsItem::ItemVisibleHasChanged) {
// permet de positionner correctement le texte du conducteur lors de son ajout a un schema
calculateTextItemPosition();
}
return(QGraphicsPathItem::itemChange(change, value));
}
@@ -1075,6 +1079,7 @@ ConductorSegment *Conductor::middleSegment() {
*/
void Conductor::calculateTextItemPosition() {
if (properties_.type != ConductorProperties::Multi) return;
if (!text_item) return;
text_item -> setPos(middleSegment() -> middle());
}