tempo-plotter Changeset - 14367aaacba1 · protofusion repositories

Changeset - 14367aaacba1

Parent rev.

Child rev.

[Not reviewed]

stream

0 2 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-05-13 12:36:25
hy@ozderya.net

updated framebuffer to reference "Stream" instead of infoModel

2 files changed with 14 insertions and 13 deletions:

src/plotmanager.cpp

src/plotmanager.h

0 comments (0 inline, 0 general)

src/plotmanager.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
@@ @@ -25,23 +25,23 @@ @@
 #include "plot.h"
 #include "plotmanager.h"
 #include "utils.h"
 #include "setting_defines.h"
 PlotManager::PlotManager(QWidget* plotArea, PlotMenu* menu,
-                         ChannelInfoModel* infoModel, QObject* parent) :
+                         const Stream* stream, QObject* parent) :
     QObject(parent)
+{
     _menu = menu;
     _plotArea = plotArea;
     _autoScaled = true;
     _yMin = 0;
     _yMax = 1;
     _xAxisAsIndex = true;
     isDemoShown = false;
-    _infoModel = infoModel;
+    _stream = stream;
     _numOfSamples = 1;
     _plotWidth = 1;
     showSymbols = Plot::ShowSymbolsAuto;
     emptyPlot = NULL;
     // initalize layout and single widget
@@ @@ -71,22 +71,23 @@ PlotManager::PlotManager(QWidget* plotAr @@
     showMinorGrid(menu->showMinorGridAction.isChecked());
     darkBackground(menu->darkBackgroundAction.isChecked());
     showLegend(menu->showLegendAction.isChecked());
     setMulti(menu->showMultiAction.isChecked());
     // connect to channel info model
-    if (_infoModel != NULL)     // TODO: remove when snapshots have infomodel
+    if (_stream != NULL)
+    {
         connect(_infoModel, &QAbstractItemModel::dataChanged,
         auto infoModel = _stream->infoModel();
         connect(infoModel, &QAbstractItemModel::dataChanged,
                 this, &PlotManager::onChannelInfoChanged);
-        connect(_infoModel, &QAbstractItemModel::modelReset,
+        connect(infoModel, &QAbstractItemModel::modelReset,
                 [this]()
+                {
                     onChannelInfoChanged(_infoModel->index(0, 0), // start
                                          _infoModel->index(_infoModel->rowCount()-1, 0), // end
                     onChannelInfoChanged(infoModel->index(0, 0), // start
                                          infoModel->index(infoModel->rowCount()-1, 0), // end
                                          {}); // roles ignored
                 });
+    }
+}
 PlotManager::~PlotManager()
@@ @@ -294,13 +295,13 @@ void PlotManager::addCurve(QString title @@
 void PlotManager::_addCurve(QwtPlotCurve* curve)
+{
     // store and init the curve
     curves.append(curve);
     unsigned index = curves.size()-1;
-    auto color = _infoModel->color(index);
+    auto color = _stream->channel(index)->color();
     curve->setPen(color);
     // create the plot for the curve if we are on multi display
     Plot* plot;
     if (isMulti)
+    {

src/plotmanager.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
@@ @@ -28,22 +28,22 @@ @@
 #include <QSettings>
 #include <QMenu>
 #include <qwt_plot_curve.h>
 #include "plot.h"
 #include "framebufferseries.h"
-#include "channelinfomodel.h"
+#include "stream.h"
 #include "plotmenu.h"
 class PlotManager : public QObject
+{
     Q_OBJECT
 public:
     explicit PlotManager(QWidget* plotArea, PlotMenu* menu,
-                         ChannelInfoModel* infoModel = NULL,
+                         const Stream* stream = NULL,
                          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);
     /// Alternative of `addCurve` for static curve data (snapshots).
@@ @@ -77,13 +77,13 @@ private: @@
     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
-    ChannelInfoModel* _infoModel;
+    const Stream* stream;       ///< attached stream, can be `NULL`
     bool isDemoShown;
     bool _autoScaled;
     double _yMin;
     double _yMax;
     bool _xAxisAsIndex;
     double _xMin;

0 comments (0 inline, 0 general)