X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=c5789630be883ed2bb45b3154576eafb4bad0a4b;hb=d23445348bf04a698e062a3b917360313ecbcaad;hp=a06c8888761f6c1237ffde3c5aecc8ceb2ff5df1;hpb=aca00b1e0d3483926c53dfd856483a397f1c29a5;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index a06c888..c578963 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <cassert>
+
 #include "view.h"
 #include "viewport.h"
 
@@ -26,10 +28,10 @@
 
 #include <QMouseEvent>
 
-#include <boost/foreach.hpp>
-
-using namespace boost;
-using namespace std;
+using std::max;
+using std::min;
+using std::shared_ptr;
+using std::vector;
 
 namespace pv {
 namespace view {
@@ -47,13 +49,17 @@ Viewport::Viewport(View &parent) :
 
 	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<Trace> > traces(_view.get_traces());
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
+	for (const shared_ptr<Trace> t : traces) {
 		assert(t);
 		h = max(t->get_v_offset() + View::SignalHeight, h);
 	}
@@ -72,16 +78,16 @@ void Viewport::paintEvent(QPaintEvent*)
 		_view.cursors().draw_viewport_background(p, rect());
 
 	// Plot the signal
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+	for (const shared_ptr<Trace> t : traces)
 	{
 		assert(t);
 		t->paint_back(p, 0, width());
 	}
 
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+	for (const shared_ptr<Trace> t : traces)
 		t->paint_mid(p, 0, width());
 
-	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+	for (const shared_ptr<Trace> t : traces)
 		t->paint_fore(p, 0, width());
 
 	if (_view.cursors_shown())
@@ -111,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);
@@ -129,7 +145,7 @@ 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) {
+	for (shared_ptr<Trace> t : traces) {
 		assert(t);
 		connect(t.get(), SIGNAL(visibility_changed()),
 			this, SLOT(update()));