X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=5dea19474c84714a3f653e8449ff099f0f700625;hp=a2e280b6f2291cd57ac11ce65403fb1dac9fd99b;hb=397c9541a50d9fe88a9877d58e1d149df31eee04;hpb=cef18fc6160f8f5055f2617fbe06eb082c2a7bd5 diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index a2e280b6..5dea1947 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -56,7 +56,7 @@ void Ruler::paintEvent(QPaintEvent *event) const int order = (int)floorf(log10f(min_period)); const double order_decimal = pow(10, order); - int unit = 0; + unsigned int unit = 0; double tick_period = 0.0f; do @@ -64,11 +64,11 @@ void Ruler::paintEvent(QPaintEvent *event) tick_period = order_decimal * ScaleUnits[unit++]; } while(tick_period < min_period && unit < countof(ScaleUnits)); - const int prefix = (order - FirstSIPrefixPower) / 3; + const unsigned int prefix = (order - FirstSIPrefixPower) / 3; assert(prefix >= 0); assert(prefix < countof(SIPrefixes)); - const double multiplier = pow(0.1, prefix * 3 + FirstSIPrefixPower); + 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();