Fix lost robot's position for loadWorldModel action (#1622)

* Fix lost robot's position for loadWorldModel action * Fix deploy Co-authored-by: iakov <[email protected]>
trikset · Feb 20, 2023 · 767413b · 767413b
1 parent 7cacb17
commit 767413b
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 35 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -69,14 +69,7 @@ jobs:
         run: |
             ARCH=32
             PLATFORM=i686
-            pacman --verbose --noconfirm -S msys/zlib-devel dos2unix ccache rsync unzip sshpass mingw$ARCH/mingw-w64-$PLATFORM-libzip mingw$ARCH/mingw-w64-$PLATFORM-libusb mingw$ARCH/mingw-w64-$PLATFORM-zlib mingw$ARCH/mingw-w64-$PLATFORM-pkg-config
-
-# https://github.com/msys2/MSYS2-packages/issues/2485 - sshpass failed with strange error
-      - name: Get older sshpass
-        run: |
-            wget http://repo.msys2.org/msys/x86_64/sshpass-1.06-1-x86_64.pkg.tar.xz
-            pacman --verbose --noconfirm -U ./sshpass-1.06-1-x86_64.pkg.tar.xz
-            rm ./sshpass-1.06-1-x86_64.pkg.tar.xz
+            pacman --verbose --noconfirm -S msys/zlib-devel dos2unix ccache rsync unzip openssh mingw$ARCH/mingw-w64-$PLATFORM-libzip mingw$ARCH/mingw-w64-$PLATFORM-libusb mingw$ARCH/mingw-w64-$PLATFORM-zlib mingw$ARCH/mingw-w64-$PLATFORM-pkg-config
 
       - name: Inject slug/short variables
         uses: rlespinasse/[email protected]
@@ -230,7 +223,10 @@ jobs:
 
       - name: Deploy installer
         if: ${{ matrix.deploy-installer && github.event_name != 'pull_request' && github.repository_owner == 'trikset' }}
-        run: sshpass -p ${{ secrets.DL_PASSWORD }} rsync -ve "ssh -o StrictHostKeyChecking=no" installer/trik-studio*installer*.exe ${{ secrets.DL_USERNAME }}@${{ secrets.DL_HOST }}:~/dl/ts/fresh/installer/trik-studio-${{ env.GITHUB_REF_SLUG }}-i686-installer.exe
+        run: |
+            install -m 600 -D /dev/null ~/.ssh/id_rsa
+            echo "${{ secrets.DL_PRIVATE_SSH_KEY }}" > ~/.ssh/id_rsa
+            rsync -v --rsh="ssh -o StrictHostKeyChecking=no" installer/trik-studio*installer*.exe ${{ secrets.DL_USERNAME }}@${{ secrets.DL_HOST }}:~/dl/ts/fresh/installer/trik-studio-${{ env.GITHUB_REF_SLUG }}-i686-installer.exe
 
       - name: Prepare for RDP connection
         if: false #comment this line to create RDP session

diff --git a/plugins/robots/common/twoDModel/include/twoDModel/engine/view/twoDModelWidget.h b/plugins/robots/common/twoDModel/include/twoDModel/engine/view/twoDModelWidget.h
@@ -234,6 +234,8 @@ private slots:
 
 	void incrementTimelineCounter();
 
+	const QDomDocument loadXmlWithConversion(const QString &loadFileName) const;
+
 	Ui::TwoDModelWidget *mUi {};
 	QScopedPointer<TwoDModelScene> mScene;
 	QScopedPointer<ActionsBox> mActions;

diff --git a/plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp b/plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp
@@ -506,16 +506,7 @@ void TwoDModelWidget::loadWorldModel()
 		return;
 	}
 
-	QString errorMessage;
-	int errorLine = 0;
-	int errorColumn = 0;
-	const QDomDocument save = utils::xmlUtils::loadDocument(loadFileName, &errorMessage, &errorLine, &errorColumn);
-	if (!errorMessage.isEmpty()) {
-		mModel.errorReporter()->addError(QString("%1:%2: %3")
-				.arg(QString::number(errorLine), QString::number(errorColumn), errorMessage));
-	}
-
-	auto command = new commands::LoadWorldCommand(*this, save);
+	auto command = new commands::LoadWorldCommand(*this, loadXmlWithConversion(loadFileName));
 	if (mController) {
 		mController->execute(command);
 	}
