X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fdouble.cpp;h=57512d723ff26b5cd3473432040e975cf914e8bb;hb=dbed5609ae31cdfc3e9db10f3ab91b7607c08372;hp=eeb13fdd37e8e366011a0da1fafe14fd72cef77f;hpb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;p=pulseview.git diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp index eeb13fd..57512d7 100644 --- a/pv/prop/double.cpp +++ b/pv/prop/double.cpp @@ -30,13 +30,14 @@ namespace pv { namespace prop { Double::Double(QString name, + QString desc, int decimals, QString suffix, optional< pair > range, optional step, Getter getter, Setter setter) : - Property(name, getter, setter), + Property(name, desc, getter, setter), decimals_(decimals), suffix_(suffix), range_(range), @@ -57,9 +58,6 @@ QWidget* Double::get_widget(QWidget *parent, bool auto_commit) if (!variant.gobj()) return nullptr; - double value = Glib::VariantBase::cast_dynamic>( - variant).get(); - spin_box_ = new QDoubleSpinBox(parent); spin_box_->setDecimals(decimals_); spin_box_->setSuffix(suffix_); @@ -68,7 +66,7 @@ QWidget* Double::get_widget(QWidget *parent, bool auto_commit) if (step_) spin_box_->setSingleStep(*step_); - spin_box_->setValue(value); + update_widget(); if (auto_commit) connect(spin_box_, SIGNAL(valueChanged(double)), @@ -77,6 +75,19 @@ QWidget* Double::get_widget(QWidget *parent, bool auto_commit) return spin_box_; } +void Double::update_widget() +{ + if (!spin_box_) + return; + + Glib::VariantBase variant = getter_(); + assert(variant.gobj()); + + double value = Glib::VariantBase::cast_dynamic>( + variant).get(); + spin_box_->setValue(value); +} + void Double::commit() { assert(setter_); @@ -92,5 +103,5 @@ void Double::on_value_changed(double) commit(); } -} // prop -} // pv +} // namespace prop +} // namespace pv