Fixes for world model (#1031)

trikset · Aug 2, 2020 · 98cc668 · 98cc668
1 parent e3bdb27
commit 98cc668
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 6 deletions.
diff --git a/plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp b/plugins/robots/common/twoDModel/src/engine/view/twoDModelWidget.cpp
@@ -533,8 +533,8 @@ void TwoDModelWidget::loadWorldModelWithoutRobot()
 	auto currentRobot = generateWorldModelXml().firstChildElement("root")
 			.firstChildElement("robots").firstChildElement("robot");
 
-	saveRobot.replaceChild(saveRobot.firstChildElement("sensors"), currentRobot.firstChildElement("sensors"));
-	saveRobot.replaceChild(saveRobot.firstChildElement("wheels"), currentRobot.firstChildElement("wheels"));
+	saveRobot.replaceChild(currentRobot.firstChildElement("sensors"), saveRobot.firstChildElement("sensors"));
+	saveRobot.replaceChild(currentRobot.firstChildElement("wheels"), saveRobot.firstChildElement("wheels"));
 	saveRobot.setAttribute("id", currentRobot.attribute("id"));
 
 	auto command = new commands::LoadWorldCommand(*this, save);

diff --git a/plugins/tools/subprogramsImporterExporter/subprogramsImporterExporterPlugin.cpp b/plugins/tools/subprogramsImporterExporter/subprogramsImporterExporterPlugin.cpp
@@ -158,6 +158,7 @@ void SubprogramsImporterExporterPlugin::importToProject() const
 	for (const auto &diagram : openedDiagrams) {
 		mMainWindowInterpretersInterface->activateItemOrDiagram(diagram);
 	}
+	mLogicalModel->mutableLogicalRepoApi().clearMetaInformation();
 	for (const auto &metaKey : oldMeta.keys()) {
 		mLogicalModel->mutableLogicalRepoApi().setMetaInformation(metaKey, oldMeta[metaKey]);
 	}
@@ -269,6 +270,7 @@ void SubprogramsImporterExporterPlugin::importFromCollectionTriggered() const
 		for (const auto &diagram : openedDiagrams) {
 			mMainWindowInterpretersInterface->activateItemOrDiagram(diagram);
 		}
+		mLogicalModel->mutableLogicalRepoApi().clearMetaInformation();
 		for (const auto &metaKey : oldMeta.keys()) {
 			mLogicalModel->mutableLogicalRepoApi().setMetaInformation(metaKey, oldMeta[metaKey]);
 		}

diff --git a/qrrepo/logicalRepoApi.h b/qrrepo/logicalRepoApi.h
@@ -49,5 +49,8 @@ class LogicalRepoApi : public CommonRepoApi
 
 	/// Stores the meta-information for current stored binded to the given key.
 	virtual void setMetaInformation(const QString &key, const QVariant &info) = 0;
+
+	/// Clear the meta-information.
+	virtual void clearMetaInformation() = 0;
 };
 }
diff --git a/qrrepo/private/repoApi.cpp b/qrrepo/private/repoApi.cpp
@@ -639,3 +639,8 @@ void RepoApi::setMetaInformation(const QString &key, const QVariant &info)
 {
 	mRepository->setMetaInformation(key, info);
 }
+
+void RepoApi::clearMetaInformation()
+{
+	mRepository->clearMetaInformation();
+}
diff --git a/qrrepo/private/repository.cpp b/qrrepo/private/repository.cpp
@@ -629,3 +629,8 @@ void Repository::setMetaInformation(const QString &key, const QVariant &info)
 {
 	mMetaInfo[key] = info;
 }
+
+void Repository::clearMetaInformation()
+{
+	mMetaInfo.clear();
+}
diff --git a/qrrepo/private/repository.h b/qrrepo/private/repository.h
@@ -152,6 +152,9 @@ class Repository
 	/// Stores the meta-information for current stored binded to the given key.
 	void setMetaInformation(const QString &key, const QVariant &info);
 
+	/// Clear the meta-information.
+	void clearMetaInformation();
+
 private:
 	void init();
 

diff --git a/qrrepo/repoApi.h b/qrrepo/repoApi.h
@@ -173,6 +173,7 @@ class QRREPO_EXPORT RepoApi : public GraphicalRepoApi, public LogicalRepoApi, pu
 	QStringList metaInformationKeys() const override;
 	QVariant metaInformation(const QString &key) const override;
 	void setMetaInformation(const QString &key, const QVariant &info) override;
+	void clearMetaInformation() override;
 
 private:
 	RepoApi(const RepoApi &other);  // Copying is not allowed.

diff --git a/qrtranslations/ru/plugins/robots/twoDModel_ru.ts b/qrtranslations/ru/plugins/robots/twoDModel_ru.ts
@@ -472,7 +472,7 @@
     <message>
         <location line="+44"/>
         <source>Robot track:</source>
-        <translation>Колейность робота:</translation>
+        <translation>Колея робота:</translation>
     </message>
 </context>
 <context>

diff --git a/qrtranslations/ru/plugins/subprogramsImporterExporter_ru.ts b/qrtranslations/ru/plugins/subprogramsImporterExporter_ru.ts
@@ -91,7 +91,7 @@
         <translation>В проекте нет подпрограмм.</translation>
     </message>
     <message>
-        <location line="+78"/>
+        <location line="+79"/>
         <source>There are not subprograms in your project</source>
         <translation>В проекте нет подпрограмм</translation>
     </message>
@@ -101,12 +101,12 @@
         <translation>В коллекции нет подпрограмм для робота %1</translation>
     </message>
     <message>
-        <location line="-97"/>
+        <location line="-98"/>
         <source>Select subprograms file</source>
         <translation>Выберите файл с подпрограммами</translation>
     </message>
     <message>
-        <location line="+143"/>
+        <location line="+145"/>
         <source>Clear the collection</source>
         <translation type="unfinished"></translation>
     </message>