tempo-plotter Changeset - 262f56d3e063 · protofusion repositories

Changeset - 262f56d3e063

Parent rev.

Child rev.

[Not reviewed]

value-tracker

0 7 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-12-16 13:30:18
hy@ozderya.net

support multi plot and channel visibility for value tracker

7 files changed with 57 insertions and 23 deletions:

src/plot.cpp

src/plot.h

src/plotmanager.cpp

src/stream.cpp

src/stream.h

src/zoomer.cpp

src/zoomer.h

0 comments (0 inline, 0 general)

src/plot.cpp

➞

Show inline comments

@@ @@ -22,27 +22,27 @@ @@
 #include <QColor>
 #include <qwt_symbol.h>
 #include <qwt_plot_curve.h>
 #include <math.h>
 #include <algorithm>
 #include "plot.h"
 #include "utils.h"
 static const int SYMBOL_SHOW_AT_WIDTH = 5;
 static const int SYMBOL_SIZE_MAX = 7;
-Plot::Plot(const Stream* stream, QWidget* parent) :
 Plot::Plot(QWidget* parent) :
     QwtPlot(parent),
-    zoomer(this->canvas(), stream, false),
     zoomer(this->canvas(), false),
     sZoomer(this, &zoomer)
+{
     isAutoScaled = true;
     symbolSize = 0;
     numOfSamples = 1;
     plotWidth = 1;
     showSymbols = Plot::ShowSymbolsAuto;
     QObject::connect(&zoomer, &Zoomer::unzoomed, this, &Plot::unzoomed);
     zoomer.setZoomBase();
     grid.attach(this);
@@ @@ -82,24 +82,29 @@ Plot::Plot(const Stream* stream, QWidget @@
     noChannelText.setBorderRadius(4);
     noChannelText.setRenderFlags(Qt::AlignHCenter | Qt::AlignVCenter);
     noChannelIndicator.setText(noChannelText);
     noChannelIndicator.hide();
     noChannelIndicator.attach(this);
+}
 Plot::~Plot()
+{
     if (snapshotOverlay != NULL) delete snapshotOverlay;
+}
 void Plot::setDispChannels(QVector<const StreamChannel*> channels)
+{
     zoomer.setDispChannels(channels);
+}
 void Plot::setYAxis(bool autoScaled, double yAxisMin, double yAxisMax)
+{
     this->isAutoScaled = autoScaled;
     if (!autoScaled)
+    {
         yMin = yAxisMin;
         yMax = yAxisMax;
+    }
     zoomer.zoom(0);
     resetAxes();

src/plot.h

➞

Show inline comments

@@ @@ -38,27 +38,30 @@ class Plot : public QwtPlot @@
     Q_OBJECT
     friend class PlotManager;
 public:
     enum ShowSymbols
+    {
         ShowSymbolsAuto,
         ShowSymbolsShow,
         ShowSymbolsHide
     };
-    Plot(const Stream* stream, QWidget* parent = 0);
     Plot(QWidget* parent = 0);
     ~Plot();
     /// Set displayed channels for value tracking (can be null)
     void setDispChannels(QVector<const StreamChannel*> channels);
 public slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);
     void showDemoIndicator(bool show = true);
     void showNoChannel(bool show = true);
     void unzoom();
     void darkBackground(bool enabled = true);
     void setYAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     void setXAxis(double xMin, double xMax);
     void setSymbols(ShowSymbols shown);

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -45,25 +45,24 @@ PlotManager::PlotManager(QWidget* plotAr @@
                                      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)->xData(), stream->channel(i)->yData());
+    }
+}
 PlotManager::PlotManager(QWidget* plotArea, PlotMenu* menu,
                          Snapshot* snapshot, QObject *parent) :
     QObject(parent)
