Add after upload for trik (python)

Author: IKhonakhbeeva

plugins/robots/generators/trik/trikGeneratorBase/include/trikGeneratorBase/trikGeneratorPluginBase.h

@@ -32,6 +32,12 @@ class ROBOTS_TRIK_GENERATOR_BASE_EXPORT TrikGeneratorPluginBase : public generat
 	Q_OBJECT
 
 public:
+	enum class RunPolicy {
+		Ask
+		, AlwaysRun
+		, NeverRun
+	};
+
 	TrikGeneratorPluginBase(kitBase::robotModel::RobotModelInterface * const robotModel
 			, const QSharedPointer<kitBase::blocksBase::BlocksFactoryInterface> &blocksFactory
 			);

plugins/robots/generators/trik/trikPythonGeneratorLibrary/include/trikPythonGeneratorLibrary/trikPythonGeneratorPluginBase.h

@@ -84,6 +84,9 @@ private slots:
 	/// Reenables buttons when program uploading or robot stopping is complete (sucessfully or with error).
 	void onProtocolFinished();
 
+	/// Runs after upload if needed
+	void onUploadSuccess();
+
 private:
 	/// Disables "run", "upload" and "stop" buttons when there is pending command to a robot.
 	void disableButtons();
@@ -116,6 +119,8 @@ private slots:
 
 	/// Protocol that is used to stop robot.
 	QScopedPointer<utils::robotCommunication::StopRobotProtocol> mStopRobotProtocol;
+
+	QFileInfo mMainFile;
 };
 
 }

plugins/robots/generators/trik/trikPythonGeneratorLibrary/src/trikPythonGeneratorPluginBase.cpp

@@ -30,7 +30,8 @@
 #include <utils/robotCommunication/uploadProgramProtocol.h>
 #include <utils/robotCommunication/networkCommunicationErrorReporter.h>
 #include <qrgui/textEditor/qscintillaTextEdit.h>
-#include <qrgui/textEditor/textManagerInterface.h>
+#include <qrkernel/settingsManager.h>
+#include <qrutils/widgets/qRealMessageBox.h>
 
 #include "trikPythonMasterGenerator.h"
 #include "emptyShell.h"
