kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-01-06 05:10:52 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed behaviour when moving conductor/independent text items.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1654 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-04-15 14:14:34 +00:00
parent 5f3dcd1dbb
commit 1a48c5af83
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sources/conductortextitem.cpp
View File

@@ -142,8 +142,11 @@ void ConductorTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *e) {
if (textInteractionFlags() & Qt::TextEditable) {
QGraphicsTextItem::mouseMoveEvent(e);
} else if ((flags() & QGraphicsItem::ItemIsMovable) && (e -> buttons() & Qt::LeftButton)) {
QPointF intended_pos = mapToParent(e -> pos()) - matrix().map(e -> buttonDownPos(Qt::LeftButton));
if (first_move_) {
mouse_to_origin_movement_ = before_mov_pos_ - mapToParent(e -> buttonDownPos(Qt::LeftButton));
}
QPointF intended_pos = mapToParent(e -> pos()) + mouse_to_origin_movement_;
// si ce texte est attache a un conducteur, alors ses mouvements seront
// limites a une certaine distance du trace de ce conducteur
if (parent_conductor_) {

1
sources/conductortextitem.h
View File

@@ -61,5 +61,6 @@ class ConductorTextItem : public DiagramTextItem {
bool moved_by_user_;
QPointF before_mov_pos_;
bool first_move_;
QPointF mouse_to_origin_movement_;
};
#endif

7
sources/independenttextitem.cpp
View File

@@ -102,11 +102,14 @@ void IndependentTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *e) {
// on applique le mouvement impose par la souris
QPointF old_pos = pos();
setPos(mapToParent(e -> pos()) - matrix().map(e -> buttonDownPos(Qt::LeftButton)));
if (first_move_) {
mouse_to_origin_movement_ = old_pos - e -> buttonDownScenePos(Qt::LeftButton);
}
QPointF expected_pos = e-> scenePos() + mouse_to_origin_movement_;
setPos(expected_pos); // setPos() will snap the expected position to the grid
// on calcule le mouvement reellement applique par setPos()
QPointF effective_movement = pos() - old_pos;
if (diagram_ptr) {
// on signale le mouvement ainsi applique au schema parent, qui
// l'appliquera aux autres items selectionnes selon son bon vouloir

1
sources/independenttextitem.h
View File

@@ -52,5 +52,6 @@ class IndependentTextItem : public DiagramTextItem {
private:
bool first_move_;
QPointF mouse_to_origin_movement_;
};
#endif