Merge remote-tracking branch 'origin/main' into main

Author: akshaybabloo

Info.plist

@@ -36,7 +36,9 @@
 	<key>UIRequiresFullScreen</key>
 	<false/>
 	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>We use Bluetooth LE to connect data logger</string>
+	<string>We use Bluetooth LE to connect data logger device</string>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>We use local network to send UDP packets</string>
 	<key>AppleMagnifiedMode</key>
 	<false/>
 </dict>

README.md

@@ -8,6 +8,8 @@ Table of Contents
 - [2. Using conan Package Manager](#2-using-conan-package-manager)
 - [3. Instillation](#3-instillation)
 - [4. Usage](#4-usage)
+  - [4.1. Streaming Data Over UDP](#41-streaming-data-over-udp)
+  - [4.2. Writing to File](#42-writing-to-file)
 
 ## 1. Requirements
 
@@ -53,4 +55,12 @@ And under `Developer and Designer Tools`, select:
 
 1. Open Qt Creator (the IDE that comes with Qt), `File -> Open File or Project...` then select `DataLogger/` folder. 
 2. The IDE should be able to automatically detect `CMakeLists.txt` file and open a configuration view, make sure you select the a configuration that looks like - `Desktop Qt 5.15.* <build type>` - `<build type>` could be `clang 64bit` (mac) or `msvc 64-bit` (windows).
-3. Clicking on the play button (bottom left) should run the program and open a GUI.
+3. Clicking on the play button (bottom left) should run the program and open a GUI.
+
+### 4.1. Streaming Data Over UDP
+
+After clicking `Stream Data` button, all the data will be streamed via `http://localhost:45454`. Clicking on the same button will stop streaming.
+
+### 4.2. Writing to File
+
+The default location is the Desktop and the file name is in the format of `DataLogger-<date and time in GMT>`. `Write to File` is a toggle button, clicking it once will write to file and clicking it again will stop it.

chart.cpp

@@ -3,8 +3,6 @@
 //
 
 #include "chart.h"
-#include <QDebug>
-#include <iostream>
 
 using namespace std;
 
@@ -45,9 +43,6 @@ void Chart::startUpdating(const QList<QLineSeries *> &seriesList, const QVector<
 
 void Chart::updateAllSeries() {
 
-    qInfo() << "updates called";
-    qInfo() << tempData.length();
-
     removeZeroRows(*matrix);
     RowVectorXd meanData = matrix->colwise().mean().normalized();
 
@@ -59,8 +54,6 @@ void Chart::updateAllSeries() {
         m_data.append(data);
     }
 
-    qInfo() << m_data.size() << c_windowWidth << pointCounter/2;
-
     for (auto &i : c_seriesList) {
         i->replace(m_data);
     }

logger.cpp

@@ -92,12 +92,18 @@ void Logger::on_actionSettings_triggered() {
 
 void Logger::on_serverButton_toggled(bool checked) {
     if (checked) {
-        ui->serverButton->setText("Stop Server");
-        emit emitServerStatusLabel("server running on 127.0.0.1:1000");
+        udpSocket = new QUdpSocket(this);
+        ui->serverButton->setText("Stop Streaming");
+        emit emitServerStatusLabel("server running on 127.0.0.1:45454");
     } else {
-        ui->serverButton->setText("Start Server");
+        udpSocket->close();
+        delete udpSocket;
+        udpSocket = nullptr;
+        ui->serverButton->setText("Stream Data");
         emit emitServerStatusLabel("");
     }
+
+    doStream = checked;
 }
 
 void Logger::slotReboot() {
@@ -256,21 +262,21 @@ void Logger::updateWaveValue(const QLowEnergyCharacteristic &info, const QByteAr
     }
     hexValue = hexValue.trimmed();
 
-    QVector<qreal> values;
+    QVector<double> realValues;
     auto hexValueArray = hexValue.split(" ");
     for (int i = 0; i < hexValueArray.length(); ++i) {
         auto nValue = -hexValueArray[i].toInt(nullptr,
                                               16); // negating value because this gives me positive value (according to c# code)
-        auto vValue = static_cast<qreal>(((nValue * 5) / 65536.0));
-        values.append(vValue);
+        auto vValue = static_cast<double>(((nValue * 5.0) / 65536.0));
+        realValues.append(vValue);
     }
 
 //    qInfo() << values;
     if (lineSeries.length() == 0) {
         qChart->legend()->hide();
         QPen red(Qt::yellow);
         red.setWidth(3);
-        for (int i = 0; i < values.length(); ++i) {
+        for (int i = 0; i < realValues.length(); ++i) {
             auto *series = new QLineSeries;
             series->setUseOpenGL(true);
             series->setPen(red);
@@ -293,9 +299,32 @@ void Logger::updateWaveValue(const QLowEnergyCharacteristic &info, const QByteAr
     }
 
 //    qreal x = qChart->plotArea().width() / axisX->tickCount();
-    chart->startUpdating(lineSeries, values, qChart->plotArea().width(), frequencyCounter);
+    chart->startUpdating(lineSeries, realValues, qChart->plotArea().width(), frequencyCounter);
 //    qInfo() << qChart->plotArea().width();
 //    qChart->scroll(x, 0);
+
+    // Converts QVector<double> to QByteArray
+    QByteArray line;
+    QDataStream stream(&line, QIODevice::WriteOnly);
+    stream << realValues;
+
+    if (doStream) {
+        udpSocket->writeDatagram(line, QHostAddress::Broadcast, 45454);
+    }
+
+    // Writes to DataLogger-(datetime in GMT).csv
+    if (isFileOpen) {
+        QTextStream out(file);
+        for (int i = 0; i < realValues.length(); ++i) {
+            if (i < realValues.length()) {
+                out << QString("%1,").arg(QString::number(realValues.value(i)));
+            } else {
+                out << QString("%1").arg(QString::number(realValues.value(i)));
+            }
+        }
+        out << Qt::endl;
+        file->flush();
+    }
 }
 
 void Logger::confirmedDescriptorWrite(const QLowEnergyDescriptor &info, const QByteArray &value) {
@@ -307,10 +336,6 @@ void Logger::confirmedDescriptorWrite(const QLowEnergyDescriptor &info, const QB
     }
 }
 
-void Logger::on_saveToFileButton_clicked() {
-
-}
-
 void Logger::countFrequency() {
     frequencyCheckDone = true;
     qInfo() << "frequency is " << frequencyCounter;
@@ -335,3 +360,21 @@ void Logger::errorService(QLowEnergyService::ServiceError error) {
     qWarning() << "Service Error: " << error;
 }
 
+
+void Logger::on_saveToFileButton_toggled(bool checked) {
+    if (checked) {
+        ui->saveToFileButton->setText("Stop Writing");
+        auto fileName = QDir(
+                QDir::fromNativeSeparators(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)) +
+                QString("/DataLogger-%1.csv").arg(QDateTime::currentDateTimeUtc().toString()));
+        file = new QFile(fileName.path());
+        file->open(QIODevice::Append | QIODevice::Text);
+    } else {
+        ui->saveToFileButton->setText("Write to File");
+        file->flush();
+        file->close();
+    }
+
+    isFileOpen = checked;
+}
+

logger.h

@@ -5,6 +5,7 @@
 #include <QtCharts>
 #include <qlowenergycontroller.h>
 #include <widgets/statusbarindicator.h>
+#include <QUdpSocket>
 #include "deviceinfo.h"
 #include "serviceinfo.h"
 #include "chart.h"
@@ -48,7 +49,7 @@ private slots:
     void on_actionAbout_DataBlogger_triggered();
     void on_actionSettings_triggered();
     void on_serverButton_toggled(bool checked);
-    void on_saveToFileButton_clicked();
+    void on_saveToFileButton_toggled(bool checked);
 
     void serviceStateChanged(QLowEnergyService::ServiceState newState);
     void updateWaveValue(const QLowEnergyCharacteristic &info, const QByteArray &value);
@@ -78,6 +79,14 @@ private slots:
     QValueAxis *axisY = nullptr;
     bool foundDataChannelService = false;
 
+    // For streaming data
+    QUdpSocket *udpSocket = nullptr;
+    bool doStream = false;
+
+    // For writing data to file
+    bool isFileOpen = false;
+    QFile *file = nullptr;
+
     // get the stream frequency
     QTimer *timer = nullptr;
     quint32 frequencyCounter = 0;

logger.ui

@@ -68,7 +68,10 @@
            <string/>
           </property>
           <property name="text">
-           <string>Save to File</string>
+           <string>Write to File</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
@@ -78,7 +81,7 @@
            <string/>
           </property>
           <property name="text">
-           <string>Start Server</string>
+           <string>Stream Data</string>
           </property>
           <property name="checkable">
            <bool>true</bool>