Merge pull request #1166 from IKhonakhbeeva/fixes

Fixes and features for images [AUTOZIP]

Author: iakov

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

@@ -35,6 +35,9 @@ ImageItem::ImageItem(const QSharedPointer<model::Image> &image, const QRect &geo
 	setY2(geometry.bottom());
 	setBackgroundRole(false);
 	unsetCursor();
+	connect(this, &AbstractItem::mouseInteractionStarted, this, [this](){
+			mEstimatedPos = pos();
+		});
 }
 
 AbstractItem *ImageItem::clone() const
@@ -255,3 +258,34 @@ QRectF ImageItem::deserializeRect(const QString &string) const
 
 	return QRectF();
 }
+
+void ImageItem::resizeItem(QGraphicsSceneMouseEvent *event)
+{
+	mEstimatedPos += event->scenePos() - event->lastScenePos();
+	const auto showGrid = SettingsManager::value("2dShowGrid").toBool();
+	if (!showGrid || event->modifiers() != Qt::ShiftModifier) {
+		if (dragState() != None) {
+			calcResizeItem(event);
+		} else {
+			setPos(mEstimatedPos);
+		}
+	} else if (dragState() != None) {
+		setFlag(QGraphicsItem::ItemIsMovable, false);
+		const auto gridSize = SettingsManager::value("2dGridCellSize").toInt();
+		const auto x = alignedCoordinate(event->scenePos().x(), gridSize);
+		const auto y = alignedCoordinate(event->scenePos().y(), gridSize);
+		setXYWithDragState(mapFromScene(x, y));
+	} else {
+		setFlag(QGraphicsItem::ItemIsMovable, false);
+		// move
+		setPos(mEstimatedPos);
+		// and align top left corner to grid
+		QRectF itemBoundingRect = calcNecessaryBoundingRect();
+		const auto topLeft = mapToScene(QPointF(itemBoundingRect.left(), itemBoundingRect.top()));
+		const auto gridSize = SettingsManager::value("2dGridCellSize").toInt();
+		const auto x = alignedCoordinate(topLeft.x(), gridSize);
+		const auto y = alignedCoordinate(topLeft.y(), gridSize);
+		auto delta = QPointF(x, y) - topLeft;
+		moveBy(delta.x(), delta.y());
+	}
+}

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

@@ -47,6 +47,7 @@ class ImageItem : public graphicsUtils::AbstractItem
 	void drawItem(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;
 	void drawExtractionForItem(QPainter* painter) override;
 	QPainterPath resizeArea() const override;
+	void resizeItem(QGraphicsSceneMouseEvent *event) override;
 
 	QDomElement serialize(QDomElement &parent) const override;
 	void deserialize(const QDomElement &element) override;
@@ -94,6 +95,7 @@ class ImageItem : public graphicsUtils::AbstractItem
 	QSharedPointer<model::Image> mImage;
 
 	bool mBackgroundRole {};
+	QPointF mEstimatedPos;
 };
 
 }

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

@@ -256,33 +256,26 @@ void WallItem::resizeWithGrid(QGraphicsSceneMouseEvent *event, int indexGrid)
 		setY2(y);
 		reshapeEndWithGrid(indexGrid);
 	} else {
-		const int coefX = static_cast<int>(pos().x()) / indexGrid;
-		const int coefY = static_cast<int>(pos().y()) / indexGrid;
-		auto newPos = QPointF(alignedCoordinate(pos().x(), coefX, indexGrid),
-				alignedCoordinate(pos().y(), coefY, indexGrid));
+		auto newPos = QPointF(alignedCoordinate(pos().x(), indexGrid),
+				alignedCoordinate(pos().y(), indexGrid));
 		setPos(newPos);
 		update();
 	}
 }
 
 void WallItem::reshapeEndWithGrid(int indexGrid)
 {
-	const int coefX = static_cast<int>(x2()) / indexGrid;
-	const int coefY = static_cast<int>(y2()) / indexGrid;
-
-	setX2(alignedCoordinate(x2(), coefX, indexGrid));
-	setY2(alignedCoordinate(y2(), coefY, indexGrid));
+	setX2(alignedCoordinate(x2(), indexGrid));
+	setY2(alignedCoordinate(y2(), indexGrid));
 
 	mCellNumbX2 = x2() / indexGrid;
 	mCellNumbY2 = y2() / indexGrid;
 }
 
 void WallItem::reshapeBeginWithGrid(int indexGrid)
 {
-	const int coefX = static_cast<int> (x1()) / indexGrid;
-	const int coefY = static_cast<int> (y1()) / indexGrid;
-	setX1(alignedCoordinate(x1(), coefX, indexGrid));
-	setY1(alignedCoordinate(y1(), coefY, indexGrid));
+	setX1(alignedCoordinate(x1(), indexGrid));
+	setY1(alignedCoordinate(y1(), indexGrid));
 	mCellNumbX1 = x1() / indexGrid;
 	mCellNumbY1 = y1() / indexGrid;
 }
