X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=3b06cf9e85e0bc31a5c8f4e7edba38be8aaaa119;hp=70282d41c4acfbd1cbe759411a716de241079aee;hb=9f46d9058be2cc2b11ccecb0ba4c4f61d55bec1a;hpb=b42d25c43e52c900cbdd3e5cde0282961b8721e7

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 70282d41..3b06cf9e 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -28,8 +28,10 @@
 
 #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 {
@@ -42,18 +44,24 @@ Viewport::Viewport(View &parent) :
 	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 h = 0;
-	const vector< shared_ptr<Signal> > sigs(
-		_view.session().get_signals());
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
-		assert(s);
-		h = max(s->get_v_offset() + View::SignalHeight, h);
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+		assert(t);
+		h = max(t->get_v_offset() + View::SignalHeight, h);
 	}
 
 	return h;
@@ -61,24 +69,29 @@ int Viewport::get_total_height() const
 
 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
-	const int v_offset = _view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
 	{
-		assert(s);
-		s->paint(p, s->get_v_offset() - v_offset, 0, width(),
-			_view.scale(), _view.offset());
+		assert(t);
+		t->paint_back(p, 0, width());
 	}
 
-	draw_cursors_foreground(p);
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+		t->paint_mid(p, 0, width());
+
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+		t->paint_fore(p, 0, width());
+
+	if (_view.cursors_shown())
+		_view.cursors().draw_viewport_foreground(p, rect());
 
 	p.end();
 }
@@ -104,6 +117,16 @@ void Viewport::mouseMoveEvent(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);
@@ -119,32 +142,14 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	}
 }
 
-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 CursorPair &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();
-	CursorPair &cursors = _view.cursors();
-	cursors.first().paint(p, r);
-	cursors.second().paint(p, r);
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+		assert(t);
+		connect(t.get(), SIGNAL(visibility_changed()),
+			this, SLOT(update()));
+	}
 }
 
 void Viewport::on_signals_moved()