X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=d699be4ffaa37092391c8a492e6d30f82ba2849e;hb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace;hp=635273dae74ad6e1131a592da699beba6a8e76e7;hpb=574c568d184240cd87be1b57fc00d60a4eac7566;p=pulseview.git

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 635273da..d699be4f 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -53,6 +53,7 @@ namespace view {
 class CursorHeader;
 class Header;
 class Ruler;
+class Signal;
 class Trace;
 class Viewport;
 class TriggerMarker;
@@ -81,6 +82,15 @@ public:
 	Session& session();
 	const Session& session() const;
 
+	/**
+	 * Returns the signals contained in this view.
+	 */
+	std::unordered_set< std::shared_ptr<view::Signal> > signals() const;
+
+	void clear_signals();
+
+	void add_signal(const std::shared_ptr<view::Signal> signal);
+
 	/**
 	 * Returns the view of the owner.
 	 */
@@ -214,8 +224,6 @@ public:
 
 	const QPoint& hover_point() const;
 
-	void update_viewport();
-
 	void restack_all_trace_tree_items();
 
 Q_SIGNALS:
@@ -267,32 +275,21 @@ private:
 
 	void update_scroll();
 
-	void update_layout();
+	void reset_scroll();
 
-	/**
-	 * Satisifies TraceTreeItem functionality.
-	 * @param p the QPainter to paint into.
-	 * @param rect the rectangle of the header area.
-	 * @param hover true if the label is being hovered over by the mouse.
-	 */
-	void paint_label(QPainter &p, const QRect &rect, bool hover);
+	void set_scroll_default();
 
-	/**
-	 * Computes the outline rectangle of a label.
-	 * @param rect the rectangle of the header area.
-	 * @return Returns the rectangle of the signal label.
-	 */
-	QRectF label_rect(const QRectF &rect);
+	void update_layout();
 
 	TraceTreeItemOwner* find_prevalent_trace_group(
 		const std::shared_ptr<sigrok::ChannelGroup> &group,
-		const std::unordered_map<std::shared_ptr<sigrok::Channel>,
+		const std::unordered_map<std::shared_ptr<data::SignalBase>,
 			std::shared_ptr<Signal> > &signal_map);
 
 	static std::vector< std::shared_ptr<Trace> >
 		extract_new_traces_for_channels(
 		const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
-		const std::unordered_map<std::shared_ptr<sigrok::Channel>,
+		const std::unordered_map<std::shared_ptr<data::SignalBase>,
 			std::shared_ptr<Signal> > &signal_map,
 		std::set< std::shared_ptr<Trace> > &add_list);
 
@@ -300,9 +297,9 @@ private:
 
 	bool eventFilter(QObject *object, QEvent *event);
 
-	bool viewportEvent(QEvent *e);
+	bool viewportEvent(QEvent *event);
 
-	void resizeEvent(QResizeEvent *e);
+	void resizeEvent(QResizeEvent *event);
 
 public:
 	void row_item_appearance_changed(bool label, bool content);
@@ -368,6 +365,8 @@ private:
 	Ruler *ruler_;
 	Header *header_;
 
+	std::unordered_set< std::shared_ptr<view::Signal> > signals_;
+
 	/// The view time scale in seconds per pixel.
 	double scale_;
 
@@ -396,6 +395,9 @@ private:
 
 	unsigned int sticky_events_;
 	QTimer lazy_event_handler_;
+
+	// This is true when the defaults couldn't be set due to insufficient info
+	bool scroll_needs_defaults;
 };
 
 } // namespace view