--no-display flag in trikRun command line arguments, which makes it run without QWS

yurii-litvinov · yurii-litvinov · commit e971a25974f4 · 2016-04-08T18:15:09.000+03:00
diff --git a/translations/fr/trikRun_fr.ts b/translations/fr/trikRun_fr.ts
@@ -1,30 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="fr_FR">
+<TS version="2.0" language="fr_FR">
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../trikRun/trikRunMain.cpp" line="44"/>
+        <location filename="../../trikRun/trikRunMain.cpp" line="65"/>
         <source>File with script to execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikRun/trikRunMain.cpp" line="45"/>
+        <location filename="../../trikRun/trikRunMain.cpp" line="66"/>
         <source>(optional of -s option is specified)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikRun/trikRunMain.cpp" line="48"/>
+        <location filename="../../trikRun/trikRunMain.cpp" line="69"/>
         <source>Script to be executed directly from command line.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikRun/trikRunMain.cpp" line="49"/>
+        <location filename="../../trikRun/trikRunMain.cpp" line="70"/>
         <source>	Example: ./trikRun -qws -s &quot;brick.smile(); script.wait(2000);&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../trikRun/trikRunMain.cpp" line="51"/>
+        <location filename="../../trikRun/trikRunMain.cpp" line="73"/>
+        <source>Disable display support. When this flag is active, trikRun can work without QWS or even physical display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../trikRun/trikRunMain.cpp" line="76"/>
         <source>Runner of JavaScript files.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/translations/ru/trikRun_ru.qm b/translations/ru/trikRun_ru.qm
diff --git a/translations/ru/trikRun_ru.ts b/translations/ru/trikRun_ru.ts
@@ -6,30 +6,35 @@
     <message>
         <source>Script to be executed directly from command line.
 </source>
-        <translation type="vanished">Скрипт, который надо исполнить прямо из командной строки.</translation>
+        <translation type="obsolete">Скрипт, который надо исполнить прямо из командной строки.</translation>
     </message>
     <message>
-        <location filename="../../trikRun/trikRunMain.cpp" line="44"/>
+        <location filename="../../trikRun/trikRunMain.cpp" line="65"/>
         <source>File with script to execute</source>
         <translation>Файл со скриптом, который надо исполнить</translation>
     </message>
     <message>
-        <location filename="../../trikRun/trikRunMain.cpp" line="45"/>
+        <location filename="../../trikRun/trikRunMain.cpp" line="66"/>
         <source>(optional of -s option is specified)</source>
         <translation>(этот параметр не надо указывать, если указан параметр -s)</translation>
     </message>
     <message>
-        <location filename="../../trikRun/trikRunMain.cpp" line="48"/>
+        <location filename="../../trikRun/trikRunMain.cpp" line="69"/>
         <source>Script to be executed directly from command line.</source>
         <translation>Скрипт, который надо исполнить прямо из командной строки.</translation>
     </message>
     <message>
-        <location filename="../../trikRun/trikRunMain.cpp" line="49"/>
+        <location filename="../../trikRun/trikRunMain.cpp" line="70"/>
         <source>	Example: ./trikRun -qws -s &quot;brick.smile(); script.wait(2000);&quot;</source>
         <translation>	Пример: ./trikRun -qws -s &quot;brick.smile(); script.wait(2000);&quot;</translation>
     </message>
     <message>
-        <location filename="../../trikRun/trikRunMain.cpp" line="51"/>
+        <location filename="../../trikRun/trikRunMain.cpp" line="73"/>
+        <source>Disable display support. When this flag is active, trikRun can work without QWS or even physical display</source>
+        <translation type="unfinished">Отключает поддержку дисплея. С этим флагом rikRun может работать без ключа -qws и даже без физического дисплея</translation>
+    </message>
+    <message>
+        <location filename="../../trikRun/trikRunMain.cpp" line="76"/>
         <source>Runner of JavaScript files.</source>
         <translation>Интерпретатор скриптов на JavaScript для ТРИК.</translation>
     </message>
diff --git a/trikControl/include/trikControl/brickInterface.h b/trikControl/include/trikControl/brickInterface.h
@@ -48,7 +48,7 @@ class TRIKCONTROL_EXPORT BrickInterface : public QObject
 	virtual void reset() = 0;
 
 	/// Returns a widget on which display output is drawn.
