tempo-plotter Changeset - 3d321162263e · protofusion repositories

Changeset - 3d321162263e

Parent rev.

Child rev.

[Not reviewed]

default

0 5 2

Hasan Yavuz ÖZDERYA - 10 years ago 2015-08-13 05:05:07
hy@ozderya.net

moved data storage related code to a new class FrameBuffer

7 files changed with 200 insertions and 86 deletions:

CMakeLists.txt

framebuffer.cpp

framebuffer.h

main.cpp

mainwindow.cpp

mainwindow.h

serialplot.pro

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -53,24 +53,25 @@ include_directories(${QWT_INCLUDE_DIR}) @@
 # wrap UI files
 qt5_wrap_ui(UI_FILES mainwindow.ui portcontrol.ui about_dialog.ui)
 add_executable(${PROGRAM_NAME} WIN32
   main.cpp
   mainwindow.cpp
   portcontrol.cpp
   customcheckablebutton.cpp
   plot.cpp
   zoomer.cpp
   hidabletabwidget.cpp
   framebuffer.cpp
   ${UI_FILES}
   misc/windows_icon.rc
+  )
 # Use the Widgets module from Qt 5.
 target_link_libraries(${PROGRAM_NAME} ${QWT_LIBRARY})
 qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Svg)
 # set compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 # Enable C++11 support, fail if not supported

framebuffer.cpp

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2015 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "framebuffer.h"
 FrameBuffer::FrameBuffer(size_t size) :
     data(size, 0.)
+{
+}
 void FrameBuffer::resize(size_t size)
+{
     size_t old_size = this->size();
     size_t new_size = size;
     if (new_size < old_size)
+    {
         data.remove(0, old_size - new_size);
+    }
     else if (new_size > old_size)
+    {
         // This is seriously inefficient!
         for (size_t i = old_size; i < new_size; i++)
+        {
             data.prepend(0);
+        }
+    }
+}
 void FrameBuffer::addSamples(QVector<double> samples)
+{
     int offset = size() - samples.size();
     if (offset < 0)
+    {
         // new samples exceed the size of frame buffer
         // excess part (from beginning) of the input will be ignored
         for (unsigned int i = 0; i < size(); i++)
+        {
             data[i] = samples[i - offset];
+        }
+    }
     else if (offset == 0) // input is the same size as the framebuffer
+    {
         data = samples;
+    }
     else // regular case; input is smaller than framebuffer
+    {
         // shift old samples
         int shift = samples.size();
         for (int i = 0; i < offset; i++)
+        {
             data[i] = data[i + shift];
+        }
         // place new samples
         for (int i = 0; i < samples.size(); i++)
+        {
             data[offset + i] = samples[i];
+        }
+    }
+}
 void FrameBuffer::clear()
+{
     data.fill(0);
+}
 size_t FrameBuffer::size() const
+{
     return (size_t) data.size();
+}
 QPointF FrameBuffer::sample(size_t i) const
+{
     return QPointF(i, data[i]);
+}
 QRectF FrameBuffer::boundingRect() const
+{
     return qwtBoundingRect(*this);
+}

framebuffer.h

➞

Show inline comments

