Merge pull request #1179 from IKhonakhbeeva/walls

Fix moving multiple items [AUTOZIP]

Author: iakov

plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp

@@ -35,6 +35,9 @@ WallItem::WallItem(const QPointF &begin, const QPointF &end)
 	setFlags(ItemIsSelectable | ItemIsMovable | ItemSendsScenePositionChanges);
 	setPrivateData();
 	setAcceptDrops(true);
+	connect(this, &AbstractItem::mouseInteractionStarted, this, [this](){
+			mEstimatedPos = pos();
+		});
 }
 
 WallItem *WallItem::clone() const
@@ -191,6 +194,8 @@ void WallItem::recalculateBorders()
 
 void WallItem::resizeItem(QGraphicsSceneMouseEvent *event)
 {
+	mEstimatedPos += event->scenePos() - event->lastScenePos();
+
 	if (event->modifiers() & Qt::ShiftModifier && (dragState() == TopLeft || dragState() == BottomRight)) {
 		AbstractItem::resizeItem(event);
 		reshapeRectWithShift();
@@ -245,7 +250,7 @@ void WallItem::resizeWithGrid(QGraphicsSceneMouseEvent *event, int indexGrid)
 	const qreal x = mapFromScene(event->scenePos()).x();
 	const qreal y = mapFromScene(event->scenePos()).y();
 
-	setFlag(QGraphicsItem::ItemIsMovable, dragState() == None);
+	setFlag(QGraphicsItem::ItemIsMovable, false);
 
 	if (dragState() == TopLeft) {
 		setX1(x);
@@ -256,26 +261,26 @@ void WallItem::resizeWithGrid(QGraphicsSceneMouseEvent *event, int indexGrid)
 		setY2(y);
 		reshapeEndWithGrid(indexGrid);
 	} else {
-		auto newPos = QPointF(alignedCoordinate(pos().x(), indexGrid),
-				alignedCoordinate(pos().y(), indexGrid));
-		setPos(newPos);
-		update();
+		setPos(mEstimatedPos);
+		moveBy(alignedCoordinate(begin().x(), indexGrid) - begin().x()
+			   , alignedCoordinate(begin().y(), indexGrid) - begin().y());
 	}
 }
 
 void WallItem::reshapeEndWithGrid(int indexGrid)
 {
-	setX2(alignedCoordinate(x2(), indexGrid));
-	setY2(alignedCoordinate(y2(), indexGrid));
+	setX2(alignedCoordinate(end().x(), indexGrid) - pos().x());
+	setY2(alignedCoordinate(end().y(), indexGrid) - pos().y());
 
 	mCellNumbX2 = x2() / indexGrid;
 	mCellNumbY2 = y2() / indexGrid;
 }
 
 void WallItem::reshapeBeginWithGrid(int indexGrid)
 {
-	setX1(alignedCoordinate(x1(), indexGrid));
-	setY1(alignedCoordinate(y1(), indexGrid));
+	setX1(alignedCoordinate(begin().x(), indexGrid) - pos().x());
+	setY1(alignedCoordinate(begin().y(), indexGrid) - pos().y());
+
 	mCellNumbX1 = x1() / indexGrid;
 	mCellNumbY1 = y1() / indexGrid;
 }

plugins/robots/common/twoDModel/src/engine/items/wallItem.h

@@ -93,6 +93,7 @@ class WallItem : public graphicsUtils::AbstractItem, public SolidItem
 
 	QPainterPath mPath;
 	int mWallWidth {10};
+	QPointF mEstimatedPos;
 };
 
 }

qrtranslations/fr/plugins/robots/twoDModel_fr.ts

@@ -353,7 +353,7 @@
 <context>
     <name>twoDModel::items::WallItem</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="+61"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="+64"/>
         <source>Wall (W)</source>
         <translation>Mur (W)</translation>
     </message>

qrtranslations/ru/plugins/robots/twoDModel_ru.ts

@@ -629,7 +629,7 @@
 <context>
     <name>twoDModel::items::WallItem</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="+61"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/items/wallItem.cpp" line="+64"/>
         <source>Wall (W)</source>
         <translation>Стена (W)</translation>
     </message>

qrutils/graphicsUtils/abstractItem.cpp

@@ -596,6 +596,7 @@ void AbstractItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
 
 void AbstractItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
+	setFlag(QGraphicsItem::ItemIsMovable, mEditable);
 	QGraphicsItem::mouseReleaseEvent(event);
 	emit mouseInteractionStopped();
 }

qrutils/graphicsUtils/abstractScene.cpp

@@ -83,12 +83,25 @@ void AbstractScene::setX2andY2(QGraphicsSceneMouseEvent *event)
 
 void AbstractScene::reshapeItem(QGraphicsSceneMouseEvent *event)
 {
+	setX2andY2(event);
+	if (!mGraphicsItem) return;
+	auto oldPos = mGraphicsItem->pos();
 	reshapeItem(event, mGraphicsItem);
+	auto delta = mGraphicsItem->pos() - oldPos;
+	if (mGraphicsItem->isSelected()) {
+		mGraphicsItem->setPos(oldPos);
+	}
+	for (auto selectedItem : selectedItems()) {
+		if (auto item = dynamic_cast<AbstractItem*>(selectedItem)) {
+			if (!item->parentItem()) {
+				item->moveBy(delta.x(), delta.y());
+			}
+		}
+	}
 }
 
 void AbstractScene::reshapeItem(QGraphicsSceneMouseEvent *event, graphicsUtils::AbstractItem *item)
 {
-	setX2andY2(event);
 	if (item && item->editable()) {
 		if (item->dragState() != graphicsUtils::AbstractItem::None) {
 			mView->setDragMode(QGraphicsView::NoDrag);