X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Ftrace.hpp;h=05be7053dac7bff45888609f5e826a6744d08cf7;hb=4640a84e926ac4b82e2a1b6ef9fc80ef44c2bd3c;hp=bc97736c03de58f1ccc4d9d2e09571c110c6d909;hpb=d9b55cc8ab01e83b392762ed1fa400fdafafb60b;p=pulseview.git

diff --git a/pv/views/trace/trace.hpp b/pv/views/trace/trace.hpp
index bc97736c..05be7053 100644
--- a/pv/views/trace/trace.hpp
+++ b/pv/views/trace/trace.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP
 
 #include <QColor>
 #include <QPainter>
@@ -93,7 +93,7 @@ private:
 	static const QColor DarkGrayBGColor;
 
 protected:
-	Trace(shared_ptr<data::SignalBase> channel);
+	Trace(shared_ptr<data::SignalBase> signal);
 	~Trace();
 
 public:
@@ -102,6 +102,16 @@ public:
 	 */
 	shared_ptr<data::SignalBase> base() const;
 
+	/**
+	 * Returns true if the item may be selected.
+	 */
+	virtual bool is_selectable(QPoint pos) const;
+
+	/**
+	 * Returns true if the item may be dragged/moved.
+	 */
+	virtual bool is_draggable(QPoint pos) const;
+
 	/**
 	 * Configures the segment display mode to use.
 	 */
@@ -117,7 +127,9 @@ 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);
+
+	virtual QMenu* create_view_context_menu(QWidget *parent, QPoint &click_pos);
 
 	pv::widgets::Popup* create_popup(QWidget *parent);
 
@@ -182,6 +194,8 @@ private Q_SLOTS:
 
 	void on_coloredit_changed(const QColor &color);
 
+	void on_create_marker_here() const;
+
 protected:
 	shared_ptr<data::SignalBase> base_;
 	QPen axis_pen_;
@@ -189,6 +203,8 @@ protected:
 	SegmentDisplayMode segment_display_mode_;
 	bool show_hover_marker_;
 
+	uint32_t context_menu_x_pos_;
+
 	/// The ID of the currently displayed segment
 	int current_segment_;
 
@@ -201,4 +217,4 @@ private:
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_TRACE_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_TRACE_HPP