X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftrace.hpp;h=0b4ecce49484af09e8b60938afc5c3069cb3d936;hp=75705226780e8c7a7aea029806fbf5ffdf78b4d4;hb=119c5c232ef47e92ef6a5cc9f8b7c4c31dc2f387;hpb=7daebd054e65a244dce36933cbf173b8d7532a09

diff --git a/pv/views/trace/trace.hpp b/pv/views/trace/trace.hpp
index 75705226..0b4ecce4 100644
--- a/pv/views/trace/trace.hpp
+++ b/pv/views/trace/trace.hpp
@@ -30,6 +30,7 @@
 
 #include "tracetreeitem.hpp"
 
+#include <pv/globalsettings.hpp>
 #include "pv/data/signalbase.hpp"
 
 using std::shared_ptr;
@@ -59,7 +60,7 @@ namespace trace {
  * For this reason, Trace is more generic and contains properties and helpers
  * that benefit any kind of time series items.
  */
-class Trace : public TraceTreeItem
+class Trace : public TraceTreeItem, public GlobalSettingsInterface
 {
 	Q_OBJECT
 
@@ -67,10 +68,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,11 +89,12 @@ 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);
+	~Trace();
 
 public:
 	/**
@@ -93,20 +103,22 @@ public:
 	shared_ptr<data::SignalBase> base() const;
 
 	/**
-	 * Sets the name of the signal.
+	 * Returns true if the item may be selected.
 	 */
-	virtual void set_name(QString name);
+	virtual bool is_selectable(QPoint pos) const;
 
 	/**
-	 * Set the colour of the signal.
+	 * Returns true if the item may be dragged/moved.
 	 */
-	virtual void set_colour(QColor colour);
+	virtual bool is_draggable(QPoint pos) const;
 
 	/**
 	 * Configures the segment display mode to use.
 	 */
 	virtual void set_segment_display_mode(SegmentDisplayMode mode);
 
+	virtual void on_setting_changed(const QString &key, const QVariant &value);
+
 	/**
 	 * Paints the signal label.
 	 * @param p the QPainter to paint into.
@@ -115,7 +127,7 @@ public:
 	 */
 	virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
 
-	virtual QMenu* create_context_menu(QWidget *parent);
+	virtual QMenu* create_header_context_menu(QWidget *parent);
 
 	pv::widgets::Popup* create_popup(QWidget *parent);
 
@@ -126,6 +138,20 @@ public:
 	 */
 	QRectF label_rect(const QRectF &rect) const;
 
+	/**
+	 * Computes the outline rectangle of the viewport hit-box.
+	 * @param rect the rectangle of the viewport area.
+	 * @return Returns the rectangle of the hit-box.
+	 * @remarks The default implementation returns an empty hit-box.
+	 */
+	virtual QRectF hit_box_rect(const ViewItemPaintParams &pp) const;
+
+	void set_current_segment(const int segment);
+
+	int get_current_segment() const;
+
+	virtual void hover_point_changed(const QPoint &hp);
+
 protected:
 	/**
 	 * Paints the background layer of the signal with a QPainter.
@@ -142,7 +168,13 @@ protected:
 	 */
 	void paint_axis(QPainter &p, ViewItemPaintParams &pp, int y);
 
-	void add_colour_option(QWidget *parent, QFormLayout *form);
+	/**
+	 * Draw a hover marker under the cursor position.
+	 * @param p The painter to draw into.
+	 */
+	void paint_hover_marker(QPainter &p);
+
+	void add_color_option(QWidget *parent, QFormLayout *form);
 
 	void create_popup_form();
 
@@ -151,20 +183,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_;
+	bool show_hover_marker_;
+
+	/// The ID of the currently displayed segment
+	int current_segment_;
 
 private:
 	pv::widgets::Popup *popup_;