Make pv::prop objects run on GVariants

[pulseview.git] / pv / prop / double.cpp

diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp
index fdd9a44c06828ff64cf44d67a1b29e4b18268b99..6f6fe0c1ea7e228ca7ed1487efa13e7202a3f5c2 100644 (file)
--- a/pv/prop/double.cpp
+++ b/pv/prop/double.cpp
@@ -35,32 +35,37 @@ Double::Double(QString name,
        QString suffix,
        optional< pair<double, double> > range,
        optional<double> step,
-       function<double ()> getter,
-       function<void (double)> setter) :
-       Property(name),
+       Getter getter,
+       Setter setter) :
+       Property(name, getter, setter),
        _decimals(decimals),
        _suffix(suffix),
        _range(range),
        _step(step),
-       _getter(getter),
-       _setter(setter),
        _spin_box(NULL)
 {
 }
 
 QWidget* Double::get_widget(QWidget *parent)
 {
-       if(_spin_box)
+       if (_spin_box)
                return _spin_box;
 
        _spin_box = new QDoubleSpinBox(parent);
        _spin_box->setDecimals(_decimals);
        _spin_box->setSuffix(_suffix);
-       if(_range)
+       if (_range)
                _spin_box->setRange(_range->first, _range->second);
-       if(_step)
+       if (_step)
                _spin_box->setSingleStep(*_step);
 
+       GVariant *const value = _getter ? _getter() : NULL;
+
+       if (value) {
+               _spin_box->setValue(g_variant_get_double(value));
+               g_variant_unref(value);
+       }
+
        return _spin_box;
 }
 
@@ -68,10 +73,10 @@ void Double::commit()
 {
        assert(_setter);
 
-       if(!_spin_box)
+       if (!_spin_box)
                return;
 
-       _setter(_spin_box->value());
+       _setter(g_variant_new_double(_spin_box->value()));
 }
 
 } // prop