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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index b437175f..f5f0ab59 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>
  *
@@ -18,133 +18,208 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "view.h"
-#include "viewport.h"
+#include <cassert>
+#include <cmath>
+#include <algorithm>
 
-#include "../../sigsession.h"
-#include "../../signal.h"
+#include "rowitempaintparams.hpp"
+#include "signal.hpp"
+#include "view.hpp"
+#include "viewport.hpp"
 
-#include <QMouseEvent>
+#include <pv/session.hpp>
 
-#include <boost/foreach.hpp>
+#include <QMouseEvent>
 
-using namespace boost;
-using namespace std;
+using std::abs;
+using std::max;
+using std::min;
+using std::shared_ptr;
+using std::stable_sort;
+using std::vector;
 
 namespace pv {
 namespace view {
 
 Viewport::Viewport(View &parent) :
-	QGLWidget(&parent),
-        _view(parent)
+	QWidget(&parent),
+	view_(parent),
+	mouse_down_valid_(false),
+	pinch_zoom_active_(false)
 {
-	setMouseTracking(true);
-	setAutoFillBackground(false);
-}
+	setAttribute(Qt::WA_AcceptTouchEvents, true);
 
-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;
-	}
-
-	return height;
-}
-
-void Viewport::initializeGL()
-{
-}
+	setMouseTracking(true);
+	setAutoFillBackground(true);
+	setBackgroundRole(QPalette::Base);
 
-void Viewport::resizeGL(int width, int height)
-{
-	setup_viewport(width, height);
+	connect(&view_, SIGNAL(signals_moved()),
+		this, SLOT(on_signals_moved()));
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
-	int offset;
-
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+	vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+	stable_sort(row_items.begin(), row_items.end(),
+		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+			return a->visual_v_offset() < b->visual_v_offset(); });
 
-	// Prepare for OpenGL rendering
-	makeCurrent();
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
+	QPainter p(this);
+	p.setRenderHint(QPainter::Antialiasing);
 
-	setup_viewport(width(), height());
+	if (view_.cursors_shown())
+		view_.cursors().draw_viewport_background(p, rect());
 
-	qglClearColor(Qt::white);
-	glClear(GL_COLOR_BUFFER_BIT);
+	const RowItemPaintParams pp(0, width(), view_.scale(), view_.offset());
 
 	// Plot the signal
-	glEnable(GL_SCISSOR_TEST);
-	glScissor(0, 0, width(), height());
-	offset = -_view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+	for (const shared_ptr<RowItem> r : row_items)
 	{
-		assert(s);
+		assert(r);
+		r->paint_back(p, pp);
+	}
 
-		const QRect signal_rect(0, offset,
-			width(), View::SignalHeight);
+	for (const shared_ptr<RowItem> r : row_items)
+		r->paint_mid(p, pp);
 
-		s->paint(*this, signal_rect, _view.scale(), _view.offset());
+	for (const shared_ptr<RowItem> r : row_items)
+		r->paint_fore(p, pp);
 
-		offset += View::SignalHeight;
-	}
+	if (view_.cursors_shown())
+		view_.cursors().draw_viewport_foreground(p, rect());
 
-	glDisable(GL_SCISSOR_TEST);
+	p.end();
+}
 
-	// Prepare for QPainter rendering
-	glMatrixMode(GL_MODELVIEW);
-	glPopMatrix();
+bool Viewport::event(QEvent *event)
+{
+	switch (event->type()) {
+	case QEvent::TouchBegin:
+	case QEvent::TouchUpdate:
+	case QEvent::TouchEnd:
+		if (touchEvent(static_cast<QTouchEvent *>(event)))
+			return true;
+		break;
+
+	default:
+		break;
+	}
 
-	QPainter painter(this);
-	painter.end();
+	return QWidget::event(event);
 }
 
 void Viewport::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	_mouse_down_point = event->pos();
-	_mouse_down_offset = _view.offset();
+	if (event->button() == Qt::LeftButton) {
+		mouse_down_point_ = event->pos();
+		mouse_down_offset_ = view_.offset();
+		mouse_down_valid_ = true;
+	}
+}
+
+void Viewport::mouseReleaseEvent(QMouseEvent *event)
+{
+	assert(event);
+
+	if (event->button() == Qt::LeftButton)
+		mouse_down_valid_ = false;
 }
 
 void Viewport::mouseMoveEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	if(event->buttons() & Qt::LeftButton)
-	{
-		_view.set_scale_offset(_view.scale(),
-			_mouse_down_offset +
-			(_mouse_down_point - event->pos()).x() *
-			_view.scale());
+	if (event->buttons() & Qt::LeftButton) {
+		if (!mouse_down_valid_) {
+			mouse_down_point_ = event->pos();
+			mouse_down_offset_ = view_.offset();
+			mouse_down_valid_ = true;
+		}
+
+		view_.set_scale_offset(view_.scale(),
+			mouse_down_offset_ +
+			(mouse_down_point_ - event->pos()).x() *
+			view_.scale());
 	}
 }
 
-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());
+	}
+}
+
+bool Viewport::touchEvent(QTouchEvent *event)
+{
+	QList<QTouchEvent::TouchPoint> touchPoints = event->touchPoints();
+
+	if (touchPoints.count() != 2) {
+		pinch_zoom_active_ = false;
+		return false;
+	}
+
+	const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first();
+	const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last();
+
+	if (!pinch_zoom_active_ ||
+	    (event->touchPointStates() & Qt::TouchPointPressed)) {
+		pinch_offset0_ = view_.offset() + view_.scale() * touchPoint0.pos().x();
+		pinch_offset1_ = view_.offset() + view_.scale() * touchPoint1.pos().x();
+		pinch_zoom_active_ = true;
+	}
+
+	double w = touchPoint1.pos().x() - touchPoint0.pos().x();
+	if (abs(w) >= 1.0) {
+		double scale = (pinch_offset1_ - pinch_offset0_) / w;
+		if (scale < 0)
+			scale = -scale;
+		double offset = pinch_offset0_ - touchPoint0.pos().x() * scale;
+		if (scale > 0)
+			view_.set_scale_offset(scale, offset);
+	}
+
+	if (event->touchPointStates() & Qt::TouchPointReleased) {
+		pinch_zoom_active_ = false;
+
+		if (touchPoint0.state() & Qt::TouchPointReleased) {
+			// Primary touch released
+			mouse_down_valid_ = false;
+		} else {
+			// Update the mouse down fields so that continued
+			// dragging with the primary touch will work correctly
+			mouse_down_point_ = touchPoint0.pos().toPoint();
+			mouse_down_offset_ = view_.offset();
+			mouse_down_valid_ = true;
+		}
+	}
+
+	return true;
 }
 
-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