X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=03749689cb44aa602f5ce12e68affb55c821d5d9;hb=9e40e83daf6a2851f4883468a4237849f984b336;hp=ec0ab9a4fe4f59857e47e0fcc7443747e3039a1c;hpb=ca4ec3eab886e62c0f9d0cc91636383a74ad5d7b;p=pulseview.git

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index ec0ab9a4..03749689 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -24,22 +24,28 @@
 
 #include <QPainter>
 
+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);
 
-TimeMarker::TimeMarker(const TimeMarker &s) :
-	_view(s._view),
-	_colour(s._colour),
-	_time(s._time)
-{
+	_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
@@ -50,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();
 }
 
@@ -60,5 +69,20 @@ void TimeMarker::paint(QPainter &p, const QRect &rect)
 	p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
 }
 
+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