TimeMarker: Fixed display of negative value in popup

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

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 49d90e39d551447f563debf9ea2e04b90d6bec4e..6571bea95c0eac9e6c98c3fca0f27bb9511a5c79 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -18,46 +18,93 @@
  * 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>
 
+#include <pv/widgets/popup.hpp>
+
 namespace pv {
 namespace view {
 
-TimeMarker::TimeMarker(const View &view, const QColor &colour,
-       double time) :
-       _view(view),
-       _colour(colour),
-       _time(time)
+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)
 {
 }
 
-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_ - view_.offset()) / view_.scale();
+}
+
+QPoint TimeMarker::point() const
 {
-       return _time;
+       return QPoint(get_x(), 0);
 }
 
 void TimeMarker::set_time(double time)
 {
-       _time = 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();
-       p.setPen(_colour);
+       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_->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;
+               time_changed();
+       }
+}
+
 } // namespace view
 } // namespace pv