Moved RulerHeight out of View into Ruler

[pulseview.git] / pv / view / view.h

diff --git a/pv/view/view.h b/pv/view/view.h
index 25e43b8a36c17b7feedf914c8fc2dd95e4c9cbac..6f1e87288bd1dd14f40568f86198ea39f0a3a7bc 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -51,9 +51,6 @@ private:
        static const double MaxScale;
        static const double MinScale;
 
-       static const int LabelMarginWidth;
-       static const int RulerHeight;
-
        static const int MaxScrollValue;
 
 public:
@@ -86,6 +83,10 @@ public:
        void zoom(double steps);
        void zoom(double steps, int offset);
 
+       void zoom_fit();
+
+       void zoom_one_to_one();
+
        /**
         * Sets the scale and offset.
         * @param scale The new view scale in seconds per pixel.
@@ -126,6 +127,8 @@ public:
 
        void normalize_layout();
 
+       void update_viewport();
+
 signals:
        void hover_point_changed();
 
@@ -138,8 +141,12 @@ signals:
 private:
        void get_scroll_layout(double &length, double &offset) const;
        
+       void set_zoom(double scale, int offset);
+
        void update_scroll();
 
+       void update_layout();
+
        static bool compare_trace_v_offsets(
                const boost::shared_ptr<pv::view::Trace> &a,
                const boost::shared_ptr<pv::view::Trace> &b);
@@ -163,6 +170,8 @@ private slots:
 
        void on_signals_moved();
 
+       void on_geometry_updated();
+
 private:
        SigSession &_session;