+{
     _stream = nullptr;
     construct(plotArea, menu);
     setNumOfSamples(snapshot->numSamples());
     setPlotWidth(snapshot->numSamples());
     infoModel = snapshot->infoModel();
@@ @@ -85,26 +84,24 @@ void PlotManager::construct(QWidget* plo @@
     _yMin = 0;
     _yMax = 1;
     _xAxisAsIndex = true;
     isDemoShown = false;
     _numOfSamples = 1;
     _plotWidth = 1;
     showSymbols = Plot::ShowSymbolsAuto;
     emptyPlot = NULL;
     // initalize layout and single widget
     isMulti = false;
     scrollArea = NULL;
     setupLayout(isMulti);
     addPlotWidget();
     // connect to  menu
     connect(menu, &PlotMenu::symbolShowChanged, this, &PlotManager:: setSymbols);
     connect(&menu->showGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &PlotManager::showGrid);
     connect(&menu->showMinorGridAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &PlotManager::showMinorGrid);
     connect(&menu->darkBackgroundAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &PlotManager::darkBackground);
     connect(&menu->showLegendAction, SELECT<bool>::OVERLOAD_OF(&QAction::toggled),
             this, &PlotManager::showLegend);
@@ @@ -208,58 +205,64 @@ void PlotManager::checkNoVisChannels() @@
                                   [](QwtPlotCurve* c) {return c->isVisible();});
     plotWidgets[0]->showNoChannel(allhidden);
     if (isMulti)
+    {
         plotWidgets[0]->showNoChannel(allhidden);
         plotWidgets[0]->setVisible(true);
+    }
+}
 void PlotManager::setMulti(bool enabled)
+{
     if (enabled == isMulti) return;
     isMulti = enabled;
     // detach all curves
     for (auto curve : curves)
+    {
         curve->detach();
+    }
     // remove all widgets
     while (plotWidgets.size())
+    {
         delete plotWidgets.takeLast();
+    }
     // setup new layout
     setupLayout(isMulti);
     if (isMulti)
+    {
         // add new widgets and attach
         int i = 0;
         for (auto curve : curves)
+        {
             auto plot = addPlotWidget();
             plot->setVisible(curve->isVisible());
             plot->setDispChannels(QVector<const StreamChannel*>(1, _stream->channel(i)));
             curve->attach(plot);
             i++;
+        }
+    }
     else
+    {
         // add a single widget
         auto plot = addPlotWidget();
         if (_stream != nullptr)
+        {
             plot->setDispChannels(_stream->allChannels());
+        }
         // attach all curves
         for (auto curve : curves)
+        {
             curve->attach(plot);
+        }
+    }
     // will skip if no plot widgets exist (can happen during constructor)
     if (plotWidgets.length())
+    {
         checkNoVisChannels();
+    }
@@ @@ -296,25 +299,25 @@ void PlotManager::setupLayout(bool multi @@
             scrollArea = NULL;
+        }
         layout = new QVBoxLayout(_plotArea);
+    }
     layout->setContentsMargins(2,2,2,2);
     layout->setSpacing(1);
+}
 Plot* PlotManager::addPlotWidget()
+{
-    auto plot = new Plot(_stream);
     auto plot = new Plot();
     plotWidgets.append(plot);
     layout->addWidget(plot);
     plot->darkBackground(_menu->darkBackgroundAction.isChecked());
     plot->showGrid(_menu->showGridAction.isChecked());
     plot->showMinorGrid(_menu->showMinorGridAction.isChecked());
     plot->showLegend(_menu->showLegendAction.isChecked());
     plot->setSymbols(_menu->showSymbols());
     plot->showDemoIndicator(isDemoShown);
     plot->setYAxis(_autoScaled, _yMin, _yMax);
     plot->setNumOfSamples(_numOfSamples);
@@ @@ -346,28 +349,30 @@ void PlotManager::_addCurve(QwtPlotCurve @@
     curves.append(curve);
     unsigned index = curves.size()-1;
     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();
         plot->setDispChannels(QVector<const StreamChannel*>(1, _stream->channel(index)));
+    }
     else
+    {
         plot = plotWidgets[0];
         plot->setDispChannels(_stream->allChannels());
+    }
     // show the curve
     curve->attach(plot);
     plot->replot();
+}
 void PlotManager::removeCurves(unsigned number)
