Added cursors

[pulseview.git] / pv / view / ruler.cpp

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index a2e280b6f2291cd57ac11ce65403fb1dac9fd99b..83863e61ea203e3a3efb08f772425a8510da029d 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -20,15 +20,19 @@
 
 #include "ruler.h"
 #include "view.h"
+#include "viewport.h"
 
 #include <extdef.h>
 
 #include <assert.h>
 #include <math.h>
 
+#include <QMouseEvent>
 #include <QPainter>
 #include <QTextStream>
 
+using namespace std;
+
 namespace pv {
 namespace view {
 
@@ -39,15 +43,22 @@ const QString Ruler::SIPrefixes[9] =
        {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"};
 const int Ruler::FirstSIPrefixPower = -15;
 
+const int Ruler::HoverArrowSize = 5;
+
 Ruler::Ruler(View &parent) :
        QWidget(&parent),
        _view(parent)
 {
+       setMouseTracking(true);
+
+       connect(&_view, SIGNAL(hover_point_changed()),
+               this, SLOT(hover_point_changed()));
 }
 
 void Ruler::paintEvent(QPaintEvent *event)
 {
        QPainter p(this);
+       p.setRenderHint(QPainter::Antialiasing);
 
        const double MinSpacing = 80;
 
@@ -56,7 +67,7 @@ void Ruler::paintEvent(QPaintEvent *event)
        const int order = (int)floorf(log10f(min_period));
        const double order_decimal = pow(10, order);
 
-       int unit = 0;
+       unsigned int unit = 0;
        double tick_period = 0.0f;
 
        do
@@ -64,11 +75,11 @@ void Ruler::paintEvent(QPaintEvent *event)
                tick_period = order_decimal * ScaleUnits[unit++];
        } while(tick_period < min_period && unit < countof(ScaleUnits));
 
-       const int prefix = (order - FirstSIPrefixPower) / 3;
+       const unsigned int prefix = (order - FirstSIPrefixPower) / 3;
        assert(prefix >= 0);
        assert(prefix < countof(SIPrefixes));
 
-       const double multiplier = pow(0.1, prefix * 3 + FirstSIPrefixPower);
+       const double multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
 
        const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
                Qt::AlignLeft | Qt::AlignTop, "8").height();
@@ -101,20 +112,61 @@ void Ruler::paintEvent(QPaintEvent *event)
                        ts << (t * multiplier) << SIPrefixes[prefix] << "s";
                        p.drawText(x, 0, 0, text_height, Qt::AlignCenter |
                                Qt::AlignTop | Qt::TextDontClip, s);
-                       p.drawLine(x, text_height, x, height());
+                       p.drawLine(QPointF(x, text_height),
+                               QPointF(x, height()));
                }
                else
                {
                        // Draw a minor tick
-                       p.drawLine(x, (text_height + height()) / 2,
-                               x, height());
+                       p.drawLine(QPointF(x, (text_height + height()) / 2),
+                               QPointF(x, height()));
                }
 
                division++;
        }
 
+       // Draw the cursors
+       draw_cursors(p);
+
+       // Draw the hover mark
+       draw_hover_mark(p);
+
        p.end();
 }
 
+void Ruler::draw_cursors(QPainter &p)
+{
+       if(!_view.cursors_shown())
+               return;
+
+       const QRect r = rect();
+       pair<Cursor, Cursor> &cursors = _view.cursors();
+       cursors.first.paint_label(p, r);
+       cursors.second.paint_label(p, r);
+}
+
+void Ruler::draw_hover_mark(QPainter &p)
+{
+       const int x = _view.hover_point().x();
+       if(x == -1)
+               return;
+
+       p.setPen(QPen(Qt::NoPen));
+       p.setBrush(QBrush(QColor(Qt::black)));
+
+       const int b = height() - 1;
+       const QPointF points[] = {
+               QPointF(x, b),
+               QPointF(x - HoverArrowSize, b - HoverArrowSize),
+               QPointF(x + HoverArrowSize, b - HoverArrowSize)
+       };
+       p.drawPolygon(points, countof(points));
+}
+
+void Ruler::hover_point_changed()
+{
+       update();
+}
+
 } // namespace view
 } // namespace pv