Serial data can now be presented in HEX and BIN formats !

Author: Mich

README.md

@@ -16,19 +16,6 @@ Universal serial monitor with data plotting capabilities, based on [Qt](https://
 -
 ---
 
-**Work in progress:**
-
-    - "What’s this ?" popups for less obvious widgets and an introduction 
-      text/html doc displayed in the main text browser on first run.
-    
-    - 3D Orientation Demo - for IMU testing (user will be able to toggle between chart view
-      and a simple 3D scene containing an object rotating accordingly to received roll,
-      pitch and yaw values, representing the sensor's orientation) 
-
-    - Improvements, fixes etc.
-
-----
-
 ***Notes:***
 
 * The app uses a custom-written parser, which searches the incoming message for plottable data in form of label-value set. At the moment, all labels and values **must be separated with a whitespace** in order to be recognized. Its possible to use separators like "=" and "," - parser will be replace them with whitespace before processing. If no label is found, a generic name will be used i.e. "Graph 0".*

src/config.h

@@ -1,7 +1,7 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#define VERSION "1.1"
+#define VERSION "1.2"
 #define CHANGELOG_TEXT ""
 
 #endif // CONFIG_H

src/infodialog.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>About this application</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="1">
@@ -40,7 +40,7 @@
       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt;&quot;&gt;Universal serial monitor with data plotting capabilities, based on &lt;/span&gt;&lt;a href=&quot;https://www.qt.io/&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt; text-decoration: underline; color:#0000ff;&quot;&gt;Qt&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt;&quot;&gt;. Designed with all sorts of &lt;/span&gt;&lt;a href=&quot;https://www.arduino.cc/&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt; text-decoration: underline; color:#0000ff;&quot;&gt;Arduino&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt;&quot;&gt; projects in mind, as a handy tool for debugging and experimentation :)&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:9pt; font-weight:600;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt; font-weight:600;&quot;&gt;Author:&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt;&quot;&gt; mich-w&lt;/span&gt;&lt;/p&gt;

src/mainwindow.cpp

@@ -119,7 +119,7 @@ void MainWindow::settingsLoadAll()
         }
 
         if (appSettings.value("Info/organizationName").value<QString>() != appSettings.organizationName() &&
-                appSettings.value("Info/applicationName").value<QString>() != appSettings.applicationName())
+            appSettings.value("Info/applicationName").value<QString>() != appSettings.applicationName())
         {
             qDebug() << "Abort loading settings ! organizationName or applicationName incorrect. Config file might be missing.";
             return;
@@ -168,7 +168,7 @@ void MainWindow::settingsLoadAll()
         ui->comboBoxRAMSaveMode->setCurrentIndex(appSettings.value("GUI_Elements/comboBoxRAMSaveMode.currentIndex").value<int>());
 
         ui->checkBoxDTR->setChecked(appSettings.value("GUI_Elements/checkBoxDTR.isChecked").value<bool>());
-        ui->checkBoxTrim->setChecked(appSettings.value("GUI_Elements/checkBoxTrim.isChecked").value<bool>());
+        ui->checkBoxSimplify->setChecked(appSettings.value("GUI_Elements/checkBoxSimplify.isChecked").value<bool>());
         ui->checkBoxSendKey->setChecked(appSettings.value("GUI_Elements/checkBoxSendKey.isChecked").value<bool>());
         ui->checkBoxWrapText->setChecked(appSettings.value("GUI_Elements/checkBoxWrapText.isChecked").value<bool>());
         ui->checkBoxAutoTrack->setChecked(appSettings.value("GUI_Elements/checkBoxAutoTrack.isChecked").value<bool>());
@@ -249,7 +249,7 @@ void MainWindow::settingsSaveAll()
         appSettings.setValue("GUI_Elements/comboBoxRAMSaveMode.currentIndex", ui->comboBoxRAMSaveMode->currentIndex());
 
         appSettings.setValue("GUI_Elements/checkBoxDTR.isChecked", ui->checkBoxDTR->isChecked());
-        appSettings.setValue("GUI_Elements/checkBoxTrim.isChecked", ui->checkBoxTrim->isChecked());
+        appSettings.setValue("GUI_Elements/checkBoxSimplify.isChecked", ui->checkBoxSimplify->isChecked());
         appSettings.setValue("GUI_Elements/checkBoxSendKey.isChecked", ui->checkBoxSendKey->isChecked());
         appSettings.setValue("GUI_Elements/checkBoxWrapText.isChecked", ui->checkBoxWrapText->isChecked());
         appSettings.setValue("GUI_Elements/checkBoxAutoTrack.isChecked", ui->checkBoxAutoTrack->isChecked());
@@ -724,9 +724,9 @@ void MainWindow::tracerShowPointValue(QMouseEvent *event)
                           "<td>Y: %L3</td>"
                           "</tr>"
                           "</table>")