-	virtual DisplayWidgetInterface &graphicsWidget() = 0;
+	virtual DisplayWidgetInterface *graphicsWidget() = 0;
 
 	/// Returns version of system configuration file.
 	virtual QString configVersion() const = 0;
diff --git a/trikControl/src/brick.cpp b/trikControl/src/brick.cpp
@@ -14,6 +14,12 @@
 
 #include "brick.h"
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+	#include <QtGui/QApplication>
+#else
+	#include <QtWidgets/QApplication>
+#endif
+
 #include <QtCore/QFileInfo>
 
 #include <trikHal/hardwareAbstractionInterface.h>
@@ -65,13 +71,20 @@ Brick::Brick(const trikKernel::DifferentOwnerPointer<trikHal::HardwareAbstractio
 		, const QString &modelConfig
 		, const QString &mediaPath)
 	: mHardwareAbstraction(hardwareAbstraction)
-	, mDisplay(new Display(mediaPath))
 	, mMediaPath(mediaPath)
 	, mConfigurer(systemConfig, modelConfig)
 {
 	qRegisterMetaType<QVector<int>>("QVector<int>");
 	qRegisterMetaType<trikKernel::TimeVal>("trikKernel::TimeVal");
 
+	const bool hasGui = (qobject_cast<QApplication *>(QCoreApplication::instance()) != nullptr);
+
+	if (hasGui) {
+		mDisplay.reset(new Display(mediaPath));
+	} else {
+		QLOG_INFO() << "Running in no GUI mode";
+	}
+
 	for (const QString &initScript : mConfigurer.initScripts()) {
 		if (mHardwareAbstraction->systemConsole().system(initScript) != 0) {
 			QLOG_ERROR() << "Init script failed";
@@ -131,9 +144,13 @@ Brick::~Brick()
 	mLed.reset();
 }
 
-DisplayWidgetInterface &Brick::graphicsWidget()
+DisplayWidgetInterface *Brick::graphicsWidget()
 {
-	return mDisplay->graphicsWidget();
+	if (mDisplay) {
+		return &mDisplay->graphicsWidget();
+	} else {
+		return nullptr;
+	}
 }
 
 QString Brick::configVersion() const
@@ -154,7 +171,9 @@ void Brick::reset()
 {
 	stop();
 	mKeys->reset();
-	mDisplay->reset();
+	if (mDisplay) {
+		mDisplay->reset();
+	}
 
 	/// @todo Temporary, we need more carefully init/deinit range sensors.
 	for (RangeSensor * const rangeSensor : mRangeSensors.values()) {
@@ -203,7 +222,9 @@ void Brick::stop()
 		powerMotor->powerOff();
 	}
 
-	mDisplay->hide();
+	if (mDisplay) {
+		mDisplay->hide();
+	}
 
 	/// @todo: Also be able to stop initializing sensor.
 	for (LineSensor * const lineSensor : mLineSensors) {
diff --git a/trikControl/src/brick.h b/trikControl/src/brick.h
@@ -74,7 +74,7 @@ class Brick : public BrickInterface
 
 	void reset() override;
 
-	DisplayWidgetInterface &graphicsWidget() override;
+	DisplayWidgetInterface *graphicsWidget() override;
 
 	QString configVersion() const override;
 
diff --git a/trikGui/backgroundWidget.cpp b/trikGui/backgroundWidget.cpp
@@ -51,7 +51,7 @@ BackgroundWidget::BackgroundWidget(
 	mStatusBarLayout.addWidget(&mCommunicatorIndicator);
 	mStatusBarLayout.addWidget(&mWiFiIndicator);
 	addMainWidget(mStartWidget);
-	mBrickDisplayWidgetWrapper.reset(new LazyMainWidgetWrapper(&mController.brick().graphicsWidget()));
+	mBrickDisplayWidgetWrapper.reset(new LazyMainWidgetWrapper(mController.brick().graphicsWidget()));
 	addLazyWidget(*mBrickDisplayWidgetWrapper);
 	mMainWidgetsLayout.addWidget(&mRunningWidget);
 
diff --git a/trikKernel/src/applicationInitHelper.cpp b/trikKernel/src/applicationInitHelper.cpp
@@ -64,9 +64,11 @@ ApplicationInitHelper::ApplicationInitHelper(QCoreApplication &app)
 			);
 
 #ifdef Q_WS_QWS
-	QWSServer * const server = QWSServer::instance();
-	if (server) {
-		server->setCursorVisible(false);
+	if (!app.arguments().contains("--no-display") && !!app.arguments().contains("-no-display")) {
+		QWSServer * const server = QWSServer::instance();
+		if (server) {
+			server->setCursorVisible(false);
+		}
 	}
 #endif
 }
diff --git a/trikRun/trikRunMain.cpp b/trikRun/trikRunMain.cpp
@@ -21,6 +21,7 @@
 #endif
 
 #include <QtCore/QTimer>
+#include <QtCore/QCoreApplication>
 #include <QtCore/QEventLoop>
 
 #include <trikKernel/configurer.h>
@@ -40,14 +41,26 @@
 
 int main(int argc, char *argv[])
 {
-	QApplication app(argc, argv);
-	app.setApplicationName("TrikRun");
+	QStringList params;
+	for (int i = 1; i < argc; ++i) {
+		params << QString(argv[i]);
+	}
+
+	QScopedPointer<QCoreApplication> app;
+
+	if (params.contains("--no-display") || params.contains("-no-display")) {
+		app.reset(new QCoreApplication(argc, argv));
+	} else {
+		app.reset(new QApplication(argc, argv));
+	}
+
+	app->setApplicationName("TrikRun");
 
 	// RAII-style code to ensure that after brick gets destroyed there will be an event loop that cleans it up.
 	trikKernel::DeinitializationHelper helper;
 	Q_UNUSED(helper);
 
-	trikKernel::ApplicationInitHelper initHelper(app);
+	trikKernel::ApplicationInitHelper initHelper(*app);
 
 	initHelper.commandLineParser().addPositionalArgument("file", QObject::tr("File with script to execute")
 			+ " " + QObject::tr("(optional of -s option is specified)"));
@@ -56,6 +69,10 @@ int main(int argc, char *argv[])
 			, QObject::tr("Script to be executed directly from command line.") + "\n"
 					+ QObject::tr("\tExample: ./trikRun -qws -s \"brick.smile(); script.wait(2000);\""));
 
+	initHelper.commandLineParser().addFlag("no-display", "no-display"
+			, QObject::tr("Disable display support. When this flag is active, trikRun can work without QWS or even "
+						  "physical display"));
+
 	initHelper.commandLineParser().addApplicationDescription(QObject::tr("Runner of JavaScript files."));
 
 	if (!initHelper.parseCommandLine()) {
@@ -78,9 +95,9 @@ int main(int argc, char *argv[])
 		QScopedPointer<trikNetwork::MailboxInterface> mailbox(trikNetwork::MailboxFactory::create(configurer));
 		trikScriptRunner::TrikScriptRunner result(*brick, mailbox.data(), gamepad.data());
 
-		QObject::connect(&result, SIGNAL(completed(QString, int)), &app, SLOT(quit()));
+		QObject::connect(&result, SIGNAL(completed(QString, int)), app.data(), SLOT(quit()));
 		result.run(script);
-		return app.exec();
+		return app->exec();
 	};
 
 	if (initHelper.commandLineParser().isSet("s")) {

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,11 @@ ApplicationInitHelper::ApplicationInitHelper(QCoreApplication &app)`
`64`	`64`	`);`
`65`	`65`
`66`	`66`	`#ifdef Q_WS_QWS`
`67`		`- QWSServer * const server = QWSServer::instance();`
`68`		`- if (server) {`
`69`		`- server->setCursorVisible(false);`
	`67`	`+ if (!app.arguments().contains("--no-display") && !!app.arguments().contains("-no-display")) {`
	`68`	`+ QWSServer * const server = QWSServer::instance();`
	`69`	`+ if (server) {`
	`70`	`+ server->setCursorVisible(false);`
	`71`	`+ }`
`70`	`72`	`}`
`71`	`73`	`#endif`
`72`	`74`	`}`