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 49d90e39d551447f563debf9ea2e04b90d6bec4e..5fd75dd8db91c4104a91b0a70b044f86374daedb 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-24,21
+24,18
@@
#include <QPainter>
#include <QPainter>
+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)
-{
-}
-
-TimeMarker::TimeMarker(const TimeMarker &s) :
- _view(s._view),
- _colour(s._colour),
- _time(s._time)
+ _time(time),
+ _value_action(NULL),
+ _value_widget(NULL),
+ _updating_value_widget(false)
{
}
{
}
@@
-50,6
+47,10
@@
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();
}
void TimeMarker::paint(QPainter &p, const QRect &rect)
}
void TimeMarker::paint(QPainter &p, const QRect &rect)
@@
-59,5
+60,13
@@
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()));
}
+void TimeMarker::on_value_changed(double value)
+{
+ if (!_updating_value_widget) {
+ _time = value;
+ time_changed();
+ }
+}
+
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv