X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=dd0ad6ca9a2c0c9e2b3b66fb4867e9f55c028d30;hb=306d43a7ab62b534bbc1a5d19a381f7e0b787dfe;hp=ac2835a49cb4b6157075741d436c6708bd165727;hpb=e2f5223b74da179688de92146a2716209b42bdb0;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index ac2835a4..dd0ad6ca 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,7 +23,12 @@
 
 #include <stdint.h>
 
+#include <utility>
+
 #include <QAbstractScrollArea>
+#include <QSizeF>
+
+#include "cursor.h"
 
 namespace pv {
 
@@ -49,6 +54,12 @@ 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);
@@ -77,16 +88,37 @@ public:
 	 */
 	void set_scale_offset(double scale, double offset);
 
+	/**
+	 * Returns true if cursors are displayed. false otherwise.
+	 */
+	bool cursors_shown() const;
+
+	/**
+	 * Shows or hides the cursors.
+	 */
+	void show_cursors(bool show = true);
+
+	/**
+	 * Returns a reference to the pair of cursors.
+	 */
+	std::pair<Cursor, Cursor>& 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);
 
@@ -96,11 +128,16 @@ private:
 
 private slots:
 
-	void h_scroll_value_changed(int value);
+	void h_scroll_moved(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;
 
@@ -118,6 +155,9 @@ private:
 
 	int _v_offset;
 
+	bool _show_cursors;
+	std::pair<Cursor, Cursor> _cursors;
+
 	QPoint _hover_point;
 };