#include "cursorpair.hpp"
+#include "ruler.hpp"
#include "view.hpp"
#include "pv/util.hpp"
using std::pair;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int CursorPair::DeltaPadding = 8;
const QColor CursorPair::ViewportFillColour(220, 231, 243);
return second_;
}
-void CursorPair::set_time(const pv::util::Timestamp& time) {
+void CursorPair::set_time(const pv::util::Timestamp& time)
+{
const pv::util::Timestamp delta = second_->time() - first_->time();
first_->set_time(time);
second_->set_time(time + delta);
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;
if (selected()) {
}
}
-void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
+void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp)
+{
if (!enabled())
return;
QString CursorPair::format_string()
{
const pv::util::SIPrefix prefix = view_.tick_prefix();
- const pv::util::Timestamp 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 / fabs(delta), "Hz", pv::util::SIPrefix::unspecified, 4));
+ const pv::util::Timestamp diff = abs(second_->time() - first_->time());
+
+ const QString s1 = Ruler::format_time_with_distance(
+ diff, diff, prefix, view_.time_unit(), view_.tick_precision(), false);
+ const QString s2 = util::format_time_si(
+ 1 / diff, pv::util::SIPrefix::unspecified, 4, "Hz", false);
+
+ return QString("%1 / %2").arg(s1).arg(s2);
}
void CursorPair::compute_text_size(QPainter &p)
((second_->time() - view_.offset()) / view_.scale()).convert_to<float>());
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv