projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix up change handler registration
[pulseview.git]
/
pv
/
prop
/
double.cpp
diff --git
a/pv/prop/double.cpp
b/pv/prop/double.cpp
index 93b45d327362f93b12595a4249e154bcdac0bb14..57512d723ff26b5cd3473432040e975cf914e8bb 100644
(file)
--- a/
pv/prop/double.cpp
+++ b/
pv/prop/double.cpp
@@
-14,15
+14,14
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
*/
-#include <
assert.h
>
+#include <
cassert
>
#include <QDoubleSpinBox>
#include <QDoubleSpinBox>
-#include "double.h"
+#include "double.h
pp
"
using boost::optional;
using std::pair;
using boost::optional;
using std::pair;
@@
-31,60
+30,72
@@
namespace pv {
namespace prop {
Double::Double(QString name,
namespace prop {
Double::Double(QString name,
+ QString desc,
int decimals,
QString suffix,
optional< pair<double, double> > range,
optional<double> step,
Getter getter,
Setter setter) :
int decimals,
QString suffix,
optional< pair<double, double> > range,
optional<double> step,
Getter getter,
Setter setter) :
- Property(name, getter, setter),
- _decimals(decimals),
- _suffix(suffix),
- _range(range),
- _step(step),
- _spin_box(NULL)
-{
-}
-
-Double::~Double()
+ Property(name, desc, getter, setter),
+ decimals_(decimals),
+ suffix_(suffix),
+ range_(range),
+ step_(step),
+ spin_box_(nullptr)
{
}
QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
{
{
}
QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
{
- if (
_spin_box
)
- return
_spin_box
;
+ if (
spin_box_
)
+ return
spin_box_
;
- GVariant *const value = _getter ? _getter() : NULL;
- if (!value)
- return NULL;
+ if (!getter_)
+ return nullptr;
- _spin_box = new QDoubleSpinBox(parent);
- _spin_box->setDecimals(_decimals);
- _spin_box->setSuffix(_suffix);
- if (_range)
- _spin_box->setRange(_range->first, _range->second);
- if (_step)
- _spin_box->setSingleStep(*_step);
+ Glib::VariantBase variant = getter_();
+ if (!variant.gobj())
+ return nullptr;
- _spin_box->setValue(g_variant_get_double(value));
- g_variant_unref(value);
+ spin_box_ = new QDoubleSpinBox(parent);
+ spin_box_->setDecimals(decimals_);
+ spin_box_->setSuffix(suffix_);
+ if (range_)
+ spin_box_->setRange(range_->first, range_->second);
+ if (step_)
+ spin_box_->setSingleStep(*step_);
+
+ update_widget();
if (auto_commit)
if (auto_commit)
- connect(
_spin_box
, SIGNAL(valueChanged(double)),
+ connect(
spin_box_
, SIGNAL(valueChanged(double)),
this, SLOT(on_value_changed(double)));
this, SLOT(on_value_changed(double)));
- return _spin_box;
+ return spin_box_;
+}
+
+void Double::update_widget()
+{
+ if (!spin_box_)
+ return;
+
+ Glib::VariantBase variant = getter_();
+ assert(variant.gobj());
+
+ double value = Glib::VariantBase::cast_dynamic<Glib::Variant<double>>(
+ variant).get();
+ spin_box_->setValue(value);
}
void Double::commit()
{
}
void Double::commit()
{
- assert(
_setter
);
+ assert(
setter_
);
- if (!
_spin_box
)
+ if (!
spin_box_
)
return;
return;
-
_setter(g_variant_new_double(_spin_box
->value()));
+
setter_(Glib::Variant<double>::create(spin_box_
->value()));
}
void Double::on_value_changed(double)
}
void Double::on_value_changed(double)
@@
-92,5
+103,5
@@
void Double::on_value_changed(double)
commit();
}
commit();
}
-}
//
prop
-}
//
pv
+}
// namespace
prop
+}
// namespace
pv