Fix issue with disconnect button

alex-spataru · alex-spataru · commit 64b2e0838e2c · 2021-02-13T21:03:30.000-05:00
diff --git a/assets/qml/main.qml b/assets/qml/main.qml
@@ -239,16 +239,16 @@ ApplicationWindow {
     Connections {
         target: Cpp_JSON_Generator
         enabled: !app.firstValidPacket
-        function onJsonChanged()  {
-            app.firstValidPacket = true
-            uiConfigTimer.start()
-        }
-    } Timer {
-        id: uiConfigTimer
-        interval: 250
-        onTriggered: {
-            setup.hide()
-            toolbar.dataClicked()
+        function onFrameChanged()  {
+            if (Cpp_IO_Manager.connected || Cpp_CSV_Player.isOpen) {
+                app.firstValidPacket = true
+                setup.hide()
+                toolbar.dataClicked()
+            } else {
+                toolbar.consoleClicked()
+                setup.show()
+                app.firstValidPacket = false
+            }
         }
     }
 
diff --git a/src/JSON/Generator.cpp b/src/JSON/Generator.cpp
@@ -48,11 +48,11 @@ static const QRegExp UNMATCHED_VALUES_REGEX("(%\b([0-9]|[1-9][0-9])\b)");
  * Initializes the JSON Parser class and connects appropiate SIGNALS/SLOTS
  */
 Generator::Generator()
-    : m_jsonChanged(false)
-    , m_dataFormatErrors(0)
-    , m_opMode(kAutomatic)
+    : m_opMode(kAutomatic)
 {
     auto io = IO::Manager::getInstance();
+    auto cp = CSV::Player::getInstance();
+    connect(cp, SIGNAL(openChanged()), this, SLOT(reset()));
     connect(io, SIGNAL(deviceChanged()), this, SLOT(reset()));
     connect(io, SIGNAL(frameReceived(QByteArray)), this, SLOT(readData(QByteArray)));
     m_workerThread.start();
@@ -264,13 +264,20 @@ void Generator::setJsonDocument(const QJsonDocument &document, const QDateTime &
     if (document.object().isEmpty())
         return;
 
-    m_jsonChanged = true;
-    m_document = document;
+    bool csvOpen = CSV::Player::getInstance()->isOpen();
+    bool devOpen = IO::Manager::getInstance()->connected();
 
-    if (m_frame.read(m_document.object()))
-        emit frameChanged();
+    if (csvOpen || devOpen)
+    {
+        m_document = document;
+        if (m_frame.read(m_document.object()))
+            emit frameChanged();
+
+        emit jsonChanged(document, time);
+    }
 
-    emit jsonChanged(document, time);
+    else
+        reset();
 }
 
 /**
@@ -279,8 +286,11 @@ void Generator::setJsonDocument(const QJsonDocument &document, const QDateTime &
  */
 void Generator::reset()
 {
-    m_dataFormatErrors = 0;
-    setJsonDocument(QJsonDocument::fromJson(QByteArray("{}")));
+    m_frame.clear();
+    m_document = QJsonDocument::fromJson(QByteArray("{}"));
+
+    emit frameChanged();
+    emit jsonChanged(document(), QDateTime::currentDateTime());
 }
 
 /**
diff --git a/src/JSON/Generator.h b/src/JSON/Generator.h
@@ -100,8 +100,6 @@ class Generator : public QObject
     QString jsonMapFilepath() const;
     OperationMode operationMode() const;
 
-    QJSEngine *javaScriptEngine() { return &m_engine; }
-
 public slots:
     void loadJsonMap();
     void setOperationMode(const OperationMode mode);
@@ -123,17 +121,13 @@ private slots:
 private:
     Frame m_frame;
     QFile m_jsonMap;
-    bool m_jsonChanged;
     QSettings m_settings;
     QString m_jsonMapData;
-    int m_dataFormatErrors;
     OperationMode m_opMode;
     QJsonDocument m_document;
 
     QThread m_workerThread;
     JSONWorker *m_jsonWorker;
-
-    QJSEngine m_engine;
 };
 }
 
