projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use libsigrok C++ bindings (patch version 7).
[pulseview.git]
/
pv
/
view
/
signal.h
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index cce9f4694e237da6fd7abd8a99b8f2c3f566fc68..7028b29e9fb31cdc182b5396ba2e7fa7f9ba75b8 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-30,7
+30,9
@@
#include "trace.h"
#include "trace.h"
-struct sr_channel;
+namespace sigrok {
+ class Channel;
+}
namespace pv {
namespace pv {
@@
-38,10
+40,6
@@
namespace data {
class SignalData;
}
class SignalData;
}
-namespace device {
-class DevInst;
-}
-
namespace view {
class Signal : public Trace
namespace view {
class Signal : public Trace
@@
-49,8
+47,7
@@
class Signal : public Trace
Q_OBJECT
protected:
Q_OBJECT
protected:
- Signal(std::shared_ptr<pv::device::DevInst> dev_inst,
- const sr_channel *const channel);
+ Signal(std::shared_ptr<sigrok::Channel> channel);
public:
/**
public:
/**
@@
-67,7
+64,7
@@
public:
void enable(bool enable = true);
void enable(bool enable = true);
-
const sr_channel*
channel() const;
+
std::shared_ptr<sigrok::Channel>
channel() const;
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
@@
-79,8
+76,7
@@
private Q_SLOTS:
void on_disable();
protected:
void on_disable();
protected:
- std::shared_ptr<pv::device::DevInst> _dev_inst;
- const sr_channel *const _channel;
+ std::shared_ptr<sigrok::Channel> _channel;
QComboBox *_name_widget;
bool _updating_name_widget;
QComboBox *_name_widget;
bool _updating_name_widget;