return (first_->get_x() + second_->get_x()) / 2.0f;
}
-QPoint CursorPair::point() const
+QPoint CursorPair::point(const QRect &rect) const
{
- return first_->point();
+ return first_->point(rect);
}
pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
if (!enabled())
return;
- const unsigned int prefix = view_.tick_prefix();
const QColor text_colour =
ViewItem::select_text_colour(Cursor::FillColour);
p.setPen(text_colour);
- compute_text_size(p, prefix);
+ compute_text_size(p);
QRectF delta_rect(label_rect(rect));
const int radius = delta_rect.height() / 2;
const QRectF text_rect(delta_rect.intersected(
rect).adjusted(radius, 0, -radius, 0));
- if(text_rect.width() >= text_size_.width())
+ if (text_rect.width() >= text_size_.width())
{
const int highlight_radius = delta_rect.height() / 2 - 2;
p.setPen(text_colour);
p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
- pv::util::format_time(second_->time() - first_->time(), prefix, 2));
+ format_string());
}
}
p.drawRect(l, pp.top(), r - l, pp.height());
}
-void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)
+QString CursorPair::format_string()
+{
+ const unsigned int prefix = view_.tick_prefix();
+ const double delta = second_->time() - first_->time();
+ return QString("%1 / %2").
+ arg(util::format_time(delta, prefix, view_.time_unit(), 2)).
+ arg(util::format_si_value(1.0 / fabs(delta), "Hz", -1, 4));
+}
+
+void CursorPair::compute_text_size(QPainter &p)
{
assert(first_);
assert(second_);
- text_size_ = p.boundingRect(QRectF(), 0, pv::util::format_time(
- second_->time() - first_->time(), prefix, 2)).size();
+ text_size_ = p.boundingRect(QRectF(), 0, format_string()).size();
}
pair<float, float> CursorPair::get_cursor_offsets() const