@@ -86,7 +87,7 @@ void TrikPythonGeneratorPluginBase::init(const kitBase::KitPluginConfigurator &c
 			, this, &TrikPythonGeneratorPluginBase::onProtocolFinished);
 
 	connect(mUploadProgramProtocol.data(), &UploadProgramProtocol::success
-			, this, &TrikPythonGeneratorPluginBase::onProtocolFinished);
+			, this, &TrikPythonGeneratorPluginBase::onUploadSuccess);
 	connect(mRunProgramProtocol.data(), &RunProgramProtocol::success
 			, this, &TrikPythonGeneratorPluginBase::onProtocolFinished);
 	connect(mStopRobotProtocol.data(), &StopRobotProtocol::success
@@ -200,6 +201,7 @@ void TrikPythonGeneratorPluginBase::uploadProgram()
 			const QFileInfo fileInfo = generateCodeForProcessing();
 			if (fileInfo != QFileInfo() && !fileInfo.absoluteFilePath().isEmpty()) {
 				disableButtons();
+				mMainFile = fileInfo;
 				mUploadProgramProtocol->run({fileInfo});
 			}
 		} else {
@@ -215,6 +217,9 @@ void TrikPythonGeneratorPluginBase::uploadProgram()
 			}
 			if (!files.isEmpty()) {
 				disableButtons();
+				if (auto code = dynamic_cast<text::QScintillaTextEdit *>(mMainWindowInterface->currentTab())) {
+					mMainFile = QFileInfo(mTextManager->path(code));
+				}
 				mUploadProgramProtocol->run(files);
 			} else {
 				mMainWindowInterface->errorReporter()->addError(
@@ -257,11 +262,45 @@ void TrikPythonGeneratorPluginBase::stopRobot()
 
 void TrikPythonGeneratorPluginBase::onProtocolFinished()
 {
+	mMainFile = QFileInfo();
 	mUploadProgramAction->setEnabled(true);
 	mRunProgramAction->setEnabled(true);
 	mStopRobotAction->setEnabled(true);
 }
 
+void TrikPythonGeneratorPluginBase::onUploadSuccess()
+{
+	auto runPolicy = static_cast<RunPolicy>(SettingsManager::value("trikRunPolicy").toInt());
+	QFileInfo fileInfo;
+	switch (runPolicy) {
+	case RunPolicy::Ask:
+		if (utils::QRealMessageBox::question(mMainWindowInterface->windowWidget()
+											, tr("The program has been uploaded")
+											, tr("Do you want to run it?")
+		) != QMessageBox::Yes) {
+			break;
+		}
+		Q_FALLTHROUGH();
+	case RunPolicy::AlwaysRun:
+		if (mMainFile != QFileInfo()) {
+			if (mRunProgramProtocol) {
+				mRunProgramProtocol->runUploaded(mMainFile);
+				return;
+			} else {
+				QLOG_ERROR() << "Run program protocol is not initialized";
+			}
+		} else {
+			utils::QRealMessageBox::question(mMainWindowInterface->windowWidget()
+					,tr("Error"), tr("Unknown file to run after upload, please run manually"),
+					QMessageBox::Ok);
+		}
+		break;
+	case RunPolicy::NeverRun:
+		break;
+	}
+	onProtocolFinished();
+}
+
 void TrikPythonGeneratorPluginBase::disableButtons()
 {
 	mUploadProgramAction->setEnabled(false);

plugins/robots/interpreters/interpreterCore/src/ui/robotsSettingsPage.cpp

@@ -126,6 +126,8 @@ void RobotsSettingsPage::save()
 		SettingsManager::setValue("nxtFlashToolRunPolicy", mUi->runningAfterUploadingComboBox->currentIndex());
 	} else if (mRobotModelManager.model().kitId().contains("ev3", Qt::CaseInsensitive)) {
 		SettingsManager::setValue("ev3RunPolicy", mUi->runningAfterUploadingComboBox->currentIndex());
+	} else if (mRobotModelManager.model().kitId().contains("trik", Qt::CaseInsensitive)) {
+		SettingsManager::setValue("trikRunPolicy", mUi->runningAfterUploadingComboBox->currentIndex());
 	}
 
 	mUi->devicesConfigurer->save();
@@ -169,6 +171,8 @@ void RobotsSettingsPage::restoreSettings()
 		mUi->runningAfterUploadingComboBox->setCurrentIndex(SettingsManager::value("nxtFlashToolRunPolicy").toInt());
 	} else if (mRobotModelManager.model().kitId().contains("ev3", Qt::CaseInsensitive)) {
 		mUi->runningAfterUploadingComboBox->setCurrentIndex(SettingsManager::value("ev3RunPolicy").toInt());
+	} else if (mRobotModelManager.model().kitId().contains("trik", Qt::CaseInsensitive)) {
+		mUi->runningAfterUploadingComboBox->setCurrentIndex(SettingsManager::value("trikRunPolicy").toInt());
 	}
 	mUi->devicesConfigurer->refresh();
 

plugins/robots/interpreters/trikKitInterpreterCommon/trikDefaultSettings.ini

@@ -3,3 +3,4 @@ FSharpPath=C:/Program Files (x86)/Microsoft SDKs/F#/3.1/Framework/v4.0/Fsc.exe
 WinScpPath=./winscp/WinSCP.com
 trikRobot2DImage=./images/trik-robot.png
 trikCameraImitationImagesDir=@AppDataLocation@/cameraImitation
+trikRunPolicy=0

plugins/robots/utils/include/utils/robotCommunication/runProgramProtocol.h

@@ -44,6 +44,9 @@ class ROBOTS_UTILS_EXPORT RunProgramProtocol : public QObject
 	/// Upload and run program from given file on a robot.
 	void run(const QFileInfo &fileToRun);
 
+	/// Run uploaded program from given file on robot.
+	void runUploaded(const QFileInfo &fileToRun);
+
 signals:
 	/// Emitted when protocol completed successfully.
 	void success();

plugins/robots/utils/src/robotCommunication/runProgramProtocol.cpp

@@ -72,3 +72,20 @@ void RunProgramProtocol::run(const QFileInfo &fileToRun)
 
 	mProtocol->run();
 }
+
+void RunProgramProtocol::runUploaded(const QFileInfo &fileToRun)
+{
+	mProtocol->setAction(mWaitingForCasingModel, [](TcpRobotCommunicatorInterface &communicator) {
+		communicator.requestCasingVersion();
+	});
+
+	mProtocol->setAction(mWaitingForUploadingComplete, [](TcpRobotCommunicatorInterface &communicator) {
+		emit communicator.uploadProgramDone();
+	});
+
+	mProtocol->setAction(mWaitingForRunComplete, [fileToRun](TcpRobotCommunicatorInterface &communicator) {
+		communicator.runProgram(fileToRun.fileName());
+	});
+
+	mProtocol->run();
+}