X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fdouble.cpp;h=93b45d327362f93b12595a4249e154bcdac0bb14;hp=c1e776e1f6c890c21d9d435cbc66316d8976e528;hb=005cd4a714981dab06c5a59b7512e19efb03e24d;hpb=793f8096c486d0fba871227d9772a510f7496c08

diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp
index c1e776e1..93b45d32 100644
--- a/pv/prop/double.cpp
+++ b/pv/prop/double.cpp
@@ -24,8 +24,8 @@
 
 #include "double.h"
 
-using namespace std;
-using namespace boost;
+using boost::optional;
+using std::pair;
 
 namespace pv {
 namespace prop {
@@ -35,24 +35,30 @@ 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)
+Double::~Double()
+{
+}
+
+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);
@@ -61,7 +67,12 @@ QWidget* Double::get_widget(QWidget *parent)
 	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;
 }
@@ -73,7 +84,12 @@ void Double::commit()
 	if (!_spin_box)
 		return;
 
-	_setter(_spin_box->value());
+	_setter(g_variant_new_double(_spin_box->value()));
+}
+
+void Double::on_value_changed(double)
+{
+	commit();
 }
 
 } // prop