X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=6f1e87288bd1dd14f40568f86198ea39f0a3a7bc;hb=27e8df221014d1a8c7769866773e8dbb0486eea8;hp=45ccd3459700a65c897fb9ab4a06efd8ba0f0083;hpb=2e57535108a0ae2e5d1ee454f1e61b71d23afdb3;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index 45ccd345..6f1e8728 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,12 +23,15 @@
 
 #include <stdint.h>
 
-#include <utility>
+#include <vector>
+
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 #include <QAbstractScrollArea>
 #include <QSizeF>
 
-#include "cursor.h"
+#include "cursorpair.h"
 
 namespace pv {
 
@@ -38,6 +41,7 @@ namespace view {
 
 class Header;
 class Ruler;
+class Trace;
 class Viewport;
 
 class View : public QAbstractScrollArea {
@@ -47,13 +51,12 @@ private:
 	static const double MaxScale;
 	static const double MinScale;
 
-	static const int LabelMarginWidth;
-	static const int RulerHeight;
-
 	static const int MaxScrollValue;
 
 public:
 	static const int SignalHeight;
+	static const int SignalMargin;
+	static const int SignalSnapGridSize;
 
 	static const QColor CursorAreaColour;
 
@@ -63,6 +66,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 +83,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 +94,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,22 +108,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.
 	 */
-	std::pair<Cursor, Cursor>& 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);
@@ -125,10 +163,15 @@ private slots:
 	void h_scroll_value_changed(int value);
 	void v_scroll_value_changed(int value);
 
+	void signals_changed();
 	void data_updated();
 
 	void marker_time_changed();
 
+	void on_signals_moved();
+
+	void on_geometry_updated();
+
 private:
 	SigSession &_session;
 
@@ -145,9 +188,10 @@ private:
 	double _offset;
 
 	int _v_offset;
+	bool _updating_scroll;
 
 	bool _show_cursors;
-	std::pair<Cursor, Cursor> _cursors;
+	CursorPair _cursors;
 
 	QPoint _hover_point;
 };