X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=03749689cb44aa602f5ce12e68affb55c821d5d9;hb=d29059343817896931df3cfce2b34ec5fcc7818b;hp=9d4c43c21d2321f0ad20526075b1ace4dbeb5be7;hpb=a55c544b0fefead0786633d6d7c2356002b192ae;p=pulseview.git

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 9d4c43c..0374968 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -29,12 +29,23 @@ using namespace std;
 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),
-	_time(time)
+	_time(time),
+	_value_action(&view),
+	_value_widget(&view),
+	_updating_value_widget(false)
 {
+	_value_action.setDefaultWidget(&_value_widget);
+
+	_value_widget.setValue(time);
+	_value_widget.setDecimals(6);
+	_value_widget.setSuffix("s");
+	_value_widget.setSingleStep(1e-6);
+
+	connect(&_value_widget, SIGNAL(valueChanged(double)),
+		this, SLOT(on_value_changed(double)));
 }
 
 double TimeMarker::time() const
@@ -45,6 +56,9 @@ double TimeMarker::time() const
 void TimeMarker::set_time(double time)
 {
 	_time = time;
+	_updating_value_widget = true;
+	_value_widget.setValue(time);
+	_updating_value_widget = false;
 	time_changed();
 }
 
@@ -58,8 +72,17 @@ void TimeMarker::paint(QPainter &p, const QRect &rect)
 const list<QAction*> TimeMarker::get_context_bar_actions()
 {
 	list<QAction*> actions;
+	actions.push_back(&_value_action);
 	return actions;
 }
 
+void TimeMarker::on_value_changed(double value)
+{
+	if (!_updating_value_widget) {
+		_time = value;
+		time_changed();
+	}
+}
+
 } // namespace view
 } // namespace pv