X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=7d844d27bccadd71a287f5aeb784f9d5f1ad5f85;hb=2e57535108a0ae2e5d1ee454f1e61b71d23afdb3;hp=593edefe99beca839a943f1b9ba79977de2231a6;hpb=64b60583ff73db2bd9458817276687b030fe48e1;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 593edefe..7d844d27 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -21,8 +21,8 @@
 #include "view.h"
 #include "viewport.h"
 
-#include "../../sigsession.h"
-#include "../../signal.h"
+#include "signal.h"
+#include "../sigsession.h"
 
 #include <QMouseEvent>
 
@@ -61,21 +61,24 @@ void Viewport::paintEvent(QPaintEvent *event)
 		_view.session().get_signals();
 
 	QPainter p(this);
+	p.setRenderHint(QPainter::Antialiasing);
+
+	draw_cursors_background(p);
 
 	// Plot the signal
-	int offset = -_view.v_offset();
+	const int v_offset = _view.v_offset();
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
 	{
 		assert(s);
 
-		const QRect signal_rect(0, offset,
+		const QRect signal_rect(0, s->get_v_offset() - v_offset,
 			width(), View::SignalHeight);
 
 		s->paint(p, signal_rect, _view.scale(), _view.offset());
-
-		offset += View::SignalHeight;
 	}
 
+	draw_cursors_foreground(p);
+
 	p.end();
 }
 
@@ -111,5 +114,33 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	_view.zoom(event->delta() / 120, event->x());
 }
 
+void Viewport::draw_cursors_background(QPainter &p)
+{
+	if(!_view.cursors_shown())
+		return;
+
+	p.setPen(Qt::NoPen);
+	p.setBrush(QBrush(View::CursorAreaColour));
+
+	const pair<Cursor, Cursor> &c = _view.cursors();
+	const float x1 = (c.first.time() - _view.offset()) / _view.scale();
+	const float x2 = (c.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)width());
+
+	p.drawRect(l, 0, r - l, height());
+}
+
+void Viewport::draw_cursors_foreground(QPainter &p)
+{
+	if(!_view.cursors_shown())
+		return;
+
+	const QRect r = rect();
+	pair<Cursor, Cursor> &cursors = _view.cursors();
+	cursors.first.paint(p, r);
+	cursors.second.paint(p, r);
+}
+
 } // namespace view
 } // namespace pv