X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sigview.cpp;h=5601be575d722df78302897fa19965fe3280464e;hb=a429590b40f74cebd13986bb1b4c06a4b47d8815;hp=6a2b62044ddc488959dde2c64798a5554b83a105;hpb=1dd95c70180967864bd83d9679f3e9a6c2a4e383;p=pulseview.git

diff --git a/sigview.cpp b/sigview.cpp
index 6a2b6204..5601be57 100644
--- a/sigview.cpp
+++ b/sigview.cpp
@@ -35,6 +35,9 @@
 using namespace boost;
 using namespace std;
 
+const double SigView::MaxScale = 1e9;
+const double SigView::MinScale = 1e-15;
+
 const int SigView::SignalHeight = 50;
 const int SigView::LabelMarginWidth = 70;
 const int SigView::RulerHeight = 30;
@@ -52,20 +55,25 @@ 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);
 }
 
+void SigView::zoom(double steps)
+{
+	zoom(steps, (width() - LabelMarginWidth) / 2);
+}
+
 void SigView::initializeGL()
 {
 }
 
 void SigView::resizeGL(int width, int height)
 {
-	setupViewport(width, height);
+	setup_viewport(width, height);
 }
 
 void SigView::paintEvent(QPaintEvent *event)
@@ -80,12 +88,14 @@ void SigView::paintEvent(QPaintEvent *event)
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
 
-	setupViewport(width(), height());
+	setup_viewport(width(), height());
 
 	qglClearColor(Qt::white);
 	glClear(GL_COLOR_BUFFER_BIT);
 
 	// Plot the signal
+	glEnable(GL_SCISSOR_TEST);
+	glScissor(LabelMarginWidth, 0, width(), height());
 	offset = RulerHeight;
 	BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
 	{
@@ -99,6 +109,8 @@ void SigView::paintEvent(QPaintEvent *event)
 		offset += SignalHeight;
 	}
 
+	glDisable(GL_SCISSOR_TEST);
+
 	// Prepare for QPainter rendering
 	glMatrixMode(GL_MODELVIEW);
 	glPopMatrix();
@@ -120,12 +132,12 @@ void SigView::paintEvent(QPaintEvent *event)
 	}
 
 	// Paint the ruler
-	paintRuler(painter);
+	paint_ruler(painter);
 
 	painter.end();
 }
 
-void SigView::dataUpdated()
+void SigView::data_updated()
 {
 	update();
 }
@@ -157,15 +169,10 @@ void SigView::mouseReleaseEvent(QMouseEvent *event)
 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();
+	zoom(event->delta() / 120, event->x() - LabelMarginWidth);
 }
 
-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);
@@ -174,7 +181,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;
 
@@ -235,3 +242,12 @@ void SigView::paintRuler(QPainter &p)
 		division++;
 	}
 }
+
+void SigView::zoom(double steps, int offset)
+{
+	const double cursor_offset = _offset + _scale * offset;
+	_scale *= pow(3.0/2.0, -steps);
+	_scale = max(min(_scale, MaxScale), MinScale);
+	_offset = cursor_offset - _scale * offset;
+	update();
+}