X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=a14f458bedd96710304cb06ad262944e5a91278d;hp=0b5363f18134b96b622e6e9e269289f0cde67218;hb=49028d6c2d8aaf61b528e2dfb7ad3fe1ccb7169e;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 0b5363f1..a14f458b 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursorpair.h"
+#include "cursorpair.hpp"
 
-#include "view.h"
-#include "pv/util.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
 #include <cassert>
 #include <algorithm>
@@ -38,12 +38,17 @@ namespace view {
 const int CursorPair::DeltaPadding = 8;
 
 CursorPair::CursorPair(View &view) :
+	TimeItem(view),
 	first_(new Cursor(view, 0.0)),
-	second_(new Cursor(view, 1.0)),
-	view_(view)
+	second_(new Cursor(view, 1.0))
 {
 }
 
+bool CursorPair::enabled() const
+{
+	return view_.cursors_shown();
+}
+
 shared_ptr<Cursor> CursorPair::first() const
 {
 	return first_;
@@ -54,7 +59,29 @@ shared_ptr<Cursor> CursorPair::second() const
 	return second_;
 }
 
-QRectF CursorPair::get_label_rect(const QRect &rect) const
+void CursorPair::set_time(double time) {
+	const double delta = second_->time() - first_->time();
+	first_->set_time(time);
+	second_->set_time(time + delta);
+}
+
+float CursorPair::get_x() const
+{
+	return (first_->get_x() + second_->get_x()) / 2.0f;
+}
+
+QPoint CursorPair::point() const
+{
+	return first_->point();
+}
+
+pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
+{
+	(void)parent;
+	return nullptr;
+}
+
+QRectF CursorPair::label_rect(const QRectF &rect) const
 {
 	const QSizeF label_size(
 		text_size_.width() + View::LabelPadding.width() * 2,
@@ -70,18 +97,25 @@ QRectF CursorPair::get_label_rect(const QRect &rect) const
 		(float)rect.width() + height);
 
 	return QRectF(left, rect.height() - label_size.height() -
-		Cursor::ArrowSize - Cursor::Offset - 0.5f,
+		TimeMarker::ArrowSize - TimeMarker::Offset - 0.5f,
 		right - left, height);
 }
 
-void CursorPair::draw_markers(QPainter &p,
-	const QRect &rect, unsigned int prefix)
+void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	assert(first_);
 	assert(second_);
 
+	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);
-	QRectF delta_rect(get_label_rect(rect));
+	QRectF delta_rect(label_rect(rect));
 
 	const int radius = delta_rect.height() / 2;
 	const QRectF text_rect(delta_rect.intersected(
@@ -90,27 +124,31 @@ void CursorPair::draw_markers(QPainter &p,
 	{
 		const int highlight_radius = delta_rect.height() / 2 - 2;
 
-		p.setBrush(Cursor::FillColour);
-		p.setPen(Cursor::LineColour);
+		if (selected()) {
+			p.setBrush(Qt::transparent);
+			p.setPen(highlight_pen());
+			p.drawRoundedRect(delta_rect, radius, radius);
+		}
+
+		p.setBrush(hover ? Cursor::FillColour.lighter() :
+			Cursor::FillColour);
+		p.setPen(Cursor::FillColour.darker());
 		p.drawRoundedRect(delta_rect, radius, radius);
 
 		delta_rect.adjust(1, 1, -1, -1);
-		p.setPen(Cursor::HighlightColour);
+		p.setPen(Cursor::FillColour.lighter());
 		p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
 
-		p.setPen(Cursor::TextColour);
+		p.setPen(text_colour);
 		p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
 			pv::util::format_time(second_->time() - first_->time(), prefix, 2));
 	}
-
-	// Paint the cursor markers
-	first_->paint_label(p, rect, prefix);
-	second_->paint_label(p, rect, prefix);
 }
 
-void CursorPair::draw_viewport_background(QPainter &p,
-	const QRect &rect)
-{
+void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
+	if (!enabled())
+		return;
+
 	p.setPen(Qt::NoPen);
 	p.setBrush(QBrush(View::CursorAreaColour));
 
@@ -118,19 +156,9 @@ void CursorPair::draw_viewport_background(QPainter &p,
 	const int l = (int)max(min(
 		offsets.first, offsets.second), 0.0f);
 	const int r = (int)min(max(
-		offsets.first, offsets.second), (float)rect.width());
-
-	p.drawRect(l, 0, r - l, rect.height());
-}
-
-void CursorPair::draw_viewport_foreground(QPainter &p,
-	const QRect &rect)
-{
-	assert(first_);
-	assert(second_);
+		offsets.first, offsets.second), (float)pp.width());
 
-	first_->paint(p, rect);
-	second_->paint(p, rect);
+	p.drawRect(l, pp.top(), r - l, pp.height());
 }
 
 void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)