projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a separate widget to hold the cursor labels.
[pulseview.git]
/
pv
/
view
/
signal.cpp
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index 61f79a8c8351e8574ceabf779324f8d733195a96..48b400d1081d843bff33859ae0b5c6570adecd3c 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-32,9
+32,9
@@
#include "signal.h"
#include "view.h"
#include "signal.h"
#include "view.h"
-#include <pv/devinst.h>
+#include <pv/devi
ce/devi
nst.h>
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-56,8
+56,8
@@
const char *const ProbeNames[] = {
"SCL"
};
"SCL"
};
-Signal::Signal(shared_ptr<pv::DevInst> dev_inst,
- const sr_
probe
*const probe) :
+Signal::Signal(shared_ptr<pv::
device::
DevInst> dev_inst,
+ const sr_
channel
*const probe) :
Trace(probe->name),
_dev_inst(dev_inst),
_probe(probe),
Trace(probe->name),
_dev_inst(dev_inst),
_probe(probe),
@@
-86,7
+86,7
@@
void Signal::enable(bool enable)
visibility_changed();
}
visibility_changed();
}
-const sr_
probe
* Signal::probe() const
+const sr_
channel
* Signal::probe() const
{
return _probe;
}
{
return _probe;
}