X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=886aa8302adc4259e44b04d43aec6b3d7e8689cc;hp=4eb255a2da7a0ec131df8daf6ea6286df8442074;hb=d7c0ca4a965c5f9cb2ae9aea584bb2547f4baca1;hpb=b42d25c43e52c900cbdd3e5cde0282961b8721e7

diff --git a/pv/view/view.h b/pv/view/view.h
index 4eb255a2..886aa830 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,6 +23,11 @@
 
 #include <stdint.h>
 
+#include <vector>
+
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
+
 #include <QAbstractScrollArea>
 #include <QSizeF>
 
@@ -36,6 +41,7 @@ namespace view {
 
 class Header;
 class Ruler;
+class Trace;
 class Viewport;
 
 class View : public QAbstractScrollArea {
@@ -45,7 +51,6 @@ private:
 	static const double MaxScale;
 	static const double MinScale;
 
-	static const int LabelMarginWidth;
 	static const int RulerHeight;
 
 	static const int MaxScrollValue;
@@ -63,6 +68,7 @@ public:
 	explicit View(SigSession &session, QWidget *parent = 0);
 
 	SigSession& session();
+	const SigSession& session() const;
 
 	/**
 	 * Returns the view time scale in seconds per pixel.
@@ -79,6 +85,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.
@@ -86,6 +96,10 @@ 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;
+
 	/**
 	 * Returns true if cursors are displayed. false otherwise.
 	 */
@@ -96,26 +110,48 @@ public:
 	 */
 	void show_cursors(bool show = true);
 
+	/**
+	 * Moves the cursors to a convenient position in the view.
+	 */
+	void centre_cursors();
+
 	/**
 	 * Returns a reference to the pair of cursors.
 	 */
 	CursorPair& cursors();
 
+	/**
+	 * Returns a reference to the pair of cursors.
+	 */
+	const CursorPair& cursors() const;
+
 	const QPoint& hover_point() const;
 
 	void normalize_layout();
 
+	void update_viewport();
+
 signals:
 	void hover_point_changed();
 
 	void signals_moved();
 
+	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();
 
-	void reset_signal_layout();
+	void update_layout();
+
+	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);
@@ -136,6 +172,8 @@ private slots:
 
 	void on_signals_moved();
 
+	void on_geometry_updated();
+
 private:
 	SigSession &_session;