Ruler: Fix tick mark calculation

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 9f8de32fd0df7686906ee6381bba581f4158340f..87f5f9b08d3f831eb638fdc065bfbeaf82cf54d3 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -22,7 +22,6 @@
 
 #include <QApplication>
 #include <QFontMetrics>
-#include <QMenu>
 #include <QMouseEvent>
 
 #include "ruler.hpp"
@@ -52,14 +51,6 @@ Ruler::Ruler(View &parent) :
                this, SLOT(hover_point_changed()));
 }
 
-void Ruler::clear_selection()
-{
-       const vector< shared_ptr<TimeItem> > items(view_.time_items());
-       for (auto &i : items)
-               i->select(false);
-       update();
-}
-
 QSize Ruler::sizeHint() const
 {
        const int text_height = calculate_text_height();
@@ -100,20 +91,19 @@ void Ruler::paintEvent(QPaintEvent*)
        p.setRenderHint(QPainter::Antialiasing);
 
        const double tick_period = view_.tick_period();
-       const unsigned int prefix = view_.tick_prefix();
 
        // Draw the tick marks
        p.setPen(palette().color(foregroundRole()));
 
        const double minor_tick_period = tick_period / MinorTickSubdivision;
-       const double first_major_division =
+       const pv::util::Timestamp first_major_division =
                floor(view_.offset() / tick_period);
-       const double first_minor_division =
+       const pv::util::Timestamp first_minor_division =
                ceil(view_.offset() / minor_tick_period);
-       const double t0 = first_major_division * tick_period;
+       const pv::util::Timestamp t0 = first_major_division * tick_period;
 
-       int division = (int)round(first_minor_division -
-               first_major_division * MinorTickSubdivision) - 1;
+       int division = (round(first_minor_division -
+               first_major_division * MinorTickSubdivision)).convert_to<int>() - 1;
 
        const int text_height = calculate_text_height();
        const int ruler_height = RulerHeight * text_height;
@@ -123,15 +113,16 @@ void Ruler::paintEvent(QPaintEvent*)
        double x;
 
        do {
-               const double t = t0 + division * minor_tick_period;
-               x = (t - view_.offset()) / view_.scale();
+               const pv::util::Timestamp t = t0 + division * minor_tick_period;
+               x = ((t - view_.offset()) / view_.scale()).convert_to<double>();
 
                if (division % MinorTickSubdivision == 0)
                {
                        // Draw a major tick
                        p.drawText(x, ValueMargin, 0, text_height,
                                AlignCenter | AlignTop | TextDontClip,
-                               pv::util::format_time(t, prefix));
+                               util::format_time(t, view_.tick_prefix(), view_.time_unit(),
+                                       view_.tick_precision()));
                        p.drawLine(QPointF(x, major_tick_y1),
                                QPointF(x, ruler_height));
                }
@@ -143,7 +134,6 @@ void Ruler::paintEvent(QPaintEvent*)
                }
 
                division++;
-
        } while (x < width());
 
        // Draw the hover mark
@@ -157,94 +147,17 @@ 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);
        }
 }
 
-void Ruler::mouseMoveEvent(QMouseEvent *e)
-{
-       mouse_point_ = e->pos();
-
-       if (!(e->buttons() & Qt::LeftButton))
-               return;
-
-       if ((e->pos() - mouse_down_point_).manhattanLength() <
-               QApplication::startDragDistance())
-               return;
-
-       // Do the drag
-       dragging_ = true;
-
-       const QPoint delta = e->pos() - mouse_down_point_;
-       const vector< shared_ptr<TimeItem> > items(view_.time_items());
-       for (auto &i : items)
-               if (i->dragging())
-                       i->drag_by(delta);
-}
-
-void Ruler::mousePressEvent(QMouseEvent *e)
-{
-       if (e->buttons() & Qt::LeftButton) {
-               mouse_down_point_ = e->pos();
-               mouse_down_item_ = get_mouse_over_item(e->pos());
-
-               clear_selection();
-
-               if (mouse_down_item_) {
-                       mouse_down_item_->select();
-                       mouse_down_item_->drag();
-               }
-
-               selection_changed();
-       }
-}
-
-void Ruler::mouseReleaseEvent(QMouseEvent *)
-{
-       using pv::widgets::Popup;
-
-       if (!dragging_ && mouse_down_item_)
-               show_popup(mouse_down_item_);
-
-       dragging_ = false;
-       mouse_down_item_.reset();
-
-       const vector< shared_ptr<TimeItem> > items(view_.time_items());
-       for (auto &i : items)
-               i->drag_release();
-}
-
 void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
 {
        view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
 }
 
-void Ruler::contextMenuEvent(QContextMenuEvent *event)
-{
-       const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
-       if (!r)
-               return;
-
-       QMenu *menu = r->create_context_menu(this);
-       if (menu)
-               menu->exec(event->globalPos());
-}
-
-void Ruler::keyPressEvent(QKeyEvent *e)
-{
-       assert(e);
-
-       if (e->key() == Qt::Key_Delete)
-       {
-               const vector< shared_ptr<TimeItem> > items(view_.time_items());
-               for (auto &i : items)
-                       if (i->selected())
-                               i->delete_pressed();
-       }
-}
-
 void Ruler::draw_hover_mark(QPainter &p, int text_height)
 {
        const int x = view_.hover_point().x();