]> sigrok.org Git - pulseview.git/blobdiff - pv/view/ruler.cpp
Added missing includes and defintions
[pulseview.git] / pv / view / ruler.cpp
index 350e49dcff0a2ee14656173ced94b422a9fc2697..a9a8452d47fc6784d6d736762ba4938ce3408895 100644 (file)
 #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;
 
 namespace pv {
@@ -49,9 +53,8 @@ const int Ruler::FirstSIPrefixPower = -15;
 const int Ruler::HoverArrowSize = 5;
 
 Ruler::Ruler(View &parent) :
-       QWidget(&parent),
-       _view(parent),
-       _grabbed_marker(NULL)
+       MarginWidget(parent),
+       _dragging(false)
 {
        setMouseTracking(true);
 
@@ -59,12 +62,35 @@ 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();
+}
+
+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;
+}
+
 void Ruler::paintEvent(QPaintEvent*)
 {
        using namespace Qt;
 
        const double SpacingIncrement = 32.0f;
        const double MinValueSpacing = 32.0f;
+       const int ValueMargin = 3;
 
        QPainter p(this);
        p.setRenderHint(QPainter::Antialiasing);
@@ -72,7 +98,6 @@ void Ruler::paintEvent(QPaintEvent*)
        double min_width = SpacingIncrement, typical_width;
        double tick_period;
        unsigned int prefix;
-       double multiplier;
 
        // Find tick spacing, and number formatting that does not cause
        // value to collide.
@@ -93,11 +118,10 @@ void Ruler::paintEvent(QPaintEvent*)
                prefix = (order - FirstSIPrefixPower) / 3;
                assert(prefix < countof(SIPrefixes));
 
-               multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
 
                typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
                        AlignLeft | AlignTop, format_time(_view.offset(),
-                       multiplier, prefix)).width() + MinValueSpacing;
+                       prefix)).width() + MinValueSpacing;
 
                min_width += SpacingIncrement;
 
@@ -117,36 +141,41 @@ void Ruler::paintEvent(QPaintEvent*)
        const double t0 = first_major_division * tick_period;
 
        int division = (int)round(first_minor_division -
-               first_major_division * MinorTickSubdivision);
-       while (1)
-       {
-               const double t = t0 + division * minor_tick_period;
-               const double x = (t - _view.offset()) / _view.scale();
+               first_major_division * MinorTickSubdivision) - 1;
 
-               if (x >= width())
-                       break;
+       const int major_tick_y1 = text_height + ValueMargin * 2;
+       const int tick_y2 = height();
+       const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2;
+
+       double x;
+
+       do {
+               const double t = t0 + division * minor_tick_period;
+               x = (t - _view.offset()) / _view.scale();
 
                if (division % MinorTickSubdivision == 0)
                {
                        // Draw a major tick
-                       p.drawText(x, 0, 0, text_height, AlignCenter |
-                               AlignTop | TextDontClip,
-                               format_time(t, multiplier, prefix));
-                       p.drawLine(QPointF(x, text_height),
-                               QPointF(x, height()));
+                       p.drawText(x, ValueMargin, 0, text_height,
+                               AlignCenter | AlignTop | TextDontClip,
+                               format_time(t, prefix));
+                       p.drawLine(QPointF(x, major_tick_y1),
+                               QPointF(x, tick_y2));
                }
                else
                {
                        // Draw a minor tick
-                       p.drawLine(QPointF(x, (text_height + height()) / 2),
-                               QPointF(x, height()));
+                       p.drawLine(QPointF(x, minor_tick_y1),
+                               QPointF(x, tick_y2));
                }
 
                division++;
-       }
+
+       } while (x < width());
 
        // Draw the cursors
-       draw_cursors(p);
+       if (_view.cursors_shown())
+               _view.cursors().draw_markers(p, rect(), prefix);
 
        // Draw the hover mark
        draw_hover_mark(p);
@@ -156,67 +185,72 @@ void Ruler::paintEvent(QPaintEvent*)
 
 void Ruler::mouseMoveEvent(QMouseEvent *e)
 {
-       if (!_grabbed_marker)
+       if (!(e->buttons() & Qt::LeftButton))
                return;
+       
+       if ((e->pos() - _mouse_down_point).manhattanLength() <
+               QApplication::startDragDistance())
+               return;
+
+       _dragging = true;
 
-       _grabbed_marker->set_time(_view.offset() +
-               ((double)e->x() + 0.5) * _view.scale());
+       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) {
-               _grabbed_marker = NULL;
+       if (e->buttons() & Qt::LeftButton)
+       {
+               _mouse_down_point = e->pos();
+
+               _grabbed_marker.reset();
+
+               clear_selection();
 
                if (_view.cursors_shown()) {
-                       std::pair<Cursor, Cursor> &cursors =
-                               _view.cursors();
-                       if (cursors.first.get_label_rect(
+                       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(
+                               _grabbed_marker = cursors.first();
+                       else if (cursors.second()->get_label_rect(
                                rect()).contains(e->pos()))
-                               _grabbed_marker = &cursors.second;
+                               _grabbed_marker = cursors.second();
                }
-       }
-}
 
-void Ruler::mouseReleaseEvent(QMouseEvent *)
-{
-       _grabbed_marker = NULL;
-}
+               if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
+                       m->select();
 
-QString Ruler::format_time(double t, double multiplier,
-       unsigned int prefix)
-{
-       QString s;
-       QTextStream ts(&s);
-       ts.setRealNumberPrecision(0);
-       ts << fixed << forcesign << (t  * multiplier) <<
-               SIPrefixes[prefix] << "s";
-       return s;
+               selection_changed();
+       }
 }
 
-void Ruler::draw_cursors(QPainter &p)
+void Ruler::mouseReleaseEvent(QMouseEvent *)
 {
-       if (!_view.cursors_shown())
-               return;
+       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();
+               }
 
-       const QRect r = rect();
-       pair<Cursor, Cursor> &cursors = _view.cursors();
-       cursors.first.paint_label(p, r);
-       cursors.second.paint_label(p, r);
+       _dragging = false;
+       _grabbed_marker.reset();
 }
 
 void Ruler::draw_hover_mark(QPainter &p)
 {
        const int x = _view.hover_point().x();
 
-       if (x == -1 || _grabbed_marker)
+       if (x == -1 || _dragging)
                return;
 
        p.setPen(QPen(Qt::NoPen));
-       p.setBrush(QBrush(QColor(Qt::black)));
+       p.setBrush(QBrush(palette().color(foregroundRole())));
 
        const int b = height() - 1;
        const QPointF points[] = {