Add custom speed factor parameter to 2d-model (#797)

* Add custom speed factor parameter to 2d-model

--speed 5..50

* Fixes after @IKhonakhbeeva

Author: iakov

plugins/robots/checker/twoDModelRunner/main.cpp

@@ -35,25 +35,33 @@ const QString description = QObject::tr(
 		"Example: \n") +
 		"    2D-model -b --platform minimal --report report.json --trajectory trajectory.fifo example.qrs";
 
-void loadTranslators(const QString &locale)
+bool loadTranslators(const QString &locale)
 {
 	QDir translationsDirectory(qReal::PlatformInfo::invariantSettingsPath("pathToTranslations") + "/" + locale);
 	QDirIterator directories(translationsDirectory, QDirIterator::Subdirectories);
+	bool hasTranslations = false;
 	while (directories.hasNext()) {
 		for (const QFileInfo &translatorFile : QDir(directories.next()).entryInfoList(QDir::Files)) {
 			QTranslator *translator = new QTranslator(qApp);
 			translator->load(translatorFile.absoluteFilePath());
 			QCoreApplication::installTranslator(translator);
+			hasTranslations = true;
 		}
 	}
+	return hasTranslations;
 }
 
 void setDefaultLocale()
 {
-	const QString locale = QLocale().name().left(2);
-	if (!locale.isEmpty()) {
-		QLocale::setDefault(QLocale(locale));
-		loadTranslators(locale);
+	const QString lang = QLocale().name().left(2);
+	if (lang.isEmpty()) {
+		return;
+	}
+
+	// Reset to default country for this language
+	QLocale::setDefault(QLocale(lang));
+	if (!loadTranslators(lang)) {
+		QLOG_INFO() << "Missing translations for language" << lang;
 	}
 }
 
@@ -70,9 +78,15 @@ void initLogging()
 int main(int argc, char *argv[])
 {
 	qReal::PlatformInfo::enableHiDPISupport();
+	qsrand(time(0));
+	initLogging();
 	QApplication app(argc, argv);
 	QCoreApplication::setApplicationName("2D-model");
-	QCoreApplication::setApplicationVersion("1.0");
+	QCoreApplication::setApplicationVersion("2020.2");
+	QLOG_INFO() << "------------------- APPLICATION STARTED --------------------";
+	QLOG_INFO() << "Running on" << QSysInfo::prettyProductName();
+	QLOG_INFO() << "Arguments:" << app.arguments();
+	QLOG_INFO() << "Setting default locale to" << QLocale().name();
 	setDefaultLocale();
 
 	QCommandLineParser parser;
@@ -83,28 +97,27 @@ int main(int argc, char *argv[])
 	QCommandLineOption backgroundOption({"b", "background"}, QObject::tr("Run emulation in background."));
 	QCommandLineOption platformOption("platform"
 			, QObject::tr("Use this option set to \"minimal\" to disable connection to X server"), "minimal");
-	QCommandLineOption reportOption("report", QObject::tr("A path to file where checker results will be written (JSON)")
-			, "path-to-report", "report.json");
-	QCommandLineOption trajectoryOption("trajectory", QObject::tr("A path to file where robot`s trajectory will be"\
+	QCommandLineOption reportOption({"r","report"}
+									, QObject::tr("A path to file where checker results will be written (JSON)")
+									, "path-to-report", "report.json");
+	QCommandLineOption trajectoryOption({"t", "trajectory"}
+										, QObject::tr("A path to file where robot`s trajectory will be"\
 				" written. The writing will not be performed not immediately, each trajectory point will be written"\
 				" just when obtained by checker, so FIFOs are recommended to be targets for this option.")
 			, "path-to-trajectory", "trajectory.fifo");
-	QCommandLineOption inputOption("input", QObject::tr("Inputs for JavaScript solution")// probably others too
+	QCommandLineOption inputOption({"i", "input"}, QObject::tr("Inputs for JavaScript solution")// probably others too
 			, "path-to-input", "inputs.txt");
-	QCommandLineOption modeOption("mode", QObject::tr("Interpret mode"), "mode", "diagram");
+	QCommandLineOption modeOption({"m", "mode"}, QObject::tr("Interpret mode"), "mode", "diagram");
+	QCommandLineOption speedOption({"s", "speed"}
+								   , QObject::tr("Speed factor, try from 5 to 20, or even 1000 (at your own risk!)")
+								   , "speed", "0");
 	parser.addOption(backgroundOption);
 	parser.addOption(platformOption);
 	parser.addOption(reportOption);
 	parser.addOption(trajectoryOption);
 	parser.addOption(inputOption);
 	parser.addOption(modeOption);
-
-	qsrand(time(0));
-	initLogging();
-	QLOG_INFO() << "------------------- APPLICATION STARTED --------------------";
-	QLOG_INFO() << "Running on" << QSysInfo::prettyProductName();
-	QLOG_INFO() << "Arguments:" << app.arguments();
-	QLOG_INFO() << "Setting default locale to" << QLocale().name();
+	parser.addOption(speedOption);
 
 	parser.process(app);
 
@@ -120,7 +133,9 @@ 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");
 	twoDModel::Runner runner(report, trajectory, input, mode);
-	if (!runner.interpret(qrsFile, backgroundMode)) {
+
+	auto speedFactor = parser.value(speedOption).toInt();
+	if (!runner.interpret(qrsFile, backgroundMode, speedFactor)) {
 		return 2;
 	}
 

plugins/robots/checker/twoDModelRunner/runner.cpp

@@ -26,6 +26,7 @@
 
 #include <twoDModel/engine/view/twoDModelWidget.h>
 #include <twoDModel/engine/model/model.h>
+#include <twoDModel/engine/model/timeline.h>
 
 using namespace twoDModel;
 
@@ -69,7 +70,7 @@ Runner::~Runner()
 	mReporter.reportMessages();
 }
 
-bool Runner::interpret(const QString &saveFile, bool background)
+bool Runner::interpret(const QString &saveFile, bool background, int customSpeedFactor)
 {
 	if (!mProjectManager.open(saveFile)) {
 		return false;
@@ -94,6 +95,7 @@ bool Runner::interpret(const QString &saveFile, bool background)
 	for (view::TwoDModelWidget * const twoDModelWindow : twoDModelWindows) {
 		connect(twoDModelWindow, &view::TwoDModelWidget::widgetClosed, &mMainWindow
 				, [this]() { this->mMainWindow.emulateClose(); });
+
 		auto layout = dynamic_cast<QGridLayout*>(twoDModelWindow->layout());
 		qReal::ui::ConsoleDock* console = nullptr;
 		if (layout) {
@@ -102,10 +104,16 @@ bool Runner::interpret(const QString &saveFile, bool background)
 			// TODO: hack to add console for each widget
 			layout->addWidget(console, layout->rowCount(), 0, 1, -1);
 		}
-		twoDModelWindow->model().timeline().setImmediateMode(background);
+
 		for (const model::RobotModel *robotModel : twoDModelWindow->model().robotModels()) {
 			connectRobotModel(robotModel, console);
 		}
+
+		auto &t = twoDModelWindow->model().timeline();
+		t.setImmediateMode(background);
+		if (!background && customSpeedFactor >= model::Timeline::normalSpeedFactor) {
+			t.setSpeedFactor(customSpeedFactor);
+		}
 	}
 
 	mReporter.onInterpretationStart();

plugins/robots/checker/twoDModelRunner/runner.h

@@ -63,7 +63,8 @@ class Runner : public QObject
 	/// @param saveFile QReal save file (qrs) that will be opened and interpreted.
 	/// @param background If true then the save file will be interpreted in the fastest speed and 2D model window
 	/// will be closed immediately after the interpretation stopped.
-	bool interpret(const QString &saveFile, bool background);
+	/// @param customSpeedFactor can be used when not in background mode to tune interpretation speed
+	bool interpret(const QString &saveFile, bool background, int customSpeedFactor);
 
 private slots:
 	void close();

plugins/robots/interpreters/interpreterCore/src/robotsPluginFacade.cpp

@@ -228,7 +228,8 @@ void RobotsPluginFacade::init(const qReal::PluginConfigurator &configurer)
 			const qReal::Id activeDiagram = mMainWindow->activeDiagram();
 			// QString() need to use method with binding
 			// TODO: need refactoring showInTextEditor(?)
-			mTextManager->showInTextEditor(codePath, QString(), qReal::text::Languages::pickByExtension(codePath.suffix()));
+			mTextManager->showInTextEditor(codePath, QString()
+					, qReal::text::Languages::pickByExtension(codePath.suffix()));
 			if (!activeDiagram.isNull()
 					&& mRobotModelManager.model().friendlyName().contains("2d", Qt::CaseInsensitive)) {
 				mMainWindow->activateItemOrDiagram(activeDiagram);

qrtranslations/fr/plugins/robots/interpreterCore_fr.ts

@@ -309,7 +309,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>No saved code found in the qrs file</source>
         <translation type="unfinished"></translation>
     </message>

qrtranslations/fr/plugins/robots/twoDModelRunner_fr.ts

@@ -11,7 +11,7 @@ In background mode the session will be terminated just after the execution ended
         <translation>Émule le comportement du robot sur le modèle 2D TRIK Studio séparément de l&apos;environnement de programmation. Le fichier .qrs sera interprété comme si le bouton &apos;Executer&apos; était appuyé dans TRIK Studio.</translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+66"/>
         <source>Save file to be interpreted.</source>
         <translation>Le fichier de sauvegarde à interpréter.</translation>
     </message>
@@ -26,12 +26,12 @@ In background mode the session will be terminated just after the execution ended
         <translation>Mettez &quot;minimal&quot; dans cette option pour désactiver la connexion au serveur X</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>A path to file where checker results will be written (JSON)</source>
         <translation>Le chemin au fichier de sauvegarde des resultats (JSON)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>A path to file where robot`s trajectory will be written. The writing will not be performed not immediately, each trajectory point will be written just when obtained by checker, so FIFOs are recommended to be targets for this option.</source>
         <translation>Le chemin au ficher ou la trajectoire du robot sera enregistrée. L&apos;enregistrement ne sera pas fait immediatement, chaque point de trajectoire sera écrit dès lors qu&apos;il est obteneur par le checker, donc FIFO sont récommandés pour cette option.</translation>
     </message>
@@ -45,11 +45,16 @@ In background mode the session will be terminated just after the execution ended
         <source>Interpret mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Speed factor, try from 5 to 20, or even 1000 (at your own risk!)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>twoDModel::Runner</name>
     <message>
-        <location filename="../../../../plugins/robots/checker/twoDModelRunner/runner.cpp" line="+100"/>
+        <location filename="../../../../plugins/robots/checker/twoDModelRunner/runner.cpp" line="+102"/>
         <source>Robot console</source>
         <translation type="unfinished"></translation>
     </message>

qrtranslations/ru/plugins/robots/interpreterCore_ru.ts

@@ -223,7 +223,7 @@
         <translation>Экспорт упражнения по заданному пути не удался (попробуйте другой путь)</translation>
     </message>
     <message>
-        <location line="+103"/>
+        <location line="+104"/>
         <source>No saved code found in the qrs file</source>
         <translation>В qrs не найден сохраннёный код</translation>
     </message>

qrtranslations/ru/plugins/robots/twoDModelRunner_ru.ts

@@ -17,7 +17,7 @@ In background mode the session will be terminated just after the execution ended
 </translation>
     </message>
     <message>
-        <location line="+52"/>
+        <location line="+66"/>
         <source>Save file to be interpreted.</source>
         <translation>Файл сохранения, который будет исполнен.</translation>
     </message>
@@ -32,12 +32,12 @@ In background mode the session will be terminated just after the execution ended
         <translation>Используйте эту опцию, установленную в &quot;minimal&quot; для того, чтобы запустить программу без X-сервера</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="+2"/>
         <source>A path to file where checker results will be written (JSON)</source>
         <translation>Путь к файлу, куда будут записаны результаты проверки (JSON)</translation>
     </message>
     <message>
-        <location line="+2"/>
+        <location line="+3"/>
         <source>A path to file where robot`s trajectory will be written. The writing will not be performed not immediately, each trajectory point will be written just when obtained by checker, so FIFOs are recommended to be targets for this option.</source>
         <translation>Путь к файлу, куда будет выводиться траектори робота. Запись не будет осуществлена единомоментно, каждый узел траектории будет записан по факту его просчета проверяющей системой. Поэтому разумно использования FIFO-файлов в качестве значения этого параметра.</translation>
     </message>
@@ -51,6 +51,11 @@ In background mode the session will be terminated just after the execution ended
         <source>Interpret mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+2"/>
+        <source>Speed factor, try from 5 to 20, or even 1000 (at your own risk!)</source>
+        <translation>Ускорение, попробуйте от 5 до 20, но можно и 1000 пробовать </translation>
+    </message>
     <message>
         <source>A path to file where robot`s trajectory will be written. The writing will not be performed not immediately, each trajectory point will be written just when obtained by checker, engine so FIFOs are recommended to be targets for this option.</source>
         <translation type="obsolete">Путь к файлу, куда будует выводиться траектория робота. Записть не будет осуществлена одномоментно, каждый узел траектории будет записан по факту его подсчета проверяющей системой</translation>
@@ -59,7 +64,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="+100"/>
+        <location filename="../../../../plugins/robots/checker/twoDModelRunner/runner.cpp" line="+102"/>
         <source>Robot console</source>
         <translation>Консоль робота</translation>
     </message>