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

diff --git a/pv/view/view.h b/pv/view/view.h
index f378e911..021767db 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -23,11 +23,15 @@
 
 #include <stdint.h>
 
-#include <boost/weak_ptr.hpp>
+#include <memory>
+#include <set>
+#include <vector>
 
 #include <QAbstractScrollArea>
 #include <QSizeF>
 
+#include <pv/data/signaldata.h>
+
 #include "cursorpair.h"
 
 namespace pv {
@@ -36,8 +40,10 @@ class SigSession;
 
 namespace view {
 
+class CursorHeader;
 class Header;
 class Ruler;
+class Trace;
 class Viewport;
 
 class View : public QAbstractScrollArea {
@@ -47,9 +53,6 @@ private:
 	static const double MaxScale;
 	static const double MinScale;
 
-	static const int LabelMarginWidth;
-	static const int RulerHeight;
-
 	static const int MaxScrollValue;
 
 public:
@@ -65,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.
@@ -81,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.
@@ -88,7 +96,14 @@ public:
 	 */
 	void set_scale_offset(double scale, double offset);
 
-	std::list<boost::weak_ptr<SelectableItem> > selected_items() const;
+	std::vector< std::shared_ptr<Trace> > get_traces() const;
+
+	std::list<std::weak_ptr<SelectableItem> > selected_items() const;
+
+	std::set< std::shared_ptr<pv::data::SignalData> >
+		get_visible_data() const;
+
+	std::pair<double, double> get_time_extents() const;
 
 	/**
 	 * Returns true if cursors are displayed. false otherwise.
@@ -119,18 +134,36 @@ public:
 
 	void normalize_layout();
 
-signals:
+	void update_viewport();
+
+Q_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;
-	
+
+	/**
+	 * Simultaneously sets the zoom and offset.
+	 * @param scale The scale to set the view to in seconds per pixel. This
+	 * value is clamped between MinScale and MaxScale.
+	 * @param offset The offset of the left edge of the view in seconds.
+	 */
+	void set_zoom(double scale, int offset);
+
 	void update_scroll();
 
+	void update_layout();
+
+	static bool compare_trace_v_offsets(
+		const std::shared_ptr<pv::view::Trace> &a,
+		const std::shared_ptr<pv::view::Trace> &b);
+
 private:
 	bool eventFilter(QObject *object, QEvent *event);
 
@@ -138,7 +171,7 @@ private:
 
 	void resizeEvent(QResizeEvent *e);
 
-private slots:
+private Q_SLOTS:
 
 	void h_scroll_value_changed(int value);
 	void v_scroll_value_changed(int value);
@@ -150,15 +183,16 @@ private slots:
 
 	void on_signals_moved();
 
+	void on_geometry_updated();
+
 private:
 	SigSession &_session;
 
 	Viewport *_viewport;
 	Ruler *_ruler;
+	CursorHeader *_cursorheader;
 	Header *_header;
 
-	uint64_t _data_length;
-
 	/// The view time scale in seconds per pixel.
 	double _scale;