projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Signal: Added a reference to _session
[pulseview.git]
/
pv
/
view
/
signal.h
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index 7cf08b2913503c1e3d89c5f0aa78d3226ff8b96e..b7666ee6f1cd14c3a0256db621b0081579abe1fb 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-30,18
+30,18
@@
#include "trace.h"
#include "trace.h"
-struct sr_channel;
+namespace sigrok {
+ class Channel;
+}
namespace pv {
namespace pv {
+class SigSession;
+
namespace data {
class SignalData;
}
namespace data {
class SignalData;
}
-namespace device {
-class DevInst;
-}
-
namespace view {
class Signal : public Trace
namespace view {
class Signal : public Trace
@@
-49,8
+49,8
@@
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(
pv::SigSession &session
,
+
std::shared_ptr<sigrok::Channel>
channel);
public:
/**
public:
/**
@@
-67,7
+67,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);
@@
-75,14
+75,12
@@
public:
void delete_pressed();
void delete_pressed();
- bool eventFilter(QObject *obj, QEvent *evt);
-
private Q_SLOTS:
void on_disable();
protected:
private Q_SLOTS:
void on_disable();
protected:
-
std::shared_ptr<pv::device::DevInst> _dev_inst
;
-
const sr_channel *const
_channel;
+
pv::SigSession &_session
;
+
std::shared_ptr<sigrok::Channel>
_channel;
QComboBox *_name_widget;
bool _updating_name_widget;
QComboBox *_name_widget;
bool _updating_name_widget;