X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fdouble.cpp;h=f39ae844fc97ce34b4519d4a67546a867e8cdb74;hp=eeb13fdd37e8e366011a0da1fafe14fd72cef77f;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9

diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp
index eeb13fdd..f39ae844 100644
--- a/pv/prop/double.cpp
+++ b/pv/prop/double.cpp
@@ -19,8 +19,11 @@
 
 #include <cassert>
 
+#include <QDebug>
 #include <QDoubleSpinBox>
 
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
 #include "double.hpp"
 
 using boost::optional;
@@ -30,13 +33,14 @@ namespace pv {
 namespace prop {
 
 Double::Double(QString name,
+	QString desc,
 	int decimals,
 	QString suffix,
 	optional< pair<double, double> > range,
 	optional<double> step,
 	Getter getter,
 	Setter setter) :
-	Property(name, getter, setter),
+	Property(name, desc, getter, setter),
 	decimals_(decimals),
 	suffix_(suffix),
 	range_(range),
@@ -53,12 +57,14 @@ QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
 	if (!getter_)
 		return nullptr;
 
-	Glib::VariantBase variant = getter_();
-	if (!variant.gobj())
+	try {
+		Glib::VariantBase variant = getter_();
+		if (!variant.gobj())
+			return nullptr;
+	} catch (const sigrok::Error &e) {
+		qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what());
 		return nullptr;
-
-	double value = Glib::VariantBase::cast_dynamic<Glib::Variant<double>>(
-		variant).get();
+	}
 
 	spin_box_ = new QDoubleSpinBox(parent);
 	spin_box_->setDecimals(decimals_);
@@ -68,7 +74,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 +83,27 @@ QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
 	return spin_box_;
 }
 
+void Double::update_widget()
+{
+	if (!spin_box_)
+		return;
+
+	Glib::VariantBase variant;
+
+	try {
+		variant = getter_();
+	} catch (const sigrok::Error &e) {
+		qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what());
+		return;
+	}
+
+	assert(variant.gobj());
+
+	double value = Glib::VariantBase::cast_dynamic<Glib::Variant<double>>(
+		variant).get();
+	spin_box_->setValue(value);
+}
+
 void Double::commit()
 {
 	assert(setter_);
@@ -92,5 +119,5 @@ void Double::on_value_changed(double)
 	commit();
 }
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv