tempo-plotter Changeset - 4ff060c076ab · protofusion repositories

Changeset - 4ff060c076ab

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 11 years ago 2015-03-16 18:23:05
hy@ozderya.net

addData function implemented properly to show all acquired data

2 files changed with 28 insertions and 7 deletions:

mainwindow.cpp

mainwindow.h

0 comments (0 inline, 0 general)

mainwindow.cpp

➞

Show inline comments

@@ @@ -206,83 +206,104 @@ void MainWindow::onPortToggled(bool open @@
+{
     ui->pbOpenPort->setChecked(open);
+}
 void MainWindow::onDataReady()
+{
     if (!ui->actionPause->isChecked())
+    {
         int bytesAvailable = serialPort.bytesAvailable();
         if (bytesAvailable < sampleSize)
+        {
             return;
+        }
         else
+        {
             int numOfSamplesToRead =
                 (bytesAvailable - (bytesAvailable % sampleSize)) / sampleSize;
             QVector<double> samples(numOfSamplesToRead);
             int i = 0;
             while(i < numOfSamplesToRead)
+            {
                 samples.replace(i, (this->*readSample)());
                 i++;
+            }
-            addData(samples[0]);
             addData(samples);
+        }
+    }
+}
 void MainWindow::onPortError(QSerialPort::SerialPortError error)
+{
     switch(error)
+    {
         case QSerialPort::NoError :
             break;
         case QSerialPort::ResourceError :
             qDebug() << "Port error: resource unavaliable; most likely device removed.";
             if (serialPort.isOpen())
+            {
                 qDebug() << "Closing port on resource error: " << serialPort.portName();
                 togglePort();
+            }
             loadPortList();
             break;
         default:
             qDebug() << "Unhandled port error: " << error;
             break;
+    }
+}
 void MainWindow::addData(double data)
+void MainWindow::addData(QVector<double> data)
+{
     // shift data array and place new data at the end
     for (int i = 0; i < dataArray.size()-1; i++)
     int offset = numOfSamples - data.size();
     if (offset < 0)
+    {
         for (int i = 0; i < numOfSamples; i++)
+        {
             dataArray[i] = data[i - offset];
+        }
+    }
     else if (offset == 0)
+    {
-        dataArray[i] = dataArray[i+1];
+        dataArray = data;
+    }
     dataArray.last() = data;
     else
+    {
         // shift old samples
         int shift = data.size();
         for (int i = 0; i < offset; i++)
+        {
             dataArray[i] = dataArray[i + shift];
+        }
         // place new samples
         for (int i = 0; i < data.size(); i++)
+        {
             dataArray[offset + i] = data[i];
+        }
+    }
     // update plot
     curve.setSamples(dataX, dataArray);
     ui->plot->replot();
+}
 void MainWindow::clearPlot()
+{
     dataArray.fill(0.0);
     // update plot
     curve.setSamples(dataX, dataArray);
     ui->plot->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     unsigned int oldNum = this->numOfSamples;
     numOfSamples = value;
     // resize data arrays
     if (numOfSamples < oldNum)
+    {
         dataX.resize(numOfSamples);

mainwindow.h

➞

Show inline comments

@@ @@ -19,49 +19,49 @@ class MainWindow : public QMainWindow @@
 public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
 private:
     enum NumberFormat
+    {
         NumberFormat_uint8,
         NumberFormat_uint16,
         NumberFormat_uint32,
         NumberFormat_int8,
         NumberFormat_int16,
         NumberFormat_int32
     };
     Ui::MainWindow *ui;
     QButtonGroup numberFormatButtons;
     QSerialPort serialPort;
     unsigned int numOfSamples;
     QwtPlotCurve curve;
     QVector<double> dataArray;
     QVector<double> dataX;
     void addData(double data);
+    void addData(QVector<double> data);
     NumberFormat numberFormat;
     unsigned int sampleSize; // number of bytes in the selected number format
     double (MainWindow::*readSample)();
     // note that serialPort should already have enough bytes present
     template<typename T> double readSampleAs();
 private slots:
     void loadPortList();
     void loadBaudRateList();
     void togglePort();
     void selectPort(QString portName);
     void onPortToggled(bool open);
     void selectBaudRate(QString baudRate);
     void onDataReady();
     void onPortError(QSerialPort::SerialPortError error);
     void onNumOfSamplesChanged(int value);
     void onAutoScaleChecked(bool checked);
     void onYScaleChanged();
     void onNumberFormatButtonToggled(int numberFormatId, bool checked);

0 comments (0 inline, 0 general)