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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 2dfdddc1..6e07a2a8 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -49,7 +49,6 @@ namespace view {
 
 Viewport::Viewport(View &parent) :
 	ViewWidget(parent),
-	drag_offset_(numeric_limits<double>::signaling_NaN()),
 	pinch_zoom_active_(false)
 {
 	setAutoFillBackground(true);
@@ -58,17 +57,18 @@ Viewport::Viewport(View &parent) :
 
 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(rect()).contains(pt))
+			(*i)->hit_box_rect(pp).contains(pt))
 			return *i;
 	return nullptr;
 }
 
 void Viewport::item_hover(const shared_ptr<ViewItem> &item)
 {
-	if (item)
+	if (item && item->is_draggable())
 		setCursor(dynamic_pointer_cast<RowItem>(item) ?
 			Qt::SizeVerCursor : Qt::SizeHorCursor);
 	else
@@ -78,25 +78,31 @@ void Viewport::item_hover(const shared_ptr<ViewItem> &item)
 void Viewport::drag()
 {
 	drag_offset_ = view_.offset();
+	drag_v_offset_ = view_.owner_visual_v_offset();
 }
 
 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()));
+
+	view_.set_v_offset(-drag_v_offset_ - delta.y());
 }
 
 void Viewport::drag_release()
 {
-	drag_offset_ = numeric_limits<double>::signaling_NaN();
+	drag_offset_ = boost::none;
 }
 
 vector< shared_ptr<ViewItem> > Viewport::items()
 {
-	vector< shared_ptr<ViewItem> > items(view_.begin(), view_.end());
+	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;
@@ -116,8 +122,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;
 	}
 
@@ -149,13 +155,13 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-	vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+	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; }));
 
 	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(); });
+			return a->point(QRect()).y() < b->point(QRect()).y(); });
 
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
 	assert(none_of(time_items.begin(), time_items.end(),
@@ -178,6 +184,8 @@ void Viewport::paintEvent(QPaintEvent*)
 
 	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);
 
@@ -199,13 +207,19 @@ 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());
+			event->delta() * view_.scale() + view_.offset());
 	}
 }