Merge branch 'startDirectoryFix' of git://github.com/romankurbatov/trikRuntime

yurii-litvinov · yurii-litvinov · commit 639c8da1915d · 2014-07-11T14:54:22.000+04:00
diff --git a/trikCommunicator/include/trikCommunicator/trikCommunicator.h b/trikCommunicator/include/trikCommunicator/trikCommunicator.h
@@ -41,7 +41,8 @@ class TrikCommunicator : public QTcpServer
 public:
 	/// Constructor that creates its own instance of a script runner.
 	/// @param configPath - path to config file for trikControl, for example, /home/root/trik/.
-	explicit TrikCommunicator(QString const &configFilePath);
+	/// @param startDirPath - path to the directory from which the application was executed.
+	explicit TrikCommunicator(QString const &configFilePath, QString const &startDirPath);
 
 	/// Constructor that accepts external script runner and issues commands to it.
 	explicit TrikCommunicator(trikScriptRunner::TrikScriptRunner &runner);
diff --git a/trikCommunicator/src/scriptRunnerWrapper.cpp b/trikCommunicator/src/scriptRunnerWrapper.cpp
@@ -18,8 +18,8 @@
 
 using namespace trikCommunicator;
 
-ScriptRunnerWrapper::ScriptRunnerWrapper(QString const &configFilePath)
-	: mRunner(new trikScriptRunner::TrikScriptRunner(configFilePath))
+ScriptRunnerWrapper::ScriptRunnerWrapper(QString const &configFilePath, QString const &startDirPath)
+	: mRunner(new trikScriptRunner::TrikScriptRunner(configFilePath, startDirPath))
 	, mOwnsRunner(true)
 	, mExecutionState(idle)
 {
diff --git a/trikCommunicator/src/scriptRunnerWrapper.h b/trikCommunicator/src/scriptRunnerWrapper.h
@@ -29,7 +29,8 @@ class ScriptRunnerWrapper : public QObject {
 public:
 	/// Constructor that creates its own instance of a script runner.
 	/// @param configPath - path to config file for trikControl, for example, /home/root/trik/.
-	explicit ScriptRunnerWrapper(QString const &configFilePath);
+	/// @param startDirPath - path to the directory from which the application was executed.
+	explicit ScriptRunnerWrapper(QString const &configFilePath, QString const &startDirPath);
 
 	/// Constructor that accepts external script runner and issues commands to it.
 	explicit ScriptRunnerWrapper(trikScriptRunner::TrikScriptRunner &runner);
diff --git a/trikCommunicator/src/trikCommunicator.cpp b/trikCommunicator/src/trikCommunicator.cpp
@@ -23,8 +23,8 @@
 
 using namespace trikCommunicator;
 
-TrikCommunicator::TrikCommunicator(QString const &configFilePath)
-	: mScriptRunnerWrapper(new ScriptRunnerWrapper(configFilePath))
+TrikCommunicator::TrikCommunicator(QString const &configFilePath, const QString &startDirPath)
+	: mScriptRunnerWrapper(new ScriptRunnerWrapper(configFilePath, startDirPath))
 {
 	init();
 }
diff --git a/trikControl/include/trikControl/brick.h b/trikControl/include/trikControl/brick.h
@@ -54,7 +54,8 @@ class TRIKCONTROL_EXPORT Brick : public QObject
 	/// @param guiThread - thread in which an application has started. Can be obtaned in main() by code like
 	///        QApplication app; app.thread();
 	/// @param configFilePath - path to config.xml
-	Brick(QThread &guiThread, QString const &configFilePath);
+	/// @param startDirPath - path to the directory from which the application was executed.
+	Brick(QThread &guiThread, QString const &configFilePath, QString const &startDirPath);
 
 	~Brick();
 
diff --git a/trikControl/include/trikControl/display.h b/trikControl/include/trikControl/display.h
@@ -15,6 +15,7 @@
 #pragma once
 
 #include <QtCore/QThread>
+#include <QtCore/QString>
 
 #include "declSpec.h"
 
@@ -30,7 +31,8 @@ class TRIKCONTROL_EXPORT Display : public QObject
 public:
 	/// Constructor.
 	/// @param guiThread - GUI thread of an application.
-	explicit Display(QThread &guiThread);
+	/// @param startDirPath - path to the directory from which the application was executed.
+	explicit Display(QThread &guiThread, QString const &startDirPath);
 
 	~Display();
 
@@ -77,6 +79,7 @@ public slots:
 
 private:
 	QThread &mGuiThread;
+	QString const mStartDirPath;
 	GuiWorker *mGuiWorker;  // Has ownership.
 };
 
diff --git a/trikControl/src/brick.cpp b/trikControl/src/brick.cpp
@@ -28,10 +28,10 @@
 
 using namespace trikControl;
 
-Brick::Brick(QThread &guiThread, QString const &configFilePath)
+Brick::Brick(QThread &guiThread, QString const &configFilePath, const QString &startDirPath)
 	: mConfigurer(new Configurer(configFilePath))
 	, mI2cCommunicator(NULL)
-	, mDisplay(guiThread)
+	, mDisplay(guiThread, startDirPath)
 	, mInEventDrivenMode(false)
 {
 	if (::system(mConfigurer->initScript().toStdString().c_str()) != 0) {
diff --git a/trikControl/src/display.cpp b/trikControl/src/display.cpp
@@ -27,8 +27,9 @@
 
 using namespace trikControl;
 
-Display::Display(QThread &guiThread)
+Display::Display(QThread &guiThread, const QString &startDirPath)
 	: mGuiThread(guiThread)
+	, mStartDirPath(startDirPath)
 {
 	mGuiWorker = new GuiWorker();
 	mGuiWorker->moveToThread(&guiThread);
@@ -65,12 +66,12 @@ void Display::removeLabels()
 
 void Display::smile()
 {
-	showImage("media/trik_smile_normal.png");
+	showImage(mStartDirPath + "/media/trik_smile_normal.png");
 }
 
 void Display::sadSmile()
 {
-	showImage("media/trik_smile_sad.png");
+	showImage(mStartDirPath + "/media/trik_smile_sad.png");
 }
 
 void Display::setBackground(QString const &color)
diff --git a/trikGui/controller.cpp b/trikGui/controller.cpp
@@ -24,8 +24,8 @@ using namespace trikGui;
 
 int const communicatorPort = 8888;
 
-Controller::Controller(QString const &configPath)
-	: mScriptRunner(configPath)
+Controller::Controller(QString const &configPath, QString const &startDirPath)
+	: mScriptRunner(configPath, startDirPath)
 	, mCommunicator(mScriptRunner)
 	, mRunningWidget(NULL)
 	, mExecutionState(idle)
diff --git a/trikGui/controller.h b/trikGui/controller.h
@@ -30,7 +30,8 @@ class Controller : public QObject
 public:
 	/// Constructor.
 	/// @param configPath - path to config file for trikControl, for example, /home/root/trik/.
-	Controller(QString const &configPath);
+	/// @param startDirPath - path to the directory from which the application was executed.
+	Controller(QString const &configPath, QString const &startDirPath);
 
 	~Controller();
 
diff --git a/trikGui/main.cpp b/trikGui/main.cpp
@@ -91,11 +91,13 @@ int main(int argc, char *argv[])
 	}
 #endif
 
+	QString startDirPath = QDir::currentPath();
+
 	if (QDir::current().exists("scripts")) {
 		QDir::setCurrent("scripts");
 	}
 
-	StartWidget w(configPath);
+	StartWidget w(configPath, startDirPath);
 	w.show();
 
 	return app.exec();
diff --git a/trikGui/motorsWidget.cpp b/trikGui/motorsWidget.cpp
@@ -23,11 +23,12 @@
 using namespace trikGui;
 
 MotorsWidget::MotorsWidget(QString const &configPath
+		, QString const &startDirPath
 		, trikControl::Motor::Type type
 		, QWidget *parent
 		)
 	: TrikGuiDialog(parent)
-	, mBrick(*TrikGuiApplication::instance()->thread(), configPath)
+	, mBrick(*TrikGuiApplication::instance()->thread(), startDirPath, configPath)
 	, mPorts(mBrick.motorPorts(type))
 	, mLevers(mPorts.size())
 {
diff --git a/trikGui/motorsWidget.h b/trikGui/motorsWidget.h
@@ -45,7 +45,9 @@ class MotorsWidget : public TrikGuiDialog
 	/// Constructor
 	/// @param configPath - path to config.xml (TrikControl configuration file).
 	/// @param parent - pointer to a parent widget.
+	/// @param startDirPath - path to the directory from which the application was executed.
 	MotorsWidget(QString const &configPath
+			, QString const &startDirPath
 			, trikControl::Motor::Type type
 			, QWidget *parent = 0
 			);
diff --git a/trikGui/sensorsSelectionWidget.cpp b/trikGui/sensorsSelectionWidget.cpp
@@ -22,11 +22,12 @@
 using namespace trikGui;
 
 SensorsSelectionWidget::SensorsSelectionWidget(const QString &configPath
+		, const QString &startDirPath
 		, trikControl::Sensor::Type type
 		, QWidget *parent)
 	: TrikGuiDialog(parent)
 	, mTitle(tr("Select sensors for testing:"))
-	, mBrick(*TrikGuiApplication::instance()->thread(), configPath)
+	, mBrick(*TrikGuiApplication::instance()->thread(), configPath, startDirPath)
 {
 	QStringList ports = mBrick.sensorPorts(type);
 	foreach (QString const &port, ports) {
diff --git a/trikGui/sensorsSelectionWidget.h b/trikGui/sensorsSelectionWidget.h
@@ -44,6 +44,7 @@ class SensorsSelectionWidget : public TrikGuiDialog
 
 public:
 	SensorsSelectionWidget(QString const &configPath
+			, QString const &startDirPath
 			, trikControl::Sensor::Type type
 			, QWidget *parent = 0);
 
diff --git a/trikGui/startWidget.cpp b/trikGui/startWidget.cpp
@@ -33,9 +33,9 @@
 
 using namespace trikGui;
 
-StartWidget::StartWidget(QString const &configPath, QWidget *parent)
+StartWidget::StartWidget(QString const &configPath, QString const &startDirPath, QWidget *parent)
 	: QWidget(parent)
-	, mController(configPath)
+	, mController(configPath, startDirPath)
 	, mConfigPath(configPath)
 {
 	setWindowState(Qt::WindowFullScreen);
@@ -88,16 +88,16 @@ void StartWidget::launch()
 			WiFiModeWidget wiFiModeWidget(mConfigPath);
 			result = wiFiModeWidget.exec();
 		} else if (currentItemText == MotorsWidget::menuEntry(trikControl::Motor::powerMotor)) {
-			MotorsWidget motorsWidget(mConfigPath, trikControl::Motor::powerMotor);
+			MotorsWidget motorsWidget(mConfigPath, mStartDirPath, trikControl::Motor::powerMotor);
 			result = motorsWidget.exec();
 		} else if (currentItemText == MotorsWidget::menuEntry(trikControl::Motor::servoMotor)) {
-			MotorsWidget motorsWidget(mConfigPath, trikControl::Motor::servoMotor);
+			MotorsWidget motorsWidget(mConfigPath, mStartDirPath, trikControl::Motor::servoMotor);
 			result = motorsWidget.exec();
 		} else if (currentItemText == SensorsSelectionWidget::menuEntry(trikControl::Sensor::analogSensor)) {
-			SensorsSelectionWidget sensorsSelectionWidget(mConfigPath, trikControl::Sensor::analogSensor);
+			SensorsSelectionWidget sensorsSelectionWidget(mConfigPath, mStartDirPath, trikControl::Sensor::analogSensor);
 			result = sensorsSelectionWidget.exec();
 		} else if (currentItemText == SensorsSelectionWidget::menuEntry(trikControl::Sensor::digitalSensor)) {
-			SensorsSelectionWidget sensorsSelectionWidget(mConfigPath, trikControl::Sensor::digitalSensor);
+			SensorsSelectionWidget sensorsSelectionWidget(mConfigPath, mStartDirPath, trikControl::Sensor::digitalSensor);
 			result = sensorsSelectionWidget.exec();
 		}
 
diff --git a/trikGui/startWidget.h b/trikGui/startWidget.h
@@ -51,8 +51,9 @@ class StartWidget : public QWidget
 public:
 	/// Constructor
 	/// @param configPath - full path to configuration files.
+	/// @param startDirPath - path to the directory from which the application was executed.
 	/// @param parent - parent of this widget in Qt object hierarchy.
-	explicit StartWidget(QString const &configPath, QWidget *parent = 0);
+	explicit StartWidget(QString const &configPath, QString const &startDirPath, QWidget *parent = 0);
 
 	~StartWidget();
 
@@ -71,6 +72,7 @@ class StartWidget : public QWidget
 	QStandardItemModel mMenuModel;
 	Controller mController;
 	QString const mConfigPath;
+	QString const mStartDirPath;
 
 	/// Stores index of item which was selected in a submenu after a last visit.
 	QMap<QPersistentModelIndex, QPersistentModelIndex> mSelections;
diff --git a/trikRun/main.cpp b/trikRun/main.cpp
@@ -22,6 +22,7 @@
 
 #include <QtCore/QDebug>
 #include <QtCore/QStringList>
+#include <QtCore/QDir>
 
 #include <trikScriptRunner/trikScriptRunner.h>
 
@@ -56,7 +57,7 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	trikScriptRunner::TrikScriptRunner runner(configPath);
+	trikScriptRunner::TrikScriptRunner runner(configPath, QDir::currentPath());
 	QObject::connect(&runner, SIGNAL(completed()), &app, SLOT(quit()));
 	runner.runFromFile(scriptFileName);
 
diff --git a/trikScriptRunner/include/trikScriptRunner/trikScriptRunner.h b/trikScriptRunner/include/trikScriptRunner/trikScriptRunner.h
@@ -32,7 +32,8 @@ class TrikScriptRunner : public QObject
 public:
 	/// Constructor.
 	/// @param configFilePath - path to config file for trikControl, for example /home/root/trik/
-	TrikScriptRunner(QString const &configFilePath);
+	/// @param startDirPath - path to the directory from which the application was executed.
+	TrikScriptRunner(QString const &configFilePath, QString const &startDirPath);
 
 	~TrikScriptRunner();
 
diff --git a/trikScriptRunner/src/scriptEngineWorker.cpp b/trikScriptRunner/src/scriptEngineWorker.cpp
@@ -44,10 +44,10 @@ Q_DECLARE_METATYPE(Sensor*)
 Q_DECLARE_METATYPE(Sensor3d*)
 Q_DECLARE_METATYPE(CameraLineDetectorSensor*)
 
-ScriptEngineWorker::ScriptEngineWorker(QString const &configFilePath)
+ScriptEngineWorker::ScriptEngineWorker(QString const &configFilePath, const QString &startDirPath)
 	: mEngine(NULL)
-	, mBrick(*this->thread(), configFilePath)
-	, mConfigFilePath(configFilePath)
+	, mBrick(*this->thread(), configFilePath, startDirPath)
+	, mStartDirPath(startDirPath)
 {
 	connect(&mBrick, SIGNAL(quitSignal()), this, SLOT(onScriptRequestingToQuit()));
 }
@@ -68,8 +68,8 @@ void ScriptEngineWorker::run(QString const &script)
 	QScriptValue brickProxy = mEngine->newQObject(&mBrick);
 	mEngine->globalObject().setProperty("brick", brickProxy);
 
-	if (QFile::exists(mConfigFilePath + "system.js")) {
-		runAndReportException(FileUtils::readFromFile(mConfigFilePath + "system.js"));
+	if (QFile::exists(mStartDirPath + "/system.js")) {
+		runAndReportException(FileUtils::readFromFile(mStartDirPath + "/system.js"));
 	}
 
 	runAndReportException(script);
diff --git a/trikScriptRunner/src/scriptEngineWorker.h b/trikScriptRunner/src/scriptEngineWorker.h
@@ -33,7 +33,8 @@ class ScriptEngineWorker : public QObject
 public:
 	/// Constructor.
 	/// @param configFilePath - path to a config file for trikControl.
-	ScriptEngineWorker(QString const &configFilePath);
+	/// @param startDirPath - path to the directory from which the application was executed.
+	ScriptEngineWorker(QString const &configFilePath, QString const &startDirPath);
 
 	/// Returns true, if script engine is initialized and running.
 	bool isRunning() const;
@@ -71,7 +72,7 @@ private slots:
 
 	trikControl::Brick mBrick;
 
-	QString mConfigFilePath;
+	QString const mStartDirPath;
 };
 
 }
diff --git a/trikScriptRunner/src/trikScriptRunner.cpp b/trikScriptRunner/src/trikScriptRunner.cpp
@@ -23,9 +23,9 @@
 
 using namespace trikScriptRunner;
 
-TrikScriptRunner::TrikScriptRunner(QString const &configFilePath)
+TrikScriptRunner::TrikScriptRunner(QString const &configFilePath, QString const &startDirPath)
 {
-	mEngineWorker = new ScriptEngineWorker(configFilePath);
+	mEngineWorker = new ScriptEngineWorker(configFilePath, startDirPath);
 
 	connect(&mWorkerThread, SIGNAL(finished()), mEngineWorker, SLOT(deleteLater()));
 	connect(&mWorkerThread, SIGNAL(finished()), &mWorkerThread, SLOT(deleteLater()));
diff --git a/trikServer/main.cpp b/trikServer/main.cpp
@@ -21,6 +21,7 @@
 #endif
 
 #include <QtCore/QStringList>
+#include <QtCore/QDir>
 #include <QtCore/QDebug>
 
 #include <trikCommunicator/trikCommunicator.h>
@@ -47,7 +48,7 @@ int main(int argc, char *argv[])
 
 	qDebug() << "Running TrikServer on port" << port;
 
-	trikCommunicator::TrikCommunicator communicator(configPath);
+	trikCommunicator::TrikCommunicator communicator(configPath, QDir::currentPath());
 	communicator.startServer(port);
 
 	return app.exec();

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@`
`18`	`18`
`19`	`19`	`using namespace trikCommunicator;`
`20`	`20`
`21`		`-ScriptRunnerWrapper::ScriptRunnerWrapper(QString const &configFilePath)`
`22`		`- : mRunner(new trikScriptRunner::TrikScriptRunner(configFilePath))`
	`21`	`+ScriptRunnerWrapper::ScriptRunnerWrapper(QString const &configFilePath, QString const &startDirPath)`
	`22`	`+ : mRunner(new trikScriptRunner::TrikScriptRunner(configFilePath, startDirPath))`
`23`	`23`	`, mOwnsRunner(true)`
`24`	`24`	`, mExecutionState(idle)`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@`
`23`	`23`
`24`	`24`	`using namespace trikCommunicator;`
`25`	`25`
`26`		`-TrikCommunicator::TrikCommunicator(QString const &configFilePath)`
`27`		`- : mScriptRunnerWrapper(new ScriptRunnerWrapper(configFilePath))`
	`26`	`+TrikCommunicator::TrikCommunicator(QString const &configFilePath, const QString &startDirPath)`
	`27`	`+ : mScriptRunnerWrapper(new ScriptRunnerWrapper(configFilePath, startDirPath))`
`28`	`28`	`{`
`29`	`29`	`init();`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,9 @@`
`27`	`27`
`28`	`28`	`using namespace trikControl;`
`29`	`29`
`30`		`-Display::Display(QThread &guiThread)`
	`30`	`+Display::Display(QThread &guiThread, const QString &startDirPath)`
`31`	`31`	`: mGuiThread(guiThread)`
	`32`	`+ , mStartDirPath(startDirPath)`
`32`	`33`	`{`
`33`	`34`	`mGuiWorker = new GuiWorker();`
`34`	`35`	`mGuiWorker->moveToThread(&guiThread);`
`@@ -65,12 +66,12 @@ void Display::removeLabels()`
`65`	`66`
`66`	`67`	`void Display::smile()`
`67`	`68`	`{`
`68`		`- showImage("media/trik_smile_normal.png");`
	`69`	`+ showImage(mStartDirPath + "/media/trik_smile_normal.png");`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`void Display::sadSmile()`
`72`	`73`	`{`
`73`		`- showImage("media/trik_smile_sad.png");`
	`74`	`+ showImage(mStartDirPath + "/media/trik_smile_sad.png");`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`void Display::setBackground(QString const &color)`