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
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 1ee99cb90595a46a9ff57fceae478d57399cf78b..b1aaae8f2ddbdf26e2724c1b99787d87d7fd8b0d 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-153,8
+153,6
@@
void LogicSignal::paint_back(QPainter &p, const RowItemPaintParams &pp)
void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
{
void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
{
- using pv::view::View;
-
QLineF *line;
vector< pair<int64_t, bool> > edges;
QLineF *line;
vector< pair<int64_t, bool> > edges;
@@
-165,14
+163,6
@@
void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
const int y = get_visual_y();
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;
if (!channel_->enabled())
return;
@@
-180,24
+170,24
@@
void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
const float low_offset = y + 0.5f;
const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
const float low_offset = y + 0.5f;
const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
- data_->
get
_snapshots();
+ data_->
logic
_snapshots();
if (snapshots.empty())
return;
const shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
if (snapshots.empty())
return;
const shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
- double samplerate =
data_
->samplerate();
+ double samplerate =
snapshot
->samplerate();
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
samplerate = 1.0;
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
samplerate = 1.0;
- const double pixels_offset =
offset / scale
;
- const double start_time =
data_->get_
start_time();
+ const double pixels_offset =
pp.pixels_offset()
;
+ 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 samples_per_pixel = samplerate *
pp.scale()
;
+ const double start = samplerate * (
pp.offset()
- start_time);
const double end = start + samples_per_pixel * pp.width();
snapshot->get_subsampled_edges(edges,
const double end = start + samples_per_pixel * pp.width();
snapshot->get_subsampled_edges(edges,