From: Joel Holdsworth <redacted>
Date: Sat, 7 Jul 2012 07:54:32 +0000 (+0100)
Subject: Added zoom limits
X-Git-Tag: pulseview-0.1.0~324
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=7ae275942e8efbe25df311fecbf3c2a4cb9b0cfe;p=pulseview.git

Added zoom limits
---

diff --git a/sigview.cpp b/sigview.cpp
index dea3cbc1..c46476a3 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;
@@ -165,6 +168,7 @@ void SigView::wheelEvent(QWheelEvent *event)
 	const double x = event->x() - LabelMarginWidth;
 	const double cursor_offset = _offset + _scale * x;
 	_scale *= powf(3.0/2.0, -event->delta() / 120);
+	_scale = max(min(_scale, MaxScale), MinScale);
 	_offset = cursor_offset - _scale * x;
 	update();
 }
diff --git a/sigview.h b/sigview.h
index 2d450df2..aae9e67e 100644
--- a/sigview.h
+++ b/sigview.h
@@ -33,6 +33,9 @@ class SigView : public QGLWidget
 	Q_OBJECT
 
 private:
+	static const double MaxScale;
+	static const double MinScale;
+
 	static const int SignalHeight;
 	static const int LabelMarginWidth;
 	static const int RulerHeight;