Bring the cursors into view when they are shown

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

diff --git a/pv/view/view.h b/pv/view/view.h
index fb52f530fcb1dccae46ac2bdc773875f7adb7d4e..0f5e254da4f12681dfff1f10621c91c0af1b9422 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,12 +23,10 @@
 
 #include <stdint.h>
 
-#include <utility>
-
 #include <QAbstractScrollArea>
 #include <QSizeF>
 
-#include "cursor.h"
+#include "cursorpair.h"
 
 namespace pv {
 
@@ -54,6 +52,7 @@ private:
 
 public:
        static const int SignalHeight;
+       static const int SignalMargin;
        static const int SignalSnapGridSize;
 
        static const QColor CursorAreaColour;
@@ -97,16 +96,25 @@ public:
         */
        void show_cursors(bool show = true);
 
+       /**
+        * Moves the cursors to a convenient position in the view.
+        */
+       void centre_cursors();
+
        /**
         * Returns a reference to the pair of cursors.
         */
-       std::pair<Cursor, Cursor>& cursors();
+       CursorPair& 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;
        
@@ -126,11 +134,12 @@ 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 signals_moved();
+       void on_signals_moved();
 
 private:
        SigSession &_session;
@@ -148,9 +157,10 @@ private:
        double _offset;
 
        int _v_offset;
+       bool _updating_scroll;
 
        bool _show_cursors;
-       std::pair<Cursor, Cursor> _cursors;
+       CursorPair _cursors;
 
        QPoint _hover_point;
 };