Add initial scrolling support with a QAbstractScrollArea

[pulseview.git] / sigviewport.h

diff --git a/sigviewport.h b/sigviewport.h
index 0846ca51a6f78209fc8ebec326db7882c8a4cc06..12f6b7c555f25644e2a6e8e15409601253652a4f 100644 (file)
--- a/sigviewport.h
+++ b/sigviewport.h
@@ -27,18 +27,14 @@
 class QPainter;
 class QPaintEvent;
 class SigSession;
+class SigView;
 
 class SigViewport : 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;
 
        static const int MinorTickSubdivision;
        static const int ScaleUnits[3];
@@ -47,12 +43,11 @@ private:
        static const int FirstSIPrefixPower;
 
 public:
-       explicit SigViewport(SigSession &session, QWidget *parent = 0);
+       explicit SigViewport(SigView &parent);
 
-       void zoom(double steps);
+       int get_total_height() const;
 
 protected:
-
        void initializeGL();
 
        void resizeGL(int width, int height);
@@ -70,16 +65,8 @@ private:
 
        void paint_ruler(QPainter &p);
 
-       void zoom(double steps, int offset);
-
-private slots:
-       void data_updated();
-
 private:
-       SigSession &_session;
-
-       double _scale;
-       double _offset;
+       SigView &_view;
 
        QPoint _mouse_down_point;
        double _mouse_down_offset;