@@ -378,16 +371,3 @@ void WallItem::setDraggedEnd(qreal x, qreal y)
 	setX2(x1() - x);
 	setY2(y1() - y);
 }
-
-qreal WallItem::alignedCoordinate(qreal coord, int coef, const int indexGrid) const
-{
-	const int coefSign = coef ? coef / qAbs(coef) : 0;
-
-	if (qAbs(qAbs(coord) - qAbs(coef) * indexGrid) <= indexGrid / 2.0) {
-		return coef * indexGrid;
-	} else if (qAbs(qAbs(coord) - (qAbs(coef) + 1) * indexGrid) <= indexGrid / 2.0) {
-		return (coef + coefSign) * indexGrid;
-	}
-
-	return coord;
-}

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

@@ -78,7 +78,6 @@ class WallItem : public graphicsUtils::AbstractItem, public SolidItem
 private:
 	void recalculateBorders();
 
-	qreal alignedCoordinate(qreal coord, int coef, const int indexGrid) const;
 	void setBeginCoordinatesWithGrid(int indexGrid);
 	void setEndCoordinatesWithGrid(int indexGrid);
 	void countCellNumbCoordinates(int indexGrid);

plugins/robots/common/twoDModel/src/engine/view/scene/twoDModelScene.cpp

@@ -784,6 +784,10 @@ void TwoDModelScene::clearScene(bool removeRobot, Reason reason)
 			worldItemsToDelete << region->id();
 		}
 
+		for (auto &&image : mModel.worldModel().imageItems()) {
+			worldItemsToDelete << image->id();
+		}
+
 		QList<QPair<model::RobotModel *, kitBase::robotModel::PortInfo>> sensorsToDelete;
 		QList<qReal::commands::AbstractCommand *> additionalCommands;
 		for (model::RobotModel *robotModel : mRobots.keys()) {

qrtranslations/fr/plugins/robots/twoDModel_fr.ts

@@ -313,7 +313,7 @@
 <context>
     <name>twoDModel::items::ImageItem</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/items/imageItem.cpp" line="+75"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/items/imageItem.cpp" line="+78"/>
         <source>Image (I)</source>
         <translation type="unfinished"></translation>
     </message>

qrtranslations/fr/qrutils_fr.ts

@@ -88,7 +88,7 @@
         <translation>Division entière par zéro</translation>
     </message>
     <message>
-        <location filename="../../qrutils/graphicsUtils/abstractItem.cpp" line="+570"/>
+        <location filename="../../qrutils/graphicsUtils/abstractItem.cpp" line="+574"/>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>

qrtranslations/ru/plugins/robots/twoDModel_ru.ts

@@ -589,7 +589,7 @@
 <context>
     <name>twoDModel::items::ImageItem</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/items/imageItem.cpp" line="+75"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/items/imageItem.cpp" line="+78"/>
         <source>Image (I)</source>
         <translation>Картинка (I)</translation>
     </message>

qrtranslations/ru/qrutils_ru.ts

@@ -92,7 +92,7 @@
         <translation>Целичисленное деление на ноль</translation>
     </message>
     <message>
-        <location filename="../../qrutils/graphicsUtils/abstractItem.cpp" line="+570"/>
+        <location filename="../../qrutils/graphicsUtils/abstractItem.cpp" line="+574"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>

qrutils/graphicsUtils/abstractItem.cpp

@@ -180,12 +180,16 @@ void AbstractItem::setDragState(AbstractItem::DragState dragState)
 
 void AbstractItem::calcResizeItem(QGraphicsSceneMouseEvent *event)
 {
-	const qreal x = mapFromScene(event->scenePos()).x();
-	const qreal y = mapFromScene(event->scenePos()).y();
 	if (mDragState != None) {
 		setFlag(QGraphicsItem::ItemIsMovable, false);
 	}
+	setXYWithDragState(mapFromScene(event->scenePos()));
+}
 
+void AbstractItem::setXYWithDragState(const QPointF pos)
+{
+	const auto x = pos.x();
+	const auto y = pos.y();
 	if (mDragState == TopLeft) {
 		setX1(x);
 		setY1(y);
@@ -628,3 +632,17 @@ void AbstractItem::copyTo(AbstractItem * const other) const
 	connect(this, &AbstractItem::brushChanged, other
 			, QOverload<const QBrush &>::of(&AbstractItem::setBrush));
 }
+
+qreal AbstractItem::alignedCoordinate(qreal coord, const int indexGrid) const
+{
+	const int coef = static_cast<int>(coord) / indexGrid;
+	const int coefSign = coef ? coef / qAbs(coef) : 0;
+
+	if (qAbs(qAbs(coord) - qAbs(coef) * indexGrid) <= indexGrid / 2.0) {
+		return coef * indexGrid;
+	} else if (qAbs(qAbs(coord) - (qAbs(coef) + 1) * indexGrid) <= indexGrid / 2.0) {
+		return (coef + coefSign) * indexGrid;
+	}
+
+	return coord;
+}