X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=4f4d39754805ee2cf988f42b8c2b011b24e7454f;hb=08d9c3caec0a3ad1c624af685f948e17b91d278a;hp=859f6fdef4e129336b23cc038cddf6e31b107e73;hpb=beb897c6c32c8e8dd9eb34d91100ab0569fca5f6;p=pulseview.git

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index 859f6fde..4f4d3975 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -36,6 +36,7 @@ namespace pv {
 namespace view {
 
 const int CursorPair::DeltaPadding = 8;
+const QColor CursorPair::ViewportFillColour(220, 231, 243);
 
 CursorPair::CursorPair(View &view) :
 	TimeItem(view),
@@ -70,9 +71,9 @@ float CursorPair::get_x() const
 	return (first_->get_x() + second_->get_x()) / 2.0f;
 }
 
-QPoint CursorPair::point() const
+QPoint CursorPair::point(const QRect &rect) const
 {
-	return first_->point();
+	return first_->point(rect);
 }
 
 pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
@@ -83,9 +84,7 @@ pv::widgets::Popup* CursorPair::create_popup(QWidget *parent)
 
 QRectF CursorPair::label_rect(const QRectF &rect) const
 {
-	const QSizeF label_size(
-		text_size_.width() + View::LabelPadding.width() * 2,
-		text_size_.height() + View::LabelPadding.height() * 2);
+	const QSizeF label_size(text_size_ + LabelPadding * 2);
 	const pair<float, float> offsets(get_cursor_offsets());
 	const pair<float, float> normal_offsets(
 		(offsets.first < offsets.second) ? offsets :
@@ -97,11 +96,11 @@ QRectF CursorPair::label_rect(const QRectF &rect) const
 		(float)rect.width() + height);
 
 	return QRectF(left, rect.height() - label_size.height() -
-		TimeMarker::ArrowSize - TimeMarker::Offset - 0.5f,
+		TimeMarker::ArrowSize - 0.5f,
 		right - left, height);
 }
 
-void CursorPair::paint_label(QPainter &p, const QRect &rect)
+void CursorPair::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
 	assert(first_);
 	assert(second_);
@@ -109,9 +108,11 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect)
 	if (!enabled())
 		return;
 
-	const unsigned int prefix = view_.tick_prefix();
+	const QColor text_colour =
+		ViewItem::select_text_colour(Cursor::FillColour);
 
-	compute_text_size(p, prefix);
+	p.setPen(text_colour);
+	compute_text_size(p);
 	QRectF delta_rect(label_rect(rect));
 
 	const int radius = delta_rect.height() / 2;
@@ -127,7 +128,8 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect)
 			p.drawRoundedRect(delta_rect, radius, radius);
 		}
 
-		p.setBrush(Cursor::FillColour);
+		p.setBrush(hover ? Cursor::FillColour.lighter() :
+			Cursor::FillColour);
 		p.setPen(Cursor::FillColour.darker());
 		p.drawRoundedRect(delta_rect, radius, radius);
 
@@ -135,10 +137,9 @@ void CursorPair::paint_label(QPainter &p, const QRect &rect)
 		p.setPen(Cursor::FillColour.lighter());
 		p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
 
-		p.setPen(ViewItem::select_text_colour(
-			Cursor::FillColour));
+		p.setPen(text_colour);
 		p.drawText(text_rect, Qt::AlignCenter | Qt::AlignVCenter,
-			pv::util::format_time(second_->time() - first_->time(), prefix, 2));
+			format_string());
 	}
 }
 
@@ -147,7 +148,7 @@ void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
 		return;
 
 	p.setPen(Qt::NoPen);
-	p.setBrush(QBrush(View::CursorAreaColour));
+	p.setBrush(QBrush(ViewportFillColour));
 
 	const pair<float, float> offsets(get_cursor_offsets());
 	const int l = (int)max(min(
@@ -158,13 +159,21 @@ void CursorPair::paint_back(QPainter &p, const ViewItemPaintParams &pp) {
 	p.drawRect(l, pp.top(), r - l, pp.height());
 }
 
-void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)
+QString CursorPair::format_string()
+{
+	const unsigned int prefix = view_.tick_prefix();
+	const double delta = second_->time() - first_->time();
+	return QString("%1 / %2").
+		arg(util::format_time(delta, prefix, 2)).
+		arg(util::format_si_value(1.0 / fabs(delta), "Hz", -1, 4));
+}
+
+void CursorPair::compute_text_size(QPainter &p)
 {
 	assert(first_);
 	assert(second_);
 
-	text_size_ = p.boundingRect(QRectF(), 0, pv::util::format_time(
-		second_->time() - first_->time(), prefix, 2)).size();
+	text_size_ = p.boundingRect(QRectF(), 0, format_string()).size();
 }
 
 pair<float, float> CursorPair::get_cursor_offsets() const