X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fviewport.cpp;h=2772c7764ead3a45b2c76733be6b0fe98d252c05;hb=282905348863fe871a48c680bd12bc1dee364a43;hp=b437175f75fa89b0adc9f325d6f43ad98a4b30c9;hpb=ccdd3ef548ce34f25c6c168598556a350831aa37;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index b437175f..2772c776 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,185 @@
  * 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 <limits>
 
-#include "../../sigsession.h"
-#include "../../signal.h"
+#include "signal.hpp"
+#include "view.hpp"
+#include "viewitempaintparams.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::back_inserter;
+using std::copy;
+using std::max;
+using std::min;
+using std::none_of;
+using std::numeric_limits;
+using std::shared_ptr;
+using std::stable_sort;
+using std::vector;
 
 namespace pv {
 namespace view {
 
 Viewport::Viewport(View &parent) :
-	QGLWidget(&parent),
-        _view(parent)
+	ViewWidget(parent),
+	drag_offset_(numeric_limits<double>::signaling_NaN()),
+	pinch_zoom_active_(false)
 {
-	setMouseTracking(true);
-	setAutoFillBackground(false);
+	setAutoFillBackground(true);
+	setBackgroundRole(QPalette::Base);
 }
 
-int Viewport::get_total_height() const
+shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 {
-	int height = 0;
-	BOOST_FOREACH(const shared_ptr<Signal> s,
-		_view.session().get_signals()) {
-		assert(s);
-		height += View::SignalHeight;
-	}
+	const vector< shared_ptr<ViewItem> > items(this->items());
+	for (auto i = items.rbegin(); i != items.rend(); i++)
+		if ((*i)->enabled() &&
+			(*i)->hit_box_rect(rect()).contains(pt))
+			return *i;
+	return nullptr;
+}
 
-	return height;
+void Viewport::drag()
+{
+	drag_offset_ = view_.offset();
 }
 
-void Viewport::initializeGL()
+void Viewport::drag_by(const QPoint &delta)
 {
+	if (isnan(drag_offset_))
+		return;
+
+	view_.set_scale_offset(view_.scale(), drag_offset_ -
+		delta.x() * view_.scale());
 }
 
-void Viewport::resizeGL(int width, int height)
+void Viewport::drag_release()
 {
-	setup_viewport(width, height);
+	drag_offset_ = numeric_limits<double>::signaling_NaN();
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+vector< shared_ptr<ViewItem> > Viewport::items()
 {
-	int offset;
+	vector< shared_ptr<ViewItem> > items(view_.begin(), view_.end());
+	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+	copy(time_items.begin(), time_items.end(), back_inserter(items));
+	return items;
+}
 
-	const vector< shared_ptr<Signal> > &sigs =
-		_view.session().get_signals();
+bool Viewport::touch_event(QTouchEvent *event)
+{
+	QList<QTouchEvent::TouchPoint> touchPoints = event->touchPoints();
 
-	// Prepare for OpenGL rendering
-	makeCurrent();
-	glMatrixMode(GL_MODELVIEW);
-	glPushMatrix();
+	if (touchPoints.count() != 2) {
+		pinch_zoom_active_ = false;
+		return false;
+	}
 
-	setup_viewport(width(), height());
+	const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first();
+	const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last();
 
-	qglClearColor(Qt::white);
-	glClear(GL_COLOR_BUFFER_BIT);
+	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;
+	}
 
-	// Plot the signal
-	glEnable(GL_SCISSOR_TEST);
-	glScissor(0, 0, width(), height());
-	offset = -_view.v_offset();
-	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
-	{
-		assert(s);
+	double w = touchPoint1.pos().x() - touchPoint0.pos().x();
+	if (abs(w) >= 1.0) {
+		const double scale =
+			fabs((pinch_offset1_ - pinch_offset0_) / w);
+		double offset = pinch_offset0_ - touchPoint0.pos().x() * scale;
+		if (scale > 0)
+			view_.set_scale_offset(scale, offset);
+	}
 
-		const QRect signal_rect(0, offset,
-			width(), View::SignalHeight);
+	if (event->touchPointStates() & Qt::TouchPointReleased) {
+		pinch_zoom_active_ = false;
+
+		if (touchPoint0.state() & Qt::TouchPointReleased) {
+			// Primary touch released
+			drag_release();
+		} else {
+			// Update the mouse down fields so that continued
+			// dragging with the primary touch will work correctly
+			mouse_down_point_ = touchPoint0.pos().toPoint();
+			drag();
+		}
+	}
 
-		s->paint(*this, signal_rect, _view.scale(), _view.offset());
+	return true;
+}
 
-		offset += View::SignalHeight;
-	}
+void Viewport::paintEvent(QPaintEvent*)
+{
+	vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+	assert(none_of(row_items.begin(), row_items.end(),
+		[](const shared_ptr<RowItem> &r) { return !r; }));
 
-	glDisable(GL_SCISSOR_TEST);
+	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 QPainter rendering
-	glMatrixMode(GL_MODELVIEW);
-	glPopMatrix();
+	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+	assert(none_of(time_items.begin(), time_items.end(),
+		[](const shared_ptr<TimeItem> &t) { return !t; }));
 
-	QPainter painter(this);
-	painter.end();
-}
+	QPainter p(this);
+	p.setRenderHint(QPainter::Antialiasing);
 
-void Viewport::mousePressEvent(QMouseEvent *event)
-{
-	assert(event);
+	const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
 
-	_mouse_down_point = event->pos();
-	_mouse_down_offset = _view.offset();
-}
+	for (const shared_ptr<TimeItem> t : time_items)
+		t->paint_back(p, pp);
+	for (const shared_ptr<RowItem> r : row_items)
+		r->paint_back(p, pp);
 
-void Viewport::mouseMoveEvent(QMouseEvent *event)
-{
-	assert(event);
+	for (const shared_ptr<TimeItem> t : time_items)
+		t->paint_mid(p, pp);
+	for (const shared_ptr<RowItem> r : row_items)
+		r->paint_mid(p, pp);
 
-	if(event->buttons() & Qt::LeftButton)
-	{
-		_view.set_scale_offset(_view.scale(),
-			_mouse_down_offset +
-			(_mouse_down_point - event->pos()).x() *
-			_view.scale());
-	}
+	for (const shared_ptr<RowItem> r : row_items)
+		r->paint_fore(p, pp);
+	for (const shared_ptr<TimeItem> t : time_items)
+		t->paint_fore(p, pp);
+
+	p.end();
 }
 
-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());
-}
 
-void Viewport::setup_viewport(int width, int height)
-{
-	glViewport(0, 0, (GLint)width, (GLint)height);
-	glMatrixMode(GL_PROJECTION);
-	glLoadIdentity();
-	glOrtho(0, width, height, 0, -1, 1);
-	glMatrixMode(GL_MODELVIEW);
+	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());
+	}
 }
 
 } // namespace view