Introduce time units

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 0149155d24c300e0bbd8b68127548ac1d4416ac9..f25bcb8fc8fc3fabb8d2f929acc9af51775cbf2d 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -83,14 +83,6 @@ shared_ptr<ViewItem> Ruler::get_mouse_over_item(const QPoint &pt)
        return nullptr;
 }
 
-void Ruler::drag_items(const QPoint &delta)
-{
-       const vector< shared_ptr<TimeItem> > items(view_.time_items());
-       for (auto &i : items)
-               if (i->dragging())
-                       i->drag_by(delta);
-}
-
 void Ruler::paintEvent(QPaintEvent*)
 {
        const int ValueMargin = 3;
@@ -130,7 +122,7 @@ void Ruler::paintEvent(QPaintEvent*)
                        // Draw a major tick
                        p.drawText(x, ValueMargin, 0, text_height,
                                AlignCenter | AlignTop | TextDontClip,
-                               pv::util::format_time(t, prefix));
+                               util::format_time(t, prefix));
                        p.drawLine(QPointF(x, major_tick_y1),
                                QPointF(x, ruler_height));
                }
@@ -156,7 +148,7 @@ void Ruler::paintEvent(QPaintEvent*)
        // Draw the items
        const vector< shared_ptr<TimeItem> > items(view_.time_items());
        for (auto &i : items) {
-               const bool highlight = !dragging_ &&
+               const bool highlight = !item_dragging_ &&
                        i->label_rect(r).contains(mouse_point_);
                i->paint_label(p, r, highlight);
        }