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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 06fab904..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,8 +44,15 @@ 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
@@ -72,9 +81,15 @@ void Viewport::paintEvent(QPaintEvent*)
 	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
 	{
 		assert(t);
-		t->paint(p, 0, width());
+		t->paint_back(p, 0, width());
 	}
 
+	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());
 
@@ -102,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);
@@ -117,6 +142,16 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	}
 }
 
+void Viewport::on_signals_changed()
+{
+	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()
 {
 	update();