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

diff --git a/pv/view/view.h b/pv/view/view.h
index b7769899..c87be369 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,18 +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 {
@@ -42,6 +45,11 @@ private:
 	static const int LabelMarginWidth;
 	static const int RulerHeight;
 
+	static const int MaxScrollValue;
+
+public:
+	static const int SignalHeight;
+
 public:
 	explicit View(SigSession &session, QWidget *parent = 0);
 
@@ -52,14 +60,15 @@ public:
 	int v_offset() const;
 
 	void zoom(double steps);
+	void zoom(double steps, int offset);
 
 	void set_scale_offset(double scale, double offset);
 
 private:
+	void get_scroll_layout(double &length, double &offset) const;
+	
 	void update_scroll();
 
-	void zoom(double steps, int offset);
-
 private:
 	bool viewportEvent(QEvent *e);
 
@@ -75,6 +84,8 @@ private:
 	SigSession &_session;
 
 	Viewport *_viewport;
+	Ruler *_ruler;
+	Header *_header;
 
 	uint64_t _data_length;
 
@@ -82,11 +93,9 @@ private:
 	double _offset;
 
 	int _v_offset;
-
-	friend class Viewport;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PV_VIEW_VIEW_H
+#endif // PULSEVIEW_PV_VIEW_VIEW_H