Merge dev - v1.2

Author: Mich

src/config.h

@@ -3,7 +3,7 @@
 
 #define VERSION "1.2"
 
-#define CHANGELOG_TEXT "Changelog - version " VERSION ": \n"
+#define CHANGELOG_TEXT "" //"Changelog - version " VERSION ": \n"
 
 #define INTRO_TEXT  "" \
                     "Welcome to QtSerialMonitor, \n" \

src/mainwindow.cpp

@@ -30,6 +30,7 @@
 #include <QTextStream>
 #include <QTime>
 #include <QTimer>
+#include <QCloseEvent>
 
 //#include <q3dsruntimeglobal.h>
 //#include <Q3DSWidget>
@@ -52,6 +53,7 @@ public slots:
     void on_processLoadedFileLine(QString *line, int *progressPercent);
     void on_setSelectedLabels(QList<QString> *labels, bool customRules = true);
     void on_updateProgressBar(float *percent);
+    void closeEvent(QCloseEvent *event);
 private slots:
     void on_aboutToQuitSlot();
     void on_action3D_orientation_triggered();
@@ -71,17 +73,18 @@ private slots:
     void on_chartBeforeReplotSlot();
     void on_chartContextMenuRequest(QPoint pos);
     void on_chartMouseDoubleClickHandler(QMouseEvent *event);
+    void on_chartMouseMoveHandler(QMouseEvent *event);
     void on_chartMousePressHandler(QMouseEvent *event);
     void on_chartSelectionChanged();
     void on_checkBoxAutoLogging_toggled(bool checked);
     void on_checkBoxAutoRefresh_toggled(bool checked);
+    void on_checkBoxAutoSaveBuffer_toggled(bool checked);    
     void on_checkBoxAutoTrack_toggled(bool checked);
     void on_checkBoxEnableTracer_toggled(bool checked);
-    void on_checkBoxExternalTimeReference_toggled(bool checked);
     void on_checkBoxShowLegend_toggled(bool checked);
-    void on_checkBoxSyncSystemClock_toggled(bool checked);
     void on_checkBoxWrapText_toggled(bool checked);
     void on_clearGraphSelection();
+    void on_comboBoxClockSource_currentIndexChanged(int index);
     void on_comboBoxGraphDisplayMode_currentIndexChanged(const QString &arg1);
     void on_comboBoxLoggingMode_currentIndexChanged(int index);
     void on_comboBoxSendReturnPressedSlot();
@@ -109,7 +112,6 @@ private slots:
     void on_pushButtonClearHistory_clicked();
     void on_pushButtonClearTable_clicked();
     void on_pushButtonEnablePlot_toggled(bool checked);
-    void on_pushButtonFitToContents_clicked();
     void on_pushButtonLoadFile_clicked();
     void on_pushButtonLoadPath_clicked();
     void on_pushButtonLoadRAMBuffer_clicked();
@@ -136,8 +138,6 @@ private slots:
     void on_toolButtonAdvancedGraphMenu_clicked();
     void on_tracerShowPointValue(QMouseEvent *event);
     void on_updateSerialDeviceList();
-    void on_checkBoxAutoSaveBuffer_toggled(bool checked);
-
 private:
     // QCompleter *completer;
     FileReader fileReader;

src/mainwindow.h

@@ -56,7 +56,6 @@ void NetworkUDP::readDatagram()
     {
         datagram.resize(int(udpSocket->pendingDatagramSize()));
         udpSocket->readDatagram(datagram.data(), datagram.size());
-        udpReceiveBytes.append(datagram);
         udpReceiveStringBuffer.append(datagram.toStdString().c_str());
     }
 }
@@ -71,29 +70,13 @@ QString NetworkUDP::readString(bool clearBuffer)
     return output;
 }
 
-QByteArray NetworkUDP::readBytes(bool clearBuffer)
-{
-    QByteArray output = udpReceiveBytes;
-
-    if (clearBuffer)
-        udpReceiveBytes.clear();
-
-    return output;
-}
-
 void NetworkUDP::clearStringBuffer()
 {
     udpReceiveStringBuffer.clear();
 }
 
