Merge branch 'master' into MinyazevR-thickness-patch

Author: MinyazevR

.github/workflows/setup_environment.yml

@@ -208,7 +208,7 @@ jobs:
 
     - name: Clang-tidy
       if: ${{ inputs.lint_clazy }}
-      uses: cpp-linter/cpp-linter-action@v2.17.0
+      uses: cpp-linter/cpp-linter-action@v2.18.0
       id: linter
       with:
          style: ''

buildScripts/github/install.sh

@@ -48,9 +48,9 @@ case "$(uname)" in
       libudev-devel libGL-devel libGLX-mesa python3-dev zlib-devel make ccache python3-module-pip time \
       qt5-multimedia-devel qt5-svg-devel qt5-script-devel qt5-tools qt5-serialport-devel
     elif [ "$ID" = "ubuntu" ]; then
-      sudo apt-get update && sudo apt-get install -y --no-install-recommends ccache curl libusb-1.0-0-dev \
-      make qtscript5-dev qttools5-dev-tools qtmultimedia5-dev libqt5serialport5-dev libqt5svg5-dev \
-      libudev-dev "$TRIK_PYTHON"-dev qtbase5-private-dev qtwayland5 libqscintilla2-qt5-dev libquazip5-dev bear
+      sudo apt-get update && sudo apt-get install -y --no-install-recommends ccache curl make bear libusb-1.0-0-dev \
+      qtscript5-dev qttools5-dev-tools qtmultimedia5-dev libqt5serialport5-dev libqt5svg5-dev qtdeclarative5-dev \
+      libudev-dev "$TRIK_PYTHON"-dev qtbase5-private-dev qtquickcontrols2-5-dev qtwayland5 libqscintilla2-qt5-dev libquazip5-dev
     elif [[ "$ID" = "rocky" || "$ID" = '"rocky"' ]]; then
       GCC_VERSION=${GCC_VERSION:-13}
       sudo yum update -y &&  sudo yum install -y --setopt=install_weak_deps=False epel-release
@@ -65,7 +65,7 @@ case "$(uname)" in
       echo $INSTALL_INSTALLER_ENVIRONMENT
       if [ "$INSTALL_INSTALLER_ENVIRONMENT" != "true" ]; then
         sudo yum install -y --setopt=install_weak_deps=False qt5-qtscript-devel qt5-qttools-devel qt5-qtmultimedia-devel qt5-qtserialport-devel \
-        qt5-qtsvg-devel qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtwayland
+        qt5-qtsvg-devel qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtquickcontrols2 qt5-qtdeclarative-devel qt5-qtwayland
       else
         sudo yum install -y --setopt=install_weak_deps=False libX11-xcb libXext libxkbcommon-x11 fontconfig freetype libXrender
         #libQt5WaylandCompositor.so.5.15: libQt5Quick.so.5 libQt5Qml.so.5 libQt5QmlModels.so.5 

installer/packages/trik-studio/ru.qreal.root.trik.core/meta/requirements.txt

@@ -1,3 +1,3 @@
 pyinstaller==6.19.0
-numpy==2.4.3; python_version >= "3.11"
+numpy==2.4.4; python_version >= "3.11"
 numpy==2.0.1; python_version < "3.11"

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

@@ -15,6 +15,7 @@
 #include "ellipseItem.h"
 
 #include <QtWidgets/QAction>
+#include <qrkernel/settingsManager.h>
 
 using namespace twoDModel::items;
 using namespace graphicsUtils;
@@ -28,6 +29,7 @@ EllipseItem::EllipseItem(graphicsUtils::AbstractCoordinateSystem *metricSystem,
 	setX2(end.x());
 	setY2(end.y());
 	setPrivateData();
+	connect(this, &AbstractItem::mouseInteractionStarted, this, [this]() {mEstimatedPos = pos(); });
 }
 
 AbstractItem *EllipseItem::clone() const
@@ -53,11 +55,21 @@ void EllipseItem::setPrivateData()
 	setPen(pen);
 }
 
