X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.cpp;h=8ef05f05bcfa20baaf608e9975a6beeadaa666cc;hb=00f6bae935837b38b0d03a5928ba8175d460413f;hp=77c772c088b07dabcbba1ed782339560527dae09;hpb=2ad82c2e40b6865481733913a2c32735602f63c4;p=pulseview.git
diff --git a/pv/binding/device.cpp b/pv/binding/device.cpp
index 77c772c..8ef05f0 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 .
*/
-#include
+#include
#include
@@ -56,17 +55,12 @@ namespace binding {
Device::Device(shared_ptr configurable) :
configurable_(configurable)
{
- std::map< const ConfigKey*, std::set > keys;
- try {
- keys = configurable->config_keys(ConfigKey::DEVICE_OPTIONS);
- } catch (const Error) {
- return;
- }
+ auto keys = configurable->config_keys();
- for (auto entry : keys) {
- auto key = entry.first;
- auto capabilities = entry.second;
+ for (auto key : keys) {
+
+ auto capabilities = configurable->config_capabilities(key);
if (!capabilities.count(Capability::GET) ||
!capabilities.count(Capability::SET))
@@ -103,12 +97,12 @@ Device::Device(shared_ptr 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, key, capabilities, get, set);
break;
+ case SR_CONF_FILTER:
case SR_CONF_EXTERNAL_CLOCK:
case SR_CONF_RLE:
case SR_CONF_POWER_OFF:
@@ -128,7 +122,10 @@ Device::Device(shared_ptr configurable) :
break;
case SR_CONF_PROBE_FACTOR:
- bind_int(name, "", pair(1, 500), get, set);
+ if (capabilities.count(Capability::LIST))
+ bind_enum(name, key, capabilities, get, set, print_probe_factor);
+ else
+ bind_int(name, "", pair(1, 500), get, set);
break;
default:
@@ -146,7 +143,7 @@ void Device::bind_bool(const QString &name,
}
void Device::bind_enum(const QString &name,
- const ConfigKey *key, std::set capabilities,
+ const ConfigKey *key, std::set capabilities,
Property::Getter getter,
Property::Setter setter, function printer)
{
@@ -180,7 +177,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)
@@ -197,5 +194,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