X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.cpp;h=fe08d2b4ab48a8c91e1543ee971ea398ae6eda4e;hp=224bc23a11079ea4593230a4637a2ff947e6886c;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=3cc9ad7b867853315473df611612c562d562ed8a

diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 224bc23..fe08d2b 100644
--- a/pv/binding/device.cpp
+++ b/pv/binding/device.cpp
@@ -14,11 +14,10 @@
  * 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 <stdint.h>
+#include <cstdint>
 
 #include <QDebug>
 
@@ -32,9 +31,11 @@
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 using boost::optional;
+
 using std::function;
 using std::make_pair;
 using std::pair;
+using std::set;
 using std::shared_ptr;
 using std::string;
 using std::vector;
@@ -56,21 +57,17 @@ namespace binding {
 Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 	configurable_(configurable)
 {
-	assert(configurable);
 
-	for (auto entry : configurable->config_keys(ConfigKey::DEVICE_OPTIONS)) {
-		auto key = entry.first;
-		auto capabilities = entry.second;
+	auto keys = configurable->config_keys();
+
+	for (auto key : keys) {
 
-		Glib::VariantContainerBase gvar_list;
+		auto capabilities = configurable->config_capabilities(key);
 
 		if (!capabilities.count(Capability::GET) ||
 			!capabilities.count(Capability::SET))
 			continue;
 
-		if (capabilities.count(Capability::LIST))
-			gvar_list = configurable->config_list(key);
-
 		string name_str;
 		try {
 			name_str = key->description();
@@ -87,8 +84,7 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 			config_changed();
 		};
 
-		switch (key->id())
-		{
+		switch (key->id()) {
 		case SR_CONF_SAMPLERATE:
 			// Sample rate values are not bound because they are shown
 			// in the MainBar
@@ -103,27 +99,35 @@ Device::Device(shared_ptr<sigrok::Configurable> configurable) :
 		case SR_CONF_BUFFERSIZE:
 		case SR_CONF_TRIGGER_SOURCE:
 		case SR_CONF_TRIGGER_SLOPE:
-		case SR_CONF_FILTER:
 		case SR_CONF_COUPLING:
 		case SR_CONF_CLOCK_EDGE:
-			bind_enum(name, gvar_list, 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);
 			break;
 
 		case SR_CONF_TIMEBASE:
-			bind_enum(name, gvar_list, get, set, print_timebase);
+			bind_enum(name, key, capabilities, get, set, print_timebase);
 			break;
 
 		case SR_CONF_VDIV:
-			bind_enum(name, gvar_list, get, set, print_vdiv);
+			bind_enum(name, key, capabilities, get, set, print_vdiv);
 			break;
 
 		case SR_CONF_VOLTAGE_THRESHOLD:
-			bind_enum(name, gvar_list, 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);
+			else
+				bind_int(name, "", pair<int64_t, int64_t>(1, 500), get, set);
 			break;
 
 		default:
@@ -141,7 +145,8 @@ void Device::bind_bool(const QString &name,
 }
 
 void Device::bind_enum(const QString &name,
-	Glib::VariantContainerBase gvar_list, Property::Getter getter,
+	const ConfigKey *key, set<const Capability *> capabilities,
+	Property::Getter getter,
 	Property::Setter setter, function<QString (Glib::VariantBase)> printer)
 {
 	Glib::VariantBase gvar;
@@ -149,7 +154,10 @@ void Device::bind_enum(const QString &name,
 
 	assert(configurable_);
 
-	Glib::VariantIter iter(gvar_list);
+	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)));
 
@@ -158,7 +166,7 @@ void Device::bind_enum(const QString &name,
 }
 
 void Device::bind_int(const QString &name, QString suffix,
-	optional< std::pair<int64_t, int64_t> > range,
+	optional< pair<int64_t, int64_t> > range,
 	Property::Getter getter, Property::Setter setter)
 {
 	assert(configurable_);
@@ -171,7 +179,7 @@ QString Device::print_timebase(Glib::VariantBase gvar)
 {
 	uint64_t p, q;
 	g_variant_get(gvar.gobj(), "(tt)", &p, &q);
-	return QString::fromUtf8(sr_period_string(p * q));
+	return QString::fromUtf8(sr_period_string(p, q));
 }
 
 QString Device::print_vdiv(Glib::VariantBase gvar)
@@ -188,5 +196,12 @@ QString Device::print_voltage_threshold(Glib::VariantBase gvar)
 	return QString("L<%1V H>%2V").arg(lo, 0, 'f', 1).arg(hi, 0, 'f', 1);
 }
 
+QString Device::print_probe_factor(Glib::VariantBase gvar)
+{
+	uint64_t factor;
+	factor = g_variant_get_uint64(gvar.gobj());
+	return QString("%1x").arg(factor);
+}
+
 } // binding
 } // pv