X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=ecce13893def06fb3e4c3f8559d412ef8d2fa5cc;hb=7ddb8da6cae27c619644cd26cfbf8263d286f7a1;hp=0370793d0407b9a9d8db11dc55e592f50ef53732;hpb=5a0192d4091b29e1e8e103482a498bd6c050c666;p=pulseview.git

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 0370793d..ecce1389 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -59,6 +59,17 @@ shared_ptr<Cursor> CursorPair::second() const
 	return second_;
 }
 
+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();
@@ -70,7 +81,7 @@ pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
 	return nullptr;
 }
 
-QRectF CursorPair::get_label_rect(const QRect &rect) const
+QRectF CursorPair::label_rect(const QRectF &rect) const
 {
 	const QSizeF label_size(
 		text_size_.width() + View::LabelPadding.width() * 2,
@@ -90,15 +101,18 @@ QRectF CursorPair::get_label_rect(const QRect &rect) const
 		right - left, height);
 }
 
-void CursorPair::draw_markers(QPainter &p, const QRect &rect)
+void CursorPair::paint_label(QPainter &p, const QRect &rect)
 {
 	assert(first_);
 	assert(second_);
 
+	if (!enabled())
+		return;
+
 	const unsigned int prefix = view_.tick_prefix();
 
 	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(
@@ -107,6 +121,12 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect)
 	{
 		const int highlight_radius = delta_rect.height() / 2 - 2;
 
+		if (selected()) {
+			p.setBrush(Qt::transparent);
+			p.setPen(highlight_pen());
+			p.drawRoundedRect(delta_rect, radius, radius);
+		}
+
 		p.setBrush(Cursor::FillColour);
 		p.setPen(Cursor::FillColour.darker());
 		p.drawRoundedRect(delta_rect, radius, radius);
@@ -120,10 +140,6 @@ void CursorPair::draw_markers(QPainter &p, const QRect &rect)
 		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);
-	second_->paint_label(p, rect);
 }
 
 void CursorPair::draw_viewport_background(QPainter &p,