X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=0f5e254da4f12681dfff1f10621c91c0af1b9422;hb=b087ba7fd88610cbf54f6371367c7b9f9829dc63;hp=1bf7132267a6d29d03dd9e95d8a7ff96d15016db;hpb=8d44d030c3923055f2ea81d5334d3a3bce7900c2;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index 1bf7132..0f5e254 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,13 +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();
 
 	const QPoint& hover_point() const;
 
+	void normalize_layout();
+
 signals:
 	void hover_point_changed();
 
@@ -129,6 +134,7 @@ 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();
@@ -151,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;
 };