2D-model: add option --close to close window on exit

Author: iakov

plugins/robots/checker/twoDModelRunner/main.cpp

@@ -117,16 +117,20 @@ int main(int argc, char *argv[])
 	QCommandLineOption speedOption({"s", "speed"}
 								   , QObject::tr("Speed factor, try from 5 to 20, or even 1000 (at your own risk!).")
 								   , "speed", "0");
-	QCommandLineOption closeOnSuccessOption("close-on-succes"
+	QCommandLineOption closeOnSuccessOption("close-on-success"
 								   , QObject::tr("Close the window and exit if the diagram/script"\
 												 " finishes without errors."));
+	QCommandLineOption closeOnFinishOption("close"
+								   , QObject::tr("Close the window and exit after diagram/script"\
+												 " finishes."));
 	QCommandLineOption showConsoleOption({"c", "console"}, QObject::tr("Shows robot's console."));
 	parser.addOption(backgroundOption);
 	parser.addOption(reportOption);
 	parser.addOption(trajectoryOption);
 	parser.addOption(inputOption);
 	parser.addOption(modeOption);
 	parser.addOption(speedOption);
+	parser.addOption(closeOnFinishOption);
 	parser.addOption(closeOnSuccessOption);
 	parser.addOption(showConsoleOption);
 
@@ -144,11 +148,13 @@ int main(int argc, char *argv[])
 	const QString input = parser.isSet(inputOption) ? parser.value(inputOption) : QString();
 	const QString mode = parser.isSet(modeOption) ? parser.value(modeOption) : QString("diagram");
 	const bool closeOnSuccessMode = parser.isSet(closeOnSuccessOption);
+	const bool closeOnFinishMode = backgroundMode || parser.isSet(closeOnFinishOption);
 	const bool showConsoleMode = parser.isSet(showConsoleOption);
 	QScopedPointer<twoDModel::Runner> runner(new twoDModel::Runner(report, trajectory, input, mode));
 
 	auto speedFactor = parser.value(speedOption).toInt();
-	if (!runner->interpret(qrsFile, backgroundMode, speedFactor, closeOnSuccessMode, showConsoleMode)) {
+	if (!runner->interpret(qrsFile, backgroundMode, speedFactor
+						   , closeOnFinishMode, closeOnSuccessMode, showConsoleMode)) {
 		return 2;
 	}
 

plugins/robots/checker/twoDModelRunner/runner.cpp

@@ -88,7 +88,8 @@ Runner::~Runner()
 }
 
 bool Runner::interpret(const QString &saveFile, const bool background
-					   , const int customSpeedFactor, const bool closeOnSuccess, const bool showConsole)
+					   , const int customSpeedFactor, bool closeOnFinish
+					   , const bool closeOnSuccess, const bool showConsole)
 {
 	if (!mProjectManager->open(saveFile)) {
 		return false;
@@ -108,12 +109,12 @@ bool Runner::interpret(const QString &saveFile, const bool background
 	}
 
 	connect(&mPluginFacade->eventsForKitPlugins(), &kitBase::EventsForKitPluginInterface::interpretationStopped
-			, this, [this, background, closeOnSuccess](qReal::interpretation::StopReason reason) {
-		if (background || (closeOnSuccess && reason == qReal::interpretation::StopReason::finised))
+			, this, [this, closeOnFinish, closeOnSuccess](qReal::interpretation::StopReason reason) {
+		if (closeOnFinish || (closeOnSuccess && reason == qReal::interpretation::StopReason::finised))
 			QTimer::singleShot(0, this, &Runner::close);
 	});
 
-	if (background) {
+	if (closeOnFinish) {
 		connect(&mPluginFacade->eventsForKitPlugins(), &kitBase::EventsForKitPluginInterface::interpretationErrored
 				, this, [this]() { QTimer::singleShot(0, this, &Runner::close); });
 	}

plugins/robots/checker/twoDModelRunner/runner.h

@@ -67,7 +67,8 @@ class Runner : public QObject
 	/// @param speedFactor can be used when not in background mode to tune interpretation speed
 	/// @param closeOnSuccessMode If true then model will be closed if the program finishes without errors.
 	/// @param showConsole If true then robot's console will be showed.
-	bool interpret(const QString &saveFile, bool background, int speedFactor, bool closeOnSuccess, bool showConsole);
+	bool interpret(const QString &saveFile, bool background, int speedFactor
+				   , bool closeOnFinish, bool closeOnSuccess, bool showConsole);
 
 private slots:
 	void close();

qrtranslations/fr/plugins/robots/twoDModelRunner_fr.ts

@@ -58,6 +58,11 @@ In background mode the session will be terminated just after the execution ended
         <source>Close the window and exit if the diagram/script finishes without errors.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>Close the window and exit after diagram/script finishes.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+2"/>
         <source>Shows robot&apos;s console.</source>
@@ -67,7 +72,7 @@ In background mode the session will be terminated just after the execution ended
 <context>
     <name>twoDModel::Runner</name>
     <message>
-        <location filename="../../../../plugins/robots/checker/twoDModelRunner/runner.cpp" line="+202"/>
+        <location filename="../../../../plugins/robots/checker/twoDModelRunner/runner.cpp" line="+203"/>
         <source>Robot console</source>
         <translation type="unfinished"></translation>
     </message>

qrtranslations/ru/plugins/robots/twoDModelRunner_ru.ts

@@ -56,6 +56,11 @@ In background mode the session will be terminated just after the execution ended
         <source>Close the window and exit if the diagram/script finishes without errors.</source>
         <translation>Закрыть окно если диаграмма/скрипт были выполнены без ошибок.</translation>
     </message>
+    <message>
+        <location line="+3"/>
+        <source>Close the window and exit after diagram/script finishes.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location line="+2"/>
         <source>Shows robot&apos;s console.</source>
@@ -69,7 +74,7 @@ In background mode the session will be terminated just after the execution ended
 <context>
     <name>twoDModel::Runner</name>
     <message>
-        <location filename="../../../../plugins/robots/checker/twoDModelRunner/runner.cpp" line="+202"/>
+        <location filename="../../../../plugins/robots/checker/twoDModelRunner/runner.cpp" line="+203"/>
         <source>Robot console</source>
         <translation>Консоль робота</translation>
     </message>