projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Invoke signals_changed outside locked region
[pulseview.git]
/
pv
/
prop
/
double.cpp
diff --git
a/pv/prop/double.cpp
b/pv/prop/double.cpp
index fdd9a44c06828ff64cf44d67a1b29e4b18268b99..39e205ee691f2910dd7899ac958ae5d9c69bde3f 100644
(file)
--- a/
pv/prop/double.cpp
+++ b/
pv/prop/double.cpp
@@
-35,32
+35,41
@@
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)
{
}
+Double::~Double()
+{
+}
+
QWidget* Double::get_widget(QWidget *parent)
{
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);
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);
_spin_box->setRange(_range->first, _range->second);
- if(_step)
+ if
(_step)
_spin_box->setSingleStep(*_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;
}
return _spin_box;
}
@@
-68,10
+77,10
@@
void Double::commit()
{
assert(_setter);
{
assert(_setter);
- if(!_spin_box)
+ if
(!_spin_box)
return;
return;
- _setter(
_spin_box->value(
));
+ _setter(
g_variant_new_double(_spin_box->value()
));
}
} // prop
}
} // prop