projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DeviceOptions: Added an error handler for the case when a device exposes an enum...
[pulseview.git]
/
pv
/
prop
/
binding
/
deviceoptions.h
diff --git
a/pv/prop/binding/deviceoptions.h
b/pv/prop/binding/deviceoptions.h
index ab0f01716f0377c563c5288a14050bed8ea7fae2..445361fd6f80467421d2e90c303719643862268f 100644
(file)
--- a/
pv/prop/binding/deviceoptions.h
+++ b/
pv/prop/binding/deviceoptions.h
@@
-26,28
+26,29
@@
#include <QString>
#include <QString>
-#include <libsigrok/libsigrok.h>
-
#include "binding.h"
#include "binding.h"
+#include <glib.h>
+
+struct sr_dev_inst;
+struct sr_channel_group;
+
namespace pv {
namespace pv {
+
+namespace device {
+class DevInst;
+}
+
namespace prop {
namespace binding {
class DeviceOptions : public Binding
{
public:
namespace prop {
namespace binding {
class DeviceOptions : public Binding
{
public:
- DeviceOptions(
const sr_dev_inst *sdi
,
- const sr_
probe
_group *group = NULL);
+ DeviceOptions(
boost::shared_ptr<pv::device::DevInst> dev_inst
,
+ const sr_
channel
_group *group = NULL);
private:
private:
-
- static GVariant* config_getter(
- const sr_dev_inst *sdi, const sr_probe_group *group, int key);
- static void config_setter(
- const sr_dev_inst *sdi, const sr_probe_group *group, int key,
- GVariant* value);
-
void bind_bool(const QString &name, int key);
void bind_enum(const QString &name, int key,
GVariant *const gvar_list,
void bind_bool(const QString &name, int key);
void bind_enum(const QString &name, int key,
GVariant *const gvar_list,
@@
-55,15
+56,13
@@
private:
void bind_int(const QString &name, int key, QString suffix,
boost::optional< std::pair<int64_t, int64_t> > range);
void bind_int(const QString &name, int key, QString suffix,
boost::optional< std::pair<int64_t, int64_t> > range);
- static QString print_gvariant(GVariant *const gvar);
-
static QString print_timebase(GVariant *const gvar);
static QString print_vdiv(GVariant *const gvar);
static QString print_voltage_threshold(GVariant *const gvar);
protected:
static QString print_timebase(GVariant *const gvar);
static QString print_vdiv(GVariant *const gvar);
static QString print_voltage_threshold(GVariant *const gvar);
protected:
-
const sr_dev_inst *const _sdi
;
- const sr_
probe
_group *const _group;
+
boost::shared_ptr<device::DevInst> _dev_inst
;
+ const sr_
channel
_group *const _group;
};
} // binding
};
} // binding