X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=ba26c3c1bcaf1743b0809c9d53c4b9fe44d6fbae;hp=99e08b277d151160bbf3b0842d68f0119c60582a;hb=a8e3b0d777d81712e24f352fadb12e6bd33e30fa;hpb=ce6e73a8e2a2a353233b440f4bbbd53007602e1a

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 99e08b27..ba26c3c1 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -21,8 +21,8 @@
 #include "view.h"
 #include "viewport.h"
 
+#include "signal.h"
 #include "../sigsession.h"
-#include "../signal.h"
 
 #include <QMouseEvent>
 
@@ -41,42 +41,45 @@ Viewport::Viewport(View &parent) :
 	setMouseTracking(true);
 	setAutoFillBackground(true);
 	setBackgroundRole(QPalette::Base);
+
+	connect(&_view, SIGNAL(signals_moved()),
+		this, SLOT(on_signals_moved()));
 }
 
 int Viewport::get_total_height() const
 {
-	int height = 0;
-	BOOST_FOREACH(const shared_ptr<Signal> s,
-		_view.session().get_signals()) {
+	int h = 0;
+	const vector< shared_ptr<Signal> > sigs(
+		_view.session().get_signals());
+	BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
 		assert(s);
-		height += View::SignalHeight;
+		h = max(s->get_v_offset() + View::SignalHeight, h);
 	}
 
-	return height;
+	return h;
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+	const vector< shared_ptr<Signal> > sigs(
+		_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,
-			width(), View::SignalHeight);
-
-		s->paint(p, signal_rect, _view.scale(), _view.offset());
-
-		offset += View::SignalHeight;
+		s->paint(p, s->get_v_offset() - v_offset, 0, width(),
+			_view.scale(), _view.offset());
 	}
 
+	draw_cursors_foreground(p);
+
 	p.end();
 }
 
@@ -92,7 +95,7 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	if(event->buttons() & Qt::LeftButton)
+	if (event->buttons() & Qt::LeftButton)
 	{
 		_view.set_scale_offset(_view.scale(),
 			_mouse_down_offset +
@@ -101,15 +104,52 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 	}
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
+void Viewport::wheelEvent(QWheelEvent *event)
 {
 	assert(event);
+
+	if (event->orientation() == Qt::Vertical) {
+		// Vertical scrolling is interpreted as zooming in/out
+		_view.zoom(event->delta() / 120, event->x());
+	} else if (event->orientation() == Qt::Horizontal) {
+		// Horizontal scrolling is interpreted as moving left/right
+		_view.set_scale_offset(_view.scale(),
+				       event->delta() * _view.scale()
+				       + _view.offset());
+	}
 }
 
-void Viewport::wheelEvent(QWheelEvent *event)
+void Viewport::draw_cursors_background(QPainter &p)
 {
-	assert(event);
-	_view.zoom(event->delta() / 120, event->x());
+	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);
+}
+
+void Viewport::on_signals_moved()
+{
+	update();
 }
 
 } // namespace view