X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=4f2ef126a83fa357e88f5b6d69872fd0802cc29e;hp=855bfa01a7fbc47a0a78d00e6309e835401048e7;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=96d3ad83edb89b2d4e0e4a4f0860c13ebbcf737a

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 855bfa01..4f2ef126 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -18,128 +18,86 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursor.h"
+#include "cursor.hpp"
 
-#include "ruler.h"
-#include "view.h"
+#include "ruler.hpp"
+#include "view.hpp"
+#include "pv/util.hpp"
 
+#include <QApplication>
 #include <QBrush>
 #include <QPainter>
 #include <QPointF>
 #include <QRect>
 #include <QRectF>
 
-#include <stdio.h>
+#include <cassert>
+#include <cstdio>
+#include <limits>
 
-#include <extdef.h>
+using std::abs;
+using std::shared_ptr;
+using std::numeric_limits;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
-const QColor Cursor::LineColour(32, 74, 135);
 const QColor Cursor::FillColour(52, 101, 164);
-const QColor Cursor::HighlightColour(83, 130, 186);
-const QColor Cursor::TextColour(Qt::white);
 
-const int Cursor::Offset = 1;
-
-const int Cursor::ArrowSize = 4;
+Cursor::Cursor(View &view, double time) :
+	TimeMarker(view, FillColour, time)
+{
+}
 
-Cursor::Cursor(const View &view, double time, Cursor &other) :
-	TimeMarker(view, LineColour, time),
-	_other(other)
+bool Cursor::enabled() const
 {
+	return view_.cursors_shown();
 }
 
-QRectF Cursor::get_label_rect(const QRect &rect) const
+QString Cursor::get_text() const
 {
-	const float x = (_time - _view.offset()) / _view.scale();
+	const shared_ptr<Cursor> other = get_other_cursor();
+	const pv::util::Timestamp& diff = abs(time_ - other->time_);
 
-	const QSizeF label_size(
-		_text_size.width() + View::LabelPadding.width() * 2,
-		_text_size.height() + View::LabelPadding.height() * 2);
-	return QRectF(x - label_size.width() / 2 - 0.5f,
-		rect.height() - label_size.height() - Offset - ArrowSize - 0.5f,
-		label_size.width() + 1, label_size.height() + 1);
+	return Ruler::format_time_with_distance(
+		diff, time_, view_.tick_prefix(), view_.time_unit(), view_.tick_precision());
 }
 
-void Cursor::paint_label(QPainter &p, const QRect &rect,
-	unsigned int prefix)
+QRectF Cursor::label_rect(const QRectF &rect) const
 {
-	compute_text_size(p, prefix);
-	const QRectF r(get_label_rect(rect));
-
-	if (_time > _other.time())
-	{
-		const QPointF points[] = {
-			r.topLeft(),
-			r.topRight(),
-			r.bottomRight(),
-			QPointF(r.left() + ArrowSize, r.bottom()),
-			QPointF(r.left(), rect.bottom()),
-		};
-
-		const QPointF highlight_points[] = {
-			QPointF(r.left() + 1, r.top() + 1),
-			QPointF(r.right() - 1, r.top() + 1),
-			QPointF(r.right() - 1, r.bottom() - 1),
-			QPointF(r.left() + ArrowSize - 1, r.bottom() - 1),
-			QPointF(r.left() + 1, rect.bottom() - 1),
-		};
-
-		p.setPen(Qt::transparent);
-		p.setBrush(FillColour);
-		p.drawPolygon(points, countof(points));
-
-		p.setPen(HighlightColour);
-		p.setBrush(Qt::transparent);
-		p.drawPolygon(highlight_points, countof(highlight_points));
-
-		p.setPen(LineColour);
-		p.setBrush(Qt::transparent);
-		p.drawPolygon(points, countof(points));
-	}
+	const shared_ptr<Cursor> other(get_other_cursor());
+	assert(other);
+
+	const float x = ((time_ - view_.offset())/ view_.scale()).convert_to<float>();
+
+	QFontMetrics m(QApplication::font());
+	QSize text_size = m.boundingRect(get_text()).size();
+
+	const QSizeF label_size(
+		text_size.width() + LabelPadding.width() * 2,
+		text_size.height() + LabelPadding.height() * 2);
+	const float top = rect.height() - label_size.height() -
+		TimeMarker::ArrowSize - 0.5f;
+	const float height = label_size.height();
+
+	const pv::util::Timestamp& other_time = other->time();
+
+	if (time_ > other_time ||
+		(abs(time_ - other_time).is_zero() && this > other.get()))
+		return QRectF(x, top, label_size.width(), height);
 	else
-	{
-		const QPointF points[] = {
-			r.topRight(),
-			r.topLeft(),
-			r.bottomLeft(),
-			QPointF(r.right() - ArrowSize, r.bottom()),
-			QPointF(r.right(), rect.bottom()),
-		};
-
-		const QPointF highlight_points[] = {
-			QPointF(r.right() - 1, r.top() + 1),
-			QPointF(r.left() + 1, r.top() + 1),
-			QPointF(r.left() + 1, r.bottom() - 1),
-			QPointF(r.right() - ArrowSize + 1, r.bottom() - 1),
-			QPointF(r.right() - 1, rect.bottom() - 1),
-		};
-
-		p.setPen(Qt::transparent);
-		p.setBrush(FillColour);
-		p.drawPolygon(points, countof(points));
-
-		p.setPen(HighlightColour);
-		p.setBrush(Qt::transparent);
-		p.drawPolygon(highlight_points, countof(highlight_points));
-
-		p.setPen(LineColour);
-		p.setBrush(Qt::transparent);
-		p.drawPolygon(points, countof(points));
-	}
-
-	p.setPen(TextColour);
-	p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
-		Ruler::format_time(_time, prefix, 2));
+		return QRectF(x - label_size.width(), top, label_size.width(), height);
 }
 
-void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
+shared_ptr<Cursor> Cursor::get_other_cursor() const
 {
-	_text_size = p.boundingRect(QRectF(), 0,
-		Ruler::format_time(_time, prefix, 2)).size();
+	const shared_ptr<CursorPair> cursors(view_.cursors());
+	assert(cursors);
+	return (cursors->first().get() == this) ?
+		cursors->second() : cursors->first();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv