projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SignalData: Moved samplerate into Snapshot
[pulseview.git]
/
pv
/
view
/
analogsignal.cpp
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index abbb94c57f1d94225db6ae7c53fb9c611899db68..e559a4a45c50da008bc8ab234c5f693e417c6f20 100644
(file)
--- a/
pv/view/analogsignal.cpp
+++ b/
pv/view/analogsignal.cpp
@@
-53,7
+53,7
@@
const QColor AnalogSignal::SignalColours[4] = {
const float AnalogSignal::EnvelopeThreshold = 256.0f;
AnalogSignal::AnalogSignal(
const float AnalogSignal::EnvelopeThreshold = 256.0f;
AnalogSignal::AnalogSignal(
- pv::S
igS
ession &session,
+ pv::Session &session,
shared_ptr<Channel> channel,
shared_ptr<data::Analog> data) :
Signal(session, channel),
shared_ptr<Channel> channel,
shared_ptr<data::Analog> data) :
Signal(session, channel),
@@
-87,46
+87,37
@@
std::pair<int, int> AnalogSignal::v_extents() const
return make_pair(-NominalHeight / 2, NominalHeight / 2);
}
return make_pair(-NominalHeight / 2, NominalHeight / 2);
}
-void AnalogSignal::paint_back(QPainter &p,
int left, int right
)
+void AnalogSignal::paint_back(QPainter &p,
const RowItemPaintParams &pp
)
{
if (channel_->enabled())
{
if (channel_->enabled())
- paint_axis(p,
get_visual_y(), left, right
);
+ paint_axis(p,
pp, get_visual_y()
);
}
}
-void AnalogSignal::paint_mid(QPainter &p,
int left, int right
)
+void AnalogSignal::paint_mid(QPainter &p,
const RowItemPaintParams &pp
)
{
assert(data_);
{
assert(data_);
- assert(right >= left);
assert(owner_);
const int y = get_visual_y();
assert(owner_);
const int y = get_visual_y();
- const View *const view = owner_->view();
- assert(view);
-
- const double scale = view->scale();
- assert(scale > 0);
-
- const double offset = view->offset();
-
if (!channel_->enabled())
return;
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
if (!channel_->enabled())
return;
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
- data_->
get
_snapshots();
+ data_->
analog
_snapshots();
if (snapshots.empty())
return;
const shared_ptr<pv::data::AnalogSnapshot> &snapshot =
snapshots.front();
if (snapshots.empty())
return;
const shared_ptr<pv::data::AnalogSnapshot> &snapshot =
snapshots.front();
- const double pixels_offset =
offset / scale
;
- const double samplerate =
data_
->samplerate();
- const double start_time =
data_->get_
start_time();
+ const double pixels_offset =
pp.pixels_offset()
;
+ const double samplerate =
snapshot
->samplerate();
+ const double start_time =
snapshot->
start_time();
const int64_t last_sample = snapshot->get_sample_count() - 1;
const int64_t last_sample = snapshot->get_sample_count() - 1;
- const double samples_per_pixel = samplerate *
scale
;
- const double start = samplerate * (
offset
- start_time);
- const double end = start + samples_per_pixel *
(right - left
);
+ const double samples_per_pixel = samplerate *
pp.scale()
;
+ const double start = samplerate * (
pp.offset()
- start_time);
+ const double end = start + samples_per_pixel *
pp.width(
);
const int64_t start_sample = min(max((int64_t)floor(start),
(int64_t)0), last_sample);
const int64_t start_sample = min(max((int64_t)floor(start),
(int64_t)0), last_sample);
@@
-134,11
+125,11
@@
void AnalogSignal::paint_mid(QPainter &p, int left, int right)
(int64_t)0), last_sample);
if (samples_per_pixel < EnvelopeThreshold)
(int64_t)0), last_sample);
if (samples_per_pixel < EnvelopeThreshold)
- paint_trace(p, snapshot, y,
left
,
+ paint_trace(p, snapshot, y,
pp.left()
,
start_sample, end_sample,
pixels_offset, samples_per_pixel);
else
start_sample, end_sample,
pixels_offset, samples_per_pixel);
else
- paint_envelope(p, snapshot, y,
left
,
+ paint_envelope(p, snapshot, y,
pp.left()
,
start_sample, end_sample,
pixels_offset, samples_per_pixel);
}
start_sample, end_sample,
pixels_offset, samples_per_pixel);
}