X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=3cd2646e91e8016cbe8543cc3d86717488b5e6f6;hp=6e5710fede733d2aa926236048d94247984dbd99;hb=4b192962559bb212408a94f48a9a8efead024aa7;hpb=cbd80f64b2637f13020da7ca003fadcb9be8d46f

diff --git a/pv/view/view.h b/pv/view/view.h
index 6e5710fe..3cd2646e 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,31 +54,71 @@ 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);
 
 	SigSession& session();
 
+	/**
+	 * Returns the view time scale in seconds per pixel.
+	 */
 	double scale() const;
+
+	/**
+	 * Returns the time offset of the left edge of the view in
+	 * seconds.
+	 */
 	double offset() const;
 	int v_offset() const;
 
 	void zoom(double steps);
 	void zoom(double steps, int offset);
 
+	/**
+	 * Sets the scale and offset.
+	 * @param scale The new view scale in seconds per pixel.
+	 * @param offset The view time offset in seconds.
+	 */
 	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);
 
@@ -88,6 +133,10 @@ private slots:
 
 	void data_updated();
 
+	void marker_time_changed();
+
+	void on_signals_moved();
+
 private:
 	SigSession &_session;
 
@@ -97,11 +146,17 @@ private:
 
 	uint64_t _data_length;
 
+	/// The view time scale in seconds per pixel.
 	double _scale;
+
+	/// The view time offset in seconds.
 	double _offset;
 
 	int _v_offset;
 
+	bool _show_cursors;
+	std::pair<Cursor, Cursor> _cursors;
+
 	QPoint _hover_point;
 };