X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=4eb255a2da7a0ec131df8daf6ea6286df8442074;hb=b42d25c43e52c900cbdd3e5cde0282961b8721e7;hp=13dd766ce788d1aa5a536a837654bb7066f081c8;hpb=f76af6375b8aea6b7edb2d6ee838e1589c3490f3;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index 13dd766c..4eb255a2 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,11 +23,10 @@
 
 #include <stdint.h>
 
-#include <utility>
-
 #include <QAbstractScrollArea>
+#include <QSizeF>
 
-#include "cursor.h"
+#include "cursorpair.h"
 
 namespace pv {
 
@@ -53,9 +52,13 @@ 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);
 
@@ -96,18 +99,24 @@ public:
 	/**
 	 * 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;
 	
 	void update_scroll();
 
+	void reset_signal_layout();
+
 private:
 	bool eventFilter(QObject *object, QEvent *event);
 
@@ -120,8 +129,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;
 
@@ -138,9 +152,10 @@ private:
 	double _offset;
 
 	int _v_offset;
+	bool _updating_scroll;
 
 	bool _show_cursors;
-	std::pair<Cursor, Cursor> _cursors;
+	CursorPair _cursors;
 
 	QPoint _hover_point;
 };