tempo-plotter Changeset - 68f79a7c6762 · protofusion repositories

Changeset - 68f79a7c6762

Parent rev.

Child rev.

[Not reviewed]

stream

0 22 0

Hasan Yavuz ÖZDERYA - 8 years ago 2018-05-15 22:18:39
hy@ozderya.net

integrated almost all code to to use new Stream class, plotting doesn't work yet

building works, needs major cleanup

22 files changed with 206 insertions and 167 deletions:

CMakeLists.txt

src/barchart.cpp

src/barchart.h

src/barplot.cpp

src/barplot.h

src/barscaledraw.cpp

src/barscaledraw.h

src/dataformatpanel.cpp

src/demoreader.h

src/framebufferseries.cpp

src/mainwindow.cpp

src/mainwindow.h

src/plotmanager.cpp

src/plotmanager.h

src/recordpanel.cpp

src/snapshot.cpp

src/snapshot.h

src/snapshotmanager.cpp

src/snapshotmanager.h

src/snapshotview.cpp

src/stream.cpp

src/stream.h

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

+#
-# Copyright © 2017 Hasan Yavuz Özderya
+# Copyright © 2018 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.
@@ @@ -94,43 +94,46 @@ else (WIN32) @@
   qt5_add_resources(RES_FILES misc/icons.qrc)
 endif (WIN32)
 add_executable(${PROGRAM_NAME} WIN32
   src/main.cpp
   src/mainwindow.cpp
   src/portcontrol.cpp
   src/plot.cpp
   src/zoomer.cpp
   src/scrollzoomer.cpp
   src/scrollbar.cpp
   src/hidabletabwidget.cpp
   src/framebuffer.cpp
   src/scalepicker.cpp
   src/scalezoomer.cpp
   src/portlist.cpp
   src/snapshot.cpp
   src/snapshotview.cpp
   src/snapshotmanager.cpp
   src/plotsnapshotoverlay.cpp
   src/commandpanel.cpp
   src/commandwidget.cpp
   src/commandedit.cpp
   src/dataformatpanel.cpp
   src/plotcontrolpanel.cpp
   src/recordpanel.cpp
   src/datarecorder.cpp
   src/tooltipfilter.cpp
   src/sneakylineedit.cpp
   src/channelmanager.cpp
   src/stream.cpp
   src/streamchannel.cpp
   src/channelinfomodel.cpp
   src/ringbuffer.cpp
   src/ringbuffer.cpp
   src/indexbuffer.cpp
   src/framebufferseries.cpp
   src/numberformatbox.cpp
   src/endiannessbox.cpp
   src/abstractreader.cpp
   src/binarystreamreader.cpp
   src/binarystreamreadersettings.cpp
   src/asciireader.cpp
   src/asciireadersettings.cpp
   src/demoreader.cpp
   src/framedreader.cpp
   src/framedreadersettings.cpp
   src/plotmanager.cpp

src/barchart.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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 <QPalette>
 #include <qwt_scale_map.h>
 #include "barchart.h"
-BarChart::BarChart(ChannelManager* channelMan)
+BarChart::BarChart(const Stream* stream)
+{
-    _channelMan = channelMan;
+    _stream = stream;
     setSpacing(0);
+}
 void BarChart::resample()
+{
     setSamples(chartData());
+}
 QVector<double> BarChart::chartData() const
+{
     unsigned numChannels = _channelMan->numOfChannels();
     unsigned numOfSamples = _channelMan->numOfSamples();
     unsigned numChannels = _stream->numChannels();
     unsigned numSamples = _stream->numSamples();
     QVector<double> data(numChannels);
     for (unsigned i = 0; i < numChannels; i++)
+    {
-        data[i] = _channelMan->channelBuffer(i)->sample(numOfSamples-1);
+        data[i] = _stream->channel(i)->yData()->sample(numSamples-1);
+    }
     return data;
+}
 QwtColumnSymbol* BarChart::specialSymbol(int sampleIndex, const QPointF& sample) const
+{
-    unsigned numChannels = _channelMan->numOfChannels();
+    unsigned numChannels = _stream->numChannels();
     if (sampleIndex < 0 || sampleIndex > (int) numChannels)
+    {
         return NULL;
+    }
     auto info = _channelMan->infoModel();
     auto color = info->color(sampleIndex);
     auto color = _stream->channel(sampleIndex)->color();
     QwtColumnSymbol* symbol = new QwtColumnSymbol(QwtColumnSymbol::Box);
     symbol->setLineWidth(1);
     symbol->setFrameStyle(QwtColumnSymbol::Plain);
     symbol->setPalette(QPalette(color));
     return symbol;
+}
 void BarChart::drawSample(
         QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
         const QRectF &canvasRect, const QwtInterval &boundingInterval,

src/barchart.h

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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 BARCHART_H
 #define BARCHART_H
 #include <qwt_plot_barchart.h>
 #include <qwt_column_symbol.h>
-#include "channelmanager.h"
+#include "stream.h"
 class BarChart : public QwtPlotBarChart
+{
 public:
-    explicit BarChart(ChannelManager* channelMan);
+    explicit BarChart(const Stream* stream);
     void resample();
     QwtColumnSymbol* specialSymbol(int sampleIndex, const QPointF&) const;
     void drawSample(
         QPainter *painter, const QwtScaleMap &xMap, const QwtScaleMap &yMap,
         const QRectF &canvasRect, const QwtInterval &boundingInterval,
         int index, const QPointF &sample ) const;
 private:
-    ChannelManager* _channelMan;
+    const Stream* _stream;
     QVector<double> chartData() const;
 };
 #endif // BARCHART_H

src/barplot.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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 "barplot.h"
 #include "barscaledraw.h"
 #include "utils.h"
 BarPlot::BarPlot(ChannelManager* channelMan, PlotMenu* menu, QWidget* parent) :
     QwtPlot(parent), _menu(menu), barChart(channelMan)
 BarPlot::BarPlot(Stream* stream, PlotMenu* menu, QWidget* parent) :
     QwtPlot(parent), _menu(menu), barChart(stream)
+{
-    _channelMan = channelMan;
+    _stream = stream;
     barChart.attach(this);
     setAxisMaxMinor(QwtPlot::xBottom, 0);
-    setAxisScaleDraw(QwtPlot::xBottom, new BarScaleDraw(channelMan));
+    setAxisScaleDraw(QwtPlot::xBottom, new BarScaleDraw(stream));
     update();
     connect(_channelMan, &ChannelManager::dataAdded, this, &BarPlot::update);
     connect(_channelMan, &ChannelManager::numOfChannelsChanged, this, &BarPlot::update);
     connect(_stream, &Stream::dataAdded, this, &BarPlot::update);
     connect(_stream, &Stream::numChannelsChanged, this, &BarPlot::update);
     // connect to menu
     connect(&menu->darkBackgroundAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &BarPlot::darkBackground);
     darkBackground(menu->darkBackgroundAction.isChecked());
+}
 void BarPlot::update()
+{
     // Note: -0.99 is used instead of -1 to handle the case of `numOfChannels==1`
-    setAxisScale(QwtPlot::xBottom, 0, _channelMan->numOfChannels()-0.99, 1);
+    setAxisScale(QwtPlot::xBottom, 0, _stream->numChannels()-0.99, 1);
     barChart.resample();
     replot();
+}
 void BarPlot::setYAxis(bool autoScaled, double yMin, double yMax)
+{
     if (autoScaled)
+    {
         setAxisAutoScale(QwtPlot::yLeft);
+    }
     else
+    {

src/barplot.h

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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 BARPLOT_H
 #define BARPLOT_H
 #include <qwt_plot.h>
-#include "channelmanager.h"
+#include "stream.h"
 #include "plotmenu.h"
 #include "barchart.h"
 class BarPlot : public QwtPlot
+{
     Q_OBJECT
 public:
-    explicit BarPlot(ChannelManager* channelMan,
+    explicit BarPlot(Stream* stream,
                      PlotMenu* menu,
                      QWidget* parent = 0);
 public slots:
     /// Set the Y axis
     void setYAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     /// Enable/disable dark background
     void darkBackground(bool enabled);
 private:
-    ChannelManager* _channelMan;
+    Stream* _stream;
     PlotMenu* _menu;
     BarChart barChart;
     QVector<double> chartData() const;
 private slots:
     void update();
 };
 #endif // BARPLOT_H

src/barscaledraw.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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 "barscaledraw.h"
 #include <QtDebug>
-BarScaleDraw::BarScaleDraw(ChannelManager* channelMan)
+BarScaleDraw::BarScaleDraw(const Stream* stream)
+{
-    _channelMan = channelMan;
+    _stream = stream;
     enableComponent(Backbone, false);
     setLabelRotation(-90);
     setLabelAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-    QObject::connect(_channelMan, &ChannelManager::channelNameChanged,
+    QObject::connect(_stream, &Stream::channelNameChanged,
             [this]()
+            {
                 invalidateCache();
             });
+}
 QwtText BarScaleDraw::label(double value) const
+{
     int index = value;
-    unsigned numChannels = _channelMan->numOfChannels();
+    unsigned numChannels = _stream->numChannels();
     if (index >=0 && index < (int) numChannels)
+    {
-        return _channelMan->channelName(index);
+        return _stream->channel(index)->name();
+    }
     else
+    {
         return QString("");
+    }
+}

src/barscaledraw.h

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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 BARSCALEDRAW_H
 #define BARSCALEDRAW_H
 #include <QStringList>
 #include <qwt_scale_draw.h>
 #include <qwt_text.h>
-#include "channelmanager.h"
+#include "stream.h"
 class BarScaleDraw : public QwtScaleDraw
+{
 public:
-    explicit BarScaleDraw(ChannelManager* channelMan);
+    explicit BarScaleDraw(const Stream* stream);
     QwtText label(double value) const;
 private:
-    ChannelManager* _channelMan;
+    const Stream* _stream;
 };
 #endif // BARSCALEDRAW_H

src/dataformatpanel.cpp

➞

Show inline comments

@@ @@ -74,42 +74,42 @@ DataFormatPanel::DataFormatPanel(QSerial @@
 DataFormatPanel::~DataFormatPanel()
+{
     delete ui;
+}
 unsigned DataFormatPanel::numChannels() const
+{
     return currentReader->numChannels();
+}
 Source* DataFormatPanel::activeSource()
+{
-    return &currentReader;
     return currentReader;
+}
 void DataFormatPanel::pause(bool enabled)
+{
     paused = enabled;
     currentReader->pause(enabled);
     demoReader.pause(enabled);
+}
 void DataFormatPanel::enableDemo(bool enabled)
+{
     if (enabled)
+    {
         demoReader.enable();
         connect(&demoReader, &DemoReader::samplesPerSecondChanged,
                 this, &DataFormatPanel::samplesPerSecondChanged);
-        emit sourceChanged(&demoreader);
+        emit sourceChanged(&demoReader);
+    }
     else
+    {
         demoReader.enable(false);
         disconnect(&demoReader, 0, this, 0);
         emit sourceChanged(currentReader);
+    }
     demoEnabled = enabled;
+}
 void DataFormatPanel::selectReader(AbstractReader* reader)
+{
@@ @@ -121,31 +121,30 @@ void DataFormatPanel::selectReader(Abstr @@
     connect(reader, SIGNAL(numOfChannelsChanged(unsigned)),
             this, SIGNAL(numOfChannelsChanged(unsigned)));
     connect(reader, SIGNAL(samplesPerSecondChanged(unsigned)),
             this, SIGNAL(samplesPerSecondChanged(unsigned)));
     // switch the settings widget
     ui->horizontalLayout->removeWidget(currentReader->settingsWidget());
     currentReader->settingsWidget()->hide();
     ui->horizontalLayout->addWidget(reader->settingsWidget(), 1);
     reader->settingsWidget()->show();
     // notify if number of channels is different
-    if (currentReader->numOfChannels() != reader->numOfChannels())
+    if (currentReader->numChannels() != reader->numChannels())
+    {
-        emit numOfChannelsChanged(reader->numOfChannels());
+        emit numOfChannelsChanged(reader->numChannels());
+    }
     reader->pause(paused);
     reader->recording = currentReader->recording;
     currentReader = reader;
     emit sourceChanged(currentReader);
+}
 void DataFormatPanel::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_DataFormat);
     // save selected format
     QString format;
     if (currentReader == &bsReader)

src/demoreader.h

➞

Show inline comments

@@ @@ -44,23 +44,27 @@ public: @@
     QWidget* settingsWidget();
     unsigned numChannels() const;
     void enable(bool enabled = true);
 public slots:
     void pause(bool);
     /// Sets the number of channels, this doesn't trigger a `numOfChannelsChanged` signal.
     void setNumOfChannels(unsigned value);
 signals:
     // TODO: added for build only, remove later
     void samplesPerSecondChanged(unsigned);
 private:
     bool paused;
     unsigned _numChannels;
     QTimer timer;
     int count;
 private slots:
     void demoTimerTimeout();
 };
 #endif // DEMOREADER_H

src/framebufferseries.cpp

➞

Show inline comments

@@ @@ -11,25 +11,25 @@ @@
   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 <math.h>
 #include "framebufferseries.h"
 FrameBufferSeries::FrameBufferSeries(FrameBuffer* buffer)
+FrameBufferSeries::FrameBufferSeries(const FrameBuffer* buffer)
+{
     xAsIndex = true;
     _xmin = 0;
     _xmax = 1;
     _buffer = buffer;
     int_index_start = 0;
     int_index_end = _buffer->size();
+}
 void FrameBufferSeries::setXAxis(bool asIndex, double xmin, double xmax)
+{
     xAsIndex = asIndex;

src/mainwindow.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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.
@@ @@ -51,35 +51,34 @@ Q_IMPORT_PLUGIN(QWindowsIntegrationPlugi @@
 const QMap<int, QString> panelSettingMap({
         {0, "Port"},
         {1, "DataFormat"},
         {2, "Plot"},
         {3, "Commands"}
     });
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     aboutDialog(this),
     portControl(&serialPort),
     channelMan(1, 1, this),
     secondaryPlot(NULL),
-    snapshotMan(this, &channelMan),
+    snapshotMan(this, &stream),
     commandPanel(&serialPort),
     dataFormatPanel(&serialPort, &channelMan, &recorder),
     recordPanel(&recorder, &channelMan),
     dataFormatPanel(&serialPort),
     recordPanel(&stream),
     updateCheckDialog(this)
+{
     ui->setupUi(this);
-    plotMan = new PlotManager(ui->plotArea, &plotMenu, channelMan.infoModel());
+    plotMan = new PlotManager(ui->plotArea, &plotMenu, &stream);
     ui->tabWidget->insertTab(0, &portControl, "Port");
     ui->tabWidget->insertTab(1, &dataFormatPanel, "Data Format");
     ui->tabWidget->insertTab(2, &plotControlPanel, "Plot");
     ui->tabWidget->insertTab(3, &commandPanel, "Commands");
     ui->tabWidget->insertTab(4, &recordPanel, "Record");
     ui->tabWidget->setCurrentIndex(0);
     auto tbPortControl = portControl.toolBar();
     addToolBar(tbPortControl);
     addToolBar(recordPanel.toolbar());
     ui->plotToolBar->addAction(snapshotMan.takeSnapshotAction());
@@ @@ -170,36 +169,26 @@ MainWindow::MainWindow(QWidget *parent) @@
             plotMan, &PlotManager::setXAxis);
     connect(&plotControlPanel, &PlotControlPanel::plotWidthChanged,
             plotMan, &PlotManager::setPlotWidth);
     // plot toolbar signals
     QObject::connect(ui->actionClear, SIGNAL(triggered(bool)),
                      this, SLOT(clearPlot()));
     QObject::connect(snapshotMan.takeSnapshotAction(), &QAction::triggered,
                      plotMan, &PlotManager::flashSnapshotOverlay);
     // init data format and reader
     QObject::connect(&channelMan, &ChannelManager::dataAdded,
                      plotMan, &PlotManager::replot);
     QObject::connect(ui->actionPause, &QAction::triggered,
                      &channelMan, &ChannelManager::pause);
     QObject::connect(&recordPanel, &RecordPanel::recordStarted,
                      &dataFormatPanel, &DataFormatPanel::startRecording);
     QObject::connect(&recordPanel, &RecordPanel::recordStopped,
                      &dataFormatPanel, &DataFormatPanel::stopRecording);
                      &stream, &Stream::pause);
     QObject::connect(ui->actionPause, &QAction::triggered,
                      [this](bool enabled)
+                     {
                          if (enabled && !recordPanel.recordPaused())
+                         {
                              dataFormatPanel.pause(true);
+                         }
                          else
+                         {
                              dataFormatPanel.pause(false);
+                         }
@@ @@ -210,42 +199,26 @@ MainWindow::MainWindow(QWidget *parent) @@
+                     {
                          if (ui->actionPause->isChecked() && enabled)
+                         {
                              dataFormatPanel.pause(false);
+                         }
                      });
     connect(&serialPort, &QIODevice::aboutToClose,
             &recordPanel, &RecordPanel::onPortClose);
     // init data arrays and plot
     numOfSamples = plotControlPanel.numOfSamples();
     unsigned numOfChannels = dataFormatPanel.numOfChannels();
     channelMan.setNumOfSamples(numOfSamples);
     channelMan.setNumOfChannels(dataFormatPanel.numOfChannels());
     connect(&dataFormatPanel, &DataFormatPanel::numOfChannelsChanged,
             &channelMan, &ChannelManager::setNumOfChannels);
     connect(&channelMan, &ChannelManager::numOfChannelsChanged,
             this, &MainWindow::onNumOfChannelsChanged);
     plotControlPanel.setChannelInfoModel(channelMan.infoModel());
     // init curve list
     for (unsigned int i = 0; i < numOfChannels; i++)
+    {
         plotMan->addCurve(channelMan.channelName(i), channelMan.channelBuffer(i));
+    }
     stream.setNumSamples(numOfSamples);
     plotControlPanel.setChannelInfoModel(stream.infoModel());
     // init scales
     plotMan->setYAxis(plotControlPanel.autoScale(),
                       plotControlPanel.yMin(), plotControlPanel.yMax());
     plotMan->setXAxis(plotControlPanel.xAxisAsIndex(),
                       plotControlPanel.xMin(), plotControlPanel.xMax());
     plotMan->setNumOfSamples(numOfSamples);
     plotMan->setPlotWidth(plotControlPanel.plotWidth());
     // Init sps (sample per second) counter
     spsLabel.setText("0sps");
     spsLabel.setToolTip("samples per second (per channel)");
@@ @@ -361,56 +334,32 @@ void MainWindow::setupAboutDialog() @@
     uiAboutDialog.lbAbout->setText(aboutText);
+}
 void MainWindow::onPortToggled(bool open)
+{
     // make sure demo mode is disabled
     if (open && isDemoRunning()) enableDemo(false);
     ui->actionDemoMode->setEnabled(!open);
+}
 void MainWindow::clearPlot()
+{
     for (unsigned ci = 0; ci < channelMan.numOfChannels(); ci++)
+    {
         channelMan.channelBuffer(ci)->clear();
+    }
     stream.clear();
     plotMan->replot();
+}
 void MainWindow::onNumOfSamplesChanged(int value)
+{
     numOfSamples = value;
     channelMan.setNumOfSamples(value);
     plotMan->replot();
+}
 void MainWindow::onNumOfChannelsChanged(unsigned value)
+{
     unsigned int oldNum = plotMan->numOfCurves();
     unsigned numOfChannels = value;
     if (numOfChannels > oldNum)
+    {
         // add new channels
         for (unsigned int i = oldNum; i < numOfChannels; i++)
+        {
             plotMan->addCurve(channelMan.channelName(i), channelMan.channelBuffer(i));
+        }
+    }
     else if(numOfChannels < oldNum)
+    {
         plotMan->removeCurves(oldNum - numOfChannels);
+    }
     stream.setNumSamples(value);
     plotMan->replot();
+}
 void MainWindow::onSpsChanged(unsigned sps)
+{
     spsLabel.setText(QString::number(sps) + "sps");
+}
 bool MainWindow::isDemoRunning()
+{
     return ui->actionDemoMode->isChecked();
+}
@@ @@ -454,25 +403,25 @@ void MainWindow::hideSecondary() @@
+    {
         qFatal("Secondary plot doesn't exist!");
+    }
     secondaryPlot->deleteLater();
     secondaryPlot = NULL;
+}
 void MainWindow::showBarPlot(bool show)
+{
     if (show)
+    {
-        auto plot = new BarPlot(&channelMan, &plotMenu);
+        auto plot = new BarPlot(&stream, &plotMenu);
         plot->setYAxis(plotControlPanel.autoScale(),
                        plotControlPanel.yMin(),
                        plotControlPanel.yMax());
         connect(&plotControlPanel, &PlotControlPanel::yScaleChanged,
                 plot, &BarPlot::setYAxis);
         showSecondary(plot);
+    }
     else
+    {
         hideSecondary();
+    }
+}
@@ @@ -538,38 +487,38 @@ void MainWindow::messageHandler(QtMsgTyp @@
     if (type == QtFatalMsg)
+    {
         __builtin_trap();
+    }
+}
 void MainWindow::saveAllSettings(QSettings* settings)
+{
     saveMWSettings(settings);
     portControl.saveSettings(settings);
     dataFormatPanel.saveSettings(settings);
-    channelMan.saveSettings(settings);
+    stream.saveSettings(settings);
     plotControlPanel.saveSettings(settings);
     plotMenu.saveSettings(settings);
     commandPanel.saveSettings(settings);
     recordPanel.saveSettings(settings);
     updateCheckDialog.saveSettings(settings);
+}
 void MainWindow::loadAllSettings(QSettings* settings)
+{
     loadMWSettings(settings);
     portControl.loadSettings(settings);
     dataFormatPanel.loadSettings(settings);
-    channelMan.loadSettings(settings);
+    stream.loadSettings(settings);
     plotControlPanel.loadSettings(settings);
     plotMenu.loadSettings(settings);
     commandPanel.loadSettings(settings);
     recordPanel.loadSettings(settings);
     updateCheckDialog.loadSettings(settings);
+}
 void MainWindow::saveMWSettings(QSettings* settings)
+{
     // save window geometry
     settings->beginGroup(SettingGroup_MainWindow);
     settings->setValue(SG_MainWindow_Size, size());

src/mainwindow.h

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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.
@@ @@ -31,26 +31,25 @@ @@
 #include <QTimer>
 #include <QColor>
 #include <QtGlobal>
 #include <QSettings>
 #include <qwt_plot_curve.h>
 #include "portcontrol.h"
 #include "commandpanel.h"
 #include "dataformatpanel.h"
 #include "plotcontrolpanel.h"
 #include "recordpanel.h"
 #include "ui_about_dialog.h"
 #include "framebuffer.h"
 #include "channelmanager.h"
 #include "stream.h"
 #include "snapshotmanager.h"
 #include "plotmanager.h"
 #include "plotmenu.h"
 #include "datarecorder.h"
 #include "updatecheckdialog.h"
 namespace Ui {
 class MainWindow;
+}
 class MainWindow : public QMainWindow
+{
@@ @@ -68,25 +67,26 @@ public: @@
 private:
     Ui::MainWindow *ui;
     QDialog aboutDialog;
     void setupAboutDialog();
     QSerialPort serialPort;
     PortControl portControl;
     unsigned int numOfSamples;
     QList<QwtPlotCurve*> curves;
     ChannelManager channelMan;
     // ChannelManager channelMan;
     Stream stream;
     PlotManager* plotMan;
     QWidget* secondaryPlot;
     SnapshotManager snapshotMan;
     DataRecorder recorder;       // operated by `recordPanel`
     QLabel spsLabel;
     CommandPanel commandPanel;
     DataFormatPanel dataFormatPanel;
     RecordPanel recordPanel;
     PlotControlPanel plotControlPanel;
     PlotMenu plotMenu;
     UpdateCheckDialog updateCheckDialog;
@@ @@ -105,25 +105,24 @@ private: @@
     /// Stores main window settings into a `QSettings`
     void saveMWSettings(QSettings* settings);
     /// Loads main window settings from a `QSettings`
     void loadMWSettings(QSettings* settings);
     /// `QWidget::closeEvent` handler
     void closeEvent(QCloseEvent * event);
 private slots:
     void onPortToggled(bool open);
     void onNumOfSamplesChanged(int value);
     void onNumOfChannelsChanged(unsigned value);
     void clearPlot();
     void onSpsChanged(unsigned sps);
     void enableDemo(bool enabled);
     void showBarPlot(bool show);
     void onExportCsv();
     void onSaveSettings();
     void onLoadSettings();
 };
 #endif // MAINWINDOW_H

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -22,32 +22,80 @@ @@
 #include <QtDebug>
 #include "qwt_symbol.h"
 #include "plot.h"
 #include "plotmanager.h"
 #include "utils.h"
 #include "setting_defines.h"
 PlotManager::PlotManager(QWidget* plotArea, PlotMenu* menu,
                          const Stream* stream, QObject* parent) :
     QObject(parent)
+{
     construct(plotArea, menu);
     _stream = stream;
     if (_stream == NULL) return;
     // connect to ChannelInfoModel
     infoModel = _stream->infoModel();
     connect(infoModel, &QAbstractItemModel::dataChanged,
                 this, &PlotManager::onChannelInfoChanged);
     connect(infoModel, &QAbstractItemModel::modelReset,
             [this]()
+            {
                 onChannelInfoChanged(infoModel->index(0, 0), // start
                                      infoModel->index(infoModel->rowCount()-1, 0), // end
                                      {}); // roles ignored
             });
     connect(stream, &Stream::numChannelsChanged, this, &PlotManager::onNumChannelsChanged);
     connect(stream, &Stream::dataAdded, this, &PlotManager::replot);
     // add initial curves if any?
     for (unsigned int i = 0; i < stream->numChannels(); i++)
+    {
         addCurve(stream->channel(i)->name(), stream->channel(i)->yData());
+    }
+}
 PlotManager::PlotManager(QWidget* plotArea, PlotMenu* menu,
                          Snapshot* snapshot, QObject *parent) :
     QObject(parent)
+{
     construct(plotArea, menu);
     setNumOfSamples(snapshot->numSamples());
     setPlotWidth(snapshot->numSamples());
     for (unsigned ci = 0; ci < snapshot->numChannels(); ci++)
+    {
         addCurve(snapshot->channelName(ci), snapshot->data[ci]);
+    }
     infoModel = snapshot->infoModel();
     connect(infoModel, &QAbstractItemModel::dataChanged,
             this, &PlotManager::onChannelInfoChanged);
+}
 void PlotManager::construct(QWidget* plotArea, PlotMenu* menu)
+{
     _menu = menu;
     _plotArea = plotArea;
     _autoScaled = true;
     _yMin = 0;
     _yMax = 1;
     _xAxisAsIndex = true;
     isDemoShown = false;
     _stream = stream;
     _numOfSamples = 1;
     _plotWidth = 1;
     showSymbols = Plot::ShowSymbolsAuto;
     emptyPlot = NULL;
     // initalize layout and single widget
     isMulti = false;
     scrollArea = NULL;
     setupLayout(isMulti);
     addPlotWidget();
     // connect to  menu
@@ @@ -63,59 +111,64 @@ PlotManager::PlotManager(QWidget* plotAr @@
             this, &PlotManager::showLegend);
     connect(&menu->showMultiAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &PlotManager::setMulti);
     connect(&menu->unzoomAction, &QAction::triggered,
             this, &PlotManager::unzoom);
     // initial settings from menu actions
     showGrid(menu->showGridAction.isChecked());
     showMinorGrid(menu->showMinorGridAction.isChecked());
     darkBackground(menu->darkBackgroundAction.isChecked());
     showLegend(menu->showLegendAction.isChecked());
     setMulti(menu->showMultiAction.isChecked());
     // connect to channel info model
     if (_stream != NULL)
+    {
         auto infoModel = _stream->infoModel();
         connect(infoModel, &QAbstractItemModel::dataChanged,
                 this, &PlotManager::onChannelInfoChanged);
         connect(infoModel, &QAbstractItemModel::modelReset,
                 [this]()
+                {
                     onChannelInfoChanged(infoModel->index(0, 0), // start
                                          infoModel->index(infoModel->rowCount()-1, 0), // end
                                          {}); // roles ignored
                 });
+    }
+}
 PlotManager::~PlotManager()
+{
     while (curves.size())
+    {
         delete curves.takeLast();
+    }
     // remove all widgets
     while (plotWidgets.size())
+    {
         delete plotWidgets.takeLast();
+    }
     if (scrollArea != NULL) delete scrollArea;
     if (emptyPlot != NULL) delete emptyPlot;
+}
 void PlotManager::onNumChannelsChanged(unsigned value)
+{
     unsigned int oldNum = numOfCurves();
     unsigned numOfChannels = value;
     if (numOfChannels > oldNum)
+    {
         // add new channels
         for (unsigned int i = oldNum; i < numOfChannels; i++)
+        {
             addCurve(_stream->channel(i)->name(), _stream->channel(i)->yData());
+        }
+    }
     else if(numOfChannels < oldNum)
+    {
         removeCurves(oldNum - numOfChannels);
+    }
     replot();
+}
 void PlotManager::onChannelInfoChanged(const QModelIndex &topLeft,
                                        const QModelIndex &bottomRight,
                                        const QVector<int> &roles)
+{
     int start = topLeft.row();
     int end = bottomRight.row();
     for (int ci = start; ci <= end; ci++)
+    {
         QString name = topLeft.sibling(ci, ChannelInfoModel::COLUMN_NAME).data(Qt::EditRole).toString();
         QColor color = topLeft.sibling(ci, ChannelInfoModel::COLUMN_NAME).data(Qt::ForegroundRole).value<QColor>();
         bool visible = topLeft.sibling(ci, ChannelInfoModel::COLUMN_VISIBILITY).data(Qt::CheckStateRole).toBool();
@@ @@ -267,47 +320,47 @@ Plot* PlotManager::addPlotWidget() @@
     if (_xAxisAsIndex)
+    {
         plot->setXAxis(0, _numOfSamples);
+    }
     else
+    {
         plot->setXAxis(_xMin, _xMax);
+    }
     return plot;
+}
 void PlotManager::addCurve(QString title, FrameBuffer* buffer)
+void PlotManager::addCurve(QString title, const FrameBuffer* buffer)
+{
     auto curve = new QwtPlotCurve(title);
     auto series = new FrameBufferSeries(buffer);
     series->setXAxis(_xAxisAsIndex, _xMin, _xMax);
     curve->setSamples(series);
     _addCurve(curve);
+}
 void PlotManager::addCurve(QString title, QVector<QPointF> data)
+{
     auto curve = new QwtPlotCurve(title);
     curve->setSamples(data);
     _addCurve(curve);
+}
 void PlotManager::_addCurve(QwtPlotCurve* curve)
+{
     // store and init the curve
     curves.append(curve);
     unsigned index = curves.size()-1;
-    auto color = _stream->channel(index)->color();
+    auto color = infoModel->color(index);
     curve->setPen(color);
     // create the plot for the curve if we are on multi display
     Plot* plot;
     if (isMulti)
+    {
         // create a new plot widget
         plot = addPlotWidget();
+    }
     else
+    {
         plot = plotWidgets[0];

src/plotmanager.h

➞

Show inline comments

@@ @@ -23,38 +23,42 @@ @@
 #include <QObject>
 #include <QWidget>
 #include <QScrollArea>
 #include <QVBoxLayout>
 #include <QList>
 #include <QSettings>
 #include <QMenu>
 #include <qwt_plot_curve.h>
 #include "plot.h"
 #include "framebufferseries.h"
 #include "stream.h"
 #include "snapshot.h"
 #include "plotmenu.h"
 class PlotManager : public QObject
+{
     Q_OBJECT
 public:
     explicit PlotManager(QWidget* plotArea, PlotMenu* menu,
                          const Stream* stream = NULL,
                          QObject *parent = 0);
     explicit PlotManager(QWidget* plotArea, PlotMenu* menu,
                          Snapshot* snapshot,
                          QObject *parent = 0);
     ~PlotManager();
     /// Add a new curve with title and buffer. A color is
     /// automatically chosen for curve.
     void addCurve(QString title, FrameBuffer* buffer);
+    void addCurve(QString title, const FrameBuffer* buffer);
     /// Alternative of `addCurve` for static curve data (snapshots).
     void addCurve(QString title, QVector<QPointF> data);
     /// Removes curves from the end
     void removeCurves(unsigned number);
     /// Returns current number of curves known by plot manager
     unsigned numOfCurves();
 public slots:
     /// Enable/Disable multiple plot display
     void setMulti(bool enabled);
     /// Update all plot widgets
     void replot();
@@ @@ -71,49 +75,53 @@ public slots: @@
     /// Maximum width of X axis (limit of hscroll)
     void setPlotWidth(double width);
 private:
     bool isMulti;
     QWidget* _plotArea;
     PlotMenu* _menu;
     QVBoxLayout* layout; ///< layout of the `plotArea`
     QScrollArea* scrollArea;
     QList<QwtPlotCurve*> curves;
     QList<Plot*> plotWidgets;
     Plot* emptyPlot;  ///< for displaying when all channels are hidden
     const Stream* stream;       ///< attached stream, can be `NULL`
     const Stream* _stream;       ///< attached stream, can be `NULL`
     const ChannelInfoModel* infoModel;
     bool isDemoShown;
     bool _autoScaled;
     double _yMin;
     double _yMax;
     bool _xAxisAsIndex;
     double _xMin;
     double _xMax;
     unsigned _numOfSamples;
     double _plotWidth;
     Plot::ShowSymbols showSymbols;
     /// Common constructor
     void construct(QWidget* plotArea, PlotMenu* menu);
     /// Setups the layout for multi or single plot
     void setupLayout(bool multiPlot);
     /// Inserts a new plot widget to the current layout.
     Plot* addPlotWidget();
     /// Returns the plot widget that given curve is attached to
     Plot* plotWidget(unsigned curveIndex);
     /// Common part of overloaded `addCurve` functions
     void _addCurve(QwtPlotCurve* curve);
     /// Check and make sure "no visible channels" text is shown
     void checkNoVisChannels();
 private slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);
     void unzoom();
     void darkBackground(bool enabled = true);
     void setSymbols(Plot::ShowSymbols shown);
     void onNumChannelsChanged(unsigned value);
     void onChannelInfoChanged(const QModelIndex & topLeft,
                               const QModelIndex & bottomRight,
                               const QVector<int> & roles = QVector<int> ());
 };
 #endif // PLOTMANAGER_H

src/recordpanel.cpp

➞

Show inline comments

@@ @@ -226,25 +226,25 @@ bool RecordPanel::confirmOverwrite(QStri @@
+    }
+}
 void RecordPanel::startRecording(void)
+{
     QStringList channelNames;
     if (ui->cbHeader->isChecked())
+    {
         channelNames = _stream->infoModel()->channelNames();
+    }
     if (recorder.startRecording(selectedFile, getSeparator(), channelNames))
+    {
-        stream->connectFollower(&recorder);
+        _stream->connectFollower(&recorder);
+    }
+}
 void RecordPanel::stopRecording(void)
+{
     recorder.stopRecording();
+}
 void RecordPanel::onPortClose()
+{
     if (recordAction.isChecked() && ui->cbStopOnClose->isChecked())
+    {

src/snapshot.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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.
@@ @@ -99,27 +99,42 @@ QString Snapshot::displayName() @@
+    {
         return name() + "*";
+    }
+}
 void Snapshot::setName(QString name)
+{
     _name = name;
     _showAction.setText(_name);
     emit nameChanged(this);
+}
 unsigned Snapshot::numChannels() const
+{
     return data.size();
+}
 unsigned Snapshot::numSamples() const
+{
     return data[0].size();
+}
 const ChannelInfoModel* Snapshot::infoModel() const
+{
     return &cInfoModel;
+}
 ChannelInfoModel* Snapshot::infoModel()
+{
-    return &cInfoModel;
+    return const_cast<ChannelInfoModel*>(static_cast<const Snapshot&>(*this).infoModel());
+}
 QString Snapshot::channelName(unsigned channel)
+{
     return cInfoModel.name(channel);
+}
 void Snapshot::save(QString fileName)
+{
     // TODO: remove code duplication (MainWindow::onExportCsv)
     QSaveFile file(fileName);

src/snapshot.h

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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.
@@ @@ -36,24 +36,27 @@ class Snapshot : public QObject @@
     Q_OBJECT
 public:
     Snapshot(MainWindow* parent, QString name, ChannelInfoModel infoModel, bool saved = false);
     ~Snapshot();
     QVector<QVector<QPointF>> data;
     QAction* showAction();
     QAction* deleteAction();
     QString name();
     QString displayName(); ///< `name()` plus '*' if snapshot is not saved
     unsigned numChannels() const; ///< number of channels in this snapshot
     unsigned numSamples() const;  ///< number of samples in every channel
     const ChannelInfoModel* infoModel() const;
     ChannelInfoModel* infoModel();
     void setName(QString name);
     QString channelName(unsigned channel);
     void save(QString fileName); ///< save snapshot data as CSV
     bool isSaved(); ///< snapshot has been saved at least once
 signals:
     void deleteRequested(Snapshot*);
     void nameChanged(Snapshot*);
 private:

src/snapshotmanager.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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.
@@ @@ -22,70 +22,72 @@ @@
 #include <QKeySequence>
 #include <QFileDialog>
 #include <QFile>
 #include <QVector>
 #include <QPointF>
 #include <QIcon>
 #include <QtDebug>
 #include "mainwindow.h"
 #include "snapshotmanager.h"
 SnapshotManager::SnapshotManager(MainWindow* mainWindow,
-                                 ChannelManager* channelMan) :
+                                 Stream* stream) :
     _menu("&Snapshots"),
     _takeSnapshotAction("&Take Snapshot", this),
     loadSnapshotAction("&Load Snapshots", this),
     clearAction("&Clear Snapshots", this)
+{
     _mainWindow = mainWindow;
-    _channelMan = channelMan;
+    _stream = stream;
     _takeSnapshotAction.setToolTip("Take a snapshot of current plot");
     _takeSnapshotAction.setShortcut(QKeySequence("F5"));
     _takeSnapshotAction.setIcon(QIcon::fromTheme("camera"));
     loadSnapshotAction.setToolTip("Load snapshots from CSV files");
     clearAction.setToolTip("Delete all snapshots");
     connect(&_takeSnapshotAction, SIGNAL(triggered(bool)),
             this, SLOT(takeSnapshot()));
     connect(&clearAction, SIGNAL(triggered(bool)),
             this, SLOT(clearSnapshots()));
     connect(&loadSnapshotAction, SIGNAL(triggered(bool)),
             this, SLOT(loadSnapshots()));
     updateMenu();
+}
 SnapshotManager::~SnapshotManager()
+{
     for (auto snapshot : snapshots)
+    {
         delete snapshot;
+    }
+}
 Snapshot* SnapshotManager::makeSnapshot()
+Snapshot* SnapshotManager::makeSnapshot() const
+{
     QString name = QTime::currentTime().toString("'Snapshot ['HH:mm:ss']'");
-    auto snapshot = new Snapshot(_mainWindow, name, *(_channelMan->infoModel()));
+    auto snapshot = new Snapshot(_mainWindow, name, *(_stream->infoModel()));
     unsigned numOfChannels = _channelMan->numOfChannels();
     unsigned numOfSamples = _channelMan->numOfSamples();
     unsigned numChannels = _stream->numChannels();
     unsigned numSamples = _stream->numSamples();
-    for (unsigned ci = 0; ci < numOfChannels; ci++)
+    for (unsigned ci = 0; ci < numChannels; ci++)
+    {
         snapshot->data.append(QVector<QPointF>(numOfSamples));
         for (unsigned i = 0; i < numOfSamples; i++)
         snapshot->data.append(QVector<QPointF>(numSamples));
         auto x = _stream->channel(ci)->xData();
         auto y = _stream->channel(ci)->yData();
         for (unsigned i = 0; i < numSamples; i++)
+        {
-            snapshot->data[ci][i] = QPointF(i, _channelMan->channelBuffer(ci)->sample(i));
+            snapshot->data[ci][i] = QPointF(x->sample(i), y->sample(i));
+        }
+    }
     return snapshot;
+}
 void SnapshotManager::takeSnapshot()
+{
     addSnapshot(makeSnapshot());
+}
 void SnapshotManager::addSnapshot(Snapshot* snapshot, bool update_menu)

src/snapshotmanager.h

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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 SNAPSHOTMANAGER_H
 #define SNAPSHOTMANAGER_H
 #include <QObject>
 #include <QAction>
 #include <QMenu>
 #include "framebuffer.h"
 #include "channelmanager.h"
 #include "stream.h"
 #include "snapshot.h"
 class MainWindow;
 class SnapshotManager : public QObject
+{
     Q_OBJECT
 public:
-    SnapshotManager(MainWindow* mainWindow, ChannelManager* channelMan);
+    SnapshotManager(MainWindow* mainWindow, Stream* stream);
     ~SnapshotManager();
     QMenu* menu();
     QAction* takeSnapshotAction();
     /// Creates a dynamically allocated snapshot object but doesn't record it in snapshots list.
     /// @note Caller is responsible for deletion of the returned `Snapshot` object.
     Snapshot* makeSnapshot();
+    Snapshot* makeSnapshot() const;
     bool isAllSaved(); ///< returns `true` if all snapshots are saved to a file
 private:
     MainWindow* _mainWindow;
-    ChannelManager* _channelMan;
+    Stream* _stream;
     QList<Snapshot*> snapshots;
     QMenu _menu;
     QAction _takeSnapshotAction;
     QAction loadSnapshotAction;
     QAction clearAction;
     void addSnapshot(Snapshot* snapshot, bool update_menu=true);
     void updateMenu();
 private slots:

src/snapshotview.cpp

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 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.
@@ @@ -21,38 +21,38 @@ @@
 #include "ui_snapshotview.h"
 SnapshotView::SnapshotView(MainWindow* parent, Snapshot* snapshot) :
     QMainWindow(parent),
     ui(new Ui::SnapshotView),
     renameDialog(this),
     plotMenu(parent->viewSettings())
+{
     _snapshot = snapshot;
     ui->setupUi(this);
-    plotMan = new PlotManager(ui->plotArea, &plotMenu, snapshot->infoModel(), this);
     plotMan = new PlotManager(ui->plotArea, &plotMenu, snapshot, this);
     ui->menuSnapshot->insertAction(ui->actionClose, snapshot->deleteAction());
     this->setWindowTitle(snapshot->displayName());
     // initialize curves
     unsigned numOfChannels = snapshot->data.size();
     unsigned numOfSamples = snapshot->data[0].size();
     for (unsigned ci = 0; ci < numOfChannels; ci++)
+    {
         plotMan->addCurve(snapshot->channelName(ci), snapshot->data[ci]);
+    }
     plotMan->setNumOfSamples(numOfSamples);
     plotMan->setPlotWidth(numOfSamples);
     // unsigned numOfChannels = snapshot->data.size();
     // unsigned numOfSamples = snapshot->data[0].size();
     // for (unsigned ci = 0; ci < numOfChannels; ci++)
     // {
     //     plotMan->addCurve(snapshot->channelName(ci), snapshot->data[ci]);
     // }
     // plotMan->setNumOfSamples(numOfSamples);
     // plotMan->setPlotWidth(numOfSamples);
     renameDialog.setWindowTitle("Rename Snapshot");
     renameDialog.setLabelText("Enter new name:");
     connect(ui->actionRename, &QAction::triggered,
             this, &SnapshotView::showRenameDialog);
     connect(ui->actionSave, &QAction::triggered,
             this, &SnapshotView::save);
     // add "View" menu
     menuBar()->insertMenu(NULL, &plotMenu);
+}

src/stream.cpp

➞

Show inline comments

@@ @@ -39,26 +39,26 @@ Stream::Stream(unsigned nc, bool x, unsi @@
+    }
     // create channels
     for (unsigned i = 0; i < nc; i++)
+    {
         auto c = new StreamChannel(i, xData, new RingBuffer(ns), &_infoModel);
         channels.append(c);
+    }
+}
 Stream::~Stream()
+{
     // notify deletion
     // delete channels
     // TODO: notify deletion
     // TODO: delete channels
+}
 bool Stream::hasX() const
+{
     return _hasx;
+}
 unsigned Stream::numChannels() const
+{
     return channels.length();
+}
@@ @@ -74,24 +74,29 @@ const StreamChannel* Stream::channel(uns @@
+}
 StreamChannel* Stream::channel(unsigned index)
+{
     return const_cast<StreamChannel*>(static_cast<const Stream&>(*this).channel(index));
+}
 const ChannelInfoModel* Stream::infoModel() const
+{
     return &_infoModel;
+}
 ChannelInfoModel* Stream::infoModel()
+{
     return const_cast<ChannelInfoModel*>(static_cast<const Stream&>(*this).infoModel());
+}
 void Stream::setNumChannels(unsigned nc, bool x)
+{
     unsigned oldNum = numChannels();
     if (oldNum == nc && x == _hasx) return;
     // adjust the number of channels
     if (nc > oldNum)
+    {
         for (unsigned i = oldNum; i < nc; i++)
+        {
             auto c = new StreamChannel(i, xData, new RingBuffer(_numSamples), &_infoModel);
             channels.append(c);

src/stream.h

➞

Show inline comments

@@ @@ -50,24 +50,25 @@ public: @@
      */
     Stream(unsigned nc = 0, bool x = false, unsigned ns = 0);
     ~Stream();
     // implementations for `Source`
     virtual bool hasX() const;
     virtual unsigned numChannels() const;
     unsigned numSamples() const;
     const StreamChannel* channel(unsigned index) const;
     StreamChannel* channel(unsigned index);
     const ChannelInfoModel* infoModel() const;
     ChannelInfoModel* infoModel();
     /// Saves channel information
     void saveSettings(QSettings* settings) const;
     /// Load channel information
     void loadSettings(QSettings* settings);
 protected:
     // implementations for `Sink`
     virtual void setNumChannels(unsigned nc, bool x);
     virtual void feedIn(const SamplePack& data);
 signals:

0 comments (0 inline, 0 general)