X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=3cc2eb173404e0213c87d6161c198f2b00ad94c1;hb=1ef49ddd04f44a4369403fbab19ed235483e2975;hp=a442901c3e9c76645e44da9a5a9bd5dd18ca8df9;hpb=3f96c34aa5735b72a8c2a48d24ad38b1d9898933;p=pulseview.git diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index a442901c..3cc2eb17 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -20,37 +20,24 @@ #include "ruler.h" -#include "cursor.h" #include "view.h" -#include "viewport.h" +#include "pv/util.h" #include -#include -#include - -#include -#include -#include - -using namespace std; +using namespace Qt; namespace pv { namespace view { +const int Ruler::RulerHeight = 30; const int Ruler::MinorTickSubdivision = 4; const int Ruler::ScaleUnits[3] = {1, 2, 5}; -const QString Ruler::SIPrefixes[9] = - {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"}; -const int Ruler::FirstSIPrefixPower = -15; - const int Ruler::HoverArrowSize = 5; Ruler::Ruler(View &parent) : - QWidget(&parent), - _view(parent), - _grabbed_marker(NULL) + MarginWidget(parent) { setMouseTracking(true); @@ -58,36 +45,29 @@ Ruler::Ruler(View &parent) : this, SLOT(hover_point_changed())); } -void Ruler::paintEvent(QPaintEvent *event) +QSize Ruler::sizeHint() const { - QPainter p(this); - p.setRenderHint(QPainter::Antialiasing); - - const double MinSpacing = 80; - - const double min_period = _view.scale() * MinSpacing; - - const int order = (int)floorf(log10f(min_period)); - const double order_decimal = pow(10, order); + return QSize(0, RulerHeight); +} - unsigned int unit = 0; - double tick_period = 0.0f; +void Ruler::paintEvent(QPaintEvent*) +{ + const int ValueMargin = 3; - do - { - tick_period = order_decimal * ScaleUnits[unit++]; - } while (tick_period < min_period && unit < countof(ScaleUnits)); + QPainter p(this); + p.setRenderHint(QPainter::Antialiasing); - const unsigned int prefix = (order - FirstSIPrefixPower) / 3; - assert(prefix < countof(SIPrefixes)); + std::pair spacing = + calculate_tick_spacing(p, _view.scale(), _view.offset()); - const double multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower); + double tick_period = spacing.first; + unsigned int prefix = spacing.second; 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 = @@ -97,97 +77,51 @@ void Ruler::paintEvent(QPaintEvent *event) 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; + + 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; - if (x >= width()) - break; + do { + const double t = t0 + division * minor_tick_period; + x = (t - _view.offset()) / _view.scale(); 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.drawLine(QPointF(x, text_height), - QPointF(x, height())); + p.drawText(x, ValueMargin, 0, text_height, + AlignCenter | AlignTop | TextDontClip, + pv::util::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++; - } - // Draw the cursors - draw_cursors(p); + } while (x < width()); // Draw the hover mark draw_hover_mark(p); - - p.end(); -} - -void Ruler::mouseMoveEvent(QMouseEvent *e) -{ - if (!_grabbed_marker) - return; - - _grabbed_marker->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 (_view.cursors_shown()) { - std::pair &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; - } - } -} - -void Ruler::mouseReleaseEvent(QMouseEvent *) -{ - _grabbed_marker = NULL; -} - -void Ruler::draw_cursors(QPainter &p) -{ - if (!_view.cursors_shown()) - return; - - const QRect r = rect(); - pair &cursors = _view.cursors(); - cursors.first.paint_label(p, r); - cursors.second.paint_label(p, r); } void Ruler::draw_hover_mark(QPainter &p) { const int x = _view.hover_point().x(); - if (x == -1 || _grabbed_marker) + if (x == -1) 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[] = { @@ -203,5 +137,41 @@ void Ruler::hover_point_changed() update(); } +std::pair 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