projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge RowItem() into ViewItem()
[pulseview.git]
/
pv
/
views
/
trace
/
trace.hpp
diff --git
a/pv/views/trace/trace.hpp
b/pv/views/trace/trace.hpp
index 0b4ecce49484af09e8b60938afc5c3069cb3d936..2b98811b32ea3506865fc8db5e9e4924644539c7 100644
(file)
--- a/
pv/views/trace/trace.hpp
+++ b/
pv/views/trace/trace.hpp
@@
-129,6
+129,8
@@
public:
virtual QMenu* create_header_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);
/**
@@
-192,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_;
@@
-199,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_;