X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=d2abbf002c2f69a958df0cefef3465d098cb05e5;hb=51e77110d4316fd0106f8306f5e1f0523c5bf7d7;hp=3c76c8ee6bd065364d679c7727f00f2c83908fee;hpb=cdf7bea7f0eead18de2616cbfd8697ac0fffb59b;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index 3c76c8e..d2abbf0 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>
  *
@@ -25,11 +25,14 @@
 
 #include <QAbstractScrollArea>
 
+namespace pv {
+
 class SigSession;
 
-namespace pv {
 namespace view {
 
+class Header;
+class Ruler;
 class Viewport;
 
 class View : public QAbstractScrollArea {
@@ -42,22 +45,30 @@ 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);
 
+	SigSession& session();
+
 	double scale() const;
 	double offset() const;
 	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);
 
@@ -73,6 +84,8 @@ private:
 	SigSession &_session;
 
 	Viewport *_viewport;
+	Ruler *_ruler;
+	Header *_header;
 
 	uint64_t _data_length;
 
@@ -80,8 +93,6 @@ private:
 	double _offset;
 
 	int _v_offset;
-
-	friend class Viewport;
 };
 
 } // namespace view