@@ -528,14 +519,7 @@ void TwoDModelWidget::loadWorldModelWithoutRobot()
 		return;
 	}
 
-	QString errorMessage;
-	int errorLine = 0;
-	int errorColumn = 0;
-	QDomDocument save = utils::xmlUtils::loadDocument(loadFileName, &errorMessage, &errorLine, &errorColumn);
-	if (!errorMessage.isEmpty()) {
-		mModel.errorReporter()->addError(QString("%1:%2: %3")
-				.arg(QString::number(errorLine), QString::number(errorColumn), errorMessage));
-	}
+	QDomDocument save = loadXmlWithConversion(loadFileName);
 
 	auto newWorld = save.firstChildElement("root");
 	auto oldWorld = generateWorldModelXml().firstChildElement("root");
@@ -1131,3 +1115,40 @@ void TwoDModelWidget::incrementTimelineCounter()
 {
 	mUi->timelineBox->stepBy(1);
 }
+
+const QDomDocument TwoDModelWidget::loadXmlWithConversion(const QString &loadFileName) const
+{
+	QString errorMessage;
+	int errorLine = 0;
+	int errorColumn = 0;
+	const QDomDocument save = utils::xmlUtils::loadDocument(loadFileName, &errorMessage, &errorLine, &errorColumn);
+	if (!errorMessage.isEmpty()) {
+		mModel.errorReporter()->addError(QString("%1:%2: %3")
+				.arg(QString::number(errorLine), QString::number(errorColumn), errorMessage));
+		return save;
+	}
+
+	QDomElement root = save.firstChildElement("root");
+
+	QDomElement oldRobot = root.firstChildElement("robots").firstChildElement("robot");
+	if (oldRobot.hasAttribute("position") || oldRobot.hasAttribute("direction")
+			|| !oldRobot.firstChildElement("startPosition").isNull()) {
+		QDomElement world = root.firstChildElement("world");
+		if (world.isNull()) {
+			world = root.ownerDocument().createElement("world");
+			root.appendChild(world);
+		}
+
+		QDomElement robot = world.ownerDocument().createElement("robot");
+		robot.setAttribute("position", oldRobot.attribute("position", "0:0"));
+		robot.setAttribute("direction", oldRobot.attribute("direction", "0"));
+		robot.appendChild(oldRobot.firstChildElement("startPosition"));
+		world.appendChild(robot);
+
+		oldRobot.removeAttribute("position");
+		oldRobot.removeAttribute("direction");
+		// start position reparented automatically
+	}
+
+	return save;
+}
diff --git a/qrtranslations/fr/plugins/robots/twoDModel_fr.ts b/qrtranslations/fr/plugins/robots/twoDModel_fr.ts
@@ -763,22 +763,22 @@
     <message>
         <location line="+0"/>
         <location line="+20"/>
-        <location line="+22"/>
+        <location line="+13"/>
         <source>2D model saves (*.xml)</source>
         <translation>Fichiers de sauvegarde du modèle 2D (*.xml) </translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-13"/>
         <source>Loading world and robot model</source>
         <translation>Chargement des modèles du monde et du robot</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+13"/>
         <source>Loading world without robot model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+316"/>
+        <location line="+309"/>
         <source>Hide details</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/qrtranslations/ru/plugins/robots/twoDModel_ru.ts b/qrtranslations/ru/plugins/robots/twoDModel_ru.ts
@@ -1106,17 +1106,17 @@
     <message>
         <location line="+0"/>
         <location line="+20"/>
-        <location line="+22"/>
+        <location line="+13"/>
         <source>2D model saves (*.xml)</source>
         <translation>Файлы 2D модели (*.xml)</translation>
     </message>
     <message>
-        <location line="-22"/>
+        <location line="-13"/>
         <source>Loading world and robot model</source>
         <translation>Загрузка модели мира</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+13"/>
         <source>Loading world without robot model</source>
         <translation>Загрузка модели мира без модели робота</translation>
     </message>
@@ -1133,7 +1133,7 @@
         <translation type="vanished">Попытка загрузить слишком большое изображение может заморозить выполнение на некоторое время. Продолжить?</translation>
     </message>
     <message>
-        <location line="+316"/>
+        <location line="+309"/>
         <source>Hide details</source>
         <translation>Скрыть детали</translation>
     </message>