+{
     for (unsigned i = 0; i < number; i++)
+    {
         if (!curves.isEmpty())

src/stream.cpp

➞

Show inline comments

@@ @@ -78,24 +78,34 @@ unsigned Stream::numSamples() const @@
 const StreamChannel* Stream::channel(unsigned index) const
+{
     Q_ASSERT(index < numChannels());
     return channels[index];
+}
 StreamChannel* Stream::channel(unsigned index)
+{
     return const_cast<StreamChannel*>(static_cast<const Stream&>(*this).channel(index));
+}
 QVector<const StreamChannel*> Stream::allChannels() const
+{
     QVector<const StreamChannel*> result(numChannels());
     for (unsigned ci = 0; ci < numChannels(); ci++)
+    {
         result[ci] = channel(ci);
+    }
     return result;
+}
 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)
+{

src/stream.h

➞

Show inline comments

@@ @@ -48,24 +48,25 @@ public: @@
      * @param x has X data input
      * @param ns number of samples
      */
     Stream(unsigned nc = 1, bool x = false, unsigned ns = 2);
     ~Stream();
     bool hasX() const;
     unsigned numChannels() const;
     unsigned numSamples() const;
     const StreamChannel* channel(unsigned index) const;
     StreamChannel* channel(unsigned index);
     QVector<const StreamChannel*> allChannels() const;
     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& pack);

src/zoomer.cpp

➞

Show inline comments

@@ @@ -17,29 +17,28 @@ @@
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "zoomer.h"
 #include <qwt_plot.h>
 #include <QPen>
 #include <QMouseEvent>
 #include <QtMath>
 static const int VALUE_POINT_DIAM = 4;
 static const int VALUE_TEXT_MARGIN = VALUE_POINT_DIAM + 2;
-Zoomer::Zoomer(QWidget* widget, const Stream* stream, bool doReplot) :
 Zoomer::Zoomer(QWidget* widget, bool doReplot) :
     ScrollZoomer(widget)
+{
     is_panning = false;
     _stream = stream;
     setTrackerMode(AlwaysOn);
     // set corner widget between the scrollbars with default background color
     auto cornerWidget = new QWidget();
     auto bgColor = cornerWidget->palette().color(QPalette::Window).name();
     auto styleSheet = QString("background-color:%1;").arg(bgColor);
     cornerWidget->setStyleSheet(styleSheet);
     ScrollZoomer::setCornerWidget(cornerWidget);
+}
 void Zoomer::zoom(int up)
@@ @@ -54,24 +53,29 @@ void Zoomer::zoom(int up) @@
 void Zoomer::zoom( const QRectF & rect)
+{
     // set the zoom base when user zooms in to first level
     if (zoomRectIndex() == 0)
+    {
         this->setZoomBase(false);
+    }
     ScrollZoomer::zoom(rect);
+}
 void Zoomer::setDispChannels(QVector<const StreamChannel*> channels)
+{
     dispChannels = channels;
+}
 QwtText Zoomer::trackerTextF(const QPointF& pos) const
+{
     QwtText b = ScrollZoomer::trackerTextF(pos);
     const QPolygon pa = selection();
     if (!isActive() || pa.count() < 2)
+    {
         return b;
+    }
     const QRectF rect = invTransform(QRect(pa.first(), pa.last()).normalized());
@@ @@ -103,80 +107,83 @@ QRegion Zoomer::rubberBandMask() const @@
         return QRegion();
+    }
     const QRect r = QRect(pa.first(), pa.last()).normalized().adjusted(0, 0, 1, 1);
     return QRegion(r);
+}
 void Zoomer::drawTracker(QPainter* painter) const
+{
     if (isActive())
+    {
         QwtPlotZoomer::drawTracker(painter);
+    }
-    else if (_stream != nullptr && _stream->numChannels())
+    else if (dispChannels.length())
+    {
         drawValues(painter);
+    }
+}
 void Zoomer::drawValues(QPainter* painter) const
