kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-05-21 12:49:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify some code

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5299 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2018-04-05 09:37:35 +00:00
parent 9c96f2b6d7
commit 22f95c22f0
6 changed files with 26 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/qetgraphicsitem/diagramtextitem.cpp
View File

@@ -286,7 +286,7 @@ void DiagramTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
//This is first move, we signal it to parent diagram
if(diagram_ && m_first_move)
diagram_ -> beginMoveElements(this);
diagram_->elementsMover().beginMovement(diagram_, this);
QPointF old_pos = pos();
@@ -297,7 +297,7 @@ void DiagramTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
//Update the actual movement for other selected item
if (diagram_)
diagram_ -> continueMoveElements(pos() - old_pos);
diagram_->elementsMover().continueMovement(pos() - old_pos);
}
else event -> ignore();
@@ -312,7 +312,7 @@ void DiagramTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
void DiagramTextItem::mouseReleaseEvent (QGraphicsSceneMouseEvent *event) {
//Signal to diagram movement is finish
if (diagram())
diagram() -> endMoveElements();
diagram()->elementsMover().endMovement();
if (!(event -> modifiers() & Qt::ControlModifier))
QGraphicsTextItem::mouseReleaseEvent(event);

6
sources/qetgraphicsitem/dynamicelementtextitem.cpp
View File

@@ -506,7 +506,7 @@ void DynamicElementTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
if((event->buttons() & Qt::LeftButton) && (flags() & ItemIsMovable))
{
if(diagram() && m_first_move)
diagram()->beginMoveElementTexts(this);
diagram()->elementTextsMover().beginMovement(diagram(), this);
if(m_first_move)
{
@@ -524,7 +524,7 @@ void DynamicElementTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
event->modifiers() == Qt::ControlModifier ? setPos(new_pos) : setPos(Diagram::snapToGrid(new_pos));
if(diagram())
diagram()->continueMoveElementTexts(event);
diagram()->elementTextsMover().continueMovement(event);
} else {
event->ignore();
}
@@ -543,7 +543,7 @@ void DynamicElementTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
m_parent_element->setHighlighted(false);
if(m_parent_element && m_parent_element->diagram())
m_parent_element->diagram()->endMoveElementTexts();
m_parent_element.data()->diagram()->elementTextsMover().endMovement();
if(!(event->modifiers() & Qt::ControlModifier))
QGraphicsTextItem::mouseReleaseEvent(event);

6
sources/qetgraphicsitem/elementtextitemgroup.cpp
View File

@@ -490,7 +490,7 @@ void ElementTextItemGroup::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
if((event->buttons() & Qt::LeftButton) && (flags() & ItemIsMovable))
{
if(diagram() && m_first_move)
diagram()->beginMoveElementTexts(this);
diagram()->elementTextsMover().beginMovement(diagram(), this);
if(m_first_move)
{
@@ -508,7 +508,7 @@ void ElementTextItemGroup::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
event->modifiers() == Qt::ControlModifier ? setPos(new_pos) : setPos(Diagram::snapToGrid(new_pos));
if(diagram())
diagram()->continueMoveElementTexts(event);
diagram()->elementTextsMover().continueMovement(event);
} else {
event->ignore();
}
@@ -525,7 +525,7 @@ void ElementTextItemGroup::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{
if(diagram())
{
diagram()->endMoveElementTexts();
diagram()->elementTextsMover().endMovement();
if(parentElement())
parentElement()->setHighlighted(false);
}

7
sources/qetgraphicsitem/qetgraphicsitem.cpp
View File

@@ -106,7 +106,7 @@ void QetGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent *e) {
//Item is moving
if(diagram() && first_move_) {
//It's the first movement, we signal it to parent diagram
diagram() -> beginMoveElements(this);
diagram()->elementsMover().beginMovement(diagram(), this);
}
//we apply the mouse movement
@@ -122,7 +122,7 @@ void QetGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent *e) {
if (diagram()) {
//we signal the real movement apply to diagram,
//who he apply to other selected item
diagram() -> continueMoveElements(effective_movement);
diagram()->elementsMover().continueMovement(effective_movement);
}
} else e -> ignore();
@@ -135,7 +135,8 @@ void QetGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent *e) {
* @param e
*/
void QetGraphicsItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) {
if (diagram()) diagram() -> endMoveElements();
if (diagram())
diagram()->elementsMover().endMovement();
if (!(e -> modifiers() & Qt::ControlModifier))
QGraphicsItem::mouseReleaseEvent(e);