tempo-plotter Changeset - 2541096f1ba6 · protofusion repositories

Changeset - 2541096f1ba6

Parent rev.

Child rev.

[Not reviewed]

value-tracker

0 2 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-09-25 16:10:06
hy@ozderya.net

preliminary drawing of values, buggy

2 files changed with 43 insertions and 7 deletions:

src/zoomer.cpp

src/zoomer.h

0 comments (0 inline, 0 general)

src/zoomer.cpp

➞

Show inline comments

@@ @@ -60,112 +60,143 @@ void Zoomer::zoom( const QRectF & rect) @@
     ScrollZoomer::zoom(rect);
+}
 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());
     QString sizeText = QString(" [%1, %2]").\
         arg(rect.width(), 0, 'g', 4).\
         arg(rect.height(), 0, 'g', 4);
     b.setText(b.text() + sizeText);
     return b;
+}
 void Zoomer::drawRubberBand(QPainter* painter) const
+{
     const double FILL_ALPHA = 0.2;
     QColor color = painter->pen().color();
     color.setAlphaF(FILL_ALPHA);
     painter->setBrush(color);
     ScrollZoomer::drawRubberBand(painter);
+}
 QRegion Zoomer::rubberBandMask() const
+{
     const QPolygon pa = selection();
     if (pa.count() < 2)
+    {
         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;
     // ScrollZoomer::drawTracker(painter);
     if (_stream != nullptr && _stream->numChannels())
+    {
-        qDebug() << findValues(x);
+        drawValues(painter);
+    }
     return;
+}
 void Zoomer::drawValues(QPainter* painter) const
+{
     painter->save();
     double x = invTransform(trackerPosition()).x();
     auto values = findValues(x);
     qDebug() <<  x << ":" << values; // TODO: cleanup
     // draw vertical line
     painter->setPen(Qt::white);
     const QRect pRect = pickArea().boundingRect().toRect();
     int px = trackerPosition().x();
     painter->drawLine(px, pRect.top(), px, pRect.bottom());
     for (auto val : values)
+    {
         if (!std::isnan(val))
+        {
             painter->drawText(transform(QPointF(x, val)),
                               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);
     for (unsigned ci = 0; ci < nc; ci++)
+    {
         auto chan = _stream->channel(ci);
         double val = chan->findValue(x);
         r[ci] = val;
+    }
     return r;
+}
 QRect Zoomer::trackerRect(const QFont& font) const
+{
     // TODO: optimize tracker area for masking instead of returning whole plot size
     return pickArea().boundingRect().toRect();
+}
 void Zoomer::widgetMousePressEvent(QMouseEvent* mouseEvent)
+{
     if (mouseEvent->modifiers() & Qt::ControlModifier)
+    {
         is_panning = true;
         parentWidget()->setCursor(Qt::ClosedHandCursor);
         pan_point = invTransform(mouseEvent->pos());
+    }
     else
+    {
         ScrollZoomer::widgetMousePressEvent(mouseEvent);
+    }
+}
 void Zoomer::widgetMouseMoveEvent(QMouseEvent* mouseEvent)
+{
     if (is_panning)
+    {
         auto cur_point = invTransform(mouseEvent->pos());
         auto delta = cur_point - pan_point;
         moveBy(-delta.x(), -delta.y());
         pan_point = invTransform(mouseEvent->pos());
+    }
     else
+    {
         ScrollZoomer::widgetMouseMoveEvent(mouseEvent);
+    }
+}
 void Zoomer::widgetMouseReleaseEvent(QMouseEvent* mouseEvent)
+{
     if (is_panning)
+    {
         is_panning = false;
         parentWidget()->setCursor(Qt::CrossCursor);
+    }
     else
+    {
         ScrollZoomer::widgetMouseReleaseEvent(mouseEvent);
+    }
+}

src/zoomer.h

➞

Show inline comments

 /*
   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 ZOOMER_H
 #define ZOOMER_H
 #include <QVector>
 #include "scrollzoomer.h"
 #include "stream.h"
 class Zoomer : public ScrollZoomer
+{
     Q_OBJECT
 public:
     Zoomer(QWidget*, const Stream* stream, bool doReplot=true);
     void zoom(int up);
     void zoom(const QRectF&);
 signals:
     void unzoomed();
 protected:
     /// Re-implemented to display selection size in the tracker text.
     QwtText trackerTextF(const QPointF &pos) const;
     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;
+    void drawRubberBand(QPainter* painter) const override;
     /// Re-implemented to draw sample values
     void drawTracker(QPainter* painter) const;
+    void drawTracker(QPainter* painter) const override;
     /// 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;
     /// Draw sample values
     void drawValues(QPainter* painter) const;
     /// Find sample values for given X value
     QVector<double> findValues(double x) const;
 };
 #endif // ZOOMER_H

0 comments (0 inline, 0 general)