X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fdeviceoptions.cpp;h=90f474f24935c04616a6871c1dec89df176d17b2;hp=b6f2f13605e54b15a34330637e0cf53cf82d44e7;hb=4d5d5d6aeb7d936fb6b939f6c6531b3f054dac1f;hpb=3820592a018c777727a6e65bd754d113742f4462;ds=sidebyside diff --git a/pv/prop/binding/deviceoptions.cpp b/pv/prop/binding/deviceoptions.cpp index b6f2f136..90f474f2 100644 --- a/pv/prop/binding/deviceoptions.cpp +++ b/pv/prop/binding/deviceoptions.cpp @@ -20,8 +20,14 @@ #include +#include +#include + +#include + #include "deviceoptions.h" +#include #include using namespace boost; @@ -34,121 +40,186 @@ namespace binding { DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) : _sdi(sdi) { - const int *options; + GVariant *gvar_opts, *gvar_list; + gsize num_opts; if ((sr_config_list(sdi->driver, SR_CONF_DEVICE_OPTIONS, - (const void **)&options, sdi) != SR_OK) || !options) + &gvar_opts, sdi) != SR_OK)) /* Driver supports no device instance options. */ return; - for (int cap = 0; options[cap]; cap++) { + const int *const options = (const int32_t *)g_variant_get_fixed_array( + gvar_opts, &num_opts, sizeof(int32_t)); + for (unsigned int i = 0; i < num_opts; i++) { const struct sr_config_info *const info = - sr_config_info_get(options[cap]); + sr_config_info_get(options[i]); + + const int key = info->key; - if (!info) + if (!info || sr_config_list(_sdi->driver, key, + &gvar_list, _sdi) != SR_OK) continue; - switch(info->key) + const QString name(info->name); + + switch(key) { - case SR_CONF_PATTERN_MODE: - bind_stropt(info, SR_CONF_PATTERN_MODE); + case SR_CONF_SAMPLERATE: + bind_samplerate(name, gvar_list); break; + case SR_CONF_PATTERN_MODE: case SR_CONF_BUFFERSIZE: - bind_buffer_size(info); - break; - - case SR_CONF_TIMEBASE: - bind_time_base(info); - break; - case SR_CONF_TRIGGER_SOURCE: - bind_stropt(info, SR_CONF_TRIGGER_SOURCE); - break; - case SR_CONF_FILTER: - bind_stropt(info, SR_CONF_FILTER); + case SR_CONF_COUPLING: + bind_enum(name, key, gvar_list); break; - case SR_CONF_VDIV: - bind_vdiv(info); + case SR_CONF_TIMEBASE: + bind_enum(name, key, gvar_list, print_timebase); break; - case SR_CONF_COUPLING: - bind_stropt(info, SR_CONF_FILTER); + case SR_CONF_VDIV: + bind_enum(name, key, gvar_list, print_vdiv); break; } + + g_variant_unref(gvar_list); } + g_variant_unref(gvar_opts); } -void DeviceOptions::expose_enum(const struct sr_config_info *info, - const vector< pair > &values, int key) +GVariant* DeviceOptions::config_getter( + const struct sr_dev_inst *sdi, int key) { - _properties.push_back(shared_ptr( - new Enum(QString(info->name), values, - function(), - bind(sr_config_set, _sdi, key, _1)))); + GVariant *data = NULL; + if (sr_config_get(sdi->driver, key, &data, sdi) != SR_OK) { + qDebug() << + "WARNING: Failed to get value of config id" << key; + return NULL; + } + return data; } -void DeviceOptions::bind_stropt( - const struct sr_config_info *info, int key) +void DeviceOptions::config_setter( + const struct sr_dev_inst *sdi, int key, GVariant* value) { - const char **stropts; - if (sr_config_list(_sdi->driver, key, - (const void **)&stropts, _sdi) != SR_OK) - return; + if (sr_config_set(sdi, key, value) != SR_OK) + qDebug() << "WARNING: Failed to set value of sample rate"; +} + +void DeviceOptions::bind_enum(const QString &name, int key, + GVariant *const gvar_list, function printer) +{ + GVariant *gvar; + GVariantIter iter; + vector< pair > values; - vector< pair > values; - for (int i = 0; stropts[i]; i++) - values.push_back(make_pair(stropts[i], stropts[i])); + g_variant_iter_init (&iter, gvar_list); + while ((gvar = g_variant_iter_next_value (&iter))) + values.push_back(make_pair(gvar, printer(gvar))); - expose_enum(info, values, key); + _properties.push_back(shared_ptr( + new Enum(name, values, + bind(config_getter, _sdi, key), + bind(config_setter, _sdi, key, _1)))); } -void DeviceOptions::bind_buffer_size(const struct sr_config_info *info) +QString DeviceOptions::print_gvariant(GVariant *const gvar) { - const uint64_t *sizes; - if (sr_config_list(_sdi->driver, SR_CONF_BUFFERSIZE, - (const void **)&sizes, _sdi) != SR_OK) - return; + QString s; + + if (g_variant_is_of_type(gvar, G_VARIANT_TYPE("s"))) + s = QString(g_variant_get_string(gvar, NULL)); + else + { + gchar *const text = g_variant_print(gvar, FALSE); + s = QString(text); + g_free(text); + } - vector< pair > values; - for (int i = 0; sizes[i]; i++) - values.push_back(make_pair(sizes + i, - QString("%1").arg(sizes[i]))); + return s; +} - expose_enum(info, values, SR_CONF_BUFFERSIZE); +void DeviceOptions::bind_samplerate(const QString &name, + GVariant *const gvar_list) +{ + GVariant *gvar_list_samplerates; + + if ((gvar_list_samplerates = g_variant_lookup_value(gvar_list, + "samplerate-steps", G_VARIANT_TYPE("at")))) + { + gsize num_elements; + const uint64_t *const elements = + (const uint64_t *)g_variant_get_fixed_array( + gvar_list_samplerates, &num_elements, sizeof(uint64_t)); + + assert(num_elements == 3); + + _properties.push_back(shared_ptr( + new Double(name, 0, QObject::tr("Hz"), + make_pair((double)elements[0], (double)elements[1]), + (double)elements[2], + bind(samplerate_double_getter, _sdi), + bind(samplerate_double_setter, _sdi, _1)))); + + g_variant_unref(gvar_list_samplerates); + } + else if ((gvar_list_samplerates = g_variant_lookup_value(gvar_list, + "samplerates", G_VARIANT_TYPE("at")))) + { + bind_enum(name, SR_CONF_SAMPLERATE, + gvar_list_samplerates, print_samplerate); + g_variant_unref(gvar_list_samplerates); + } } -void DeviceOptions::bind_time_base(const struct sr_config_info *info) +QString DeviceOptions::print_samplerate(GVariant *const gvar) { - struct sr_rational *timebases; - if (sr_config_list(_sdi->driver, SR_CONF_TIMEBASE, - (const void **)&timebases, _sdi) != SR_OK) - return; + char *const s = sr_samplerate_string( + g_variant_get_uint64(gvar)); + const QString qstring(s); + g_free(s); + return qstring; +} + +GVariant* DeviceOptions::samplerate_double_getter( + const struct sr_dev_inst *sdi) +{ + GVariant *const gvar = config_getter(sdi, SR_CONF_SAMPLERATE); + + if(!gvar) + return NULL; + + GVariant *const gvar_double = g_variant_new_double( + g_variant_get_uint64(gvar)); - vector< pair > values; - for (int i = 0; timebases[i].p && timebases[i].q; i++) - values.push_back(make_pair(timebases + i, - QString(sr_period_string( - timebases[i].p * timebases[i].q)))); + g_variant_unref(gvar); - expose_enum(info, values, SR_CONF_TIMEBASE); + return gvar_double; } -void DeviceOptions::bind_vdiv(const struct sr_config_info *info) +void DeviceOptions::samplerate_double_setter( + struct sr_dev_inst *sdi, GVariant *value) { - struct sr_rational *vdivs; - if (sr_config_list(_sdi->driver, SR_CONF_VDIV, - (const void **)&vdivs, _sdi) != SR_OK) - return; + GVariant *const gvar = g_variant_new_uint64( + g_variant_get_double(value)); + config_setter(sdi, SR_CONF_SAMPLERATE, gvar); +} - vector< pair > values; - for (int i = 0; vdivs[i].p && vdivs[i].q; i++) - values.push_back(make_pair(vdivs + i, - QString(sr_voltage_string(vdivs + i)))); +QString DeviceOptions::print_timebase(GVariant *const gvar) +{ + uint64_t p, q; + g_variant_get(gvar, "(tt)", &p, &q); + return QString(sr_period_string(p * q)); +} - expose_enum(info, values, SR_CONF_VDIV); +QString DeviceOptions::print_vdiv(GVariant *const gvar) +{ + uint64_t p, q; + g_variant_get(gvar, "(tt)", &p, &q); + return QString(sr_voltage_string(p, q)); } } // binding