+{
     painter->save();
     double x = invTransform(trackerPosition()).x();
     auto values = findValues(x);
     // draw vertical line
     auto linePen = QPen(Qt::DotLine);
     linePen.setColor(Qt::white);
     painter->setPen(linePen);
     const QRect pRect = pickArea().boundingRect().toRect();
     int px = trackerPosition().x();
     painter->drawLine(px, pRect.top(), px, pRect.bottom());
     // draw sample values
     for (int ci = 0; ci < values.size(); ci++)
+    {
         if (!dispChannels[ci]->visible()) continue;
         double val = values[ci];
         if (!std::isnan(val))
+        {
             auto p = transform(QPointF(x, val));
-            painter->setBrush(_stream->channel(ci)->color());
+            painter->setBrush(dispChannels[ci]->color());
             painter->setPen(Qt::NoPen);
             painter->drawEllipse(p, VALUE_POINT_DIAM, VALUE_POINT_DIAM);
             painter->setPen(Qt::white);
             // We give a very small (1x1) rectangle but disable clipping
             painter->drawText(QRectF(p.x() + VALUE_TEXT_MARGIN, p.y(), 1, 1),
                               Qt::AlignVCenter | Qt::TextDontClip,
                               QString("%1").arg(val));
+        }
+    }
     painter->restore();
+}
 QVector<double> Zoomer::findValues(double x) const
+{
     // TODO: process only channel(s) of this plot
     unsigned nc = _stream->numChannels();
     QVector<double> r(nc);
     unsigned nc = dispChannels.length();
     QVector<double> result(nc);
     for (unsigned ci = 0; ci < nc; ci++)
+    {
         auto chan = _stream->channel(ci);
         double val = chan->findValue(x);
         r[ci] = val;
         if (dispChannels[ci]->visible())
+        {
             result[ci] = dispChannels[ci]->findValue(x);
+        }
+    }
-    return r;
+    return result;
+}
 QRect Zoomer::trackerRect(const QFont& font) const
+{
     if (isActive())
+    {
         return QwtPlotZoomer::trackerRect(font);
+    }
     else
+    {
         return valueTrackerRect(font);
+    }

src/zoomer.h

➞

Show inline comments

@@ @@ -15,34 +15,36 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef ZOOMER_H
 #define ZOOMER_H
 #include <QVector>
 #include <QRect>
 #include "scrollzoomer.h"
-#include "stream.h"
+#include "streamchannel.h"
 class Zoomer : public ScrollZoomer
+{
     Q_OBJECT
 public:
-    Zoomer(QWidget*, const Stream* stream, bool doReplot=true);
     Zoomer(QWidget*, bool doReplot=true);
     void zoom(int up);
     void zoom(const QRectF&);
     /// Set displayed channels for value tracking (can be null)
     void setDispChannels(QVector<const StreamChannel*> channels);
 signals:
     void unzoomed();
 protected:
     /// Re-implemented to display selection size in the tracker text.
     QwtText trackerTextF(const QPointF &pos) const override;
     /// Re-implemented for sample value tracker
     QRect trackerRect(const QFont&) const override;
     /// Re-implemented for alpha background
     void drawRubberBand(QPainter* painter) const override;
     /// Re-implemented to draw sample values
@@ @@ -50,23 +52,24 @@ protected: @@
     /// Re-implemented for alpha background (masking is basically disabled)
     QRegion rubberBandMask() const;
     /// Overloaded for panning
     void widgetMousePressEvent(QMouseEvent* mouseEvent);
     /// Overloaded for panning
     void widgetMouseReleaseEvent(QMouseEvent* mouseEvent);
     /// Overloaded for panning
     void widgetMouseMoveEvent(QMouseEvent* mouseEvent);
 private:
     bool is_panning;
     QPointF pan_point;
     const Stream* _stream;
     /// displayed channels for value tracking
     QVector<const StreamChannel*> dispChannels;
     /// Draw sample values
     void drawValues(QPainter* painter) const;
     /// Find sample values for given X value
     QVector<double> findValues(double x) const;
     /// Returns trackerRect for value tracker
     QRect valueTrackerRect(const QFont& font) const;
 };
 #endif // ZOOMER_H

0 comments (0 inline, 0 general)