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

diff --git a/pv/views/trace/trace.hpp b/pv/views/trace/trace.hpp
index cd1c8af..410d82c 100644
--- a/pv/views/trace/trace.hpp
+++ b/pv/views/trace/trace.hpp
@@ -67,10 +67,18 @@ public:
 	/**
 	 * Allowed values for the multi-segment display mode.
 	 *
-	 * Note: Consider @ref View::set_segment_display_mode when updating the list.
+	 * 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
@@ -80,8 +88,8 @@ 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);
@@ -92,16 +100,6 @@ public:
 	 */
 	shared_ptr<data::SignalBase> base() const;
 
-	/**
-	 * Sets the name of the signal.
-	 */
-	virtual void set_name(QString name);
-
-	/**
-	 * Set the colour of the signal.
-	 */
-	virtual void set_colour(QColor colour);
-
 	/**
 	 * Configures the segment display mode to use.
 	 */
@@ -146,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();
 
@@ -155,14 +153,14 @@ 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_;