X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=9529e7a3fee25a3c057a76c5c1c76a5ebc0c4d08;hp=8fd7e968552f6af0528e3697e16f8eca2a5fb11e;hb=451dc5f33fbc4f559881acdf338c476a976fcbf2;hpb=4e86ec7042631d4b54876cba89c01a73abaf7213;ds=sidebyside

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 8fd7e968..9529e7a3 100644
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -37,6 +37,7 @@
 
 #include "cursorpair.hpp"
 #include "flag.hpp"
+#include "trace.hpp"
 #include "tracetreeitemowner.hpp"
 
 using std::list;
@@ -150,11 +151,21 @@ public:
 	double scale() const;
 
 	/**
-	 * Returns the time offset of the left edge of the view in
-	 * seconds.
+	 * Returns the internal view version of the time offset of the left edge
+	 * of the view in seconds.
 	 */
 	const pv::util::Timestamp& offset() const;
 
+	/**
+	 * Returns the ruler version of the time offset of the left edge
+	 * of the view in seconds.
+	 */
+	const pv::util::Timestamp& ruler_offset() const;
+
+	void set_zero_position(pv::util::Timestamp& position);
+
+	void reset_zero_position();
+
 	/**
 	 * Returns the vertical scroll offset.
 	 */
@@ -180,6 +191,11 @@ public:
 	 */
 	const pv::util::Timestamp& tick_period() const;
 
+	/**
+	 * Returns number of minor division ticks per time marking.
+	 */
+	unsigned int minor_tick_count() const;
+
 	/**
 	 * Returns the unit of time currently used.
 	 */
@@ -190,6 +206,20 @@ public:
 	 */
 	unsigned int depth() const;
 
+	/**
+	 * Returns the currently displayed segment, starting at 0.
+	 */
+	uint32_t current_segment() const;
+
+	/**
+	 * Returns whether the currently shown segment can be influenced
+	 * (selected) or not.
+	 */
+	bool segment_is_selectable() const;
+
+	Trace::SegmentDisplayMode segment_display_mode() const;
+	void set_segment_display_mode(Trace::SegmentDisplayMode mode);
+
 	void zoom(double steps);
 	void zoom(double steps, int offset);
 
@@ -295,8 +325,15 @@ Q_SIGNALS:
 	/// Emitted when the time_unit changed.
 	void time_unit_changed();
 
+	/// Emitted when the currently selected segment changed
+	void segment_changed(int segment_id);
+
+	/// Emitted when the multi-segment display mode changed
+	/// @param mode is a value of Trace::SegmentDisplayMode
+	void segment_display_mode_changed(int mode, bool segment_selectable);
+
 public Q_SLOTS:
-	void trigger_event(util::Timestamp location);
+	void trigger_event(int segment_id, util::Timestamp location);
 
 private:
 	void get_scroll_layout(double &length, pv::util::Timestamp &offset) const;
@@ -367,17 +404,20 @@ private Q_SLOTS:
 	void capture_state_updated(int state);
 
 	void on_new_segment(int new_segment_id);
+	void on_segment_completed(int new_segment_id);
 	void on_segment_changed(int segment);
 
+	void on_settingViewTriggerIsZeroTime_changed(const QVariant new_value);
+
 	virtual void perform_delayed_view_update();
 
 	void process_sticky_events();
 
 	/**
-	 * Sets the 'offset_' member and emits the 'offset_changed'
+	 * Sets the 'offset_' and ruler_offset_ members and emits the 'offset_changed'
 	 * signal if needed.
 	 */
-	void set_offset(const pv::util::Timestamp& offset);
+	void set_offset(const pv::util::Timestamp& offset, bool force_update = false);
 
 	/**
 	 * Sets the 'scale_' member and emits the 'scale_changed'
@@ -409,6 +449,11 @@ private Q_SLOTS:
 	 */
 	void set_time_unit(pv::util::TimeUnit time_unit);
 
+	/**
+	 * Sets the current segment with the first segment starting at 0.
+	 */
+	void set_current_segment(uint32_t segment_id);
+
 private:
 	CustomScrollArea *scrollarea_;
 	Viewport *viewport_;
@@ -422,14 +467,18 @@ private:
 	vector< shared_ptr<DecodeTrace> > decode_traces_;
 #endif
 
-	/// The ID of the currently displayed segment
-	int current_segment_;
+	Trace::SegmentDisplayMode segment_display_mode_;
+
+	/// Signals whether the user can change the currently shown segment.
+	bool segment_selectable_;
 
 	/// The view time scale in seconds per pixel.
 	double scale_;
 
-	/// The view time offset in seconds.
+	/// The internal view version of the time offset in seconds.
 	pv::util::Timestamp offset_;
+	/// The ruler version of the time offset in seconds.
+	pv::util::Timestamp ruler_offset_;
 
 	bool updating_scroll_;
 	bool settings_restored_;
@@ -441,6 +490,7 @@ private:
 
 	pv::util::Timestamp tick_period_;
 	pv::util::SIPrefix tick_prefix_;
+	unsigned int minor_tick_count_;
 	unsigned int tick_precision_;
 	util::TimeUnit time_unit_;