X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=cdae779e5dc0dfeec7a39d9fe3ecc2758bb98fed;hp=d9b0ff1b85af41c44aa32a4212974470e437dfe5;hb=d9aecf1fcd9af471db3b59de7efc65b9632a6d79;hpb=8d634081d8b0cc741dd34d8c646474ff6754aea8

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index d9b0ff1..cdae779 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -26,10 +26,10 @@
 
 #include <QMouseEvent>
 
-#include <boost/foreach.hpp>
-
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::max;
+using std::min;
+using std::vector;
 
 namespace pv {
 namespace view {
@@ -41,45 +41,55 @@ Viewport::Viewport(View &parent) :
 	setMouseTracking(true);
 	setAutoFillBackground(true);
 	setBackgroundRole(QPalette::Base);
+
+	connect(&_view.session(), SIGNAL(signals_changed()),
+		this, SLOT(on_signals_changed()));
+
+	connect(&_view, SIGNAL(signals_moved()),
+		this, SLOT(on_signals_moved()));
+
+	// Trigger the initial event manually. The default device has signals
+	// which were created before this object came into being
+	on_signals_changed();
 }
 
 int Viewport::get_total_height() const
 {
-	int height = 0;
-	BOOST_FOREACH(const shared_ptr<Signal> s,
-		_view.session().get_signals()) {
-		assert(s);
-		height += View::SignalHeight;
+	int h = 0;
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	for (const shared_ptr<Trace> t : traces) {
+		assert(t);
+		h = max(t->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<Trace> > traces(_view.get_traces());
 
 	QPainter p(this);
 	p.setRenderHint(QPainter::Antialiasing);
 
-	draw_cursors_background(p);
+	if (_view.cursors_shown())
+		_view.cursors().draw_viewport_background(p, rect());
 
 	// Plot the signal
-	int offset = -_view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+	for (const shared_ptr<Trace> t : traces)
 	{
-		assert(s);
-
-		const QRect signal_rect(0, offset,
-			width(), View::SignalHeight);
+		assert(t);
+		t->paint_back(p, 0, width());
+	}
 
-		s->paint(p, signal_rect, _view.scale(), _view.offset());
+	for (const shared_ptr<Trace> t : traces)
+		t->paint_mid(p, 0, width());
 
-		offset += View::SignalHeight;
-	}
+	for (const shared_ptr<Trace> t : traces)
+		t->paint_fore(p, 0, width());
 
-	draw_cursors_foreground(p);
+	if (_view.cursors_shown())
+		_view.cursors().draw_viewport_foreground(p, rect());
 
 	p.end();
 }
@@ -96,7 +106,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 +
@@ -105,43 +115,44 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 	}
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
+void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
 {
 	assert(event);
+
+	if (event->buttons() & Qt::LeftButton)
+		_view.zoom(2.0, event->x());
+	else if (event->buttons() & Qt::RightButton)
+		_view.zoom(-2.0, event->x());
 }
 
 void Viewport::wheelEvent(QWheelEvent *event)
 {
 	assert(event);
-	_view.zoom(event->delta() / 120, event->x());
+
+	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::draw_cursors_background(QPainter &p)
+void Viewport::on_signals_changed()
 {
-	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());
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	for (shared_ptr<Trace> t : traces) {
+		assert(t);
+		connect(t.get(), SIGNAL(visibility_changed()),
+			this, SLOT(update()));
+	}
 }
 
-void Viewport::draw_cursors_foreground(QPainter &p)
+void Viewport::on_signals_moved()
 {
-	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);
+	update();
 }
 
 } // namespace view