X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursor.cpp;h=d5b0a641f075a5b9c5d7f4ddd0cb511102aee08a;hp=809a0501b20da1a4be759451fb0d51b717a4dff6;hb=4fabd61a2676246265c12d614cde496bf0a79075;hpb=199441e4fe68f1ee45f3d4b7617a7166a87c7926

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 809a0501..d5b0a641 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -18,133 +18,63 @@
  * 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 "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 <extdef.h>
+using std::shared_ptr;
 
 namespace pv {
 namespace view {
 
-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(const View &view, double time, Cursor &other) :
-	TimeMarker(view, LineColour, time),
-	_other(other)
+Cursor::Cursor(View &view, double time) :
+	TimeMarker(view, FillColour, time)
 {
 }
 
 QRectF Cursor::get_label_rect(const QRect &rect) const
 {
-	const float x = (_time - _view.offset()) / _view.scale();
+	const shared_ptr<Cursor> other(get_other_cursor());
+	assert(other);
+
+	const float x = (time_ - view_.offset()) / view_.scale();
+
+	QFontMetrics m(QApplication::font());
+	QSize text_size = m.boundingRect(
+		pv::util::format_time(time_, view_.tick_prefix(), 2)).size();
 
 	const QSizeF label_size(
-		_text_size.width() + View::LabelPadding.width() * 2,
-		_text_size.height() + View::LabelPadding.height() * 2);
+		text_size.width() + View::LabelPadding.width() * 2,
+		text_size.height() + View::LabelPadding.height() * 2);
 	const float top = rect.height() - label_size.height() -
-		Cursor::Offset - Cursor::ArrowSize - 0.5f;
-	const float height = label_size.height() + 1;
+		TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
+	const float height = label_size.height();
 
-	if (_time > _other.time())
+	if (time_ > other->time())
 		return QRectF(x, top, label_size.width(), height);
 	else
 		return QRectF(x - label_size.width(), top,
 			label_size.width(), height);
 }
 
-void Cursor::paint_label(QPainter &p, const QRect &rect,
-	unsigned int prefix)
-{
-	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));
-	}
-	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));
-}
-
-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 CursorPair &cursors = view_.cursors();
+	return (cursors.first().get() == this) ?
+		cursors.second() : cursors.first();
 }
 
 } // namespace view