X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=db03ce9b43a81b1a7b6a5eda32e0986e15cb1c86;hb=f3f98f8fade1cffb28161da2710dfc9def5e6d74;hp=f378e9116c24a6ccb0b3376cf2fe7d77ac18b7ba;hpb=ef8311a4296a2dc85c82b063de61efa4eb7a8404;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index f378e911..db03ce9b 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,6 +23,9 @@
 
 #include <stdint.h>
 
+#include <vector>
+
+#include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
 #include <QAbstractScrollArea>
@@ -38,6 +41,7 @@ namespace view {
 
 class Header;
 class Ruler;
+class Trace;
 class Viewport;
 
 class View : public QAbstractScrollArea {
@@ -65,6 +69,7 @@ public:
 	explicit View(SigSession &session, QWidget *parent = 0);
 
 	SigSession& session();
+	const SigSession& session() const;
 
 	/**
 	 * Returns the view time scale in seconds per pixel.
@@ -81,6 +86,10 @@ public:
 	void zoom(double steps);
 	void zoom(double steps, int offset);
 
+	void zoom_fit();
+
+	void zoom_one_to_one();
+
 	/**
 	 * Sets the scale and offset.
 	 * @param scale The new view scale in seconds per pixel.
@@ -88,6 +97,8 @@ public:
 	 */
 	void set_scale_offset(double scale, double offset);
 
+	std::vector< boost::shared_ptr<Trace> > get_traces() const;
+
 	std::list<boost::weak_ptr<SelectableItem> > selected_items() const;
 
 	/**
@@ -119,6 +130,8 @@ public:
 
 	void normalize_layout();
 
+	void update_viewport();
+
 signals:
 	void hover_point_changed();
 
@@ -126,11 +139,19 @@ signals:
 
 	void selection_changed();
 
+	void scale_offset_changed();
+
 private:
 	void get_scroll_layout(double &length, double &offset) const;
 	
+	void set_zoom(double scale, int offset);
+
 	void update_scroll();
 
+	static bool compare_trace_v_offsets(
+		const boost::shared_ptr<pv::view::Trace> &a,
+		const boost::shared_ptr<pv::view::Trace> &b);
+
 private:
 	bool eventFilter(QObject *object, QEvent *event);