X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=2dfdddc1448bddecd8653918c63204ca63dd266c;hp=feb880e94a0bd0ea477ed225bdae4642c5cef767;hb=e8b969a9ae4e0a683eabddc8ded7babaf03844fd;hpb=beb897c6c32c8e8dd9eb34d91100ab0569fca5f6

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index feb880e9..2dfdddc1 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -21,6 +21,7 @@
 #include <cassert>
 #include <cmath>
 #include <algorithm>
+#include <limits>
 
 #include "signal.hpp"
 #include "view.hpp"
@@ -32,9 +33,13 @@
 #include <QMouseEvent>
 
 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;
@@ -43,19 +48,103 @@ namespace pv {
 namespace view {
 
 Viewport::Viewport(View &parent) :
-	QWidget(&parent),
-	view_(parent),
-	mouse_down_valid_(false),
+	ViewWidget(parent),
+	drag_offset_(numeric_limits<double>::signaling_NaN()),
 	pinch_zoom_active_(false)
 {
-	setAttribute(Qt::WA_AcceptTouchEvents, true);
-
-	setMouseTracking(true);
 	setAutoFillBackground(true);
 	setBackgroundRole(QPalette::Base);
+}
+
+shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
+{
+	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;
+}
+
+void Viewport::item_hover(const shared_ptr<ViewItem> &item)
+{
+	if (item)
+		setCursor(dynamic_pointer_cast<RowItem>(item) ?
+			Qt::SizeVerCursor : Qt::SizeHorCursor);
+	else
+		unsetCursor();
+}
+
+void Viewport::drag()
+{
+	drag_offset_ = view_.offset();
+}
+
+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::drag_release()
+{
+	drag_offset_ = numeric_limits<double>::signaling_NaN();
+}
+
+vector< shared_ptr<ViewItem> > Viewport::items()
+{
+	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;
+}
+
+bool Viewport::touch_event(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) {
+		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);
+	}
+
+	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();
+		}
+	}
 
-	connect(&view_, SIGNAL(signals_moved()),
-		this, SLOT(on_signals_moved()));
+	return true;
 }
 
 void Viewport::paintEvent(QPaintEvent*)
@@ -95,60 +184,6 @@ void Viewport::paintEvent(QPaintEvent*)
 	p.end();
 }
 
-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;
-	}
-
-	return QWidget::event(event);
-}
-
-void Viewport::mousePressEvent(QMouseEvent *event)
-{
-	assert(event);
-
-	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) {
-		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::mouseDoubleClickEvent(QMouseEvent *event)
 {
 	assert(event);
@@ -174,57 +209,5 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	}
 }
 
-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::on_signals_moved()
-{
-	update();
-}
-
 } // namespace view
 } // namespace pv