+void EllipseItem::resizeItem(QGraphicsSceneMouseEvent *event)
+{
+	const auto showGrid = qReal::SettingsManager::value("2dShowGrid").toBool();
+	const auto gridSize = qReal::SettingsManager::value("2dDoubleGridCellSize").toReal();
+	AbstractItem::resizeItemCommon(event, mEstimatedPos, showGrid, gridSize);
+}
+
+void EllipseItem::reshapeRectWithShift()
+{
+	AbstractItem::reshapeToIsotropic();
+}
+
 QRectF EllipseItem::calcNecessaryBoundingRect() const
 {
-	qreal penWidth = pen().widthF();
-	return QRectF(qMin(x1(), x2()), qMin(y1(), y2()), qAbs(x2() - x1()),
-			qAbs(y2() - y1())).adjusted(-penWidth, -penWidth, penWidth, penWidth);
+	return {qMin(x1(), x2()), qMin(y1(), y2()), qAbs(x2() - x1()), qAbs(y2() - y1())};
 }
 
 QRectF EllipseItem::boundingRect() const

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

@@ -45,14 +45,16 @@ class EllipseItem : public ColorFieldItem
 	void deserialize(const QDomElement &element) override;
 	QPainterPath shapeWihoutResizeArea() const;
 	QPainterPath shape() const override;
-
+	void resizeItem(QGraphicsSceneMouseEvent *event) override;
+	void reshapeRectWithShift() override;
 	/// Returns true if ellipse is filled with its pen color or false if it is "empty".
 	bool filled() const;
 
 	/// Fills ellipse with its pen color if true is passed or makes it "empty".
 	void setFilled(bool filled);
 
 private:
+	QPointF mEstimatedPos;
 	void setPrivateData();
 };
 

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

@@ -108,6 +108,10 @@ QPainterPath ImageItem::shape() const
 	return result;
 }
 
+void ImageItem::reshapeRectWithShift()
+{
+}
+
 QDomElement ImageItem::serialize(QDomElement &parent) const
 {
 	QDomElement imageNode = AbstractItem::serialize(parent);
@@ -240,31 +244,7 @@ QRectF ImageItem::deserializeRect(const QString &string) const
 
 void ImageItem::resizeItem(QGraphicsSceneMouseEvent *event)
 {
-	mEstimatedPos += event->scenePos() - event->lastScenePos();
-	const auto showGrid = SettingsManager::value("2dShowGrid").toBool();
-	if (!showGrid || event->modifiers() == Qt::ControlModifier) {
-		if (dragState() != None) {
-			calcResizeItem(event);
-		} else {
-			setPos(mEstimatedPos);
-		}
-	} else if (dragState() != None) {
-		setFlag(QGraphicsItem::ItemIsMovable, false);
-		const auto gridSize = SettingsManager::value("2dDoubleGridCellSize").toReal();
-		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("2dDoubleGridCellSize").toReal();
-		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());
-	}
+	const auto showGrid = qReal::SettingsManager::value("2dShowGrid").toBool();
+	const auto gridSize = qReal::SettingsManager::value("2dDoubleGridCellSize").toReal();
+	AbstractItem::resizeItemCommon(event, mEstimatedPos, showGrid, gridSize);
 }

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

@@ -49,7 +49,7 @@ class ImageItem : public graphicsUtils::AbstractItem
 	void drawExtractionForItem(QPainter* painter) override;
 	QPainterPath resizeArea() const override;
 	void resizeItem(QGraphicsSceneMouseEvent *event) override;
-
+	void reshapeRectWithShift() override;
 	QDomElement serialize(QDomElement &parent) const override;
 	void deserialize(const QDomElement &element) override;
 

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

@@ -34,6 +34,7 @@ LineItem::LineItem(graphicsUtils::AbstractCoordinateSystem *metricSystem,
 	setX2(end.x());
 	setY2(end.y());
 	setPrivateData();
+	connect(this, &AbstractItem::mouseInteractionStarted, this, [this]() {mEstimatedPos = pos(); });
 }
 
 AbstractItem *LineItem::clone() const
@@ -45,7 +46,7 @@ AbstractItem *LineItem::clone() const
 
 QAction *LineItem::lineTool()
 {
-	QAction * const result = new QAction(QIcon(":/icons/2d_ruler.png"), tr("Line (L)"), nullptr);
+	auto * const result = new QAction(QIcon(":/icons/2d_ruler.png"), tr("Line (L)"), nullptr);
 	result->setShortcuts({QKeySequence(Qt::Key_L), QKeySequence(Qt::Key_5)});
 	result->setCheckable(true);
 	return result;
@@ -65,6 +66,11 @@ QRectF LineItem::boundingRect() const
 	return mLineImpl.boundingRect(x1(), y1(), x2(), y2(), pen().width(), drift);
 }
 
