projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added Disable context menu item to Signal
[pulseview.git]
/
pv
/
prop
/
binding
/
deviceoptions.cpp
diff --git
a/pv/prop/binding/deviceoptions.cpp
b/pv/prop/binding/deviceoptions.cpp
index f71cbac2a42aeb57a3db42d4377b973346e679d5..513fe856599682411a552c5345fde38384b1255c 100644
(file)
--- a/
pv/prop/binding/deviceoptions.cpp
+++ b/
pv/prop/binding/deviceoptions.cpp
@@
-42,6
+42,8
@@
namespace binding {
DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
_sdi(sdi)
{
DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
_sdi(sdi)
{
+ assert(sdi);
+
GVariant *gvar_opts, *gvar_list;
gsize num_opts;
GVariant *gvar_opts, *gvar_list;
gsize num_opts;
@@
-73,7
+75,7
@@
DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
break;
case SR_CONF_CAPTURE_RATIO:
break;
case SR_CONF_CAPTURE_RATIO:
- bind_int(name, key, "%",
make_pair(0L, 100L
));
+ bind_int(name, key, "%",
pair<int64_t, int64_t>(0, 100
));
break;
case SR_CONF_PATTERN_MODE:
break;
case SR_CONF_PATTERN_MODE:
@@
-95,6
+97,10
@@
DeviceOptions::DeviceOptions(struct sr_dev_inst *sdi) :
case SR_CONF_VDIV:
bind_enum(name, key, gvar_list, print_vdiv);
break;
case SR_CONF_VDIV:
bind_enum(name, key, gvar_list, print_vdiv);
break;
+
+ case SR_CONF_VOLTAGE_THRESHOLD:
+ bind_enum(name, key, gvar_list, print_voltage_threshold);
+ break;
}
if (gvar_list)
}
if (gvar_list)
@@
-255,6
+261,15
@@
QString DeviceOptions::print_vdiv(GVariant *const gvar)
return QString(sr_voltage_string(p, q));
}
return QString(sr_voltage_string(p, q));
}
+QString DeviceOptions::print_voltage_threshold(GVariant *const gvar)
+{
+ gdouble lo, hi;
+ char buf[64];
+ g_variant_get(gvar, "(dd)", &lo, &hi);
+ snprintf(buf, sizeof(buf), "L<%.1fV H>%.1fV", lo, hi);
+ return QString(buf);
+}
+
} // binding
} // prop
} // pv
} // binding
} // prop
} // pv