X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=155c875b777c8143bbd34fe8a88336388214a8ba;hb=58864c5c5dffac4254f199356aaeb5eabd608630;hp=dd0ad6ca9a2c0c9e2b3b66fb4867e9f55c028d30;hpb=149e359e48ede480f3734cfc5c04bd1399d0d4be;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index dd0ad6c..155c875 100644
--- 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 {
 
@@ -98,10 +96,20 @@ 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();
+
+	/**
+	 * Returns a reference to the pair of cursors.
+	 */
+	const CursorPair& cursors() const;
 
 	const QPoint& hover_point() const;
 
@@ -112,6 +120,8 @@ signals:
 
 	void signals_moved();
 
+	void selection_changed();
+
 private:
 	void get_scroll_layout(double &length, double &offset) const;
 	
@@ -128,7 +138,7 @@ private:
 
 private slots:
 
-	void h_scroll_moved(int value);
+	void h_scroll_value_changed(int value);
 	void v_scroll_value_changed(int value);
 
 	void signals_changed();
@@ -154,9 +164,10 @@ private:
 	double _offset;
 
 	int _v_offset;
+	bool _updating_scroll;
 
 	bool _show_cursors;
-	std::pair<Cursor, Cursor> _cursors;
+	CursorPair _cursors;
 
 	QPoint _hover_point;
 };