-void NetworkUDP::clearBytesBuffer()
-{
-    udpReceiveBytes.clear();
-}
-
 void NetworkUDP::clearAll()
 {
-    udpReceiveBytes.clear();
     udpReceiveStringBuffer.clear();
 }
 

src/mainwindow.ui

@@ -13,10 +13,8 @@ class NetworkUDP : public QObject
     bool bind(QHostAddress ip, qint16 port);
     bool end();
     bool isOpen();
-    QByteArray readBytes(bool clearBuffer = true);
     QString readString(bool clearBuffer = true);
     void clearAll();
-    void clearBytesBuffer();
     void clearStringBuffer();
     void write(QString message, QHostAddress ip, qint16 port);
 signals:
@@ -27,7 +25,6 @@ private slots:
 
 private:
     bool isBinded = false;
-    QByteArray udpReceiveBytes;
     QString udpReceiveStringBuffer;
     QUdpSocket *udpSocket;
 };

src/networkudp.cpp

@@ -52,7 +52,7 @@ void Parser::parse(QString inputString, bool syncToSystemClock, bool useExternal
                 {
                     latestTimeStamp = QTime::fromMSecsSinceStartOfDay(inputStringSplitArray[i + 1].toInt());
                 }
-                else
+                else if (externalClockLabel.isEmpty() == true)
                 {
                     foreach (auto timeFormat, searchTimeFormatList)
                     {

src/networkudp.h

@@ -17,29 +17,25 @@ void Serial::readString()
     case canReadLine_ReadLine:
         while (this->serialDevice->canReadLine())
         {
-            serialByteArray.append(serialDevice->readLine());
-            serialInputString.append(serialByteArray);
+            serialInputString.append(serialDevice->readLine());
         }
         break;
     case canReadLine_ReadAll:
         while (this->serialDevice->canReadLine())
         {
-            serialByteArray.append(serialDevice->readAll());
-            serialInputString.append(serialByteArray);
+            serialInputString.append(serialDevice->readAll());
         }
         break;
     case bytesAvailable_ReadLine:
         while (this->serialDevice->bytesAvailable())
         {
-            serialByteArray.append(serialDevice->readLine());
-            serialInputString.append(serialByteArray);
+            serialInputString.append(serialDevice->readLine());
         }
         break;
     case bytesAvailable_ReadAll:
         while (this->serialDevice->bytesAvailable())
         {
-            serialByteArray.append(serialDevice->readAll());
-            serialInputString.append(serialByteArray);
+            serialInputString.append(serialDevice->readAll());
         }
         break;
     }
@@ -82,30 +78,14 @@ QString Serial::getString(bool clearBuffer)
     return output;
 }
 
-QByteArray Serial::getBytes(bool clearBuffer)
-{
-    QByteArray outputByteArray = serialByteArray;
-
-    if (clearBuffer)
-        clearBytes();
-
-    return outputByteArray;
-}
-
 void Serial::clearAll(bool clearHardwareBuffers)
 {
     serialInputString.clear();
-    serialByteArray.clear();
 
     if (clearHardwareBuffers)
         serialDevice->clear();
 }
 
-void Serial::clearBytes()
-{
-    serialByteArray.clear();
-}
-
 void Serial::clearString()
 {
     serialInputString.clear();

src/parser.cpp

@@ -27,19 +27,16 @@ class Serial : public QObject
     bool send(QString message);
     bool setReadMode(int mode);
     int getAvailiblePortsCount();
-    QByteArray getBytes(bool clearBuffer = true);
     QString getSerialInfo();
     QString getString(bool clearBuffer = true);
     void clearAll(bool clearHardwareBuffers = false);
-    void clearBytes();
     void clearString();
 signals:
 
 public slots:
     void readString();
 
 private:
-    QByteArray serialByteArray;
     QSerialPort *serialDevice = nullptr;
     QString serialInputString;
     SERIAL_READ_MODE stringReadMode = canReadLine_ReadLine;