@@ new file 100644 @@
 /*
   Copyright © 2015 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef FRAMEBUFFER_H
 #define FRAMEBUFFER_H
 #include <qwt_series_data.h>
 #include <QPointF>
 #include <QRectF>
 class FrameBuffer : public QwtSeriesData<QPointF>
+{
 public:
     FrameBuffer(size_t size);
     void resize(size_t size);
     void addSamples(QVector<double> samples);
     void clear(); // fill 0
     // QwtSeriesData implementations
     size_t size() const;
     QPointF sample(size_t i) const;
     QRectF boundingRect() const;
 private:
     QVector<double> data;
 };
 #endif // FRAMEBUFFER_H

main.cpp

➞

Show inline comments

@@ @@ -14,36 +14,70 @@ @@
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mainwindow.h"
 #include <QApplication>
 #include <QtGlobal>
 #include "version.h"
 // TEST CODE
 #include "framebuffer.h"
 // #include <QtDebug>
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
 MainWindow* pMainWindow;
 void messageHandler(QtMsgType type, const QMessageLogContext &context,
                     const QString &msg)
+{
     // TODO: don't call MainWindow::messageHandler if window is destroyed
     pMainWindow->messageHandler(type, context, msg);
+}
 int main(int argc, char *argv[])
+{
     QApplication a(argc, argv);
     MainWindow w;
     pMainWindow = &w;
     qInstallMessageHandler(messageHandler);
     // log application information
     qDebug() << "SerialPlot" << VERSION_STRING;
     qDebug() << "Revision" << VERSION_REVISION;
     w.show();
     // test framebuffer
     FrameBuffer buffer(10);
     QVector<double> s(3,15.);
     s.append(1.0);
     s.append(2.0);
     s.append(3.0);
     buffer.addSamples(s);
     // buffer.addSamples(s);
     // buffer.resize(5);
     QwtPlot plot;
     QwtPlotCurve curve;
     curve.setSamples(&buffer);
     curve.attach(&plot);
     plot.show();
     qDebug() << buffer.sample(0);
     qDebug() << buffer.sample(1);
     qDebug() << "size:" << buffer.size();
     buffer.addSamples(s);
     // curve.setSamples(&buffer);
     plot.replot();
     // qDebug() << buffer.sample(5);
     // qDebug() << buffer.sample(7);
     // qDebug() << buffer.sample(8);
     // qDebug() << buffer.sample(9);
     // qDebug() << buffer.sample(15);
     // qDebug() << buffer.sample(19);
     return a.exec();
+}

mainwindow.cpp

➞

Show inline comments

@@ @@ -128,36 +128,30 @@ MainWindow::MainWindow(QWidget *parent) @@
     // set limits for axis limit boxes
     ui->spYmin->setRange((-1) * std::numeric_limits<double>::max(),
                          std::numeric_limits<double>::max());
     ui->spYmax->setRange((-1) * std::numeric_limits<double>::max(),
                          std::numeric_limits<double>::max());
     // init data arrays and plot
     numOfSamples = ui->spNumOfSamples->value();
     numOfChannels = 1;
     dataX.resize(numOfSamples);
     for (int i = 0; i < dataX.size(); i++)
+    {
         dataX[i] = i;
+    }
     // init channel data and curve list
     for (unsigned int i = 0; i < numOfChannels; i++)
+    {
-        channelsData.append(DataArray(numOfSamples, 0.0));
+        channelBuffers.append(new FrameBuffer(numOfSamples));
         curves.append(new QwtPlotCurve());
-        curves[i]->setSamples(dataX, channelsData[i]);
+        curves[i]->setSamples(channelBuffers[i]);
         curves[i]->setPen(makeColor(i));
         curves[i]->attach(ui->plot);
+    }
     // init auto scale
     ui->plot->setAxis(ui->cbAutoScale->isChecked(),
                       ui->spYmin->value(), ui->spYmax->value());
     // init grid
     ui->plot->showGrid(ui->actionGrid->isChecked());
     ui->plot->showMinorGrid(ui->actionMinorGrid->isChecked());
@@ @@ -196,24 +190,25 @@ MainWindow::MainWindow(QWidget *parent) @@
         demoText.setRenderFlags(Qt::AlignLeft | Qt::AlignTop);
         demoIndicator.setText(demoText);
         demoIndicator.hide();
         demoIndicator.attach(ui->plot);
+    }
+}
 MainWindow::~MainWindow()
+{
     for (auto curve : curves)
+    {
         // also deletes respective FrameBuffer
         delete curve;
+    }
     if (serialPort.isOpen())
+    {
         serialPort.close();
+    }
     delete ui;
     ui = NULL; // we check if ui is deleted in messageHandler
+}
 void MainWindow::setupAboutDialog()
@@ @@ -387,137 +382,75 @@ required privileges or device is already @@
             qCritical() << "Unhandled port error: " << error;
             break;
+    }
+}
 void MainWindow::skipByte()
+{
     skipByteRequested = true;
+}
 void MainWindow::addChannelData(unsigned int channel, DataArray data)
+{
     DataArray* channelDataArray = &(channelsData[channel]);
     int offset = numOfSamples - data.size();
     if (offset < 0)
+    {
         for (unsigned int i = 0; i < numOfSamples; i++)
+        {
             (*channelDataArray)[i] = data[i - offset];
+        }
+    }
     else if (offset == 0)
+    {
         (*channelDataArray) = data;
+    }
     else
+    {
         // shift old samples
         int shift = data.size();
         for (int i = 0; i < offset; i++)
+        {
             (*channelDataArray)[i] = (*channelDataArray)[i + shift];
+        }
         // place new samples
         for (int i = 0; i < data.size(); i++)
+        {
             (*channelDataArray)[offset + i] = data[i];
+        }
+    }
     // update plot
     curves[channel]->setSamples(dataX, (*channelDataArray));
     channelBuffers[channel]->addSamples(data);
     ui->plot->replot(); // TODO: replot after all channel data updated
     sampleCount += data.size();
+}
 void MainWindow::clearPlot()
+{
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         channelsData[ci].fill(0.0);
         curves[ci]->setSamples(dataX, channelsData[ci]);
         channelBuffers[ci]->clear();
+    }
     // update plot
     ui->plot->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     unsigned int oldNum = this->numOfSamples;
     numOfSamples = value;
     // resize data arrays
     if (numOfSamples < oldNum)
+    {
         dataX.resize(numOfSamples);
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             channelsData[ci].remove(0, oldNum - numOfSamples);
             curves[ci]->setSamples(dataX, channelsData[ci]);
+        }
         ui->plot->replot();
+    }
     else if(numOfSamples > oldNum)
     for (unsigned int ci = 0; ci < numOfChannels; ci++)
+    {
         // update data arrays
         dataX.resize(numOfSamples);
         for (unsigned int i = oldNum; i < numOfSamples; i++)
+        {
             dataX[i] = i;
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 // TODO: opportunity of major optimization here
                 //       let's hope nobody sees this
                 channelsData[ci].prepend(0);
+            }
+        }
         // update curves
         for (unsigned int ci = 0; ci < numOfChannels; ci++)
+        {
             curves[ci]->setSamples(dataX, channelsData[ci]);
+        }
         ui->plot->replot();
         channelBuffers[ci]->resize(numOfSamples);
+    }
     ui->plot->replot();
+}
 void MainWindow::onNumOfChannelsChanged(int value)
+{
     unsigned int oldNum = this->numOfChannels;
     this->numOfChannels = value;
     if (numOfChannels > oldNum)
+    {
         // add new channels
         for (unsigned int i = 0; i < numOfChannels - oldNum; i++)
+        {
-            channelsData.append(DataArray(numOfSamples, 0.0));
+            channelBuffers.append(new FrameBuffer(numOfSamples));
             curves.append(new QwtPlotCurve());
-            curves.last()->setSamples(dataX, channelsData.last());
+            curves.last()->setSamples(channelBuffers.last());
             curves.last()->setPen(makeColor(curves.length()-1));
             curves.last()->attach(ui->plot);
+        }
+    }
     else if(numOfChannels < oldNum)
+    {
         // remove channels
         for (unsigned int i = 0; i < oldNum - numOfChannels; i++)
+        {
             channelsData.removeLast();
             auto curve = curves.takeLast();
             curve->detach();
             delete curve;
             // also deletes owned FrameBuffer
             delete curves.takeLast();
             channelBuffers.removeLast();
+        }
+    }
+}
 void MainWindow::onAutoScaleChecked(bool checked)
+{
     if (checked)
+    {
         ui->plot->setAxis(true);
         ui->lYmin->setEnabled(false);
         ui->lYmax->setEnabled(false);
         ui->spYmin->setEnabled(false);
@@ @@ -723,25 +656,25 @@ void MainWindow::onExportCsv() @@
             for (unsigned int ci = 0; ci < numOfChannels; ci++)
+            {
                 fileStream << "Channel " << ci;
                 if (ci != numOfChannels-1) fileStream << ",";
+            }
             fileStream << '\n';
             for (unsigned int i = 0; i < numOfSamples; i++)
+            {
                 for (unsigned int ci = 0; ci < numOfChannels; ci++)
+                {
-                    fileStream << channelsData[ci][i];
+                    fileStream << channelBuffers[ci]->sample(i).y();
                     if (ci != numOfChannels-1) fileStream << ",";
+                }
                 fileStream << '\n';
+            }
+        }
         else
+        {
             qCritical() << "File open error during export: " << file.error();
+        }
+    }
+}

mainwindow.h

➞

Show inline comments

@@ @@ -27,24 +27,25 @@ @@
 #include <QVector>
 #include <QList>
 #include <QSerialPort>
 #include <QSignalMapper>
 #include <QTimer>
 #include <QColor>
 #include <QtGlobal>
 #include <qwt_plot_curve.h>
 #include <qwt_plot_textlabel.h>
 #include "portcontrol.h"
 #include "ui_about_dialog.h"
 #include "framebuffer.h"
 namespace Ui {
 class MainWindow;
+}
 class MainWindow : public QMainWindow
+{
     Q_OBJECT
 public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
@@ @@ -70,26 +71,26 @@ private: @@
     QDialog aboutDialog;
     void setupAboutDialog();
     QSerialPort serialPort;
     PortControl portControl;
     unsigned int numOfSamples;
     unsigned int numOfChannels;
     QList<QwtPlotCurve*> curves;
     typedef QVector<double> DataArray;
     DataArray dataX;   // array that simply contains numbers 0..numberOfSamples
     QList<DataArray> channelsData;
     // Note: FrameBuffer s are owned by their respective QwtPlotCurve s.
     QList<FrameBuffer*> channelBuffers;
     // `data` contains i th channels data
     void addChannelData(unsigned int channel, DataArray 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();
     bool skipByteRequested;

serialplot.pro

➞

Show inline comments

@@ @@ -30,30 +30,32 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += @@
 TARGET = serialplot
 TEMPLATE = app
 CONFIG += qwt
 SOURCES += main.cpp\
         mainwindow.cpp \
     customcheckablebutton.cpp \
     portcontrol.cpp \
     plot.cpp \
     zoomer.cpp \
     hidabletabwidget.cpp
     hidabletabwidget.cpp \
     framebuffer.cpp
 HEADERS  += mainwindow.h \
     utils.h \
     customcheckablebutton.h \
     portcontrol.h \
     floatswap.h \
     plot.h \
     zoomer.h \
     hidabletabwidget.h
     hidabletabwidget.h \
     framebuffer.h
 FORMS    += mainwindow.ui \
     about_dialog.ui \
     portcontrol.ui
 INCLUDEPATH += qmake/
 CONFIG += c++11

0 comments (0 inline, 0 general)