Merge pull request #63 from Anna-/filesBeep

#BrickBeep after file loading

Author: yurii-litvinov

media/beep_soft.wav

@@ -52,6 +52,7 @@ void Connection::processData(QByteArray const &data)
 		QString const fileName = command.left(separatorPosition);
 		QString const fileContents = command.mid(separatorPosition + 1);
 		trikKernel::FileUtils::writeToFile(fileName, fileContents);
+		QMetaObject::invokeMethod(&mTrikScriptRunner, "brickBeep");
 	} else if (command.startsWith("run")) {
 		command.remove(0, QString("run:").length());
 		QString const fileContents = trikKernel::FileUtils::readFromFile(command);

trikCommunicator/src/connection.cpp

@@ -62,6 +62,9 @@ public slots:
 	/// be stopped as well.
 	void abort();
 
+	/// Plays "beep" sound.
+	void brickBeep();
+
 signals:
 	/// Emitted when current script completes execution (for event-driven mode it means that script requested to quit
 	/// or was aborted).

trikScriptRunner/include/trikScriptRunner/trikScriptRunner.h

@@ -66,6 +66,11 @@ ScriptEngineWorker::ScriptEngineWorker(trikControl::Brick &brick, QString const
 	connect(&mBrick, SIGNAL(quitSignal()), this, SLOT(onScriptRequestingToQuit()));
 }
 
+void ScriptEngineWorker::brickBeep()
+{
+	mBrick.playSound(mStartDirPath + "media/beep_soft.wav");
+}
+
 void ScriptEngineWorker::reset()
 {
 	Q_ASSERT(mEngine);

trikScriptRunner/src/scriptEngineWorker.cpp

@@ -64,6 +64,9 @@ public slots:
 	/// evaluated as-is, else function call will be appended to @arg script.
 	void run(QString const &script, bool inEventDrivenMode, QString const &function = "main");
 
+	/// Plays "beep" sound.
+	void brickBeep();
+
 private slots:
 	/// Abort script execution.
 	void onScriptRequestingToQuit();

trikScriptRunner/src/scriptEngineWorker.h

@@ -45,6 +45,11 @@ ScriptRunnerProxy::~ScriptRunnerProxy()
 	mWorkerThread.wait(1000);
 }
 
+void ScriptRunnerProxy::brickBeep()
+{
+	QMetaObject::invokeMethod(mEngineWorker, "brickBeep");
+}
+
 void ScriptRunnerProxy::run(QString const &script, bool inEventDrivenMode, QString const &function)
 {
 	QMetaObject::invokeMethod(mEngineWorker, "run"

trikScriptRunner/src/scriptRunnerProxy.cpp

@@ -48,6 +48,9 @@ class ScriptRunnerProxy : public QObject
 	/// Aborts script execution.
 	void reset();
 
+	/// Plays "beep" sound.
+	void brickBeep();
+
 signals:
 	/// Fired when current script completes execution.
 	/// @param error - localized error message or empty string.

trikScriptRunner/src/scriptRunnerProxy.h

@@ -30,6 +30,11 @@ TrikScriptRunner::~TrikScriptRunner()
 {
 }
 
+void TrikScriptRunner::brickBeep()
+{
+	mScriptRunnerProxy->brickBeep();
+}
+
 void TrikScriptRunner::run(QString const &script)
 {
 	mScriptRunnerProxy->run(script, false);