X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=fb52f530fcb1dccae46ac2bdc773875f7adb7d4e;hp=c87be36913e368c68bbd334a8d304b99c93a9849;hb=491536836d878a3abf7959800f56641ac093bd11;hpb=640d091b45b196cc586fbc6a7bec71c5c7d75544

diff --git a/pv/view/view.h b/pv/view/view.h
index c87be369..fb52f530 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,37 +54,84 @@ private:
 
 public:
 	static const int SignalHeight;
+	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;
+
+signals:
+	void hover_point_changed();
+
 private:
 	void get_scroll_layout(double &length, double &offset) const;
 	
 	void update_scroll();
 
+	void reset_signal_layout();
+
 private:
+	bool eventFilter(QObject *object, QEvent *event);
+
 	bool viewportEvent(QEvent *e);
 
 	void resizeEvent(QResizeEvent *e);
 
 private slots:
+
 	void h_scroll_value_changed(int value);
 	void v_scroll_value_changed(int value);
 
 	void data_updated();
 
+	void marker_time_changed();
+
+	void signals_moved();
+
 private:
 	SigSession &_session;
 
@@ -89,10 +141,18 @@ 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;
 };
 
 } // namespace view