projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Link signals to probes
[pulseview.git]
/
pv
/
view
/
analogsignal.cpp
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index 367b5890d7d6ef46f078c732cd579a2b4a5daa09..f4a665c2ec49f225a5c8f246937e713923f89295 100644
(file)
--- a/
pv/view/analogsignal.cpp
+++ b/
pv/view/analogsignal.cpp
@@
-41,13
+41,13
@@
const QColor AnalogSignal::SignalColours[4] = {
const float AnalogSignal::EnvelopeThreshold = 256.0f;
const float AnalogSignal::EnvelopeThreshold = 256.0f;
-AnalogSignal::AnalogSignal(
QString name, shared_ptr<data::Analog> data
,
-
int probe_index
) :
- Signal(
nam
e),
+AnalogSignal::AnalogSignal(
const sr_probe *const probe
,
+
shared_ptr<data::Analog> data
) :
+ Signal(
prob
e),
_data(data),
_scale(1.0f)
{
_data(data),
_scale(1.0f)
{
- _colour = SignalColours[probe
_
index % countof(SignalColours)];
+ _colour = SignalColours[probe
->
index % countof(SignalColours)];
}
AnalogSignal::~AnalogSignal()
}
AnalogSignal::~AnalogSignal()
@@
-66,6
+66,9
@@
void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
assert(_data);
assert(right >= left);
assert(_data);
assert(right >= left);
+ if (!_probe->enabled)
+ return;
+
paint_axis(p, y, left, right);
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
paint_axis(p, y, left, right);
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =