X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fviewport.cpp;h=70282d41c4acfbd1cbe759411a716de241079aee;hb=b42d25c43e52c900cbdd3e5cde0282961b8721e7;hp=6ce52abc28c4a362cf798fac507e4187c311cef7;hpb=333d5bbc0a326e6fa82db44f3e6ba8dd79cafdd8;p=pulseview.git

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 6ce52ab..70282d4 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -59,7 +59,7 @@ int Viewport::get_total_height() const
 	return h;
 }
 
-void Viewport::paintEvent(QPaintEvent *event)
+void Viewport::paintEvent(QPaintEvent*)
 {
 	const vector< shared_ptr<Signal> > sigs(
 		_view.session().get_signals());
@@ -74,11 +74,8 @@ void Viewport::paintEvent(QPaintEvent *event)
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
 	{
 		assert(s);
-
-		const QRect signal_rect(0, s->get_v_offset() - v_offset,
-			width(), View::SignalHeight);
-
-		s->paint(p, signal_rect, _view.scale(), _view.offset());
+		s->paint(p, s->get_v_offset() - v_offset, 0, width(),
+			_view.scale(), _view.offset());
 	}
 
 	draw_cursors_foreground(p);
@@ -107,15 +104,19 @@ void Viewport::mouseMoveEvent(QMouseEvent *event)
 	}
 }
 
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
-{
-	assert(event);
-}
-
 void Viewport::wheelEvent(QWheelEvent *event)
 {
 	assert(event);
-	_view.zoom(event->delta() / 120, event->x());
+
+	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());
+	}
 }
 
 void Viewport::draw_cursors_background(QPainter &p)
@@ -126,9 +127,9 @@ void Viewport::draw_cursors_background(QPainter &p)
 	p.setPen(Qt::NoPen);
 	p.setBrush(QBrush(View::CursorAreaColour));
 
-	const pair<Cursor, Cursor> &c = _view.cursors();
-	const float x1 = (c.first.time() - _view.offset()) / _view.scale();
-	const float x2 = (c.second.time() - _view.offset()) / _view.scale();
+	const CursorPair &c = _view.cursors();
+	const float x1 = (c.first().time() - _view.offset()) / _view.scale();
+	const float x2 = (c.second().time() - _view.offset()) / _view.scale();
 	const int l = (int)max(min(x1, x2), 0.0f);
 	const int r = (int)min(max(x1, x2), (float)width());
 
@@ -141,9 +142,9 @@ void Viewport::draw_cursors_foreground(QPainter &p)
 		return;
 
 	const QRect r = rect();
-	pair<Cursor, Cursor> &cursors = _view.cursors();
-	cursors.first.paint(p, r);
-	cursors.second.paint(p, r);
+	CursorPair &cursors = _view.cursors();
+	cursors.first().paint(p, r);
+	cursors.second().paint(p, r);
 }
 
 void Viewport::on_signals_moved()