Revert "View: Decouple horizontal scrolling from the scoll bar"

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

diff --git a/pv/view/view.h b/pv/view/view.h
index ac2835a49cb4b6157075741d436c6708bd165727..5a10ee9ecea7be2b9dacd69c6bb964d0a215de23 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,7 +23,12 @@
 
 #include <stdint.h>
 
+#include <utility>
+
 #include <QAbstractScrollArea>
+#include <QSizeF>
+
+#include "cursor.h"
 
 namespace pv {
 
@@ -49,6 +54,12 @@ private:
 
 public:
        static const int SignalHeight;
+       static const int SignalMargin;
+       static const int SignalSnapGridSize;
+
+       static const QColor CursorAreaColour;
+
+       static const QSizeF LabelPadding;
 
 public:
        explicit View(SigSession &session, QWidget *parent = 0);
@@ -77,16 +88,37 @@ public:
         */
        void set_scale_offset(double scale, double offset);
 
+       /**
+        * Returns true if cursors are displayed. false otherwise.
+        */
+       bool cursors_shown() const;
+
+       /**
+        * Shows or hides the cursors.
+        */
+       void show_cursors(bool show = true);
+
+       /**
+        * Returns a reference to the pair of cursors.
+        */
+       std::pair<Cursor, Cursor>& cursors();
+
        const QPoint& hover_point() const;
 
+       void normalize_layout();
+
 signals:
        void hover_point_changed();
 
+       void signals_moved();
+
 private:
        void get_scroll_layout(double &length, double &offset) const;
        
        void update_scroll();
 
+       void reset_signal_layout();
+
 private:
        bool eventFilter(QObject *object, QEvent *event);
 
@@ -99,8 +131,13 @@ private slots:
        void h_scroll_value_changed(int value);
        void v_scroll_value_changed(int value);
 
+       void signals_changed();
        void data_updated();
 
+       void marker_time_changed();
+
+       void on_signals_moved();
+
 private:
        SigSession &_session;
 
@@ -118,6 +155,9 @@ private:
 
        int _v_offset;
 
+       bool _show_cursors;
+       std::pair<Cursor, Cursor> _cursors;
+
        QPoint _hover_point;
 };