Made pv::view::View::zoom public

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 4e0fed063fca8c4d42e67c5bcb6cb58c23cee390..95b94cf1a0ab8d768fd966207dad1b92628aaf97 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -96,6 +96,19 @@ void View::zoom(double steps)
        zoom(steps, (width() - LabelMarginWidth) / 2);
 }
 
+void View::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;
+
+       _ruler->update();
+       _viewport->update();
+       update_scroll();
+}
+
+
 void View::set_scale_offset(double scale, double offset)
 {
        _scale = scale;
@@ -132,18 +145,6 @@ void View::update_scroll()
                _viewport->get_total_height() - areaSize.height());
 }
 
-void View::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;
-
-       _ruler->update();
-       _viewport->update();
-       update_scroll();
-}
-
 bool View::viewportEvent(QEvent *e)
 {
        switch(e->type()) {

diff --git a/pv/view/view.h b/pv/view/view.h
index d7fc635697aebf2c95b8f449e7b7b68b2e52ee58..0413b3d79820c6174aa421d4d89c57d80c58c4cb 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -57,14 +57,13 @@ public:
        int v_offset() const;
 
        void zoom(double steps);
+       void zoom(double steps, int offset);
 
        void set_scale_offset(double scale, double offset);
 
 private:
        void update_scroll();
 
-       void zoom(double steps, int offset);
-
 private:
        bool viewportEvent(QEvent *e);