projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix clazy warnings regarding range-for references
[pulseview.git]
/
pv
/
views
/
trace
/
trace.hpp
diff --git
a/pv/views/trace/trace.hpp
b/pv/views/trace/trace.hpp
index bc97736c03de58f1ccc4d9d2e09571c110c6d909..2b98811b32ea3506865fc8db5e9e4924644539c7 100644
(file)
--- a/
pv/views/trace/trace.hpp
+++ b/
pv/views/trace/trace.hpp
@@
-102,6
+102,16
@@
public:
*/
shared_ptr<data::SignalBase> base() const;
*/
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.
*/
/**
* Configures the segment display mode to use.
*/
@@
-117,7
+127,9
@@
public:
*/
virtual void paint_label(QPainter &p, const QRect &rect, bool hover);
*/
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);
pv::widgets::Popup* create_popup(QWidget *parent);
@@
-182,6
+194,8
@@
private Q_SLOTS:
void on_coloredit_changed(const QColor &color);
void on_coloredit_changed(const QColor &color);
+ void on_create_marker_here() const;
+
protected:
shared_ptr<data::SignalBase> base_;
QPen axis_pen_;
protected:
shared_ptr<data::SignalBase> base_;
QPen axis_pen_;
@@
-189,6
+203,8
@@
protected:
SegmentDisplayMode segment_display_mode_;
bool show_hover_marker_;
SegmentDisplayMode segment_display_mode_;
bool show_hover_marker_;
+ uint32_t context_menu_x_pos_;
+
/// The ID of the currently displayed segment
int current_segment_;
/// The ID of the currently displayed segment
int current_segment_;