- p.setPen(Qt::black);
-
- const double minor_tick_period = tick_period / MinorTickSubdivision;
- const double first_major_division =
- floor(_view.offset() / tick_period);
- const double first_minor_division =
- ceil(_view.offset() / minor_tick_period);
- 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();
-
- if(x >= width())
- break;
-
- 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()));
- }
- else
- {
- // Draw a minor tick
- p.drawLine(QPointF(x, (text_height + height()) / 2),
- QPointF(x, height()));
+ p.setPen(palette().color(foregroundRole()));
+
+ for (const auto& tick: tick_position_cache_->major) {
+ p.drawText(tick.first, ValueMargin, 0, text_height,
+ AlignCenter | AlignTop | TextDontClip, tick.second);
+ p.drawLine(QPointF(tick.first, major_tick_y1),
+ QPointF(tick.first, ruler_height));
+ }
+
+ for (const auto& tick: tick_position_cache_->minor) {
+ p.drawLine(QPointF(tick, minor_tick_y1),
+ QPointF(tick, ruler_height));
+ }
+
+ // Draw the hover mark
+ draw_hover_mark(p, text_height);
+
+ p.setRenderHint(QPainter::Antialiasing);
+
+ // The cursor labels are not drawn with the arrows exactly on the
+ // bottom line of the widget, because then the selection shadow
+ // would be clipped away.
+ const QRect r = rect().adjusted(0, 0, 0, -ViewItem::HighlightRadius);
+
+ // Draw the items
+ const vector< shared_ptr<TimeItem> > items(view_.time_items());
+ for (auto &i : items) {
+ const bool highlight = !item_dragging_ &&
+ i->label_rect(r).contains(mouse_point_);
+ i->paint_label(p, r, highlight);
+ }
+}
+
+Ruler::TickPositions Ruler::calculate_tick_positions(
+ const pv::util::Timestamp& major_period,
+ const pv::util::Timestamp& offset,
+ const double scale,
+ const int width,
+ std::function<QString(const pv::util::Timestamp&)> format_function)
+{
+ TickPositions tp;
+
+ const pv::util::Timestamp minor_period = major_period / MinorTickSubdivision;
+ const pv::util::Timestamp first_major_division = floor(offset / major_period);
+ const pv::util::Timestamp first_minor_division = ceil(offset / minor_period);
+ const pv::util::Timestamp t0 = first_major_division * major_period;
+
+ int division = (round(first_minor_division -
+ first_major_division * MinorTickSubdivision)).convert_to<int>() - 1;
+
+ double x;
+
+ do {
+ pv::util::Timestamp t = t0 + division * minor_period;
+ x = ((t - offset) / scale).convert_to<double>();
+
+ if (division % MinorTickSubdivision == 0) {
+ // Recalculate 't' without using 'minor_period' which is a fraction
+ t = t0 + division / MinorTickSubdivision * major_period;
+ tp.major.emplace_back(x, format_function(t));
+ } else {
+ tp.minor.emplace_back(x);