X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=f22680b9f46f547bfbb315f43f9131140a588dc0;hp=503031a7fbe592d4aa01b4873ca12de7c2d4966b;hb=cb5a1216019ae561046f7812b7fc67c11ea3d6c5;hpb=96b6316ab8ed24551a0affb7a5819d1c97147a5c

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 503031a7..f22680b9 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -14,14 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "cursor.hpp"
 
-#include "view.hpp"
 #include "pv/util.hpp"
+#include "ruler.hpp"
+#include "view.hpp"
 
 #include <QApplication>
 #include <QBrush>
@@ -34,12 +34,12 @@
 #include <cstdio>
 #include <limits>
 
-using std::abs;
+using std::abs; // Force usage of std::abs() instead of C's abs().
 using std::shared_ptr;
-using std::numeric_limits;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 const QColor Cursor::FillColour(52, 101, 164);
 
@@ -55,8 +55,11 @@ bool Cursor::enabled() const
 
 QString Cursor::get_text() const
 {
-	return util::format_time(time_, view_.tick_prefix(),
-		util::TimeUnit::Time, 2);
+	const shared_ptr<Cursor> other = get_other_cursor();
+	const pv::util::Timestamp& diff = abs(time_ - other->time_);
+
+	return Ruler::format_time_with_distance(
+		diff, time_, view_.tick_prefix(), view_.time_unit(), view_.tick_precision());
 }
 
 QRectF Cursor::label_rect(const QRectF &rect) const
@@ -64,7 +67,7 @@ QRectF Cursor::label_rect(const QRectF &rect) const
 	const shared_ptr<Cursor> other(get_other_cursor());
 	assert(other);
 
-	const float x = (time_ - view_.offset()) / view_.scale();
+	const float x = get_x();
 
 	QFontMetrics m(QApplication::font());
 	QSize text_size = m.boundingRect(get_text()).size();
@@ -76,14 +79,13 @@ QRectF Cursor::label_rect(const QRectF &rect) const
 		TimeMarker::ArrowSize - 0.5f;
 	const float height = label_size.height();
 
-	const double other_time = other->time();
+	const pv::util::Timestamp& other_time = other->time();
+
 	if (time_ > other_time ||
-		(abs(time_ - other_time) < numeric_limits<double>::epsilon() &&
-		this > other.get()))
+		(abs(time_ - other_time).is_zero() && this > other.get()))
 		return QRectF(x, top, label_size.width(), height);
 	else
-		return QRectF(x - label_size.width(), top,
-			label_size.width(), height);
+		return QRectF(x - label_size.width(), top, label_size.width(), height);
 }
 
 shared_ptr<Cursor> Cursor::get_other_cursor() const
@@ -94,5 +96,6 @@ shared_ptr<Cursor> Cursor::get_other_cursor() const
 		cursors->second() : cursors->first();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv