X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=5ee90aa1357e6f2f89ce32f1cffbf14dcbdb3506;hp=c3753e6560707cbeacd132e4b94140a7a9455c28;hb=a8743cd962b2d18082c6ddaeb554d56013919d95;hpb=ec39632d1267a42cb858ac6ad7c98486886a46a0

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index c3753e65..5ee90aa1 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -20,6 +20,7 @@
 
 #include "cursorpair.hpp"
 
+#include "ruler.hpp"
 #include "view.hpp"
 #include "pv/util.hpp"
 
@@ -60,8 +61,8 @@ shared_ptr<Cursor> CursorPair::second() const
 	return second_;
 }
 
-void CursorPair::set_time(double time) {
-	const double delta = second_->time() - first_->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);
 }
@@ -71,9 +72,9 @@ float CursorPair::get_x() const
 	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)
@@ -84,9 +85,7 @@ pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
 
 QRectF CursorPair::label_rect(const QRectF &rect) const
 {
-	const QSizeF label_size(
-		text_size_.width() + LabelPadding.width() * 2,
-		text_size_.height() + LabelPadding.height() * 2);
+	const QSizeF label_size(text_size_ + LabelPadding * 2);
 	const pair<float, float> offsets(get_cursor_offsets());
 	const pair<float, float> normal_offsets(
 		(offsets.first < offsets.second) ? offsets :
@@ -110,18 +109,17 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
 	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;
 
@@ -142,7 +140,7 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
 
 		p.setPen(text_colour);
 		p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
-			pv::util::format_time(second_->time() - first_->time(), prefix, 2));
+			format_string());
 	}
 }
 
@@ -162,13 +160,25 @@ void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
 	p.drawRect(l, pp.top(), r - l, pp.height());
 }
 
-void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)
+QString CursorPair::format_string()
+{
+	const pv::util::SIPrefix prefix = view_.tick_prefix();
+	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)
 {
 	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
@@ -177,8 +187,8 @@ pair<float, float> CursorPair::get_cursor_offsets() const
 	assert(second_);
 
 	return pair<float, float>(
-		(first_->time() - view_.offset()) / view_.scale(),
-		(second_->time() - view_.offset()) / view_.scale());
+		((first_->time() - view_.offset()) / view_.scale()).convert_to<float>(),
+		((second_->time() - view_.offset()) / view_.scale()).convert_to<float>());
 }
 
 } // namespace view