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

diff --git a/pv/view/view.h b/pv/view/view.h
index ad607b5a..3cd2646e 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the PulseView project.
  *
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
@@ -18,19 +18,26 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PV_VIEW_VIEW_H
-#define PV_VIEW_VIEW_H
+#ifndef PULSEVIEW_PV_VIEW_VIEW_H
+#define PULSEVIEW_PV_VIEW_VIEW_H
 
 #include <stdint.h>
 
+#include <utility>
+
 #include <QAbstractScrollArea>
+#include <QSizeF>
 
-class SigSession;
+#include "cursor.h"
 
 namespace pv {
+
+class SigSession;
+
 namespace view {
 
 class Header;
+class Ruler;
 class Viewport;
 
 class View : public QAbstractScrollArea {
@@ -43,55 +50,117 @@ private:
 	static const int LabelMarginWidth;
 	static const int RulerHeight;
 
+	static const int MaxScrollValue;
+
 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 zoom(double steps, int offset);
+	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 on_signals_moved();
+
 private:
 	SigSession &_session;
 
 	Viewport *_viewport;
+	Ruler *_ruler;
 	Header *_header;
 
 	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;
 
-	friend class Viewport;
+	bool _show_cursors;
+	std::pair<Cursor, Cursor> _cursors;
+
+	QPoint _hover_point;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PV_VIEW_VIEW_H
+#endif // PULSEVIEW_PV_VIEW_VIEW_H