-                       .arg(graph->name())
-                       .arg(QTime::fromMSecsSinceStartOfDay(temp.x() * 1000).toString("hh:mm:ss:zzz"))
-                       .arg(QString::number(temp.y(), 'f', 5)),
+                           .arg(graph->name())
+                           .arg(QTime::fromMSecsSinceStartOfDay(temp.x() * 1000).toString("hh:mm:ss:zzz"))
+                           .arg(QString::number(temp.y(), 'f', 5)),
                        ui->widgetChart, ui->widgetChart->rect());
 }
 
@@ -797,17 +797,55 @@ void MainWindow::addLog(QString text)
     }
 }
 
+void MainWindow::addLogBytes(QString prefix, QByteArray bytes, bool hexToBinary)
+{
+    if (ui->pushButtonTextLogToggle->isChecked() == false)
+    {
+        QString currentDateTime = QDateTime::currentDateTime().toString("hh:mm:ss:zzz ");
+
+        QString bytesText;
+
+        if (hexToBinary == false)
+            bytesText = prefix + bytes.toHex(' ');
+        else
+        {
+            bytesText.append(prefix);
+            for (auto i = 0; i < bytes.size(); ++i)
+            {
+                bytesText.append(QString::number(bytes[i], 2) + ' ');
+            }
+        }
+
+        if (ui->checkBoxShowTime->isChecked())
+            bytesText = currentDateTime + bytesText;
+
+        ui->textBrowserLogs->append(bytesText);
+    }
+}
+
 void MainWindow::processSerial()
 {
-    QString serialInput = serial.getString();
+    QString serialInput = serial.getString().trimmed();
+    QByteArray serialInputBytes = serial.getBytes();
 
-    if (serialInput.isEmpty() == false)
+    if (ui->comboBoxFormat->currentIndex() == 0 && serialInput.isEmpty() == false)
     {
-        if (ui->checkBoxTrim->isChecked()) // Append text to textBrowser
-            addLog("Serial <<\t" + serialInput.trimmed());
+        if (ui->checkBoxSimplify->isChecked()) // Append text to textBrowser
+            addLog("Serial <<\t" + serialInput.simplified());
         else
             addLog("Serial <<\t" + serialInput);
+    }
+    else if (ui->comboBoxFormat->currentIndex() == 1 && serialInputBytes.length() > 0)
+    {
+        addLogBytes("Serial (HEX) <<\t", serialInputBytes);
+    }
+    else if (ui->comboBoxFormat->currentIndex() == 2 && serialInputBytes.length() > 0)
+    {
+        addLogBytes("Serial (BIN) <<\t", serialInputBytes, true);
+    }
 
+    if (serialInput.isEmpty() == false)
+    {
         parser.parse(serialInput, ui->checkBoxSyncSystemClock->isChecked(), ui->checkBoxExternalTimeReference->isChecked(), ui->lineEditExternalClockLabel->text()); // Parse string - split into labels + numeric data
         QStringList labelList = parser.getStringListLabels();
         QList<double> numericDataList = parser.getListNumericValues();
@@ -834,14 +872,27 @@ void MainWindow::writeLogToFile(QString rawLine, QStringList labelList, QList<do
 
 void MainWindow::processUDP()
 {
-    QString udpInput = networkUDP.readString();
-    if (udpInput.isEmpty() == false)
+    QString udpInput = networkUDP.readString().trimmed();
+    QByteArray udpInputBytes = networkUDP.readBytes();
+
+    if (ui->comboBoxFormat->currentIndex() == 0 && udpInput.isEmpty() == false)
     {
-        if (ui->checkBoxTrim->isChecked())
-            addLog("UDP <<\t" + udpInput.trimmed());
+        if (ui->checkBoxSimplify->isChecked())
+            addLog("UDP <<\t" + udpInput.simplified());
         else
             addLog("UDP <<\t" + udpInput);
+    }
+    else if (ui->comboBoxFormat->currentIndex() == 1 && udpInputBytes.length() > 0)
+    {
+        addLogBytes("UDP (HEX) <<\t", udpInputBytes);
+    }
+    else if (ui->comboBoxFormat->currentIndex() == 2 && udpInputBytes.length() > 0)
+    {
+        addLogBytes("UDP (BIN) <<\t", udpInputBytes, true);
+    }
 
+    if (udpInput.isEmpty() == false)
+    {
         parser.parse(udpInput, ui->checkBoxSyncSystemClock->isChecked(), ui->checkBoxExternalTimeReference->isChecked(), ui->lineEditExternalClockLabel->text()); // Parse string - split into labels + numeric data
         QStringList labelList = parser.getStringListLabels();
         QList<double> numericDataList = parser.getListNumericValues();
@@ -877,9 +928,9 @@ void MainWindow::processChart(QStringList labelList, QList<double> numericDataLi
         }
 
         if (canAddGraph && ui->widgetChart->graphCount() < ui->spinBoxMaxGraphs->value() &&
-                ((ui->comboBoxGraphDisplayMode->currentIndex() == 0) ||
-                 (ui->comboBoxGraphDisplayMode->currentIndex() == 1 &&
-                  ui->lineEditCustomParsingRules->text().simplified().contains(label, Qt::CaseSensitivity::CaseSensitive))))
+            ((ui->comboBoxGraphDisplayMode->currentIndex() == 0) ||
+             (ui->comboBoxGraphDisplayMode->currentIndex() == 1 &&
+              ui->lineEditCustomParsingRules->text().simplified().contains(label, Qt::CaseSensitivity::CaseSensitive))))
         {
             ui->widgetChart->addGraph();
             ui->widgetChart->graph()->setName(label);
@@ -1031,9 +1082,9 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
 void MainWindow::sendSerial(QString message)
 {
     if (serial.send(message))
-        this->addLog("S >>\t" + message);
+        this->addLog("Serial >>\t" + message);
     else
-        this->addLog("S >>\t Unable to send! Serial port closed !");
+        this->addLog("Serial >>\t Unable to send! Serial port closed !");
 }
 
 void MainWindow::on_checkBoxAutoRefresh_toggled(bool checked)
@@ -1559,7 +1610,7 @@ void MainWindow::sendDatagram(QString message)
         networkUDP.write(message, QHostAddress(ui->lineEditUDPTargetIP->text()), ui->spinBoxUDPTargetPort->value());
     }
 
-    addLog("App >>\t" + message);
+    addLog("UDP >>\t" + message);
 }
 
 void MainWindow::on_comboBoxUDPSendMode_currentIndexChanged(const QString &arg1)
@@ -1925,7 +1976,7 @@ void MainWindow::loadFromRAM(bool loadText)
     {
         QStringList RAMText = parser.getTextList();
         foreach (auto line, RAMText)
-            addLog(line);
+            addLog("Mem >>\t" + line);
     }
 
     if (RAMLabels.isEmpty() || RAMData.isEmpty() || RAMTime.isEmpty())
@@ -1973,18 +2024,18 @@ void MainWindow::on_pushButtonLoadFile_clicked()
 
             if (fileReader.readAllAtOnce(&inputFile))
             {
-                addLog("Read file succesfully... ");
+                addLog("App >>\t Read file succesfully... ");
             }
             else
             {
-                addLog("invalid file !");
+                addLog("App >>\t invalid file !");
                 ui->pushButtonLoadFile->setText("Load File");
                 ui->progressBarLoadFile->setValue(0);
             }
         }
         else
         {
-            addLog("File Reader - Invalid file path !");
+            addLog("App >>\t file reader error - invalid file path !");
             ui->pushButtonLoadFile->setText("Load File");
             ui->progressBarLoadFile->setValue(0);
         }

src/mainwindow.h

@@ -54,10 +54,10 @@ public slots:
     void updateProgressBar(float *percent);
 private slots:
     void aboutToQuitSlot();
+    void chartBeforeReplotSlot();
     void chartContextMenuRequest(QPoint pos);
     void chartMouseDoubleClickHandler(QMouseEvent *event);
     void chartMousePressHandler(QMouseEvent *event);
-    void chartBeforeReplotSlot();
     void chartSelectionChanged();
     void comboBoxSendReturnPressedSlot();
     void hideAllGraphs();
@@ -68,12 +68,14 @@ private slots:
     void on_actionAbout_Qt_triggered();
     void on_actionFull_chart_triggered();
     void on_actionFull_text_view_triggered();
+    void on_actionInfo_triggered();
     void on_actionPlotter_triggered();
     void on_actionPrint_Graph_triggered();
     void on_actionPrint_log_triggered();
     void on_actionQuit_triggered();
     void on_actionSave_As_triggered();
     void on_actionSave_graph_as_triggered();
+    void on_actionUser_guide_triggered();
     void on_actionWhat_s_new_triggered();
     void on_checkBoxAutoLogging_toggled(bool checked);
     void on_checkBoxAutoRefresh_toggled(bool checked);
@@ -85,6 +87,7 @@ private slots:
     void on_checkBoxSyncSystemClock_toggled(bool checked);
     void on_checkBoxWrapText_toggled(bool checked);
     void on_comboBoxGraphDisplayMode_currentIndexChanged(const QString &arg1);
+    void on_comboBoxLoggingMode_currentIndexChanged(int index);
     void on_comboBoxSerialReadMode_currentIndexChanged(int index);
     void on_comboBoxTracerStyle_currentIndexChanged(const QString &arg1);
     void on_comboBoxUDPReceiveMode_currentIndexChanged(const QString &arg1);
@@ -128,16 +131,14 @@ private slots:
     void processSerial();
     void processUDP();
     void showAllGraphs();
-    void tracerShowPointValue(QMouseEvent *event);
     void showSelectedGraph();
     void showSelectedGraphExclusively();
+    void tracerShowPointValue(QMouseEvent *event);
     void updateSerialDeviceList();
-    void on_actionUser_guide_triggered();
-    void on_actionInfo_triggered();
-    void on_comboBoxLoggingMode_currentIndexChanged(int index);
 private:
     // QCompleter *completer;
     FileReader fileReader;
+    InfoDialog infoDialog;
     Logger fileLogger;
     NetworkUDP networkUDP;
     Parser parser;
@@ -150,8 +151,8 @@ private slots:
     QTimer *udpStringProcessingTimer;
     Serial serial;
     Ui::MainWindow *ui;
-    InfoDialog infoDialog;
     void addLog(QString text);
+    void addLogBytes(QString prefix, QByteArray bytes, bool hexToBinary = false);
     void chartPrintPreview();
     void clearGraphData(bool replot);
     void clearGraphs(bool replot);
@@ -173,7 +174,6 @@ private slots:
     void setupGUI();
     void setupTable();
     void writeLogToFile(QString rawLine, QStringList labelList, QList<double> dataList, QList<long> timeList);
-
 protected:
     void keyPressEvent(QKeyEvent *event);
 };

src/mainwindow.ui

@@ -1543,15 +1543,15 @@
               </widget>
              </item>
              <item>
-              <widget class="QCheckBox" name="checkBoxTrim">
+              <widget class="QCheckBox" name="checkBoxSimplify">
                <property name="maximumSize">
                 <size>
                  <width>16777215</width>
                  <height>25</height>
                 </size>
                </property>
                <property name="text">
-                <string>Trim</string>
+                <string>Simplify</string>
                </property>
               </widget>
              </item>
@@ -1562,6 +1562,31 @@
                </property>
               </widget>
              </item>
+             <item>
+              <widget class="QComboBox" name="comboBoxFormat">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <item>
+                <property name="text">
+                 <string>TEXT</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>HEX</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>BIN</string>
+                </property>
+               </item>
+              </widget>
+             </item>
              <item>
               <spacer name="horizontalSpacer_2">
                <property name="maximumSize">
@@ -2489,7 +2514,7 @@
  </customwidgets>
  <tabstops>
   <tabstop>lineEditHighlight</tabstop>
-  <tabstop>checkBoxTrim</tabstop>
+  <tabstop>checkBoxSimplify</tabstop>
   <tabstop>pushButtonScrollToButtom</tabstop>
   <tabstop>pushButtonClear</tabstop>
   <tabstop>tabWidgetConnectivity</tabstop>