Added missing includes and defintions

[pulseview.git] / pv / view / timemarker.cpp

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 49d90e39d551447f563debf9ea2e04b90d6bec4e..5935fb3b9fd2535b6e1d15dbabe0f0ca85086b92 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -22,42 +22,85 @@
 
 #include "view.h"
 
+#include <QFormLayout>
 #include <QPainter>
 
+#include <pv/widgets/popup.h>
+
+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(NULL),
+       _value_widget(NULL),
+       _updating_value_widget(false)
 {
 }
 
-TimeMarker::TimeMarker(const TimeMarker &s) :
-       _view(s._view),
-       _colour(s._colour),
-       _time(s._time)
+double TimeMarker::time() const
 {
+       return _time;
 }
 
-double TimeMarker::time() const
+float TimeMarker::get_x() const
 {
-       return _time;
+       return (_time - _view.offset()) / _view.scale();
 }
 
 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()));
 }
 
+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->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)));
+
+       form->addRow(tr("Time"), _value_widget);
+
+       return popup;
+}
+
+void TimeMarker::on_value_changed(double value)
+{
+       if (!_updating_value_widget) {
+               _time = value;
+               time_changed();
+       }
+}
+
 } // namespace view
 } // namespace pv