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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 2772c776..007a8c21 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -35,6 +35,7 @@
 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;
@@ -48,7 +49,6 @@ namespace view {
 
 Viewport::Viewport(View &parent) :
 	ViewWidget(parent),
-	drag_offset_(numeric_limits<double>::signaling_NaN()),
 	pinch_zoom_active_(false)
 {
 	setAutoFillBackground(true);
@@ -65,6 +65,15 @@ shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 	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();
@@ -72,16 +81,16 @@ void Viewport::drag()
 
 void Viewport::drag_by(const QPoint &delta)
 {
-	if (isnan(drag_offset_))
+	if (drag_offset_ == boost::none)
 		return;
 
-	view_.set_scale_offset(view_.scale(), drag_offset_ -
-		delta.x() * view_.scale());
+	view_.set_scale_offset(view_.scale(),
+		(*drag_offset_ - delta.x() * view_.scale()));
 }
 
 void Viewport::drag_release()
 {
-	drag_offset_ = numeric_limits<double>::signaling_NaN();
+	drag_offset_ = boost::none;
 }
 
 vector< shared_ptr<ViewItem> > Viewport::items()
@@ -106,8 +115,8 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 	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_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;
 	}
 
@@ -139,12 +148,12 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-	vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+	vector< shared_ptr<TraceTreeItem> > row_items(view_.begin(), view_.end());
 	assert(none_of(row_items.begin(), row_items.end(),
-		[](const shared_ptr<RowItem> &r) { return !r; }));
+		[](const shared_ptr<TraceTreeItem> &r) { return !r; }));
 
 	stable_sort(row_items.begin(), row_items.end(),
-		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+		[](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
 			return a->visual_v_offset() < b->visual_v_offset(); });
 
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
@@ -158,15 +167,17 @@ void Viewport::paintEvent(QPaintEvent*)
 
 	for (const shared_ptr<TimeItem> t : time_items)
 		t->paint_back(p, pp);
-	for (const shared_ptr<RowItem> r : row_items)
+	for (const shared_ptr<TraceTreeItem> 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)
+	for (const shared_ptr<TraceTreeItem> r : row_items)
 		r->paint_mid(p, pp);
 
-	for (const shared_ptr<RowItem> r : row_items)
+	p.setRenderHint(QPainter::Antialiasing, false);
+
+	for (const shared_ptr<TraceTreeItem> r : row_items)
 		r->paint_fore(p, pp);
 	for (const shared_ptr<TimeItem> t : time_items)
 		t->paint_fore(p, pp);
@@ -184,18 +195,27 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
 		view_.zoom(-2.0, event->x());
 }
 
-void Viewport::wheelEvent(QWheelEvent *event)
+void Viewport::wheelEvent(QWheelEvent *e)
 {
-	assert(event);
-
-	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) {
+	assert(e);
+
+	if (e->orientation() == Qt::Vertical)
+	{
+		if (e->modifiers() & Qt::ControlModifier) {
+			// Vertical scrolling with the control key pressed
+			// is intrepretted as vertical scrolling
+			view_.set_v_offset(-view_.owner_visual_v_offset() -
+				(e->delta() * height()) / (8 * 120));
+		} else {
+			// Vertical scrolling is interpreted as zooming in/out
+			view_.zoom(e->delta() / 120, e->x());
+		}
+	}
+	else if (e->orientation() == Qt::Horizontal)
+	{
 		// Horizontal scrolling is interpreted as moving left/right
 		view_.set_scale_offset(view_.scale(),
-				       event->delta() * view_.scale()
-				       + view_.offset());
+			e->delta() * view_.scale() + view_.offset());
 	}
 }