save feature added, gui-scrolling experience improved

m.zabic · m.zabic · commit 8ca3ceccfbc9 · 2019-09-13T13:11:04.000+02:00
diff --git a/src/FDMLControl.pro b/src/FDMLControl.pro
@@ -52,7 +52,8 @@ HEADERS += ./fdmlcontrol.h \
     plotwidget.h \
     querymanager.h \
     querywidget.h \
-    querywidgetmanager.h
+    querywidgetmanager.h \
+    eventguard.h
 
 SOURCES += ./fdmlcontrol.cpp \
     ./QCustomPlot/qcustomplot.cpp \
@@ -67,10 +68,11 @@ SOURCES += ./fdmlcontrol.cpp \
     plotwidget.cpp \
     querymanager.cpp \
     querywidget.cpp \
-    querywidgetmanager.cpp
+    querywidgetmanager.cpp \
+    eventguard.cpp
 
-FORMS += ./ComSettingsWidget.ui \
-    ./ConsoleWidget.ui \
+FORMS += ./comsettingswidget.ui \
+    ./consolewidget.ui \
     ./fdmlcontrol.ui
 
 RESOURCES += fdmlcontrol.qrc
diff --git a/src/authenticationwidget.cpp b/src/authenticationwidget.cpp
@@ -41,11 +41,12 @@ AuthenticationWidget::~AuthenticationWidget()
 {
 }
 
