X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=fb097b01cfb604fb9893d4d50390ca7b64e5100f;hb=7ea2a4ff0765fdad34b84e4b4631d6f3f5588714;hp=712151dcae30fc2d11a503a04cc90e4ea697f236;hpb=558ad6ceb934ab7406d286c1a4ae08da4aba1448;p=pulseview.git

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index 712151d..fb097b0 100644
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -151,11 +151,17 @@ 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;
+
 	/**
 	 * Returns the vertical scroll offset.
 	 */
@@ -181,6 +187,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.
 	 */
@@ -191,12 +202,18 @@ 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);
@@ -308,10 +325,11 @@ Q_SIGNALS:
 	void segment_changed(int segment_id);
 
 	/// Emitted when the multi-segment display mode changed
-	void segment_display_mode_changed(bool segment_selectable);
+	/// @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;
@@ -390,7 +408,7 @@ private Q_SLOTS:
 	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);
@@ -443,8 +461,6 @@ 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.
@@ -453,8 +469,10 @@ private:
 	/// 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_;
@@ -466,6 +484,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_;