projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix objectName warnings.
[pulseview.git]
/
pv
/
view
/
analogsignal.cpp
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index 156af1003a4440ed527516123f22352aa9768029..e3f51aabc6d787b00f10955432a1c53e73d5a179 100644
(file)
--- a/
pv/view/analogsignal.cpp
+++ b/
pv/view/analogsignal.cpp
@@
-20,7
+20,8
@@
#include <extdef.h>
#include <extdef.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
#include "analogsignal.h"
#include "pv/data/analog.h"
#include "analogsignal.h"
#include "pv/data/analog.h"
@@
-45,12
+46,12
@@
const QColor AnalogSignal::SignalColours[4] = {
const float AnalogSignal::EnvelopeThreshold = 256.0f;
AnalogSignal::AnalogSignal(shared_ptr<pv::device::DevInst> dev_inst,
const float AnalogSignal::EnvelopeThreshold = 256.0f;
AnalogSignal::AnalogSignal(shared_ptr<pv::device::DevInst> dev_inst,
- const sr_channel *const
probe
, shared_ptr<data::Analog> data) :
- Signal(dev_inst,
probe
),
+ const sr_channel *const
channel
, shared_ptr<data::Analog> data) :
+ Signal(dev_inst,
channel
),
_data(data),
_scale(1.0f)
{
_data(data),
_scale(1.0f)
{
- _colour = SignalColours[
probe
->index % countof(SignalColours)];
+ _colour = SignalColours[
channel
->index % countof(SignalColours)];
}
AnalogSignal::~AnalogSignal()
}
AnalogSignal::~AnalogSignal()
@@
-74,7
+75,7
@@
void AnalogSignal::set_scale(float scale)
void AnalogSignal::paint_back(QPainter &p, int left, int right)
{
void AnalogSignal::paint_back(QPainter &p, int left, int right)
{
- if (_
probe
->enabled)
+ if (_
channel
->enabled)
paint_axis(p, get_y(), left, right);
}
paint_axis(p, get_y(), left, right);
}
@@
-91,7
+92,7
@@
void AnalogSignal::paint_mid(QPainter &p, int left, int right)
const double offset = _view->offset();
const double offset = _view->offset();
- if (!_
probe
->enabled)
+ if (!_
channel
->enabled)
return;
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
return;
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =