X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=97a0d8f1d7b89c2c01cdae488715b2a4cf715f81;hb=d2caed8d652ded997255a881bbe246ee68235448;hp=c043aacf2b160d926a557915e2bafe95c397329a;hpb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8;p=pulseview.git diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index c043aac..97a0d8f 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -58,7 +59,7 @@ Ruler::Ruler(View &parent) : this, SLOT(hover_point_changed())); } -void Ruler::paintEvent(QPaintEvent *event) +void Ruler::paintEvent(QPaintEvent*) { QPainter p(this); p.setRenderHint(QPainter::Antialiasing); @@ -79,7 +80,6 @@ void Ruler::paintEvent(QPaintEvent *event) } 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); @@ -88,7 +88,7 @@ void Ruler::paintEvent(QPaintEvent *event) Qt::AlignLeft | Qt::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 =