X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=564b331cf99e6157c92f857f8126a80700c5efc4;hp=f8d568109f3c198f78e145ba0bdc25be041779b7;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index f8d56810..564b331c 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -18,101 +18,181 @@
  * 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 "signal.h"
-#include "../sigsession.h"
+#include "signal.hpp"
+#include "view.hpp"
+#include "viewitempaintparams.hpp"
+#include "viewport.hpp"
+
+#include <pv/session.hpp>
 
 #include <QMouseEvent>
 
+#include <QDebug>
+
+using std::abs;
+using std::back_inserter;
+using std::copy;
+using std::dynamic_pointer_cast;
 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 {
+namespace views {
+namespace TraceView {
 
 Viewport::Viewport(View &parent) :
-	QWidget(&parent),
-        _view(parent)
+	ViewWidget(parent),
+	pinch_zoom_active_(false)
 {
-	setMouseTracking(true);
 	setAutoFillBackground(true);
 	setBackgroundRole(QPalette::Base);
+}
 
-	connect(&_view.session(), SIGNAL(signals_changed()),
-		this, SLOT(on_signals_changed()));
+shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
+{
+	const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
+	const vector< shared_ptr<ViewItem> > items(this->items());
+	for (auto i = items.rbegin(); i != items.rend(); i++)
+		if ((*i)->enabled() &&
+			(*i)->hit_box_rect(pp).contains(pt))
+			return *i;
+	return nullptr;
+}
 
-	connect(&_view, SIGNAL(signals_moved()),
-		this, SLOT(on_signals_moved()));
+void Viewport::item_hover(const shared_ptr<ViewItem> &item)
+{
+	if (item && item->is_draggable())
+		setCursor(dynamic_pointer_cast<RowItem>(item) ?
+			Qt::SizeVerCursor : Qt::SizeHorCursor);
+	else
+		unsetCursor();
+}
 
-	// Trigger the initial event manually. The default device has signals
-	// which were created before this object came into being
-	on_signals_changed();
+void Viewport::drag()
+{
+	drag_offset_ = view_.offset();
+	drag_v_offset_ = view_.owner_visual_v_offset();
 }
 
-int Viewport::get_total_height() const
+void Viewport::drag_by(const QPoint &delta)
 {
-	int h = 0;
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
-	for (const shared_ptr<Trace> t : traces) {
-		assert(t);
-		h = max(t->get_v_offset() + View::SignalHeight, h);
-	}
+	if (drag_offset_ == boost::none)
+		return;
 
-	return h;
+	view_.set_scale_offset(view_.scale(),
+		(*drag_offset_ - delta.x() * view_.scale()));
+
+	view_.set_v_offset(-drag_v_offset_ - delta.y());
 }
 
-void Viewport::paintEvent(QPaintEvent*)
+void Viewport::drag_release()
 {
-	const vector< shared_ptr<Trace> > traces(_view.get_traces());
+	drag_offset_ = boost::none;
+}
 
-	QPainter p(this);
-	p.setRenderHint(QPainter::Antialiasing);
+vector< shared_ptr<ViewItem> > Viewport::items()
+{
+	vector< shared_ptr<ViewItem> > items;
+	const std::vector< shared_ptr<ViewItem> > view_items(
+		view_.list_by_type<ViewItem>());
+	copy(view_items.begin(), view_items.end(), back_inserter(items));
+	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+	copy(time_items.begin(), time_items.end(), back_inserter(items));
+	return items;
+}
 
-	if (_view.cursors_shown())
-		_view.cursors().draw_viewport_background(p, rect());
+bool Viewport::touch_event(QTouchEvent *event)
+{
+	QList<QTouchEvent::TouchPoint> touchPoints = event->touchPoints();
 
-	// Plot the signal
-	for (const shared_ptr<Trace> t : traces)
-	{
-		assert(t);
-		t->paint_back(p, 0, width());
+	if (touchPoints.count() != 2) {
+		pinch_zoom_active_ = false;
+		return false;
 	}
 
-	for (const shared_ptr<Trace> t : traces)
-		t->paint_mid(p, 0, width());
+	const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first();
+	const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last();
 
-	for (const shared_ptr<Trace> t : traces)
-		t->paint_fore(p, 0, width());
+	if (!pinch_zoom_active_ ||
+	    (event->touchPointStates() & Qt::TouchPointPressed)) {
+		pinch_offset0_ = (view_.offset() + view_.scale() * touchPoint0.pos().x()).convert_to<double>();
+		pinch_offset1_ = (view_.offset() + view_.scale() * touchPoint1.pos().x()).convert_to<double>();
+		pinch_zoom_active_ = true;
+	}
 
-	if (_view.cursors_shown())
-		_view.cursors().draw_viewport_foreground(p, rect());
+	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);
+	}
 
-	p.end();
+	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();
+		}
+	}
+
+	return true;
 }
 
-void Viewport::mousePressEvent(QMouseEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
-	assert(event);
+	vector< shared_ptr<RowItem> > row_items(view_.list_by_type<RowItem>());
+	assert(none_of(row_items.begin(), row_items.end(),
+		[](const shared_ptr<RowItem> &r) { return !r; }));
 
-	_mouse_down_point = event->pos();
-	_mouse_down_offset = _view.offset();
-}
+	stable_sort(row_items.begin(), row_items.end(),
+		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+			return a->point(QRect()).y() < b->point(QRect()).y(); });
 
-void Viewport::mouseMoveEvent(QMouseEvent *event)
-{
-	assert(event);
+	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; }));
 
-	if (event->buttons() & Qt::LeftButton)
-	{
-		_view.set_scale_offset(_view.scale(),
-			_mouse_down_offset +
-			(_mouse_down_point - event->pos()).x() *
-			_view.scale());
-	}
+	QPainter p(this);
+	p.setRenderHint(QPainter::Antialiasing);
+
+	const ViewItemPaintParams pp(rect(), view_.scale(), 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);
+
+	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);
+
+	for (const shared_ptr<RowItem> r : row_items)
+		r->paint_fore(p, pp);
+
+	p.setRenderHint(QPainter::Antialiasing, false);
+	for (const shared_ptr<TimeItem> t : time_items)
+		t->paint_fore(p, pp);
+
+	p.end();
 }
 
 void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
@@ -120,9 +200,9 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
 	assert(event);
 
 	if (event->buttons() & Qt::LeftButton)
-		_view.zoom(2.0, event->x());
+		view_.zoom(2.0, event->x());
 	else if (event->buttons() & Qt::RightButton)
-		_view.zoom(-2.0, event->x());
+		view_.zoom(-2.0, event->x());
 }
 
 void Viewport::wheelEvent(QWheelEvent *event)
@@ -130,30 +210,22 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	assert(event);
 
 	if (event->orientation() == Qt::Vertical) {
-		// Vertical scrolling is interpreted as zooming in/out
-		_view.zoom(event->delta() / 120, event->x());
+		if (event->modifiers() & Qt::ControlModifier) {
+			// Vertical scrolling with the control key pressed
+			// is intrepretted as vertical scrolling
+			view_.set_v_offset(-view_.owner_visual_v_offset() -
+				(event->delta() * height()) / (8 * 120));
+		} else {
+			// 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());
+		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());
-	for (shared_ptr<Trace> t : traces) {
-		assert(t);
-		connect(t.get(), SIGNAL(visibility_changed()),
-			this, SLOT(update()));
-	}
-}
-
-void Viewport::on_signals_moved()
-{
-	update();
-}
-
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv