X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.cpp;h=458a9d69a71d64c2bda65cb24f3ad0b85e24394e;hp=fe08d2b4ab48a8c91e1543ee971ea398ae6eda4e;hb=a9627352f283dd4f83906dc1710a1d9d327fbe57;hpb=6f925ba9d6faf1077b73c5a5808259576081716a

diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index fe08d2b4..458a9d69 100644
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -24,7 +24,6 @@
 #include "device.hpp"
 
 #include <pv/prop/bool.hpp>
-#include <pv/prop/double.hpp>
 #include <pv/prop/enum.hpp>
 #include <pv/prop/int.hpp>
 
@@ -46,7 +45,6 @@ using sigrok::ConfigKey;
 using sigrok::Error;
 
 using pv::prop::Bool;
-using pv::prop::Double;
 using pv::prop::Enum;
 using pv::prop::Int;
 using pv::prop::Property;
@@ -91,7 +89,7 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 			break;
 
 		case SR_CONF_CAPTURE_RATIO:
-			bind_int(name, "%", pair<int64_t, int64_t>(0, 100),
+			bind_int(name, "", "%", pair<int64_t, int64_t>(0, 100),
 				get, set);
 			break;
 
@@ -101,33 +99,33 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 		case SR_CONF_TRIGGER_SLOPE:
 		case SR_CONF_COUPLING:
 		case SR_CONF_CLOCK_EDGE:
-			bind_enum(name, key, capabilities, get, set);
+			bind_enum(name, "", key, capabilities, get, set);
 			break;
 
 		case SR_CONF_FILTER:
 		case SR_CONF_EXTERNAL_CLOCK:
 		case SR_CONF_RLE:
 		case SR_CONF_POWER_OFF:
-			bind_bool(name, get, set);
+			bind_bool(name, "", get, set);
 			break;
 
 		case SR_CONF_TIMEBASE:
-			bind_enum(name, key, capabilities, get, set, print_timebase);
+			bind_enum(name, "", key, capabilities, get, set, print_timebase);
 			break;
 
 		case SR_CONF_VDIV:
-			bind_enum(name, key, capabilities, get, set, print_vdiv);
+			bind_enum(name, "", key, capabilities, get, set, print_vdiv);
 			break;
 
 		case SR_CONF_VOLTAGE_THRESHOLD:
-			bind_enum(name, key, capabilities, get, set, print_voltage_threshold);
+			bind_enum(name, "", key, capabilities, get, set, print_voltage_threshold);
 			break;
 
 		case SR_CONF_PROBE_FACTOR:
 			if (capabilities.count(Capability::LIST))
-				bind_enum(name, key, capabilities, get, set, print_probe_factor);
+				bind_enum(name, "", key, capabilities, get, set, print_probe_factor);
 			else
-				bind_int(name, "", pair<int64_t, int64_t>(1, 500), get, set);
+				bind_int(name, "", "", pair<int64_t, int64_t>(1, 500), get, set);
 			break;
 
 		default:
@@ -136,43 +134,49 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 	}
 }
 
-void Device::bind_bool(const QString &name,
+void Device::bind_bool(const QString &name, const QString &desc,
 	Property::Getter getter, Property::Setter setter)
 {
 	assert(configurable_);
 	properties_.push_back(shared_ptr<Property>(new Bool(
-		name, getter, setter)));
+		name, desc, getter, setter)));
 }
 
-void Device::bind_enum(const QString &name,
+void Device::bind_enum(const QString &name, const QString &desc,
 	const ConfigKey *key, set<const Capability *> capabilities,
 	Property::Getter getter,
 	Property::Setter setter, function<QString (Glib::VariantBase)> printer)
 {
-	Glib::VariantBase gvar;
-	vector< pair<Glib::VariantBase, QString> > values;
-
 	assert(configurable_);
 
 	if (!capabilities.count(Capability::LIST))
 		return;
 
-	Glib::VariantIter iter(configurable_->config_list(key));
-	while ((iter.next_value(gvar)))
-		values.push_back(make_pair(gvar, printer(gvar)));
+	try {
+		Glib::VariantContainerBase gvar = configurable_->config_list(key);
+		Glib::VariantIter iter(gvar);
+
+		vector< pair<Glib::VariantBase, QString> > values;
+		while ((iter.next_value(gvar)))
+			values.push_back(make_pair(gvar, printer(gvar)));
+
+		properties_.push_back(shared_ptr<Property>(new Enum(name, desc, values,
+			getter, setter)));
 
-	properties_.push_back(shared_ptr<Property>(new Enum(name, values,
-		getter, setter)));
+	} catch (sigrok::Error& e) {
+		qDebug() << "Error: Listing device key" << name << "failed!";
+		return;
+	}
 }
 
-void Device::bind_int(const QString &name, QString suffix,
+void Device::bind_int(const QString &name, const QString &desc, QString suffix,
 	optional< pair<int64_t, int64_t> > range,
 	Property::Getter getter, Property::Setter setter)
 {
 	assert(configurable_);
 
-	properties_.push_back(shared_ptr<Property>(new Int(name, suffix, range,
-		getter, setter)));
+	properties_.push_back(shared_ptr<Property>(new Int(name, desc, suffix,
+		range, getter, setter)));
 }
 
 QString Device::print_timebase(Glib::VariantBase gvar)
@@ -203,5 +207,5 @@ QString Device::print_probe_factor(Glib::VariantBase gvar)
 	return QString("%1x").arg(factor);
 }
 
-} // binding
-} // pv
+}  // namespace binding
+}  // namespace pv