Exercise manipulations (#1685)

* Don't change start position if item is not editable * Reset draw action when reloading world model * Lupdate
trikset · Oct 23, 2023 · 60bf9c5 · 60bf9c5
1 parent b3d33cb
commit 60bf9c5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/plugins/robots/common/twoDModel/include/twoDModel/engine/view/twoDModelWidget.h b/plugins/robots/common/twoDModel/include/twoDModel/engine/view/twoDModelWidget.h
@@ -101,6 +101,7 @@ class TWO_D_MODEL_EXPORT TwoDModelWidget : public QWidget
 
 	void setBackgroundMode();
 	void bringToFront();
+	void resetDrawAction();
 
 	QString editorId() const override;
 	bool supportsZooming() const override;

diff --git a/plugins/robots/common/twoDModel/src/engine/items/ballItem.cpp b/plugins/robots/common/twoDModel/src/engine/items/ballItem.cpp
@@ -119,9 +119,11 @@ QPainterPath BallItem::shape() const
 
 void BallItem::saveStartPosition()
 {
-	mStartPosition = pos();
-	mStartRotation = rotation();
-	emit x1Changed(x1());
+	if (this->editable()) {
+		mStartPosition = pos();
+		mStartRotation = rotation();
+		emit x1Changed(x1());
+	}
 }
 
 void BallItem::returnToStartPosition()

diff --git a/plugins/robots/common/twoDModel/src/engine/items/skittleItem.cpp b/plugins/robots/common/twoDModel/src/engine/items/skittleItem.cpp
@@ -112,9 +112,11 @@ void SkittleItem::deserialize(const QDomElement &element)
 
 void SkittleItem::saveStartPosition()
 {
-	mStartPosition = pos();
-	mStartRotation = rotation();
-	emit x1Changed(x1());
+	if (this->editable()) {
+		mStartPosition = pos();
+		mStartRotation = rotation();
+		emit x1Changed(x1());
+	}
 }
 
 void SkittleItem::returnToStartPosition()

diff --git a/plugins/robots/common/twoDModel/src/engine/twoDModelEngineFacade.cpp b/plugins/robots/common/twoDModel/src/engine/twoDModelEngineFacade.cpp
@@ -89,6 +89,7 @@ void TwoDModelEngineFacade::init(const kitBase::EventsForKitPluginInterface &eve
 		}
 
 		mView->loadXmls(worldModel);
+		mView->resetDrawAction();
 
 		loadReadOnlyFlags(logicalModel);
 		QLOG_DEBUG() << "Reloading 2D world done";

diff --git a/plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp b/plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp
@@ -300,6 +300,11 @@ void TwoDModelWidget::initPalette()
 	connect(imageTool, &QAction::triggered, this, [this](){ mUi->palette->unselect(); });
 }
 
+void TwoDModelWidget::resetDrawAction()
+{
+	mUi->palette->unselect();
+}
+
 void TwoDModelWidget::initDetailsTab()
 {
 }

diff --git a/qrtranslations/fr/plugins/robots/twoDModel_fr.ts b/qrtranslations/fr/plugins/robots/twoDModel_fr.ts
@@ -301,7 +301,7 @@
 <context>
     <name>twoDModel::engine::TwoDModelEngineFacade</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/twoDModelEngineFacade.cpp" line="+189"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/twoDModelEngineFacade.cpp" line="+190"/>
         <source>Realistic physics&apos; must be turned on to enjoy skittles and balls</source>
         <translation type="unfinished"></translation>
     </message>
@@ -728,7 +728,7 @@
 <context>
     <name>twoDModel::view::TwoDModelWidget</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp" line="+318"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp" line="+323"/>
         <source>Warning</source>
         <translation>Attention</translation>
     </message>

diff --git a/qrtranslations/ru/plugins/robots/twoDModel_ru.ts b/qrtranslations/ru/plugins/robots/twoDModel_ru.ts
@@ -573,7 +573,7 @@
 <context>
     <name>twoDModel::engine::TwoDModelEngineFacade</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/twoDModelEngineFacade.cpp" line="+189"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/twoDModelEngineFacade.cpp" line="+190"/>
         <source>Realistic physics&apos; must be turned on to enjoy skittles and balls</source>
         <translation>Реалистичная физика должна быть включена для взаимодействия с кеглями и мячами</translation>
     </message>
@@ -1071,7 +1071,7 @@
 <context>
     <name>twoDModel::view::TwoDModelWidget</name>
     <message>
-        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp" line="+318"/>
+        <location filename="../../../../plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp" line="+323"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>