-bool AuthenticationWidget::isKeyAvailable(){
+bool AuthenticationWidget::isKeyAvailable()
+{
     return this->keyAvailable;
 }
 
-void AuthenticationWidget::loadKeyFromFile(QString filePath){
+void AuthenticationWidget::loadKeyFromFile(QString filePath) {
 	QFile inputFile(filePath);
 	if (inputFile.open(QIODevice::ReadOnly)){
 		QTextStream in(&inputFile);
@@ -97,7 +98,7 @@ void AuthenticationWidget::handleResponse(QString initialQuery, QString response
 			}
 		}
 	}
-    else if (status == "401"){
+	else if (status == "401") {
 		emit error(tr("Invalid command! Initial query: ") + initialQuery + tr(" Response: ") + recoveredResponse);
 	}
 	else {
diff --git a/src/authenticationwidget.h b/src/authenticationwidget.h
@@ -43,16 +43,18 @@ class AuthenticationWidget : public QueryWidget
 
     bool isKeyAvailable();
 
+
 private:
 	QString key;
 	bool keyAvailable;
 
+
 public slots:
 	void loadKeyFromFile(QString filePath);
 	void authenticate();
 	void handleResponse(QString initialQuery, QString response) override;
 
+
 signals:
 
 };
-
diff --git a/src/buttonquerywidget.cpp b/src/buttonquerywidget.cpp
@@ -40,18 +40,17 @@ ButtonQueryWidget::ButtonQueryWidget(QWidget *parent) : QueryWidget(parent) {
 }
 
 ButtonQueryWidget::ButtonQueryWidget(QString name, QString command, bool expert, QString infoText, QWidget* parent) : ButtonQueryWidget(parent) {
-		this->name = name;
-		this->command = command;
-		this->expert = expert;
-		this->setToolTip("<font>" + infoText + "</font>");
-		this->button->setText(name);
+    this->name = name;
+    this->command = command;
+    this->expert = expert;
+    this->setToolTip("<font>" + infoText + "</font>");
+    this->button->setText(name);
 }
 
-ButtonQueryWidget::~ButtonQueryWidget()
-{
+ButtonQueryWidget::~ButtonQueryWidget() {
 }
 
-void ButtonQueryWidget::handleResponse(QString initialQuery, QString response){
+void ButtonQueryWidget::handleResponse(QString initialQuery, QString response) {
 }
 
 void ButtonQueryWidget::sendQuery() {
diff --git a/src/buttonquerywidget.h b/src/buttonquerywidget.h
@@ -42,11 +42,13 @@ class ButtonQueryWidget : public QueryWidget
 	ButtonQueryWidget(QString name, QString command, bool expert, QString infoText, QWidget *parent = nullptr);
 	~ButtonQueryWidget();
 
+    
 private:
 	QPushButton* button;
 	QHBoxLayout* layout;
 	QString command;
 
+    
 public slots:
 	void handleResponse(QString initialQuery, QString response) override;
 	void sendQuery();
diff --git a/src/comboboxquerywidget.cpp b/src/comboboxquerywidget.cpp
@@ -30,6 +30,8 @@
 
 ComboBoxQueryWidget::ComboBoxQueryWidget(QWidget *parent) : QueryWidget(parent) {
 	this->comboBox = new QComboBox(this);
+    this->comboBox->setFocusPolicy(Qt::StrongFocus);
+    this->comboBox->installEventFilter(new EventGuard(this->comboBox)); //StrongFocus and event filter prevent the accidental change of comboBox value inside QScrollArea
 	this->label = new QLabel(this);
 	this->layout = new QHBoxLayout(this);
     this->layout->setMargin(0);
@@ -59,7 +61,11 @@ ComboBoxQueryWidget::~ComboBoxQueryWidget()
 {
 }
 
-void ComboBoxQueryWidget::handleResponse(QString initialQuery, QString response){
+QString ComboBoxQueryWidget::content() {
+    return this->name + ":" + "\t" + this->comboBox->currentText();
+}
+
+void ComboBoxQueryWidget::handleResponse(QString initialQuery, QString response) {
 	//check if response is not empty
 	if (!(response.size() > 2)) {
 		emit error(tr("Could not change value, response too short. Initial query: ") + initialQuery + tr(" Response: ") + response);
diff --git a/src/comboboxquerywidget.h b/src/comboboxquerywidget.h
@@ -33,6 +33,7 @@
 #include <QString>
 #include <QHBoxLayout>
 #include "querywidget.h"
+#include "eventguard.h"
 
 class ComboBoxQueryWidget : public QueryWidget
 {
@@ -42,6 +43,8 @@ class ComboBoxQueryWidget : public QueryWidget
 	ComboBoxQueryWidget(QWidget *parent = nullptr);
 	ComboBoxQueryWidget(QString name, QStringList options, bool expert, QString infoText, QWidget *parent = nullptr);
 	~ComboBoxQueryWidget();	
+    QString content() override;
+
 
 private:
 	QComboBox* comboBox;
@@ -50,11 +53,13 @@ class ComboBoxQueryWidget : public QueryWidget
 	QStringList options;
 	bool enableDisableComboBox;
 
+
 public slots:
 	void handleResponse(QString initialQuery, QString response) override;
 	void changeValue(int value);
 	void queryCurrentValue();
 
+
 signals:
 
 };
diff --git a/src/comsettingswidget.h b/src/comsettingswidget.h
@@ -104,4 +104,3 @@ private slots:
 	void connectCom();
 	void disconnectCom();
 };
-
diff --git a/src/consolewidget.cpp b/src/consolewidget.cpp
diff --git a/src/consolewidget.h b/src/consolewidget.h
@@ -24,8 +24,6 @@
 **                      at                                                **
 **                      iqo.uni-hannover.de                               **
 **                                                                        **
-**          Date:       12 June 2019                                      **
-**          Version:    1.0.0                                             **
 ****************************************************************************/
 
 #pragma once
@@ -42,9 +40,11 @@ class ConsoleWidget : public QueryWidget
 	ConsoleWidget(QWidget *parent = Q_NULLPTR);
 	~ConsoleWidget();
 
+
 private:
 	Ui::ConsoleWidget ui;
 
+
 public slots:
 	void handleResponse(QString initialQuery, QString response) override;
 	void slot_commandSent();
diff --git a/src/fdmlcontrol.cpp b/src/fdmlcontrol.cpp
@@ -59,6 +59,8 @@ FDMLControl::FDMLControl(QWidget *parent) : QMainWindow(parent){
 	connect(this->queryManager, &QueryManager::serialOpen, this, &FDMLControl::enableGui);
 	connect(this->queryManager, &QueryManager::info, this->logConsole, &MessageConsole::slot_displayInfo);
 	connect(this->queryManager, &QueryManager::error, this->logConsole, &MessageConsole::slot_displayError);
+    connect(this->widgetManager, &QueryWidgetManager::info, this->logConsole, &MessageConsole::slot_displayInfo);
+    connect(this->widgetManager, &QueryWidgetManager::error, this->logConsole, &MessageConsole::slot_displayError);
 	connect(&comThread, &QThread::finished, queryManager, &QueryManager::deleteLater);
 	connect(&comThread, &QThread::finished, &comThread, &QThread::deleteLater);
 	comThread.start();
@@ -187,9 +189,11 @@ void FDMLControl::initGui(){
 
 void FDMLControl::initMenu(){
     QMenu *fileMenu = this->menuBar()->addMenu(tr("&File"));
-	QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close);
-	exitAct->setShortcuts(QKeySequence::Quit);
-	exitAct->setStatusTip(tr("Close FDML Control"));
+    QAction* saveToFileAction = fileMenu->addAction(tr("&Save Parameters"), this->widgetManager, &QueryWidgetManager::saveWidgetValuesToFile);
+    saveToFileAction->setStatusTip(tr("Save parameter values that are visible in right area of FDMLControl"));
+    QAction *exitAct = fileMenu->addAction(tr("E&xit"), this, &QWidget::close);
+    exitAct->setShortcuts(QKeySequence::Quit);
+    exitAct->setStatusTip(tr("Close FDML Control"));
 
 	QMenu* viewMenu = this->menuBar()->addMenu(tr("&View"));
 	this->expertViewAction = viewMenu->addAction(tr("&Expert"), this, &FDMLControl::toggleExpertView);
@@ -290,8 +294,8 @@ void FDMLControl::showAbout() {
            "Contact:    zabic"
            "@"
            "iqo.uni-hannover.de<br>"
-           "Date:       17 July 2019<br>"
-           "Version:    1.0.3"));
+           "Date:       ")+ VERSION_DATE + tr("<br>"
+           "Version:    ") + VERSION);
 }
 
 void FDMLControl::toggleExpertView() {
diff --git a/src/fdmlcontrol.h b/src/fdmlcontrol.h
@@ -44,16 +44,20 @@
 
 #define COMMAND_FILE_PATH QCoreApplication::applicationDirPath() + "/fdml_commands.xml"
 #define KEY_FILE_PATH QCoreApplication::applicationDirPath() + "/key.dat"
+#define VERSION "1.0.4"
+#define VERSION_DATE "13 September 2019"
 
 class FDMLControl : public QMainWindow
 {
 	Q_OBJECT
 	QThread comThread;
 
+
 public:
 	FDMLControl(QWidget *parent = Q_NULLPTR);
 	~FDMLControl();
 
+
 private:
 	Ui::FDMLControlClass ui;
 	ConsoleWidget* console;
@@ -96,6 +100,7 @@ public slots:
 	void readOutDevice();
     void authenticateAsAdmin();
 
+
 signals:
 	void serialResponse(QString);
 	void openSerialPort(ComSettings);
diff --git a/src/intvaluewidget.cpp b/src/intvaluewidget.cpp
@@ -34,6 +34,8 @@ IntValueWidget::IntValueWidget(QWidget* parent, QString name) : QueryWidget(pare
 	this->value = 0;
 	this->name = name;
 	this->spinBox = new QSpinBox(this);
+    this->spinBox->setFocusPolicy(Qt::StrongFocus);
+    this->spinBox->installEventFilter(new EventGuard(this->spinBox)); //StrongFocus and event filter prevent the accidental change of spinbox value inside QScrollArea
 	this->label = new QLabel(this->name, this);
 	this->layout = new QHBoxLayout(this);
     this->layout->setMargin(0);
@@ -55,18 +57,20 @@ IntValueWidget::~IntValueWidget()
 {
 }
 
-void IntValueWidget::setMin(int minValue)
-{
+void IntValueWidget::setMin(int minValue) {
 	this->spinBox->setMinimum(minValue);
 }
 
-void IntValueWidget::setMax(int maxValue)
-{
+void IntValueWidget::setMax(int maxValue) {
 	this->spinBox->setMaximum(maxValue);
 }
 
 void IntValueWidget::setStepSize(int stepSize){
-	this->spinBox->setSingleStep(stepSize);
+    this->spinBox->setSingleStep(stepSize);
+}
+
+QString IntValueWidget::content(){
+    return this->name + ":" + "\t" + QString::number(this->value);
 }
 
 void IntValueWidget::setValue(int value) {
diff --git a/src/intvaluewidget.h b/src/intvaluewidget.h
@@ -29,12 +29,14 @@
 ****************************************************************************/
 
 #pragma once
+
 #include <qwidget.h>
 #include <qspinbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <QCoreApplication>
 #include "querywidget.h"
+#include "eventguard.h"
 
 class IntValueWidget : public QueryWidget
 {
@@ -46,7 +48,9 @@ class IntValueWidget : public QueryWidget
 	void setMin(int minValue);
 	void setMax(int maxValue);
 	void setStepSize(int stepSize);
+    QString content() override;
 
+    
 private:
 	int value;
 	QSpinBox* spinBox;
@@ -60,8 +64,7 @@ public slots:
 	void queryCurrentValue();
 	void handleResponse(QString initialQuery, QString response) override;
 
+    
 signals:
 	void valueChanged(QString name, int value);
-
 };
-
diff --git a/src/messageconsole.h b/src/messageconsole.h
@@ -28,8 +28,7 @@
 **          Version:    1.0.0                                             **
 ****************************************************************************/
 
-#ifndef MESSAGECONSOLE_H
-#define MESSAGECONSOLE_H
+#pragma once
 
 #include <QTextEdit>
 #include <QGridLayout>
@@ -71,5 +70,3 @@ public slots:
     void slot_displayInfo(QString info);
     void slot_displayError(QString error);
 };
-
-#endif // MESSAGECONSOLE_H
diff --git a/src/querymanager.h b/src/querymanager.h
diff --git a/src/querywidget.h b/src/querywidget.h
diff --git a/src/querywidgetmanager.cpp b/src/querywidgetmanager.cpp
diff --git a/src/querywidgetmanager.h b/src/querywidgetmanager.h

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,12 @@ AuthenticationWidget::~AuthenticationWidget()`
`41`	`41`	`{`
`42`	`42`	`}`
`43`	`43`
`44`		`-bool AuthenticationWidget::isKeyAvailable(){`
	`44`	`+bool AuthenticationWidget::isKeyAvailable()`
	`45`	`+{`
`45`	`46`	`return this->keyAvailable;`
`46`	`47`	`}`
`47`	`48`
`48`		`-void AuthenticationWidget::loadKeyFromFile(QString filePath){`
	`49`	`+void AuthenticationWidget::loadKeyFromFile(QString filePath) {`
`49`	`50`	`QFile inputFile(filePath);`
`50`	`51`	`if (inputFile.open(QIODevice::ReadOnly)){`
`51`	`52`	`QTextStream in(&inputFile);`
`@@ -97,7 +98,7 @@ void AuthenticationWidget::handleResponse(QString initialQuery, QString response`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`	`}`
`100`		`- else if (status == "401"){`
	`101`	`+ else if (status == "401") {`
`101`	`102`	`emit error(tr("Invalid command! Initial query: ") + initialQuery + tr(" Response: ") + recoveredResponse);`
`102`	`103`	`}`
`103`	`104`	`else {`
Original file line number	Diff line number	Diff line change
`@@ -40,18 +40,17 @@ ButtonQueryWidget::ButtonQueryWidget(QWidget *parent) : QueryWidget(parent) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`ButtonQueryWidget::ButtonQueryWidget(QString name, QString command, bool expert, QString infoText, QWidget* parent) : ButtonQueryWidget(parent) {`
`43`		`- this->name = name;`
`44`		`- this->command = command;`
`45`		`- this->expert = expert;`
`46`		`- this->setToolTip("<font>" + infoText + "</font>");`
`47`		`- this->button->setText(name);`
	`43`	`+ this->name = name;`
	`44`	`+ this->command = command;`
	`45`	`+ this->expert = expert;`
	`46`	`+ this->setToolTip("<font>" + infoText + "</font>");`
	`47`	`+ this->button->setText(name);`
`48`	`48`	`}`
`49`	`49`
`50`		`-ButtonQueryWidget::~ButtonQueryWidget()`
`51`		`-{`
	`50`	`+ButtonQueryWidget::~ButtonQueryWidget() {`
`52`	`51`	`}`
`53`	`52`
`54`		`-void ButtonQueryWidget::handleResponse(QString initialQuery, QString response){`
	`53`	`+void ButtonQueryWidget::handleResponse(QString initialQuery, QString response) {`
`55`	`54`	`}`
`56`	`55`
`57`	`56`	`void ButtonQueryWidget::sendQuery() {`