X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=7fef8419e625232b7013eb4e4e84a7bbcae60af0;hp=2938d00fc0014296712adecc921ada3f2e5511d2;hb=HEAD;hpb=3d6ff1cd572a55e92779420c2d1a708cdb003fe0

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 2938d00f..7fef8419 100644
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -17,14 +17,14 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP
 
 #include <cstdint>
 #include <list>
 #include <memory>
+#include <mutex>
 #include <set>
-#include <unordered_map>
 #include <vector>
 
 #include <QAbstractScrollArea>
@@ -43,8 +43,7 @@
 #include "tracetreeitemowner.hpp"
 
 using std::list;
-using std::unordered_map;
-using std::unordered_set;
+using std::map;
 using std::set;
 using std::shared_ptr;
 using std::vector;
@@ -96,6 +95,7 @@ private:
 	static const pv::util::Timestamp MinScale;
 
 	static const int MaxScrollValue;
+	static const int ViewScrollMargin;
 
 	static const int ScaleUnits[3];
 
@@ -118,13 +118,13 @@ public:
 	/**
 	 * Returns the signals contained in this view.
 	 */
-	unordered_set< shared_ptr<Signal> > signals() const;
+	vector< shared_ptr<Signal> > signals() const;
 
 	shared_ptr<Signal> get_signal_by_signalbase(shared_ptr<data::SignalBase> base) const;
 
-	virtual void clear_signals();
-
-	void add_signal(const shared_ptr<Signal> signal);
+	virtual void clear_signalbases();
+	virtual void add_signalbase(const shared_ptr<data::SignalBase> signalbase);
+	virtual void remove_signalbase(const shared_ptr<data::SignalBase> signalbase);
 
 #ifdef ENABLE_DECODE
 	virtual void clear_decode_signals();
@@ -134,6 +134,8 @@ public:
 	virtual void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
+	void remove_trace(shared_ptr<Trace> trace);
+
 	shared_ptr<Signal> get_signal_under_mouse_cursor() const;
 
 	/**
@@ -154,7 +156,6 @@ public:
 	const Ruler* ruler() const;
 
 	virtual void save_settings(QSettings &settings) const;
-
 	virtual void restore_settings(QSettings &settings);
 
 	/**
@@ -254,6 +255,8 @@ public:
 
 	void zoom_fit(bool gui_state);
 
+	virtual void focus_on_range(uint64_t start_sample, uint64_t end_sample);
+
 	/**
 	 * Sets the scale and offset.
 	 * @param scale The new view scale in seconds per pixel.
@@ -261,7 +264,7 @@ public:
 	 */
 	void set_scale_offset(double scale, const pv::util::Timestamp& offset);
 
-	set< shared_ptr<pv::data::SignalData> > get_visible_data() const;
+	vector< shared_ptr<pv::data::SignalData> > get_visible_data() const;
 
 	pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
 
@@ -390,9 +393,7 @@ private:
 	void adjust_top_margin();
 
 	void update_scroll();
-
 	void reset_scroll();
-
 	void set_scroll_default();
 
 	void determine_if_header_was_shrunk();
@@ -403,14 +404,12 @@ private:
 
 	TraceTreeItemOwner* find_prevalent_trace_group(
 		const shared_ptr<sigrok::ChannelGroup> &group,
-		const unordered_map<shared_ptr<data::SignalBase>,
-			shared_ptr<Signal> > &signal_map);
+		const map<shared_ptr<data::SignalBase>, shared_ptr<Signal> > &signal_map);
 
 	static vector< shared_ptr<Trace> >
 		extract_new_traces_for_channels(
 		const vector< shared_ptr<sigrok::Channel> > &channels,
-		const unordered_map<shared_ptr<data::SignalBase>,
-			shared_ptr<Signal> > &signal_map,
+		const map<shared_ptr<data::SignalBase>, shared_ptr<Signal> > &signal_map,
 		set< shared_ptr<Trace> > &add_list);
 
 	void determine_time_unit();
@@ -421,6 +420,7 @@ private:
 
 	void resizeEvent(QResizeEvent *event);
 
+	void update_view_range_metaobject() const;
 	void update_hover_point();
 
 public:
@@ -452,6 +452,8 @@ private Q_SLOTS:
 
 	void on_settingViewTriggerIsZeroTime_changed(const QVariant new_value);
 
+	void on_create_marker_here();
+
 	virtual void perform_delayed_view_update();
 
 	void process_sticky_events();
@@ -510,7 +512,8 @@ private:
 	QShortcut *grab_ruler_left_shortcut_, *grab_ruler_right_shortcut_;
 	QShortcut *cancel_grab_shortcut_;
 
-	unordered_set< shared_ptr<Signal> > signals_;
+	mutable mutex signal_mutex_;
+	vector< shared_ptr<Signal> > signals_;
 
 #ifdef ENABLE_DECODE
 	vector< shared_ptr<DecodeTrace> > decode_traces_;
@@ -530,9 +533,11 @@ private:
 	pv::util::Timestamp ruler_offset_;
 	/// The offset of the zero point in seconds.
 	pv::util::Timestamp zero_offset_;
+	/// Shows whether the user set a custom zero offset that we should keep
+	bool custom_zero_offset_set_;
 
 	bool updating_scroll_;
-	bool settings_restored_;
+	bool restoring_state_;
 	bool header_was_shrunk_;
 
 	bool sticky_scrolling_;
@@ -565,22 +570,19 @@ private:
 	// This is true when the defaults couldn't be set due to insufficient info
 	bool scroll_needs_defaults_;
 
-	// A nonzero value indicates the v offset to restore. See View::resizeEvent()
+	// The v offset to restore. See View::eventFilter()
 	int saved_v_offset_;
 
 	// These are used to determine whether the view was altered after acq started
 	double scale_at_acq_start_;
 	pv::util::Timestamp offset_at_acq_start_;
 
-	// Used to suppress performing a "zoom to fit" when the session stops. This
-	// is needed when the view's settings are restored before acquisition ends.
-	// In that case we want to keep the restored settings, not have a "zoom to fit"
-	// mess them up.
-	bool suppress_zoom_to_fit_after_acq_;
+	// X coordinate of mouse cursor where the user clicked to open a context menu
+	uint32_t context_menu_x_pos_;
 };
 
 } // namespace trace
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP