projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Fix snap-to-edge when using all signals
[pulseview.git]
/
pv
/
views
/
trace
/
timemarker.hpp
diff --git
a/pv/views/trace/timemarker.hpp
b/pv/views/trace/timemarker.hpp
index 1a2abb3251e7bc3a8a3caa6e4d63b150141ecffd..48afc16bb77e9c346ec75e80c06ab3564873ecc1 100644
(file)
--- a/
pv/views/trace/timemarker.hpp
+++ b/
pv/views/trace/timemarker.hpp
@@
-56,10
+56,10
@@
protected:
/**
* Constructor.
* @param view A reference to the view that owns this marker.
/**
* Constructor.
* @param view A reference to the view that owns this marker.
- * @param colo
ur A reference to the colou
r of this cursor.
+ * @param colo
r A reference to the colo
r of this cursor.
* @param time The time to set the flag to.
*/
* @param time The time to set the flag to.
*/
- TimeMarker(View &view, const QColor &colo
u
r, const pv::util::Timestamp& time);
+ TimeMarker(View &view, const QColor &color, const pv::util::Timestamp& time);
public:
/**
public:
/**
@@
-120,7
+120,7
@@
private Q_SLOTS:
void on_value_changed(const pv::util::Timestamp& value);
protected:
void on_value_changed(const pv::util::Timestamp& value);
protected:
- const QColor &colo
u
r_;
+ const QColor &color_;
pv::util::Timestamp time_;
pv::util::Timestamp time_;