#include "double.h"
-using namespace std;
-using namespace boost;
+using boost::optional;
+using std::pair;
namespace pv {
namespace prop {
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)
+Double::~Double()
{
- if(_spin_box)
+}
+
+QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
+{
+ if (_spin_box)
return _spin_box;
+ GVariant *const value = _getter ? _getter() : NULL;
+ if (!value)
+ return NULL;
+
_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);
- _spin_box->setValue(_getter ? _getter() : 0.0);
+ _spin_box->setValue(g_variant_get_double(value));
+ g_variant_unref(value);
+
+ if (auto_commit)
+ connect(_spin_box, SIGNAL(valueChanged(double)),
+ this, SLOT(on_value_changed(double)));
return _spin_box;
}
{
assert(_setter);
- if(!_spin_box)
+ if (!_spin_box)
return;
- _setter(_spin_box->value());
+ _setter(g_variant_new_double(_spin_box->value()));
+}
+
+void Double::on_value_changed(double)
+{
+ commit();
}
} // prop