tempo-plotter Changeset - 81bc58c2b941 · protofusion repositories

Changeset - 81bc58c2b941

Parent rev.

Child rev.

[Not reviewed]

value-tracker

0 9 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-09-23 12:49:48
hy@ozderya.net

find values from tracker x position, no drawing yet

9 files changed with 92 insertions and 19 deletions:

src/plot.cpp

src/plot.h

src/plotmanager.cpp

src/plotmanager.h

src/stream.h

src/streamchannel.cpp

src/streamchannel.h

src/zoomer.cpp

src/zoomer.h

0 comments (0 inline, 0 general)

src/plot.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
@@ @@ -28,15 +28,15 @@ @@
 #include "plot.h"
 #include "utils.h"
 static const int SYMBOL_SHOW_AT_WIDTH = 5;
 static const int SYMBOL_SIZE_MAX = 7;
 Plot::Plot(QWidget* parent) :
+Plot::Plot(const Stream* stream, QWidget* parent) :
     QwtPlot(parent),
     zoomer(this->canvas(), false),
+    zoomer(this->canvas(), stream, false),
     sZoomer(this, &zoomer)
+{
     isAutoScaled = true;
     symbolSize = 0;
     numOfSamples = 1;
     plotWidth = 1;

src/plot.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
@@ @@ -44,13 +44,13 @@ public: @@
+    {
         ShowSymbolsAuto,
         ShowSymbolsShow,
         ShowSymbolsHide
     };
     Plot(QWidget* parent = 0);
+    Plot(const Stream* stream, QWidget* parent = 0);
     ~Plot();
 public slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -28,15 +28,15 @@ @@
 #include "setting_defines.h"
 PlotManager::PlotManager(QWidget* plotArea, PlotMenu* menu,
                          const Stream* stream, QObject* parent) :
     QObject(parent)
+{
     _stream = stream;
     construct(plotArea, menu);
     _stream = stream;
     if (_stream == NULL) return;
     if (_stream == nullptr) return;
     // connect to ChannelInfoModel
     infoModel = _stream->infoModel();
     connect(infoModel, &QAbstractItemModel::dataChanged,
                 this, &PlotManager::onChannelInfoChanged);
     connect(infoModel, &QAbstractItemModel::modelReset,
@@ @@ -59,12 +59,13 @@ PlotManager::PlotManager(QWidget* plotAr @@
+}
 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();
@@ @@ -302,13 +303,13 @@ void PlotManager::setupLayout(bool multi @@
     layout->setContentsMargins(2,2,2,2);
     layout->setSpacing(1);
+}
 Plot* PlotManager::addPlotWidget()
+{
     auto plot = new Plot();
+    auto plot = new Plot(_stream);
     plotWidgets.append(plot);
     layout->addWidget(plot);
     plot->darkBackground(_menu->darkBackgroundAction.isChecked());
     plot->showGrid(_menu->showGridAction.isChecked());
     plot->showMinorGrid(_menu->showMinorGridAction.isChecked());

src/plotmanager.h

➞

Show inline comments

@@ @@ -38,13 +38,13 @@ @@
 class PlotManager : public QObject
+{
     Q_OBJECT
 public:
     explicit PlotManager(QWidget* plotArea, PlotMenu* menu,
-                         const Stream* stream = NULL,
+                         const Stream* stream = nullptr,
                          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
@@ @@ -79,13 +79,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
-    const Stream* _stream;       ///< attached stream, can be `NULL`
+    const Stream* _stream;       ///< attached stream, can be `nullptr`
     const ChannelInfoModel* infoModel;
     bool isDemoShown;
     bool _autoScaled;
     double _yMin;
     double _yMax;
     bool _xAxisAsIndex;

src/stream.h

➞

Show inline comments

@@ @@ -48,15 +48,14 @@ public: @@
      * @param x has X data input
      * @param ns number of samples
      */
     Stream(unsigned nc = 0, bool x = false, unsigned ns = 0);
     ~Stream();
     // implementations for `Source`
     virtual bool hasX() const;
     virtual unsigned numChannels() const;
     bool hasX() const;
     unsigned numChannels() const;
     unsigned numSamples() const;
     const StreamChannel* channel(unsigned index) const;
     StreamChannel* channel(unsigned index);
     const ChannelInfoModel* infoModel() const;
     ChannelInfoModel* infoModel();

src/streamchannel.cpp

➞

Show inline comments

@@ @@ -14,12 +14,13 @@ @@
   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 <limits>
 #include "streamchannel.h"
 StreamChannel::StreamChannel(unsigned i, const FrameBuffer* x,
               FrameBuffer* y, ChannelInfoModel* info)
+{
     _index = i;
@@ @@ -39,6 +40,38 @@ QColor StreamChannel::color() const {ret @@
 bool StreamChannel::visible() const {return _info->isVisible(_index);};
 const FrameBuffer* StreamChannel::xData() const {return _x;}
 const FrameBuffer* StreamChannel::yData() const {return _y;}
 FrameBuffer* StreamChannel::yData() {return _y;}
 const ChannelInfoModel* StreamChannel::info() const {return _info;}
 void StreamChannel::setX(const FrameBuffer* x) {_x = x;};
 double StreamChannel::findValue(double x) const
+{
     int index = findIndex(x);
     if (index >= 0)
         return _y->sample(index);
     else
         return std::numeric_limits<double>::quiet_NaN();
+}
 int StreamChannel::findIndex(double x) const
+{
     // TODO: optimize, implement in `framebuffer`
     bool first = true;
     for (int i = _x->size()-1; i > 0; i--)
+    {
         double val = _x->sample(i);
         if (x >= val)
+        {
             // TODO: optional linear approx. method
             // check if previous sample (bigger one) is actually closer
             if (!first && (x - val) > (_x->sample(i + 1) - x))
+            {
                 ++i;
+            }
             return i;
+        }
         first = false;
+    }
     return -1;
+}

src/streamchannel.h

➞

Show inline comments

@@ @@ -47,14 +47,20 @@ public: @@
     const FrameBuffer* xData() const;
     FrameBuffer* yData();
     const FrameBuffer* yData() const;
     const ChannelInfoModel* info() const;
     void setX(const FrameBuffer* x);
     /// Returns sample value for closest X
     double findValue(double x) const;
 private:
     unsigned _index;
     const FrameBuffer* _x;
     FrameBuffer* _y;
     ChannelInfoModel* _info;
     /// Finds index of closest X in `xData`
     int findIndex(double x) const;
 };
 #endif // STREAMCHANNEL_H

src/zoomer.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
@@ @@ -20,16 +20,17 @@ @@
 #include "zoomer.h"
 #include <qwt_plot.h>
 #include <QtDebug>
 #include <QMouseEvent>
 Zoomer::Zoomer(QWidget* widget, bool doReplot) :
+Zoomer::Zoomer(QWidget* widget, const Stream* stream, 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();
@@ @@ -99,12 +100,37 @@ 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
+{
     ScrollZoomer::drawTracker(painter);
     auto x = invTransform(trackerPosition()).x();
     qDebug() <<  x;
     if (_stream != nullptr && _stream->numChannels())
+    {
         qDebug() << findValues(x);
+    }
     return;
+}
 QVector<double> Zoomer::findValues(double x) const
+{
     unsigned nc = _stream->numChannels();
     QVector<double> r(nc);
     for (unsigned ci = 0; ci < nc; ci++)
+    {
         auto chan = _stream->channel(ci);
         double val = chan->findValue(x);
         r[ci] = val;
+    }
     return r;
+}
 void Zoomer::widgetMousePressEvent(QMouseEvent* mouseEvent)
+{
     if (mouseEvent->modifiers() & Qt::ControlModifier)
+    {
         is_panning = true;
         parentWidget()->setCursor(Qt::ClosedHandCursor);

src/zoomer.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
@@ @@ -17,40 +17,48 @@ @@
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef ZOOMER_H
 #define ZOOMER_H
 #include <scrollzoomer.h>
 #include <QVector>
 #include "scrollzoomer.h"
 #include "stream.h"
 class Zoomer : public ScrollZoomer
+{
     Q_OBJECT
 public:
     Zoomer(QWidget *, bool doReplot=true);
+    Zoomer(QWidget*, const Stream* stream, bool doReplot=true);
     void zoom(int up);
-    void zoom( const QRectF & );
     void zoom(const QRectF&);
 signals:
     void unzoomed();
 protected:
     /// Re-implemented to display selection size in the tracker text.
     QwtText trackerTextF(const QPointF &pos) const;
     /// Re-implemented for alpha background
     void drawRubberBand(QPainter* painter) const;
     /// Re-implemented to draw sample values
     void drawTracker(QPainter* painter) const;
     /// 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;
     QVector<double> findValues(double x) const;
 };
 #endif // ZOOMER_H

0 comments (0 inline, 0 general)