projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix 'Exception: not applicable' when connecting to hantek-dso
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index 95e518a274db8c11314ca22808bbea6fd0831108..25d1dbf78b1b8afb2134d0ceb3aec2f7759b1ea2 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
@@
-170,6
+171,12
@@
public:
*/
void enable_sticky_scrolling(bool state);
*/
void enable_sticky_scrolling(bool state);
+ /**
+ * Enables or disables coloured trace backgrounds. If they're not
+ * coloured then they will use alternating colors.
+ */
+ void enable_coloured_bg(bool state);
+
/**
* Returns true if cursors are displayed. false otherwise.
*/
/**
* Returns true if cursors are displayed. false otherwise.
*/
@@
-238,6
+245,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;
@@
-260,7
+270,7
@@
private:
void update_layout();
/**
void update_layout();
/**
- * Satis
i
fies TraceTreeItem functionality.
+ * Satisfies TraceTreeItem functionality.
* @param p the QPainter to paint into.
* @param rect the rectangle of the header area.
* @param hover true if the label is being hovered over by the mouse.
* @param p the QPainter to paint into.
* @param rect the rectangle of the header area.
* @param hover true if the label is being hovered over by the mouse.
@@
-290,9
+300,9
@@
private:
bool eventFilter(QObject *object, QEvent *event);
bool eventFilter(QObject *object, QEvent *event);
- bool viewportEvent(QEvent *e);
+ bool viewportEvent(QEvent *e
vent
);
- void resizeEvent(QResizeEvent *e);
+ void resizeEvent(QResizeEvent *e
vent
);
public:
void row_item_appearance_changed(bool label, bool content);
public:
void row_item_appearance_changed(bool label, bool content);
@@
-380,6
+390,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_;