X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fdouble.cpp;h=93b45d327362f93b12595a4249e154bcdac0bb14;hp=39e205ee691f2910dd7899ac958ae5d9c69bde3f;hb=6db7315814ee9d2f92d4b326be7c5b9e6e4b789b;hpb=f459c5400e067c4389c472b84194d760e7bfd585 diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp index 39e205ee..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 { @@ -50,11 +50,15 @@ Double::~Double() { } -QWidget* Double::get_widget(QWidget *parent) +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); @@ -63,12 +67,12 @@ QWidget* Double::get_widget(QWidget *parent) if (_step) _spin_box->setSingleStep(*_step); - GVariant *const value = _getter ? _getter() : NULL; + _spin_box->setValue(g_variant_get_double(value)); + g_variant_unref(value); - if (value) { - _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; } @@ -83,5 +87,10 @@ void Double::commit() _setter(g_variant_new_double(_spin_box->value())); } +void Double::on_value_changed(double) +{ + commit(); +} + } // prop } // pv