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

diff --git a/pv/view/view.h b/pv/view/view.h
index ad607b5a..6e5710fe 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,21 @@
  * 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 <QAbstractScrollArea>
 
+namespace pv {
+
 class SigSession;
 
-namespace pv {
 namespace view {
 
 class Header;
+class Ruler;
 class Viewport;
 
 class View : public QAbstractScrollArea {
@@ -43,6 +45,8 @@ private:
 	static const int LabelMarginWidth;
 	static const int RulerHeight;
 
+	static const int MaxScrollValue;
+
 public:
 	static const int SignalHeight;
 
@@ -56,20 +60,29 @@ public:
 	int v_offset() const;
 
 	void zoom(double steps);
+	void zoom(double steps, int offset);
 
 	void set_scale_offset(double scale, double offset);
 
+	const QPoint& hover_point() const;
+
+signals:
+	void hover_point_changed();
+
 private:
+	void get_scroll_layout(double &length, double &offset) const;
+	
 	void update_scroll();
 
-	void zoom(double steps, int offset);
-
 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);
 
@@ -79,6 +92,7 @@ private:
 	SigSession &_session;
 
 	Viewport *_viewport;
+	Ruler *_ruler;
 	Header *_header;
 
 	uint64_t _data_length;
@@ -88,10 +102,10 @@ private:
 
 	int _v_offset;
 
-	friend class Viewport;
+	QPoint _hover_point;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PV_VIEW_VIEW_H
+#endif // PULSEVIEW_PV_VIEW_VIEW_H