X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=6571bea95c0eac9e6c98c3fca0f27bb9511a5c79;hb=0f1f98fe5b6ccc7add3cedc035b0df5d8e5431eb;hp=5907631a671f463efa3e479bf340c9b31b4c4633;hpb=ef8311a4296a2dc85c82b063de61efa4eb7a8404;p=pulseview.git

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 5907631a..6571bea9 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -18,74 +18,90 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "timemarker.h"
+#include "timemarker.hpp"
 
-#include "view.h"
+#include "view.hpp"
 
+#include <QFormLayout>
 #include <QPainter>
 
-using namespace std;
+#include <pv/widgets/popup.hpp>
 
 namespace pv {
 namespace view {
 
 TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
-	_view(view),
-	_colour(colour),
-	_time(time),
-	_value_action(NULL),
-	_value_widget(NULL),
-	_updating_value_widget(false)
+	view_(view),
+	colour_(colour),
+	time_(time),
+	value_action_(NULL),
+	value_widget_(NULL),
+	updating_value_widget_(false)
 {
 }
 
-void TimeMarker::init_context_bar_actions(QWidget *parent)
+double TimeMarker::time() const
 {
-	_value_widget = new QDoubleSpinBox(parent);
-	_value_widget->setValue(_time);
-	_value_widget->setDecimals(6);
-	_value_widget->setSuffix("s");
-	_value_widget->setSingleStep(1e-6);
-
-	_value_action = new QWidgetAction(parent);
-	_value_action->setDefaultWidget(_value_widget);
+	return time_;
+}
 
-	connect(_value_widget, SIGNAL(valueChanged(double)),
-		this, SLOT(on_value_changed(double)));
+float TimeMarker::get_x() const
+{
+	return (time_ - view_.offset()) / view_.scale();
 }
 
-double TimeMarker::time() const
+QPoint TimeMarker::point() const
 {
-	return _time;
+	return QPoint(get_x(), 0);
 }
 
 void TimeMarker::set_time(double time)
 {
-	_time = time;
-	_updating_value_widget = true;
-	_value_widget->setValue(time);
-	_updating_value_widget = false;
+	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();
-	p.setPen(_colour);
+	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)
 {
-	list<QAction*> actions;
-	actions.push_back(_value_action);
-	return actions;
+	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_->setRange(-1.0e9, 1.0e9);
+	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)
 {
-	if (!_updating_value_widget) {
-		_time = value;
+	if (!updating_value_widget_) {
+		time_ = value;
 		time_changed();
 	}
 }