projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various minor whitespace and consistency fixes.
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index 95e518a274db8c11314ca22808bbea6fd0831108..66d31a225bf7b28806da3b28e87465ce5349daa7 100644
(file)
--- a/
pv/view/view.hpp
+++ b/
pv/view/view.hpp
@@
-55,6
+55,7
@@
class Header;
class Ruler;
class Trace;
class Viewport;
class Ruler;
class Trace;
class Viewport;
+class TriggerMarker;
class View : public QAbstractScrollArea, public TraceTreeItemOwner {
Q_OBJECT
class View : public QAbstractScrollArea, public TraceTreeItemOwner {
Q_OBJECT
@@
-238,6
+239,9
@@
Q_SIGNALS:
/// Emitted when the time_unit changed.
void time_unit_changed();
/// Emitted when the time_unit changed.
void time_unit_changed();
+public Q_SLOTS:
+ void trigger_event(util::Timestamp location);
+
private:
void get_scroll_layout(double &length, pv::util::Timestamp &offset) const;
private:
void get_scroll_layout(double &length, pv::util::Timestamp &offset) const;
@@
-380,6
+384,8
@@
private:
std::list< std::shared_ptr<Flag> > flags_;
char next_flag_text_;
std::list< std::shared_ptr<Flag> > flags_;
char next_flag_text_;
+ std::vector< std::shared_ptr<TriggerMarker> > trigger_markers_;
+
QPoint hover_point_;
unsigned int sticky_events_;
QPoint hover_point_;
unsigned int sticky_events_;