X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=e80198d329062f8175b04e9e28dbf4c1be543c75;hb=89914a8657612761ff962ee973721a4872cda8d7;hp=b73e78280a28eeed1628957c431e75913574ed65;hpb=9510aea0fca1c7438be30a4f43988c001b5f0b11;p=pulseview.git

diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index b73e782..e80198d 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;
@@ -190,6 +191,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,6 +310,13 @@ 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);
 
@@ -325,7 +347,7 @@ private:
 
 	void determine_if_header_was_shrunk();
 
-	void expand_header_to_fit();
+	void resize_header_to_fit();
 
 	void update_layout();
 
@@ -366,6 +388,8 @@ private Q_SLOTS:
 	void signals_changed();
 	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);
 
 	virtual void perform_delayed_view_update();
@@ -408,6 +432,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_;
@@ -421,8 +450,10 @@ 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_;