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 c1e776e1f6c890c21d9d435cbc66316d8976e528..6f6fe0c1ea7e228ca7ed1487efa13e7202a3f5c2 100644 (file)
--- a/pv/prop/double.cpp
+++ b/pv/prop/double.cpp
@@ -35,15 +35,13 @@ Double::Double(QString name,
        QString suffix,
        optional< pair<double, double> > range,
        optional<double> step,
        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),
        _decimals(decimals),
        _suffix(suffix),
        _range(range),
        _step(step),

-       _getter(getter),
-       _setter(setter),

        _spin_box(NULL)
 {
 }
        _spin_box(NULL)
 {
 }


@@ -61,7 +59,12 @@ QWidget* Double::get_widget(QWidget *parent)
        if (_step)
                _spin_box->setSingleStep(*_step);
 
        if (_step)
                _spin_box->setSingleStep(*_step);
 

-       _spin_box->setValue(_getter ? _getter() : 0.0);
+       GVariant *const value = _getter ? _getter() : NULL;
+
+       if (value) {
+               _spin_box->setValue(g_variant_get_double(value));
+               g_variant_unref(value);
+       }

 
        return _spin_box;
 }
 
        return _spin_box;
 }


@@ -73,7 +76,7 @@ void Double::commit()
        if (!_spin_box)
                return;
 
        if (!_spin_box)
                return;
 

-       _setter(_spin_box->value());
+       _setter(g_variant_new_double(_spin_box->value()));

 }
 
 } // prop
 }
 
 } // prop