Merge pull request #39 from romankurbatov/keysFix

Keys fix
trikset · Jun 18, 2014 · e8105b9 · e8105b9
2 parents c1ed98c + 8693405
commit e8105b9
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 9 deletions.
diff --git a/trikControl/include/trikControl/brick.h b/trikControl/include/trikControl/brick.h
@@ -58,13 +58,14 @@ class TRIKCONTROL_EXPORT Brick : public QObject
 
 	~Brick();
 
+	/// Do reset (stop motors, reset keys, clear screen, etc). We should call it before executing any script
+	/// with this Brick instance.
+	void reset();
+
 	/// Returns true if a system is in event-driven running mode, so it shall wait for events when script is executed.
 	/// If it is false, script will exit immediately.
 	bool isInEventDrivenMode() const;
 
-	/// Clears event driven mode, returning brick to a state where a script will exit immediately.
-	void resetEventDrivenMode();
-
 public slots:
 	/// Plays given music file on a speaker (in format accepted by aplay utility).
 	void playSound(QString const &soundFileName);

diff --git a/trikControl/include/trikControl/display.h b/trikControl/include/trikControl/display.h
@@ -62,13 +62,17 @@ public slots:
 
 	void hide();
 
+	/// Clear everything painted with this object.
+	void clear();
+
 signals:
 	void threadShowImage(QString const &fileName);
 	void threadAddLabel(QString const &text, int x, int y);
 	void threadRemoveLabels();
 	void threadSetBackground(QString const &color);
 	void threadHide();
 	void threadDelete();
+	void threadClear();
 
 private:
 	QThread &mGuiThread;

diff --git a/trikControl/include/trikControl/keys.h b/trikControl/include/trikControl/keys.h
@@ -36,6 +36,9 @@ class TRIKCONTROL_EXPORT Keys : public QObject
 
 	~Keys();
 
+	/// Clear data about previous key pressures.
+	void reset();
+
 public slots:
 	/// Returns true, if button with given code was pressed, and clears "pressed" state for that button.
 	bool wasPressed(int code);

diff --git a/trikControl/src/brick.cpp b/trikControl/src/brick.cpp
@@ -150,6 +150,14 @@ Brick::~Brick()
 	delete mGamepad;
 }
 
+void Brick::reset()
+{
+	stop();
+	mKeys->reset();
+	mDisplay.clear();
+	mInEventDrivenMode = false;
+}
+
 void Brick::playSound(QString const &soundFileName)
 {
 	qDebug() << soundFileName;
@@ -329,8 +337,3 @@ void Brick::system(QString const &command)
 	qDebug() << "Running:" << "sh" << args;
 	QProcess::startDetached("sh", args);
 }
-
-void Brick::resetEventDrivenMode()
-{
-	mInEventDrivenMode = false;
-}
diff --git a/trikControl/src/display.cpp b/trikControl/src/display.cpp
@@ -39,6 +39,7 @@ trikControl::Display::Display(QThread &guiThread)
 	connect(this, SIGNAL(threadSetBackground(QString)), mGuiWorker, SLOT(setBackground(QString)));
 	connect(this, SIGNAL(threadHide()), mGuiWorker, SLOT(hide()));
 	connect(this, SIGNAL(threadDelete()), mGuiWorker, SLOT(deleteWorker()));
+	connect(this, SIGNAL(threadClear()), mGuiWorker, SLOT(clear()));
 }
 
 trikControl::Display::~Display()
@@ -81,3 +82,8 @@ void trikControl::Display::hide()
 {
 	emit threadHide();
 }
+
+void Display::clear()
+{
+	emit threadClear();
+}
diff --git a/trikControl/src/guiWorker.cpp b/trikControl/src/guiWorker.cpp
@@ -38,6 +38,7 @@ GuiWorker::GuiWorker()
 	mImageWidget.setLayout(layout);
 	mImageWidget.setWindowState(Qt::WindowFullScreen);
 	mImageWidget.setWindowFlags(mImageWidget.windowFlags() | Qt::WindowStaysOnTopHint);
+	resetBackground();
 }
 
 void GuiWorker::showImage(QString const &fileName)
@@ -127,6 +128,21 @@ void GuiWorker::setBackground(QString const &color)
 	mImageWidget.show();
 }
 
+void GuiWorker::resetBackground()
+{
+	QPalette palette = mImageWidget.palette();
+	palette.setColor(QPalette::Window, Qt::lightGray);
+	mImageWidget.setPalette(palette);
+}
+
+void GuiWorker::clear()
+{
+	mImageWidget.hide();
+	removeLabels();
+	mImageLabel.setPixmap(QPixmap());
+	resetBackground();
+}
+
 void GuiWorker::hide()
 {
 	mImageWidget.hide();

diff --git a/trikControl/src/guiWorker.h b/trikControl/src/guiWorker.h
@@ -62,7 +62,12 @@ public slots:
 	/// @param color - color of a background.
 	void setBackground(QString const &color);
 
+	/// Clear everything painted with this object.
+	void clear();
+
 private:
+	void resetBackground();
+
 	/// Returns existing label with given coordinates or NULL if no such label exists.
 	QLabel *findLabel(int x, int y) const;
 

diff --git a/trikControl/src/keysWorker.cpp b/trikControl/src/keysWorker.cpp
@@ -35,6 +35,11 @@ KeysWorker::KeysWorker(QString const &keysPath)
 	mSocketNotifier->setEnabled(true);
 }
 
+void KeysWorker::reset()
+{
+	mWasPressed.clear();
+}
+
 bool KeysWorker::wasPressed(int code)
 {
 	mLock.lockForRead();

diff --git a/trikControl/src/keysWorker.h b/trikControl/src/keysWorker.h
@@ -31,6 +31,9 @@ class KeysWorker : public QObject
 	/// @param keysPath - path to device file that controls brick keys.
 	KeysWorker(QString const &keysPath);
 
+	/// Clear data about previous key pressures.
+	void reset();
+
 public slots:
 	bool wasPressed(int code);
 

diff --git a/trikControl/src/linux/keys.cpp b/trikControl/src/linux/keys.cpp
@@ -32,6 +32,11 @@ Keys::~Keys()
 	mWorkerThread.wait();
 }
 
+void Keys::reset()
+{
+	mKeysWorker->reset();
+}
+
 bool Keys::wasPressed(int code)
 {
 	return mKeysWorker->wasPressed(code);

diff --git a/trikScriptRunner/src/scriptEngineWorker.cpp b/trikScriptRunner/src/scriptEngineWorker.cpp
@@ -114,7 +114,7 @@ void ScriptEngineWorker::initScriptEngine()
 
 	connect(mEngine, SIGNAL(destroyed()), this, SLOT(onScriptEngineDestroyed()));
 
-	mBrick.resetEventDrivenMode();
+	mBrick.reset();
 
 	qScriptRegisterMetaType(mEngine, batteryToScriptValue, batteryFromScriptValue);
 	qScriptRegisterMetaType(mEngine, displayToScriptValue, displayFromScriptValue);