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

diff --git a/pv/view/view.h b/pv/view/view.h
index 13dd766c..980ccf1f 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -26,6 +26,7 @@
 #include <utility>
 
 #include <QAbstractScrollArea>
+#include <QSizeF>
 
 #include "cursor.h"
 
@@ -53,9 +54,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);
 
@@ -100,14 +105,20 @@ public:
 
 	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 +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;
 
@@ -138,6 +154,7 @@ private:
 	double _offset;
 
 	int _v_offset;
+	bool _updating_scroll;
 
 	bool _show_cursors;
 	std::pair<Cursor, Cursor> _cursors;