Made working directory be available as command-line argument

Author: yurii-litvinov

trikControl/src/display.cpp

@@ -66,12 +66,12 @@ void Display::removeLabels()
 
 void Display::smile()
 {
-	showImage(mStartDirPath + "/media/trik_smile_normal.png");
+	showImage(mStartDirPath + "media/trik_smile_normal.png");
 }
 
 void Display::sadSmile()
 {
-	showImage(mStartDirPath + "/media/trik_smile_sad.png");
+	showImage(mStartDirPath + "media/trik_smile_sad.png");
 }
 
 void Display::setBackground(QString const &color)

trikGui/main.cpp

@@ -34,15 +34,20 @@
 using namespace trikGui;
 
 void printUsage() {
-	qDebug() << "Usage: ./trikGui [-qws] [-c <full path to config files>]";
+	qDebug() << "Usage: ./trikGui"
+				<< "[-qws]"
+				<< "[-c <full path to config files>]"
+				<< "[-d <full path to a directory with resources>]";
 	qDebug() << "Arguments:";
 	qDebug() << "  -qws --- start in Qt for Embedded Linux server mode."
 				<< "Exactly one GUI application needs to be run as server at a time. trikGui generally"
 				<< "shall use this parameter, as in many cases it is the only GUI application on robot.";
 	qDebug() << "  -c --- path to a directory where all configs for TRIK runtime are stored. Config files are"
 				<< "config.xml (configuration of robot hardware for trikControl library) and wpa-config.xml"
 				<< "(configuration of known WiFi networks). Default value for this parameter is current directory."
-				<< "Example: ./trikGui -qws -c /home/root/";
+				<< "Example: ./trikGui -qws -c /home/root/trik/";
+	qDebug() << "  -d --- path to a directory where images, example scripts and system.js file are stored."
+				<< "Example: ./trikGui -qws -d /home/root/trik/";
 }
 
 int main(int argc, char *argv[])
@@ -84,15 +89,28 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	QString startDirPath = QDir::currentPath();
+	if (app.arguments().contains("-d")) {
+		int const index = app.arguments().indexOf("-d");
+		if (app.arguments().count() <= index + 1) {
+			printUsage();
+			return 1;
+		}
+
+		startDirPath = app.arguments()[index + 1];
+	}
+
+	if (startDirPath.right(1) != "/") {
+		startDirPath += "/";
+	}
+
 #ifdef Q_WS_QWS
 	QWSServer * const server = QWSServer::instance();
 	if (server) {
 		server->setCursorVisible(false);
 	}
 #endif
 
-	QString startDirPath = QDir::currentPath();
-
 	if (QDir::current().exists("scripts")) {
 		QDir::setCurrent("scripts");
 	}

trikRun/main.cpp

@@ -15,6 +15,7 @@
 #include <QtCore/qglobal.h>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+	#include <QtGui/QWSServer>
 	#include <QtGui/QApplication>
 #else
 	#include <QtWidgets/QApplication>
@@ -28,15 +29,15 @@
 
 void printUsage()
 {
-	qDebug() << "Usage: trikRun <QtScript file name> [-c <config file name]>";
+	qDebug() << "Usage: trikRun <QtScript file name> [-c <config file name] [-d <working directory name>]";
 }
 
 int main(int argc, char *argv[])
 {
 	QApplication app(argc, argv);
 	QStringList const args = app.arguments();
 
-	if (args.count() != 2) {
+	if (args.count() < 2) {
 		printUsage();
 		return 1;
 	}
@@ -57,7 +58,29 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	trikScriptRunner::TrikScriptRunner runner(configPath, QDir::currentPath());
+	QString startDirPath = QDir::currentPath();
+	if (app.arguments().contains("-d")) {
+		int const index = app.arguments().indexOf("-d");
+		if (app.arguments().count() <= index + 1) {
+			printUsage();
+			return 1;
+		}
+
+		startDirPath = app.arguments()[index + 1];
+	}
+
+	if (startDirPath.right(1) != "/") {
+		startDirPath += "/";
+	}
+
+#ifdef Q_WS_QWS
+	QWSServer * const server = QWSServer::instance();
+	if (server) {
+		server->setCursorVisible(false);
+	}
+#endif
+
+	trikScriptRunner::TrikScriptRunner runner(configPath, startDirPath);
 	QObject::connect(&runner, SIGNAL(completed()), &app, SLOT(quit()));
 	runner.runFromFile(scriptFileName);
 

trikScriptRunner/src/scriptEngineWorker.cpp

@@ -68,8 +68,8 @@ void ScriptEngineWorker::run(QString const &script)
 	QScriptValue brickProxy = mEngine->newQObject(&mBrick);
 	mEngine->globalObject().setProperty("brick", brickProxy);
 
-	if (QFile::exists(mStartDirPath + "/system.js")) {
-		runAndReportException(FileUtils::readFromFile(mStartDirPath + "/system.js"));
+	if (QFile::exists(mStartDirPath + "system.js")) {
+		runAndReportException(FileUtils::readFromFile(mStartDirPath + "system.js"));
 	}
 
 	runAndReportException(script);

trikServer/main.cpp

@@ -16,6 +16,7 @@
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 	#include <QtGui/QApplication>
+	#include <QtGui/QWSServer>
 #else
 	#include <QtWidgets/QApplication>
 #endif
@@ -26,6 +27,11 @@
 
 #include <trikCommunicator/trikCommunicator.h>
 
+void printUsage()
+{
+	qDebug() << "Usage: trikServer [-c <config file name] [-d <working directory name>]";
+}
+
 int main(int argc, char *argv[])
 {
 	int const port = 8888;
@@ -36,7 +42,7 @@ int main(int argc, char *argv[])
 	if (app.arguments().contains("-c")) {
 		int const index = app.arguments().indexOf("-c");
 		if (app.arguments().count() <= index + 1) {
-			qDebug() << "Usage: ./trikServer [-c <config file path>]";
+			printUsage();
 			return 1;
 		}
 
@@ -46,9 +52,31 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	QString startDirPath = QDir::currentPath();
+	if (app.arguments().contains("-d")) {
+		int const index = app.arguments().indexOf("-d");
+		if (app.arguments().count() <= index + 1) {
+			printUsage();
+			return 1;
+		}
+
+		startDirPath = app.arguments()[index + 1];
+	}
+
+	if (startDirPath.right(1) != "/") {
+		startDirPath += "/";
+	}
+
+#ifdef Q_WS_QWS
+	QWSServer * const server = QWSServer::instance();
+	if (server) {
+		server->setCursorVisible(false);
+	}
+#endif
+
 	qDebug() << "Running TrikServer on port" << port;
 
-	trikCommunicator::TrikCommunicator communicator(configPath, QDir::currentPath());
+	trikCommunicator::TrikCommunicator communicator(configPath, startDirPath);
 	communicator.startServer(port);
 
 	return app.exec();