diff options
Diffstat (limited to 'DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp')
| -rw-r--r-- | DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp b/DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp index 189afcc..05b488e 100644 --- a/DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp +++ b/DSLogic-gui/pv/prop/binding/binding_deviceoptions.cpp @@ -83,7 +83,12 @@ DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) : case SR_CONF_BUFFERSIZE: case SR_CONF_TRIGGER_SOURCE: case SR_CONF_FILTER: - case SR_CONF_COUPLING: + case SR_CONF_COUPLING0: + case SR_CONF_COUPLING1: + case SR_CONF_EN_CH0: + case SR_CONF_EN_CH1: + case SR_CONF_OPERATION_MODE: + case SR_CONF_ZERO: bind_enum(name, key, gvar_list); break; @@ -99,9 +104,12 @@ DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) : bind_enum(name, key, gvar_list, print_timebase); break; - case SR_CONF_VDIV: + case SR_CONF_VDIV0: + case SR_CONF_VDIV1: bind_enum(name, key, gvar_list, print_vdiv); - break; + break; + default: + gvar_list = NULL; } if (gvar_list) @@ -131,13 +139,13 @@ void DeviceOptions::config_setter( void DeviceOptions::bind_bool(const QString &name, int key) { - _properties.push_back(shared_ptr<Property>( + _properties.push_back(boost::shared_ptr<Property>( new Bool(name, bind(config_getter, _sdi, key), bind(config_setter, _sdi, key, _1)))); } void DeviceOptions::bind_enum(const QString &name, int key, - GVariant *const gvar_list, function<QString (GVariant*)> printer) + GVariant *const gvar_list, boost::function<QString (GVariant*)> printer) { GVariant *gvar; GVariantIter iter; @@ -149,7 +157,7 @@ void DeviceOptions::bind_enum(const QString &name, int key, while ((gvar = g_variant_iter_next_value (&iter))) values.push_back(make_pair(gvar, printer(gvar))); - _properties.push_back(shared_ptr<Property>( + _properties.push_back(boost::shared_ptr<Property>( new Enum(name, values, bind(config_getter, _sdi, key), bind(config_setter, _sdi, key, _1)))); @@ -158,7 +166,7 @@ void DeviceOptions::bind_enum(const QString &name, int key, void DeviceOptions::bind_int(const QString &name, int key, QString suffix, optional< std::pair<int64_t, int64_t> > range) { - _properties.push_back(shared_ptr<Property>( + _properties.push_back(boost::shared_ptr<Property>( new Int(name, suffix, range, bind(config_getter, _sdi, key), bind(config_setter, _sdi, key, _1)))); @@ -197,7 +205,7 @@ void DeviceOptions::bind_samplerate(const QString &name, assert(num_elements == 3); - _properties.push_back(shared_ptr<Property>( + _properties.push_back(boost::shared_ptr<Property>( new Double(name, 0, QObject::tr("Hz"), make_pair((double)elements[0], (double)elements[1]), (double)elements[2], |