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

diff --git a/sigview.cpp b/sigview.cpp
index 8461af6..5601be5 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;
@@ -59,6 +62,11 @@ SigView::SigView(SigSession &session, QWidget *parent) :
 	setAutoFillBackground(false);
 }
 
+void SigView::zoom(double steps)
+{
+	zoom(steps, (width() - LabelMarginWidth) / 2);
+}
+
 void SigView::initializeGL()
 {
 }
@@ -86,6 +94,8 @@ void SigView::paintEvent(QPaintEvent *event)
 	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();
@@ -157,12 +169,7 @@ 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::setup_viewport(int width, int height)
@@ -235,3 +242,12 @@ void SigView::paint_ruler(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();
+}