tempo-plotter Changeset - e6427508f520 · protofusion repositories

Changeset - e6427508f520

Parent rev.

Child rev.

[Not reviewed]

value-tracker

0 2 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-10-01 15:39:39
hy@ozderya.net

calculate smaller trackerrect for value tracker

2 files changed with 19 insertions and 3 deletions:

src/zoomer.cpp

src/zoomer.h

0 comments (0 inline, 0 general)

src/zoomer.cpp

➞

Show inline comments

@@ @@ -12,24 +12,27 @@ @@
   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 "zoomer.h"
 #include <qwt_plot.h>
 #include <QPen>
 #include <QMouseEvent>
 #include <QtMath>
 static const int VALUE_POINT_DIAM = 4;
 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();
@@ @@ -130,25 +133,25 @@ void Zoomer::drawValues(QPainter* painte @@
     painter->drawLine(px, pRect.top(), px, pRect.bottom());
     // draw sample values
     for (int ci = 0; ci < values.size(); ci++)
+    {
         double val = values[ci];
         if (!std::isnan(val))
+        {
             auto p = transform(QPointF(x, val));
             painter->setBrush(_stream->channel(ci)->color());
             painter->setPen(Qt::NoPen);
-            painter->drawEllipse(p, 4, 4);
+            painter->drawEllipse(p, VALUE_POINT_DIAM, VALUE_POINT_DIAM);
             painter->setPen(Qt::white);
             painter->drawText(p, QString("%1").arg(val));
+        }
+    }
     painter->restore();
+}
 QVector<double> Zoomer::findValues(double x) const
+{
     // TODO: process only channel(s) of this plot
@@ @@ -162,29 +165,39 @@ QVector<double> Zoomer::findValues(doubl @@
+    }
     return r;
+}
 QRect Zoomer::trackerRect(const QFont& font) const
+{
     if (isActive())
+    {
         return QwtPlotZoomer::trackerRect(font);
+    }
     else
+    {
         // TODO: optimize tracker area for masking instead of returning whole plot size
         return pickArea().boundingRect().toRect();
         return valueTrackerRect(font);
+    }
+}
 QRect Zoomer::valueTrackerRect(const QFont& font) const
+{
     // TODO: consider using actual tracker values for width calculation
     const int textWidth = qCeil(QwtText("-8.8888888").textSize(font).width());
     const int width = textWidth + VALUE_POINT_DIAM;
     const int x = trackerPosition().x() - VALUE_POINT_DIAM;
     const auto pickRect = pickArea().boundingRect();
     return QRect(x, pickRect.y(), width, pickRect.height());
+}
 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);
+    }

src/zoomer.h

➞

Show inline comments

@@ @@ -12,24 +12,25 @@ @@
   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 <QRect>
 #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&);
@@ @@ -55,15 +56,17 @@ protected: @@
     /// 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;
     /// Returns trackerRect for value tracker
     QRect valueTrackerRect(const QFont& font) const;
 };
 #endif // ZOOMER_H

0 comments (0 inline, 0 general)