X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fcursorpair.cpp;h=8aba0abd1274a7fc778d89a70d8df06fe67347a3;hp=feac91d20d47a513c60f0a294c97b4f4fbda65cb;hb=4c8a6a6d03e2a12f67d910a83589072b478114cb;hpb=96d3ad83edb89b2d4e0e4a4f0860c13ebbcf737a

diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index feac91d2..8aba0abd 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -18,49 +18,95 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "cursorpair.h"
+#include "cursorpair.hpp"
 
-#include "view.h"
+#include "view.hpp"
+#include "pv/util.hpp"
 
+#include <cassert>
 #include <algorithm>
 
-using namespace std;
+using std::max;
+using std::make_pair;
+using std::min;
+using std::shared_ptr;
+using std::pair;
 
 namespace pv {
 namespace view {
 
-CursorPair::CursorPair(const View &view) :
-	_first(view, 0.0, _second),
-	_second(view, 1.0, _first),
-	_view(view)
-{
-}
+const int CursorPair::DeltaPadding = 8;
 
-const Cursor& CursorPair::first() const
+CursorPair::CursorPair(View &view) :
+	first_(new Cursor(view, 0.0)),
+	second_(new Cursor(view, 1.0)),
+	view_(view)
 {
-	return _first;
 }
 
-Cursor& CursorPair::first()
+shared_ptr<Cursor> CursorPair::first() const
 {
-	return _first;
+	return first_;
 }
 
-const Cursor& CursorPair::second() const
+shared_ptr<Cursor> CursorPair::second() const
 {
-	return _second;
+	return second_;
 }
 
-Cursor& CursorPair::second()
+QRectF CursorPair::get_label_rect(const QRect &rect) const
 {
-	return _second;
+	const QSizeF label_size(
+		text_size_.width() + View::LabelPadding.width() * 2,
+		text_size_.height() + View::LabelPadding.height() * 2);
+	const pair<float, float> offsets(get_cursor_offsets());
+	const pair<float, float> normal_offsets(
+		(offsets.first < offsets.second) ? offsets :
+		make_pair(offsets.second, offsets.first));
+
+	const float height = label_size.height();
+	const float left = max(normal_offsets.first + DeltaPadding, -height);
+	const float right = min(normal_offsets.second - DeltaPadding,
+		(float)rect.width() + height);
+
+	return QRectF(left, rect.height() - label_size.height() -
+		Cursor::ArrowSize - Cursor::Offset - 0.5f,
+		right - left, height);
 }
 
-void CursorPair::draw_markers(QPainter &p,
-	const QRect &rect, unsigned int prefix)
+void CursorPair::draw_markers(QPainter &p, const QRect &rect)
 {
-	_first.paint_label(p, rect, prefix);
-	_second.paint_label(p, rect, prefix);
+	assert(first_);
+	assert(second_);
+
+	const unsigned int prefix = view_.tick_prefix();
+
+	compute_text_size(p, prefix);
+	QRectF delta_rect(get_label_rect(rect));
+
+	const int radius = delta_rect.height() / 2;
+	const QRectF text_rect(delta_rect.intersected(
+		rect).adjusted(radius, 0, -radius, 0));
+	if(text_rect.width() >= text_size_.width())
+	{
+		const int highlight_radius = delta_rect.height() / 2 - 2;
+
+		p.setBrush(Cursor::FillColour);
+		p.setPen(Cursor::LineColour);
+		p.drawRoundedRect(delta_rect, radius, radius);
+
+		delta_rect.adjust(1, 1, -1, -1);
+		p.setPen(Cursor::HighlightColour);
+		p.drawRoundedRect(delta_rect, highlight_radius, highlight_radius);
+
+		p.setPen(Cursor::TextColour);
+		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,
@@ -69,10 +115,11 @@ void CursorPair::draw_viewport_background(QPainter &p,
 	p.setPen(Qt::NoPen);
 	p.setBrush(QBrush(View::CursorAreaColour));
 
-	const float x1 = (_first.time() - _view.offset()) / _view.scale();
-	const float x2 = (_second.time() - _view.offset()) / _view.scale();
-	const int l = (int)max(min(x1, x2), 0.0f);
-	const int r = (int)min(max(x1, x2), (float)rect.width());
+	const pair<float, float> offsets(get_cursor_offsets());
+	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());
 }
@@ -80,8 +127,30 @@ void CursorPair::draw_viewport_background(QPainter &p,
 void CursorPair::draw_viewport_foreground(QPainter &p,
 	const QRect &rect)
 {
-	_first.paint(p, rect);
-	_second.paint(p, rect);
+	assert(first_);
+	assert(second_);
+
+	first_->paint(p, rect);
+	second_->paint(p, rect);
+}
+
+void CursorPair::compute_text_size(QPainter &p, unsigned int prefix)
+{
+	assert(first_);
+	assert(second_);
+
+	text_size_ = p.boundingRect(QRectF(), 0, pv::util::format_time(
+		second_->time() - first_->time(), prefix, 2)).size();
+}
+
+pair<float, float> CursorPair::get_cursor_offsets() const
+{
+	assert(first_);
+	assert(second_);
+
+	return pair<float, float>(
+		(first_->time() - view_.offset()) / view_.scale(),
+		(second_->time() - view_.offset()) / view_.scale());
 }
 
 } // namespace view