X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=sigview.cpp;h=8461af6e455f37b1182ef9b9bc1a8197ada54d09;hb=04abfae9c8f8e4884e6535d6584df8b5f1e3a1db;hp=a8e8535923d5a2acfc1a1aa2ae84ec804315d434;hpb=438440ea9d4631a18b5fa95b0aefec9894c39c9b;p=pulseview.git

diff --git a/sigview.cpp b/sigview.cpp
index a8e8535..8461af6 100644
--- a/sigview.cpp
+++ b/sigview.cpp
@@ -52,8 +52,8 @@ SigView::SigView(SigSession &session, QWidget *parent) :
 	_scale(1e-6),
 	_offset(0)
 {
-	connect(&_session, SIGNAL(dataUpdated()),
-		this, SLOT(dataUpdated()));
+	connect(&_session, SIGNAL(data_updated()),
+		this, SLOT(data_updated()));
 
 	setMouseTracking(true);
 	setAutoFillBackground(false);
@@ -65,7 +65,7 @@ void SigView::initializeGL()
 
 void SigView::resizeGL(int width, int height)
 {
-	setupViewport(width, height);
+	setup_viewport(width, height);
 }
 
 void SigView::paintEvent(QPaintEvent *event)
@@ -80,7 +80,7 @@ void SigView::paintEvent(QPaintEvent *event)
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 
-	setupViewport(width(), height());
+	setup_viewport(width(), height());
 
 	qglClearColor(Qt::white);
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -120,49 +120,52 @@ void SigView::paintEvent(QPaintEvent *event)
 	}
 
 	// Paint the ruler
-	paintRuler(painter);
+	paint_ruler(painter);
 
 	painter.end();
 }
 
-void SigView::dataUpdated()
+void SigView::data_updated()
 {
 	update();
 }
 
-void SigView::mouseMoveEvent(QMouseEvent *event)
+void SigView::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
+
+	_mouse_down_point = event->pos();
+	_mouse_down_offset = _offset;
 }
 
-void SigView::mousePressEvent(QMouseEvent *event)
+void SigView::mouseMoveEvent(QMouseEvent *event)
 {
 	assert(event);
+
+	if(event->buttons() & Qt::LeftButton)
+	{
+		_offset = _mouse_down_offset + (_mouse_down_point - event->pos()).x() * _scale;
+		update();
+	}
 }
 
 void SigView::mouseReleaseEvent(QMouseEvent *event)
 {
 	assert(event);
+}
 
-	const double cursor_offset = _offset + _scale * (double)event->x();
-
-	switch(event->button())
-	{
-	case Qt::LeftButton:
-		_scale *= 2.0 / 3.0;
-		break;
-
-	case Qt::RightButton:
-		_scale *= 3.0 / 2.0;
-		break;
-	}
-
-	_offset = cursor_offset - _scale * (double)event->x();
+void SigView::wheelEvent(QWheelEvent *event)
+{
+	assert(event);
 
+	const double x = event->x() - LabelMarginWidth;
+	const double cursor_offset = _offset + _scale * x;
+	_scale *= powf(3.0/2.0, -event->delta() / 120);
+	_offset = cursor_offset - _scale * x;
 	update();
 }
 
-void SigView::setupViewport(int width, int height)
+void SigView::setup_viewport(int width, int height)
 {
 	glViewport(0, 0, (GLint)width, (GLint)height);
 	glMatrixMode(GL_PROJECTION);
@@ -171,7 +174,7 @@ void SigView::setupViewport(int width, int height)
 	glMatrixMode(GL_MODELVIEW);
 }
 
-void SigView::paintRuler(QPainter &p)
+void SigView::paint_ruler(QPainter &p)
 {
 	const double MinSpacing = 80;