+QRectF LineItem::calcNecessaryBoundingRect() const
+{
+	return {qMin(x1(), x2()), qMin(y1(), y2()), qAbs(x2() - x1()), qAbs(y2() - y1())};
+}
+
 void LineItem::drawItem(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
 	Q_UNUSED(option);
@@ -96,15 +102,9 @@ QPainterPath LineItem::resizeArea() const
 
 void LineItem::resizeItem(QGraphicsSceneMouseEvent *event)
 {
-	const bool isResizing = dragState() == TopLeft || dragState() == BottomRight;
-	if (event->modifiers() & Qt::ShiftModifier && isResizing) {
-		AbstractItem::resizeItem(event);
-		reshapeRectWithShift();
-	} else if (isResizing) {
-		AbstractItem::resizeItem(event);
-	} else {
-		setFlag(QGraphicsItem::ItemIsMovable, true);
-	}
+	const auto showGrid = qReal::SettingsManager::value("2dShowGrid").toBool();
+	const auto gridSize = qReal::SettingsManager::value("2dDoubleGridCellSize").toReal();
+	AbstractItem::resizeItemCommon(event, mEstimatedPos, showGrid, gridSize);
 }
 
 void LineItem::reshapeRectWithShift()
@@ -113,7 +113,7 @@ void LineItem::reshapeRectWithShift()
 	const qreal differenceY = qAbs(y2() - y1());
 	const qreal differenceXY = qAbs(differenceX - differenceY);
 	const qreal size = qMax(differenceX, differenceY);
-	const int delta = size / 2;
+	const int delta = static_cast<int>(size / 2);
 	if (differenceXY > delta) {
 		const qreal corner1X = dragState() == TopLeft ? x2() : x1();
 		const qreal corner1Y = dragState() == TopLeft ? y2() : y1();

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

@@ -38,7 +38,8 @@ class LineItem : public ColorFieldItem
 	QPainterPath shape() const override;
 
 	QRectF boundingRect() const override;
-	void drawItem(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override;
+	QRectF calcNecessaryBoundingRect() const override;
+	void drawItem(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override;
 	void drawExtractionForItem(QPainter* painter) override;
 
 	void resizeItem(QGraphicsSceneMouseEvent *event) override;
@@ -53,6 +54,7 @@ class LineItem : public ColorFieldItem
 	void setSerializeName(const QString &name);
 
 protected:
+	QPointF mEstimatedPos;
 	void setPrivateData();
 
 	graphicsUtils::LineImpl mLineImpl;

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

@@ -15,6 +15,7 @@
 #include "rectangleItem.h"
 #include <QMenu>
 #include <QtWidgets/QAction>
+#include <qrkernel/settingsManager.h>
 
 using namespace twoDModel::items;
 using namespace graphicsUtils;
@@ -28,6 +29,7 @@ RectangleItem::RectangleItem(graphicsUtils::AbstractCoordinateSystem *metricSyst
 	setX2(end.x());
 	setY2(end.y());
 	setPrivateData();
+	connect(this, &AbstractItem::mouseInteractionStarted, this, [this]() {mEstimatedPos = pos(); });
 }
 
 AbstractItem *RectangleItem::clone() const
@@ -53,11 +55,14 @@ void RectangleItem::setPrivateData()
 	setPen(pen);
 }
 
+void RectangleItem::reshapeRectWithShift()
+{
+	AbstractItem::reshapeToIsotropic();
+}
+
 QRectF RectangleItem::calcNecessaryBoundingRect() const
 {
-	qreal penWidth = pen().widthF();
-	return QRectF(qMin(x1(), x2()), qMin(y1(), y2()), qAbs(x2() - x1()),
-			qAbs(y2() - y1())).adjusted(-penWidth, -penWidth, penWidth, penWidth);
+	return {qMin(x1(), x2()), qMin(y1(), y2()), qAbs(x2() - x1()), qAbs(y2() - y1())};
 }
 
 QRectF RectangleItem::boundingRect() const
@@ -135,6 +140,13 @@ QPainterPath RectangleItem::shapeWihoutResizeArea() const
 	return result;
 }
 
+void RectangleItem::resizeItem(QGraphicsSceneMouseEvent *event)
+{
+	const auto showGrid = qReal::SettingsManager::value("2dShowGrid").toBool();
+	const auto gridSize = qReal::SettingsManager::value("2dDoubleGridCellSize").toReal();
+	AbstractItem::resizeItemCommon(event, mEstimatedPos, showGrid, gridSize);
+}
+
 QPainterPath RectangleItem::shape() const
 {
 	QPainterPath result;