projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed context bar
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 9d4c43c21d2321f0ad20526075b1ace4dbeb5be7..5fd75dd8db91c4104a91b0a70b044f86374daedb 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-29,11
+29,13
@@
using namespace std;
namespace pv {
namespace view {
namespace pv {
namespace view {
-TimeMarker::TimeMarker(const View &view, const QColor &colour,
- double time) :
+TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
_view(view),
_colour(colour),
_view(view),
_colour(colour),
- _time(time)
+ _time(time),
+ _value_action(NULL),
+ _value_widget(NULL),
+ _updating_value_widget(false)
{
}
{
}
@@
-45,6
+47,9
@@
double TimeMarker::time() const
void TimeMarker::set_time(double time)
{
_time = time;
void TimeMarker::set_time(double time)
{
_time = time;
+ _updating_value_widget = true;
+ _value_widget->setValue(time);
+ _updating_value_widget = false;
time_changed();
}
time_changed();
}
@@
-55,10
+60,12
@@
void TimeMarker::paint(QPainter &p, const QRect &rect)
p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
}
p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
}
-
const list<QAction*> TimeMarker::get_context_bar_actions(
)
+
void TimeMarker::on_value_changed(double value
)
{
{
- list<QAction*> actions;
- return actions;
+ if (!_updating_value_widget) {
+ _time = value;
+ time_changed();
+ }
}
} // namespace view
}
} // namespace view