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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index b437175f..3b06cf9e 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -21,89 +21,79 @@
 #include "view.h"
 #include "viewport.h"
 
-#include "../../sigsession.h"
-#include "../../signal.h"
+#include "signal.h"
+#include "../sigsession.h"
 
 #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 {
 
 Viewport::Viewport(View &parent) :
-	QGLWidget(&parent),
+	QWidget(&parent),
         _view(parent)
 {
 	setMouseTracking(true);
-	setAutoFillBackground(false);
-}
+	setAutoFillBackground(true);
+	setBackgroundRole(QPalette::Base);
 
-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;
-	}
+	connect(&_view.session(), SIGNAL(signals_changed()),
+		this, SLOT(on_signals_changed()));
 
-	return height;
-}
+	connect(&_view, SIGNAL(signals_moved()),
+		this, SLOT(on_signals_moved()));
 
-void Viewport::initializeGL()
-{
+	// Trigger the initial event manually. The default device has signals
+	// which were created before this object came into being
+	on_signals_changed();
 }
 
-void Viewport::resizeGL(int width, int height)
+int Viewport::get_total_height() const
 {
-	setup_viewport(width, height);
+	int h = 0;
+	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;
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
-	int offset;
+	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+	QPainter p(this);
+	p.setRenderHint(QPainter::Antialiasing);
 
-	// Prepare for OpenGL rendering
-	makeCurrent();
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
-
-	setup_viewport(width(), height());
-
-	qglClearColor(Qt::white);
-	glClear(GL_COLOR_BUFFER_BIT);
+	if (_view.cursors_shown())
+		_view.cursors().draw_viewport_background(p, rect());
 
 	// Plot the signal
-	glEnable(GL_SCISSOR_TEST);
-	glScissor(0, 0, width(), height());
-	offset = -_view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
 	{
-		assert(s);
-
-		const QRect signal_rect(0, offset,
-			width(), View::SignalHeight);
-
-		s->paint(*this, signal_rect, _view.scale(), _view.offset());
-
-		offset += View::SignalHeight;
+		assert(t);
+		t->paint_back(p, 0, width());
 	}
 
-	glDisable(GL_SCISSOR_TEST);
+	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());
 
-	// Prepare for QPainter rendering
-	glMatrixMode(GL_MODELVIEW);
-	glPopMatrix();
+	if (_view.cursors_shown())
+		_view.cursors().draw_viewport_foreground(p, rect());
 
-	QPainter painter(this);
-	painter.end();
+	p.end();
 }
 
 void Viewport::mousePressEvent(QMouseEvent *event)
@@ -118,7 +108,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 +
@@ -127,24 +117,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::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::setup_viewport(int width, int height)
+void Viewport::on_signals_moved()
 {
-	glViewport(0, 0, (GLint)width, (GLint)height);
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	glOrtho(0, width, height, 0, -1, 1);
-	glMatrixMode(GL_MODELVIEW);
+	update();
 }
 
 } // namespace view