Fix hangs (#9)

* QLineSeries instead QSplineSeries * Increase buffer, add reset connection
donarturo11 · Dec 7, 2023 · ba8d1a0 · ba8d1a0
1 parent 0049ba4
commit ba8d1a0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/GUI/GraphsWidget/TGWaveWidget.cpp b/src/GUI/GraphsWidget/TGWaveWidget.cpp
@@ -8,7 +8,7 @@ TGWaveWidget::TGWaveWidget(QWidget *parent)
 : TGWidget(parent)
 {
     _cur_pos = 0;
-    _series = new QSplineSeries;
+    _series = new QLineSeries;
     init();
 }
 

diff --git a/src/GUI/GraphsWidget/TGWaveWidget.h b/src/GUI/GraphsWidget/TGWaveWidget.h
@@ -2,7 +2,7 @@
 #define TGWAVE_WIDGET_H
 #include "TGWidget.h"
 #include <QList>
-#include <QSplineSeries>
+#include <QLineSeries>
 
 #define MAXRAWVALUE 2048.0000
 #define SAMPLERATE 512.0000
@@ -14,7 +14,7 @@ class TGWaveWidget : public TGWidget
     TGWaveWidget(QWidget *parent = nullptr);
     ~TGWaveWidget();
     void insertValue(int val);
-    QSplineSeries* series() { return reinterpret_cast<QSplineSeries*>(_series); }
+    QLineSeries* series() { return reinterpret_cast<QLineSeries*>(_series); }
 private:
     void update();
     void setupAxes();

diff --git a/src/QThinkGear/QThinkGear.cpp b/src/QThinkGear/QThinkGear.cpp
@@ -46,7 +46,7 @@ void QThinkGear::close()
 void QThinkGear::onReadyRead()
 {
     int bufsize = _device.readBufferSize();
-    char buffer[1024];
+    char buffer[BUFFER_SIZE];
     int size = _device.bytesAvailable();
     if (size) {
         changeStatus(ThinkGearStatus::Reading);
@@ -64,6 +64,8 @@ void QThinkGear::checkState()
 {
     if (!_device.waitForReadyRead(10)) {
        changeStatus(ThinkGearStatus::Idle);
+       close();
+       open();
        emit receiveStatusChanged(0);
     }
 }

diff --git a/src/QThinkGear/QThinkGear.h b/src/QThinkGear/QThinkGear.h
@@ -7,6 +7,8 @@
 #include "ThinkGearStreamParser.h"
 #include "QThinkGearDataHandler.h"
 
+#define BUFFER_SIZE 2048
+
 const int ThinkgearBaudrates[] {
     57600, 9600
 };