From d3bb961c72c98b51fbe59aa50c53831d2e734c50 Mon Sep 17 00:00:00 2001
From: Giacomo Strangolino <giacomo.strangolino@elettra.eu>
Date: Fri, 22 Sep 2023 16:50:47 +0200
Subject: [PATCH] added --xy and --fn command line switches to enable only one
section of the panel
---
src/main.cpp | 9 +++++++--
src/tiptiltgcs.cpp | 24 ++++++++++++++++--------
src/tiptiltgcs.h | 2 +-
3 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index c29a67d..e8e0726 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,7 @@
#include <quapplication.h>
#include "tiptiltgcs.h"
-
+#include <QCommandLineParser>
+#include <QCommandLineOption>
// cumbia
#include <cumbiapool.h>
#include <cuthreadfactoryimpl.h>
@@ -22,9 +23,13 @@ int main(int argc, char *argv[])
qu_app.setProperty("office", "T2 ");
qu_app.setProperty("hwReferent", "R. Gobessi, A. Bogani "); /* name of the referent that provides the device server */
+ QCommandLineParser parser;
+ parser.addOption(QCommandLineOption("xy", "enable XY"));
+ parser.addOption(QCommandLineOption("fn", "enable FN"));
+ parser.parse(qu_app.arguments());
CumbiaPool *cu_p = new CumbiaPool();
- TipTiltGcs *w = new TipTiltGcs(cu_p, NULL);
+ TipTiltGcs *w = new TipTiltGcs(cu_p, NULL, parser.isSet("xy"), parser.isSet("fn"));
w->show();
// exec application loop
int ret = qu_app.exec();
diff --git a/src/tiptiltgcs.cpp b/src/tiptiltgcs.cpp
index bd89a92..81fdd0d 100644
--- a/src/tiptiltgcs.cpp
+++ b/src/tiptiltgcs.cpp
@@ -10,7 +10,7 @@
// cumbia
#include <QErrorMessage>
-TipTiltGcs::TipTiltGcs(CumbiaPool *cumbia_pool, QWidget *parent) :
+TipTiltGcs::TipTiltGcs(CumbiaPool *cumbia_pool, QWidget *parent, bool xy, bool fn) :
QWidget(parent)
{
// cumbia
@@ -19,13 +19,21 @@ TipTiltGcs::TipTiltGcs(CumbiaPool *cumbia_pool, QWidget *parent) :
ui = new Ui::tiptiltgcs;
ui->setupUi(this, cu_pool, m_ctrl_factory_pool);
- if (QApplication::arguments().size() >= 3){
- QString tabsel=QApplication::arguments()[2];
- if (tabsel.contains("X") || tabsel.contains("Y"))
- ui->tabWidget->setCurrentIndex(0);
- if (tabsel.contains("F") || tabsel.contains("N"))
- ui->tabWidget->setCurrentIndex(1);
- }
+ if(xy && fn) {
+
+ }
+ else if(xy)
+ ui->tabWidget->removeTab(1);
+ else if(fn)
+ ui->tabWidget->removeTab(0);
+
+// if (QApplication::arguments().size() >= 3){
+// QString tabsel=QApplication::arguments()[2];
+// if (tabsel.contains("X") || tabsel.contains("Y"))
+// ui->tabWidget->setCurrentIndex(0);
+// if (tabsel.contains("F") || tabsel.contains("N"))
+// ui->tabWidget->setCurrentIndex(1);
+// }
}
diff --git a/src/tiptiltgcs.h b/src/tiptiltgcs.h
index 76fd40b..5084e26 100644
--- a/src/tiptiltgcs.h
+++ b/src/tiptiltgcs.h
@@ -18,7 +18,7 @@ class TipTiltGcs : public QWidget
Q_OBJECT
public:
- explicit TipTiltGcs(CumbiaPool *cu_p, QWidget *parent = nullptr);
+ explicit TipTiltGcs(CumbiaPool *cu_p, QWidget *parent, bool xy, bool fn);
~TipTiltGcs();
private:
Ui::tiptiltgcs *ui;
--
GitLab