X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=5434203507fb63823e8f78fb760c5ec84b331539;hb=0dda6fe595932b2e340930104fad8ac4fc574895;hp=9d4c43c21d2321f0ad20526075b1ace4dbeb5be7;hpb=a55c544b0fefead0786633d6d7c2356002b192ae;p=pulseview.git

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 9d4c43c2..54342035 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -22,18 +22,21 @@
 
 #include "view.h"
 
+#include <QFormLayout>
 #include <QPainter>
 
-using namespace std;
+#include <pv/widgets/popup.h>
 
 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(NULL),
+	_value_widget(NULL),
+	_updating_value_widget(false)
 {
 }
 
@@ -42,23 +45,64 @@ double TimeMarker::time() const
 	return _time;
 }
 
+float TimeMarker::get_x() const
+{
+	return (_time - _view.offset()) / _view.scale();
+}
+
+QPoint TimeMarker::point() const
+{
+	return QPoint(get_x(), 0);
+}
+
 void TimeMarker::set_time(double time)
 {
 	_time = time;
+
+	if (_value_widget) {
+		_updating_value_widget = true;
+		_value_widget->setValue(time);
+		_updating_value_widget = false;
+	}
+
 	time_changed();
 }
 
 void TimeMarker::paint(QPainter &p, const QRect &rect)
 {
-	const float x = (_time - _view.offset()) / _view.scale();
+	const float x = get_x();
 	p.setPen(_colour);
 	p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
 }
 
-const list<QAction*> TimeMarker::get_context_bar_actions()
+pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
+{
+	using pv::widgets::Popup;
+
+	Popup *const popup = new Popup(parent);
+	QFormLayout *const form = new QFormLayout(popup);
+	popup->setLayout(form);
+
+	_value_widget = new QDoubleSpinBox(parent);
+	_value_widget->setDecimals(9);
+	_value_widget->setSuffix("s");
+	_value_widget->setSingleStep(1e-6);
+	_value_widget->setValue(_time);
+
+	connect(_value_widget, SIGNAL(valueChanged(double)),
+		this, SLOT(on_value_changed(double)));
+
+	form->addRow(tr("Time"), _value_widget);
+
+	return popup;
+}
+
+void TimeMarker::on_value_changed(double value)
 {
-	list<QAction*> actions;
-	return actions;
+	if (!_updating_value_widget) {
+		_time = value;
+		time_changed();
+	}
 }
 
 } // namespace view