X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.h;h=dec317ccf9a4f2000cd2ec2406f42998965dd936;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=50fbcf1ce11e64ad47cf8a3d4137759f19a55408;hpb=68b21a71797051fb48ed272bc2a6b4893bdbf517;p=pulseview.git

diff --git a/pv/view/view.h b/pv/view/view.h
index 50fbcf1..dec317c 100644
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -25,10 +25,12 @@
 
 #include <memory>
 #include <set>
+#include <unordered_map>
 #include <vector>
 
 #include <QAbstractScrollArea>
 #include <QSizeF>
+#include <QTimer>
 
 #include <pv/data/signaldata.h>
 
@@ -49,6 +51,12 @@ class Viewport;
 class View : public QAbstractScrollArea, public RowItemOwner {
 	Q_OBJECT
 
+private:
+	enum StickyEvents {
+		SelectableItemHExtentsChanged = 1,
+		SelectableItemVExtentsChanged = 2
+	};
+
 private:
 	static const double MaxScale;
 	static const double MinScale;
@@ -56,10 +64,6 @@ private:
 	static const int MaxScrollValue;
 
 public:
-	static const int SignalHeight;
-	static const int SignalMargin;
-	static const int SignalSnapGridSize;
-
 	static const QColor CursorAreaColour;
 
 	static const QSizeF LabelPadding;
@@ -94,7 +98,12 @@ public:
 	 * seconds.
 	 */
 	double offset() const;
-	int owner_v_offset() const;
+	int owner_visual_v_offset() const;
+
+	/**
+	 * Returns the number of nested parents that this row item owner has.
+	 */
+	unsigned int depth() const;
 
 	void zoom(double steps);
 	void zoom(double steps, int offset);
@@ -110,8 +119,6 @@ public:
 	 */
 	void set_scale_offset(double scale, double offset);
 
-	std::list<std::weak_ptr<SelectableItem> > selected_items() const;
-
 	std::set< std::shared_ptr<pv::data::SignalData> >
 		get_visible_data() const;
 
@@ -144,10 +151,10 @@ public:
 
 	const QPoint& hover_point() const;
 
-	void normalize_layout();
-
 	void update_viewport();
 
+	void restack_all_row_items();
+
 Q_SIGNALS:
 	void hover_point_changed();
 
@@ -189,6 +196,17 @@ private:
 	 */
 	QRectF label_rect(int right);
 
+	static bool add_channels_to_owner(
+		const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
+		RowItemOwner *owner, int &offset,
+		std::unordered_map<std::shared_ptr<sigrok::Channel>,
+			std::shared_ptr<Signal> > &signal_map,
+		std::function<bool (std::shared_ptr<RowItem>)> filter_func =
+			std::function<bool (std::shared_ptr<RowItem>)>());
+
+	static void apply_offset(
+		std::shared_ptr<RowItem> row_item, int &offset);
+
 private:
 	bool eventFilter(QObject *object, QEvent *event);
 
@@ -196,6 +214,11 @@ private:
 
 	void resizeEvent(QResizeEvent *e);
 
+public:
+	void appearance_changed(bool label, bool content);
+
+	void extents_changed(bool horz, bool vert);
+
 private Q_SLOTS:
 
 	void h_scroll_value_changed(int value);
@@ -208,31 +231,34 @@ private Q_SLOTS:
 
 	void on_signals_moved();
 
-	void on_geometry_updated();
+	void process_sticky_events();
 
 	void on_hover_point_changed();
 
 private:
-	SigSession &_session;
+	SigSession &session_;
 
-	Viewport *_viewport;
-	Ruler *_ruler;
-	CursorHeader *_cursorheader;
-	Header *_header;
+	Viewport *viewport_;
+	Ruler *ruler_;
+	CursorHeader *cursorheader_;
+	Header *header_;
 
 	/// The view time scale in seconds per pixel.
-	double _scale;
+	double scale_;
 
 	/// The view time offset in seconds.
-	double _offset;
+	double offset_;
+
+	int v_offset_;
+	bool updating_scroll_;
 
-	int _v_offset;
-	bool _updating_scroll;
+	bool show_cursors_;
+	CursorPair cursors_;
 
-	bool _show_cursors;
-	CursorPair _cursors;
+	QPoint hover_point_;
 
-	QPoint _hover_point;
+	unsigned int sticky_events_;
+	QTimer lazy_event_handler_;
 };
 
 } // namespace view