Use a separate widget to hold the cursor labels.

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index a9a8452d47fc6784d6d736762ba4938ce3408895..86f73f95e457c7306cbc51e6e55b51e4de939417 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -20,41 +20,24 @@
 
 #include "ruler.h"
 
-#include "cursor.h"
 #include "view.h"
-#include "viewport.h"
+#include "pv/util.h"
 
 #include <extdef.h>
 
-#include <assert.h>
-#include <math.h>
-#include <limits.h>
-
-#include <QApplication>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QTextStream>
-
-#include <pv/widgets/popup.h>
-
-using namespace boost;
-using namespace std;
+using namespace Qt;
 
 namespace pv {
 namespace view {
 
+const int Ruler::RulerHeight = 30;
 const int Ruler::MinorTickSubdivision = 4;
 const int Ruler::ScaleUnits[3] = {1, 2, 5};
 
-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) :
-       MarginWidget(parent),
-       _dragging(false)
+       MarginWidget(parent)
 {
        setMouseTracking(true);
 
@@ -62,32 +45,13 @@ Ruler::Ruler(View &parent) :
                this, SLOT(hover_point_changed()));
 }
 
-void Ruler::clear_selection()
+QSize Ruler::sizeHint() const
 {
-       CursorPair &cursors = _view.cursors();
-       cursors.first()->select(false);
-       cursors.second()->select(false);
-       update();
-}
-
-QString Ruler::format_time(double t, unsigned int prefix,
-       unsigned int precision)
-{
-       const double multiplier = pow(10.0,
-               - prefix * 3 - FirstSIPrefixPower);
-
-       QString s;
-       QTextStream ts(&s);
-       ts.setRealNumberPrecision(precision);
-       ts << fixed << forcesign << (t  * multiplier) <<
-               SIPrefixes[prefix] << "s";
-       return s;
+       return QSize(0, RulerHeight);
 }
 
 void Ruler::paintEvent(QPaintEvent*)
 {
-       using namespace Qt;
-
        const double SpacingIncrement = 32.0f;
        const double MinValueSpacing = 32.0f;
        const int ValueMargin = 3;
@@ -106,7 +70,7 @@ void Ruler::paintEvent(QPaintEvent*)
                const double min_period = _view.scale() * min_width;
 
                const int order = (int)floorf(log10f(min_period));
-               const double order_decimal = pow(10, order);
+               const double order_decimal = pow(10.0, order);
 
                unsigned int unit = 0;
 
@@ -115,12 +79,10 @@ void Ruler::paintEvent(QPaintEvent*)
                        tick_period = order_decimal * ScaleUnits[unit++];
                } while (tick_period < min_period && unit < countof(ScaleUnits));
 
-               prefix = (order - FirstSIPrefixPower) / 3;
-               assert(prefix < countof(SIPrefixes));
-
+               prefix = (order - pv::util::FirstSIPrefixPower) / 3;
 
                typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-                       AlignLeft | AlignTop, format_time(_view.offset(),
+                       AlignLeft | AlignTop, pv::util::format_time(_view.offset(),
                        prefix)).width() + MinValueSpacing;
 
                min_width += SpacingIncrement;
@@ -158,7 +120,7 @@ void Ruler::paintEvent(QPaintEvent*)
                        // Draw a major tick
                        p.drawText(x, ValueMargin, 0, text_height,
                                AlignCenter | AlignTop | TextDontClip,
-                               format_time(t, prefix));
+                               pv::util::format_time(t, prefix));
                        p.drawLine(QPointF(x, major_tick_y1),
                                QPointF(x, tick_y2));
                }
@@ -173,80 +135,15 @@ void Ruler::paintEvent(QPaintEvent*)
 
        } while (x < width());
 
-       // Draw the cursors
-       if (_view.cursors_shown())
-               _view.cursors().draw_markers(p, rect(), prefix);
-
        // Draw the hover mark
        draw_hover_mark(p);
-
-       p.end();
-}
-
-void Ruler::mouseMoveEvent(QMouseEvent *e)
-{
-       if (!(e->buttons() & Qt::LeftButton))
-               return;
-       
-       if ((e->pos() - _mouse_down_point).manhattanLength() <
-               QApplication::startDragDistance())
-               return;
-
-       _dragging = true;
-
-       if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
-               m->set_time(_view.offset() +
-                       ((double)e->x() + 0.5) * _view.scale());
-}
-
-void Ruler::mousePressEvent(QMouseEvent *e)
-{
-       if (e->buttons() & Qt::LeftButton)
-       {
-               _mouse_down_point = e->pos();
-
-               _grabbed_marker.reset();
-
-               clear_selection();
-
-               if (_view.cursors_shown()) {
-                       CursorPair &cursors = _view.cursors();
-                       if (cursors.first()->get_label_rect(
-                               rect()).contains(e->pos()))
-                               _grabbed_marker = cursors.first();
-                       else if (cursors.second()->get_label_rect(
-                               rect()).contains(e->pos()))
-                               _grabbed_marker = cursors.second();
-               }
-
-               if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
-                       m->select();
-
-               selection_changed();
-       }
-}
-
-void Ruler::mouseReleaseEvent(QMouseEvent *)
-{
-       using pv::widgets::Popup;
-
-       if (!_dragging)
-               if (shared_ptr<TimeMarker> m = _grabbed_marker.lock()) {
-                       Popup *const p = m->create_popup(&_view);
-                       p->set_position(mapToGlobal(QPoint(m->get_x(),
-                               height())), Popup::Bottom);
-                       p->show();
-               }
-
-       _dragging = false;
-       _grabbed_marker.reset();
 }
 
 void Ruler::draw_hover_mark(QPainter &p)
 {
        const int x = _view.hover_point().x();
 
-       if (x == -1 || _dragging)
+       if (x == -1)
                return;
 
        p.setPen(QPen(Qt::NoPen));