X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftrace.hpp;h=410d82cd14e8c9121e9a758024dee4c5d540204f;hb=0acf629d46c91b48cdb5fd6041f40b0479250296;hp=407592de63bc7bb2221aadc77388424789533dfe;hpb=561ba3ae052a93fe150a2161fcdc361144e68e4f;p=pulseview.git

diff --git a/pv/views/trace/trace.hpp b/pv/views/trace/trace.hpp
index 407592d..410d82c 100644
--- a/pv/views/trace/trace.hpp
+++ b/pv/views/trace/trace.hpp
@@ -63,12 +63,33 @@ class Trace : public TraceTreeItem
 {
 	Q_OBJECT
 
+public:
+	/**
+	 * Allowed values for the multi-segment display mode.
+	 *
+	 * Note: Consider these locations when updating the list:
+	 * *
+	 * @ref View::set_segment_display_mode
+	 * @ref View::on_segment_changed
+	 * @ref AnalogSignal::get_analog_segment_to_paint
+	 * @ref AnalogSignal::get_logic_segment_to_paint
+	 * @ref LogicSignal::get_logic_segment_to_paint
+	 * @ref StandardBar
+	 */
+	enum SegmentDisplayMode {
+		ShowLastSegmentOnly = 1,
+		ShowLastCompleteSegmentOnly,
+		ShowSingleSegmentOnly,
+		ShowAllSegments,
+		ShowAccumulatedIntensity
+	};
+
 private:
 	static const QPen AxisPen;
 	static const int LabelHitPadding;
 
-	static const QColor BrightGrayBGColour;
-	static const QColor DarkGrayBGColour;
+	static const QColor BrightGrayBGColor;
+	static const QColor DarkGrayBGColor;
 
 protected:
 	Trace(shared_ptr<data::SignalBase> channel);
@@ -80,14 +101,9 @@ public:
 	shared_ptr<data::SignalBase> base() const;
 
 	/**
-	 * Sets the name of the signal.
+	 * Configures the segment display mode to use.
 	 */
-	virtual void set_name(QString name);
-
-	/**
-	 * Set the colour of the signal.
-	 */
-	virtual void set_colour(QColor colour);
+	virtual void set_segment_display_mode(SegmentDisplayMode mode);
 
 	/**
 	 * Paints the signal label.
@@ -108,6 +124,10 @@ public:
 	 */
 	QRectF label_rect(const QRectF &rect) const;
 
+	void set_current_segment(const int segment);
+
+	int get_current_segment() const;
+
 protected:
 	/**
 	 * Paints the background layer of the signal with a QPainter.
@@ -124,7 +144,7 @@ protected:
 	 */
 	void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
 
-	void add_colour_option(QWidget *parent, QFormLayout *form);
+	void add_color_option(QWidget *parent, QFormLayout *form);
 
 	void create_popup_form();
 
@@ -133,19 +153,24 @@ protected:
 protected Q_SLOTS:
 	virtual void on_name_changed(const QString &text);
 
-	virtual void on_colour_changed(const QColor &colour);
+	virtual void on_color_changed(const QColor &color);
 
 	void on_popup_closed();
 
 private Q_SLOTS:
 	void on_nameedit_changed(const QString &name);
 
-	void on_colouredit_changed(const QColor &colour);
+	void on_coloredit_changed(const QColor &color);
 
 protected:
 	shared_ptr<data::SignalBase> base_;
 	QPen axis_pen_;
 
+	SegmentDisplayMode segment_display_mode_;
+
+	/// The ID of the currently displayed segment
+	int current_segment_;
+
 private:
 	pv::widgets::Popup *popup_;
 	QFormLayout *popup_form_;