Use Qt namespace to simplify Ruler::paintEvent

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

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index bbafdb0f22cdce854fb52322a7a666b82bdac039..9f7cff2c6341e6f40dd86de31e388c6ee66f701f 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -28,6 +28,7 @@
 
 #include <assert.h>
 #include <math.h>
+#include <limits.h>
 
 #include <QMouseEvent>
 #include <QPainter>
@@ -58,8 +59,10 @@ Ruler::Ruler(View &parent) :
                this, SLOT(hover_point_changed()));
 }
 
-void Ruler::paintEvent(QPaintEvent *event)
+void Ruler::paintEvent(QPaintEvent*)
 {
+       using namespace Qt;
+
        QPainter p(this);
        p.setRenderHint(QPainter::Antialiasing);
 
@@ -76,19 +79,18 @@ void Ruler::paintEvent(QPaintEvent *event)
        do
        {
                tick_period = order_decimal * ScaleUnits[unit++];
-       } while(tick_period < min_period && unit < countof(ScaleUnits));
+       } while (tick_period < min_period && unit < countof(ScaleUnits));
 
        const unsigned int prefix = (order - FirstSIPrefixPower) / 3;
-       assert(prefix >= 0);
        assert(prefix < countof(SIPrefixes));
 
        const double multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
 
        const int text_height = p.boundingRect(0, 0, INT_MAX, INT_MAX,
-               Qt::AlignLeft | Qt::AlignTop, "8").height();
+               AlignLeft | AlignTop, "8").height();
 
        // Draw the tick marks
-       p.setPen(Qt::black);
+       p.setPen(palette().color(foregroundRole()));
 
        const double minor_tick_period = tick_period / MinorTickSubdivision;
        const double first_major_division =
@@ -99,22 +101,22 @@ void Ruler::paintEvent(QPaintEvent *event)
 
        int division = (int)round(first_minor_division -
                first_major_division * MinorTickSubdivision);
-       while(1)
+       while (1)
        {
                const double t = t0 + division * minor_tick_period;
                const double x = (t - _view.offset()) / _view.scale();
 
-               if(x >= width())
+               if (x >= width())
                        break;
 
-               if(division % MinorTickSubdivision == 0)
+               if (division % MinorTickSubdivision == 0)
                {
                        // Draw a major tick
                        QString s;
                        QTextStream ts(&s);
                        ts << (t * multiplier) << SIPrefixes[prefix] << "s";
-                       p.drawText(x, 0, 0, text_height, Qt::AlignCenter |
-                               Qt::AlignTop | Qt::TextDontClip, s);
+                       p.drawText(x, 0, 0, text_height, AlignCenter |
+                               AlignTop | TextDontClip, s);
                        p.drawLine(QPointF(x, text_height),
                                QPointF(x, height()));
                }
@@ -139,7 +141,7 @@ void Ruler::paintEvent(QPaintEvent *event)
 
 void Ruler::mouseMoveEvent(QMouseEvent *e)
 {
-       if(!_grabbed_marker)
+       if (!_grabbed_marker)
                return;
 
        _grabbed_marker->set_time(_view.offset() +
@@ -148,16 +150,16 @@ void Ruler::mouseMoveEvent(QMouseEvent *e)
 
 void Ruler::mousePressEvent(QMouseEvent *e)
 {
-       if(e->buttons() & Qt::LeftButton) {
+       if (e->buttons() & Qt::LeftButton) {
                _grabbed_marker = NULL;
 
-               if(_view.cursors_shown()) {
+               if (_view.cursors_shown()) {
                        std::pair<Cursor, Cursor> &cursors =
                                _view.cursors();
-                       if(cursors.first.get_label_rect(
+                       if (cursors.first.get_label_rect(
                                rect()).contains(e->pos()))
                                _grabbed_marker = &cursors.first;
-                       else if(cursors.second.get_label_rect(
+                       else if (cursors.second.get_label_rect(
                                rect()).contains(e->pos()))
                                _grabbed_marker = &cursors.second;
                }
@@ -171,7 +173,7 @@ void Ruler::mouseReleaseEvent(QMouseEvent *)
 
 void Ruler::draw_cursors(QPainter &p)
 {
-       if(!_view.cursors_shown())
+       if (!_view.cursors_shown())
                return;
 
        const QRect r = rect();
@@ -183,7 +185,8 @@ void Ruler::draw_cursors(QPainter &p)
 void Ruler::draw_hover_mark(QPainter &p)
 {
        const int x = _view.hover_point().x();
-       if(x == -1 || _grabbed_marker)
+
+       if (x == -1 || _grabbed_marker)
                return;
 
        p.setPen(QPen(Qt::NoPen));