[trik-checkapp] + installer fixes (trikset#1743)

* Add missing QtConcurrent to installer * Update trik-checkapp submodule
iakov · Jul 8, 2024 · b79bea4 · b79bea4
1 parent bfaaf60
commit b79bea4
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 12 deletions.
diff --git a/installer/packages/qreal-base/ru.qreal.root/meta/prebuild-linux-gnu.sh b/installer/packages/qreal-base/ru.qreal.root/meta/prebuild-linux-gnu.sh
@@ -52,6 +52,7 @@ rsync -a "$QT_LIB"/libQt5Script.so*                                     "$PWD"/.
 rsync -a "$QT_LIB"/libQt5Test.so*                                       "$PWD"/../data/lib/
 rsync -a "$QT_LIB"/libQt5XcbQpa.so*                                     "$PWD"/../data/lib/
 rsync -a "$QT_LIB"/libQt5WaylandC{lient,ompositor}.so*                  "$PWD"/../data/lib/
+rsync -a "$QT_LIB"/libQt5Concurrent.so*                                 "$PWD"/../data/lib/
 
 rsync -avR "$QT_PLUGINS"/./{platforms,imageformats,iconengines,wayland-*}/lib*.so                             "$PWD"/../data/bin/
 

diff --git a/installer/packages/qreal-base/ru.qreal.root/meta/prebuild-mac.sh b/installer/packages/qreal-base/ru.qreal.root/meta/prebuild-mac.sh
@@ -78,6 +78,7 @@ copy_qt_lib QtXml
 copy_qt_lib QtScript
 copy_qt_lib QtTest
 copy_qt_lib QtMacExtras
+copy_qt_lib QtConcurrent
 
 mkdir "$BUNDLE_CONTENTS/MacOS/platforms"
 mkdir "$BUNDLE_CONTENTS/MacOS/imageformats"

diff --git a/plugins/robots/checker/twoDModelRunner/runner.cpp b/plugins/robots/checker/twoDModelRunner/runner.cpp
@@ -110,7 +110,7 @@ bool Runner::interpret(const QString &saveFile, const bool background
 
 	connect(&mPluginFacade->eventsForKitPlugins(), &kitBase::EventsForKitPluginInterface::interpretationStopped
 			, this, [this, closeOnFinish, closeOnSuccess](qReal::interpretation::StopReason reason) {
-		if (closeOnFinish || (closeOnSuccess && reason == qReal::interpretation::StopReason::finised))
+		if (closeOnFinish || (closeOnSuccess && reason == qReal::interpretation::StopReason::finished))
 			QTimer::singleShot(0, this, &Runner::close);
 	});
 

diff --git a/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp b/plugins/robots/common/twoDModel/src/engine/constraints/constraintsChecker.cpp
@@ -293,7 +293,7 @@ void ConstraintsChecker::programStarted()
 void ConstraintsChecker::programFinished(qReal::interpretation::StopReason reason)
 {
 	if (!mSuccessTriggered && !mFailTriggered && mEnabled) {
-		if (mDefferedSuccessTriggered && reason == qReal::interpretation::StopReason::finised) {
+		if (mDefferedSuccessTriggered && reason == qReal::interpretation::StopReason::finished) {
 			onSuccess();
 		} else {
 			emit fail(tr("Program has finished, but the task is not accomplished."));

diff --git a/plugins/robots/common/twoDModel/src/engine/model/model.cpp b/plugins/robots/common/twoDModel/src/engine/model/model.cpp
@@ -63,14 +63,15 @@ void Model::init(qReal::ErrorReporterInterface &errorReporter
 		// Stopping cannot be performed immediately because we still have constraints to check in event loop
 		// and they need scene to be alive (in checker stopping interpretation means deleting all).
 		QTimer::singleShot(0, &interpreterControl,
-				[&interpreterControl](){ Q_EMIT interpreterControl.stopAllInterpretation(); });
+				[&interpreterControl]() {
+				Q_EMIT interpreterControl.stopAllInterpretation(qReal::interpretation::StopReason::finished); });
 	});
 	connect(mChecker.data(), &constraints::ConstraintsChecker::fail, this, [&](const QString &message) {
 		errorReporter.addError(message);
 		// Stopping cannot be performed immediately because we still have constraints to check in event loop
 		// and they need scene to be alive (in checker stopping interpretation means deleting all).
 		QTimer::singleShot(0, &interpreterControl,
-				[&interpreterControl](){ Q_EMIT interpreterControl.stopAllInterpretation(); });
+				[&interpreterControl]() { Q_EMIT interpreterControl.stopAllInterpretation(); });
 	});
 	connect(mChecker.data(), &constraints::ConstraintsChecker::message, this, [&](const QString &message) {
 		errorReporter.addInformation(message);

diff --git a/plugins/robots/interpreters/trikKitInterpreterCommon/src/trikKitInterpreterPluginBase.cpp b/plugins/robots/interpreters/trikKitInterpreterCommon/src/trikKitInterpreterPluginBase.cpp
@@ -330,7 +330,7 @@ void TrikKitInterpreterPluginBase::init(const kitBase::KitPluginConfigurator &co
 			, &TrikTextualInterpreter::completed
 			, this
 			, [this](){
-		this->testStop(qReal::interpretation::StopReason::finised);
+		this->testStop(qReal::interpretation::StopReason::finished);
 	});
 	// refactor?
 	connect(this

diff --git a/...s/robotsTests/interpretersTests/interpreterCoreTests/interpreterTests/interpreterTest.cpp b/...s/robotsTests/interpretersTests/interpreterCoreTests/interpreterTests/interpreterTest.cpp
@@ -159,5 +159,5 @@ TEST_F(InterpreterTest, stopRobot)
 		mEventLoop.exec();
 	}
 
-	mInterpreter->stopRobot(qReal::interpretation::StopReason::finised);
+	mInterpreter->stopRobot(qReal::interpretation::StopReason::finished);
 }
diff --git a/qrtranslations/fr/plugins/robots/twoDModel_fr.ts b/qrtranslations/fr/plugins/robots/twoDModel_fr.ts
@@ -394,7 +394,7 @@
         <translation>La tâche a été accomplie en %1 secondes!</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <source>Error in checker: %1</source>
         <translation>Erreur dans le vérificateur : %1</translation>
     </message>

diff --git a/qrtranslations/ru/plugins/robots/twoDModel_ru.ts b/qrtranslations/ru/plugins/robots/twoDModel_ru.ts
@@ -670,7 +670,7 @@
         <translation>Задание выполнено за %1 сек!</translation>
     </message>
     <message>
-        <location line="+22"/>
+        <location line="+23"/>
         <source>Error in checker: %1</source>
         <translation>Ошибка в проверяющей программе: %1</translation>
     </message>

diff --git a/qrutils/interpreter/stopReason.h b/qrutils/interpreter/stopReason.h
@@ -21,7 +21,7 @@ namespace interpretation {
 enum class StopReason
 {
 	/// Program finished correctly
-	finised = 0
+	finished = 0
 	/// Program finished incorrectly, error occured
 	, error
 	/// User stopped program execution (explicitly or implicitly)

diff --git a/qrutils/interpreter/thread.cpp b/qrutils/interpreter/thread.cpp
@@ -129,7 +129,7 @@ void Thread::stepInto(const Id &diagram)
 void Thread::finishedSteppingInto()
 {
 	if (mStack.isEmpty()) {
-		emit stopped(qReal::interpretation::StopReason::finised);
+		emit stopped(qReal::interpretation::StopReason::finished);
 		return;
 	}
 

diff --git a/qrutils/interpreter/thread.h b/qrutils/interpreter/thread.h
@@ -73,7 +73,7 @@ class QRUTILS_EXPORT Thread : public QObject
 	void interpret();
 
 	/// Stops interpretation. Optionally reason may be specified.
-	void stop(qReal::interpretation::StopReason reason = qReal::interpretation::StopReason::finised);
+	void stop(qReal::interpretation::StopReason reason = qReal::interpretation::StopReason::finished);
 
 	/// Inserts a message to a message queue.
 	void newMessage(const QString &message);

diff --git a/thirdparty/checkapp/checkapp b/thirdparty/checkapp/checkapp