CursorHeader: Use the same number format as the ruler.

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 9e29ec294b76786ed3e3e22b7a824be056c71720..3cc2eb173404e0213c87d6161c198f2b00ad94c1 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -20,22 +20,12 @@
 
 #include "ruler.h"
 
-#include "cursor.h"
 #include "view.h"
-#include "viewport.h"
 #include "pv/util.h"
 
 #include <extdef.h>
 
-#include <QApplication>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QTextStream>
-
-#include <pv/widgets/popup.h>
-
 using namespace Qt;
-using boost::shared_ptr;
 
 namespace pv {
 namespace view {
@@ -47,8 +37,7 @@ const int Ruler::ScaleUnits[3] = {1, 2, 5};
 const int Ruler::HoverArrowSize = 5;
 
 Ruler::Ruler(View &parent) :
-       MarginWidget(parent),
-       _dragging(false)
+       MarginWidget(parent)
 {
        setMouseTracking(true);
 
@@ -56,15 +45,6 @@ Ruler::Ruler(View &parent) :
                this, SLOT(hover_point_changed()));
 }
 
-void Ruler::clear_selection()
-{
-       CursorPair &cursors = _view.cursors();
-       cursors.first()->select(false);
-       cursors.second()->select(false);
-       update();
-}
-
-
 QSize Ruler::sizeHint() const
 {
        return QSize(0, RulerHeight);
@@ -72,43 +52,16 @@ QSize Ruler::sizeHint() const
 
 void Ruler::paintEvent(QPaintEvent*)
 {
-
-       const double SpacingIncrement = 32.0f;
-       const double MinValueSpacing = 32.0f;
        const int ValueMargin = 3;
 
        QPainter p(this);
        p.setRenderHint(QPainter::Antialiasing);
 
-       double min_width = SpacingIncrement, typical_width;
-       double tick_period;
-       unsigned int prefix;
-
-       // Find tick spacing, and number formatting that does not cause
-       // value to collide.
-       do
-       {
-               const double min_period = _view.scale() * min_width;
-
-               const int order = (int)floorf(log10f(min_period));
-               const double order_decimal = pow(10.0, order);
-
-               unsigned int unit = 0;
-
-               do
-               {
-                       tick_period = order_decimal * ScaleUnits[unit++];
-               } while (tick_period < min_period && unit < countof(ScaleUnits));
-
-               prefix = (order - pv::util::FirstSIPrefixPower) / 3;
-
-               typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-                       AlignLeft | AlignTop, pv::util::format_time(_view.offset(),
-                       prefix)).width() + MinValueSpacing;
-
-               min_width += SpacingIncrement;
+       std::pair<double, unsigned int> spacing =
+               calculate_tick_spacing(p, _view.scale(), _view.offset());
 
-       } while(typical_width > tick_period / _view.scale());
+       double tick_period = spacing.first;
+       unsigned int prefix = spacing.second;
 
        const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
                AlignLeft | AlignTop, "8").height();
@@ -156,80 +109,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));
@@ -249,5 +137,41 @@ void Ruler::hover_point_changed()
        update();
 }
 
+std::pair<double, unsigned int> Ruler::calculate_tick_spacing(
+       QPainter& p, double scale, double offset)
+{
+       const double SpacingIncrement = 32.0f;
+       const double MinValueSpacing = 32.0f;
+
+       double min_width = SpacingIncrement, typical_width;
+
+       double tick_period;
+       unsigned int prefix;
+
+       do {
+               const double min_period = scale * min_width;
+
+               const int order = (int)floorf(log10f(min_period));
+               const double order_decimal = pow(10.0, order);
+
+               unsigned int unit = 0;
+
+               do {
+                       tick_period = order_decimal * ScaleUnits[unit++];
+               } while (tick_period < min_period && unit < countof(ScaleUnits));
+
+               prefix = (order - pv::util::FirstSIPrefixPower) / 3;
+
+               typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
+                       AlignLeft | AlignTop, pv::util::format_time(offset,
+                       prefix)).width() + MinValueSpacing;
+
+               min_width += SpacingIncrement;
+
+       } while(typical_width > tick_period / scale);
+
+       return std::make_pair(tick_period, prefix);
+}
+
 } // namespace view
 } // namespace pv