X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=7b9f671f036f603809ec420d172cde2198d7f479;hp=46f2455677a962bc86f92bcfd4b9bc7321b03aa0;hb=60d9b99a32e551cffd2b537d3e157d578a761c9b;hpb=f32905530347e1020d5ce7959123cf797c9a4829

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 46f2455..7b9f671 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -60,8 +60,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);
 }
@@ -162,9 +162,9 @@ void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
 QString CursorPair::format_string()
 {
 	const unsigned int prefix = view_.tick_prefix();
-	const double delta = second_->time() - first_->time();
+	const pv::util::Timestamp delta = second_->time() - first_->time();
 	return QString("%1 / %2").
-		arg(util::format_time(delta, prefix, 2)).
+		arg(util::format_time(delta, prefix, view_.time_unit(), 2)).
 		arg(util::format_si_value(1.0 / fabs(delta), "Hz", -1, 4));
 }
 
@@ -182,8 +182,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