fix(data): the gather origin is the caller's, so a deep zoom draws on the sample
`Series::gather()` stages x as f32 relative to `x0()` -- the start of the *retained window* -- so the value's ULP was a fraction of data the view need not even hold: 1.9 us over a 20 s ring. A readout quotes `x_at()` in exact f64, so at a 10 us view across 700 px that put more than a hundred pixels between where a sample is drawn and the x reported for it. The origin is now a parameter, placed before `out_xy` so every call site is a type error rather than a silent change of behaviour. `Renderer::draw_traces` passes the visible range's minimum, which makes the error a fixed 2^-24 of the span on screen -- 4e-5 of a pixel over a 700 px axis -- at every zoom. `stage_xy()` loses its second origin as a consequence: the gather origin and the draw origin are now always the same value, so the linear case hands the gathered buffer straight to `add_polyline_xy()` with no per-point copy. `Plot::crosshair_point()` names the query itself, the one origin that cannot lose precision for a caller that might. Guarded by `a_gather_origin_at_the_view_keeps_a_deep_zoom_on_the_sample_it_quotes`, which measures the error in pixels both ways: under 0.05 px with the view's minimum, over 10 px with `x0()`.
This commit is contained in:
1 parent
59c2e45af7
commit
c2c8c596f3
15 files changed
+150
-95
No files matched your search
@@ -75,9 +75,9 @@ Range ArraySeries::y_bounds() const { return y_bounds_; }
|
||||
|
||||
const MinMaxPyramid& ArraySeries::pyramid() const { return pyramid_; }
|
||||
|
||||
void ArraySeries::gather(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy,
|
||||
void ArraySeries::gather(u32 level, u64 begin, u64 end, f64 x_origin, std::vector<f32>& out_xy,
|
||||
GatherMode mode) const {
|
||||
gather_impl(level, begin, end, out_xy, mode);
|
||||
gather_impl(level, begin, end, x_origin, out_xy, mode);
|
||||
}
|
||||
|
||||
void ArraySeries::copy_raw(u64 begin, u64 end, f32* out) const {
|
||||
|
||||
+15
-11
@@ -176,21 +176,24 @@ u64 Series::snap_index(f64 x) const {
|
||||
return static_cast<u64>(k);
|
||||
}
|
||||
|
||||
void Series::gather_raw(u64 begin, u64 end, std::vector<f32>& out_xy) const {
|
||||
void Series::gather_raw(u64 begin, u64 end, f64 x_origin, std::vector<f32>& out_xy) const {
|
||||
const f64 step = dx();
|
||||
// Sample i sits at `x0() + i*step`, so this is `x_at(i) - x_origin` with the subtraction done
|
||||
// once in f64 rather than per sample: see gather() for why the caller owns the origin.
|
||||
const f64 shift = x0() - x_origin;
|
||||
f32 raw[kGatherChunk];
|
||||
for (u64 i = begin; i < end;) {
|
||||
const u64 take = std::min<u64>(kGatherChunk, end - i);
|
||||
copy_raw(i, i + take, raw);
|
||||
for (u64 k = 0; k < take; ++k) {
|
||||
out_xy.push_back(f32(f64(i + k) * step)); // x relative to x0(): see gather()
|
||||
out_xy.push_back(f32(shift + f64(i + k) * step)); // x relative to x_origin: see gather()
|
||||
out_xy.push_back(raw[k]);
|
||||
}
|
||||
i += take;
|
||||
}
|
||||
}
|
||||
|
||||
void Series::gather_impl(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy,
|
||||
void Series::gather_impl(u32 level, u64 begin, u64 end, f64 x_origin, std::vector<f32>& out_xy,
|
||||
GatherMode mode) const {
|
||||
const u64 n = size();
|
||||
const u64 b = std::min(begin, n);
|
||||
@@ -198,7 +201,7 @@ void Series::gather_impl(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy
|
||||
if (b >= e) return;
|
||||
|
||||
if (level == 0) {
|
||||
gather_raw(b, e, out_xy);
|
||||
gather_raw(b, e, x_origin, out_xy);
|
||||
return;
|
||||
}
|
||||
// Public levels clamp to the deepest representable one (R3): past
|
||||
@@ -226,6 +229,7 @@ void Series::gather_impl(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy
|
||||
// picks, so the envelope path stays O(buckets) and the geometry still spans
|
||||
// the requested range exactly, for every mode.
|
||||
const f64 step = dx();
|
||||
const f64 shift = x0() - x_origin; // as in gather_raw(): x_at(i) - x_origin = shift + i*step
|
||||
const u64 span = u64{kBucket} << level;
|
||||
const u64 origin = pyramid().window_base();
|
||||
const u64 lbase = pyramid().level_base(level);
|
||||
@@ -235,11 +239,11 @@ void Series::gather_impl(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy
|
||||
if (first >= last) {
|
||||
// No complete bucket of this level is inside the range -- a window squeezed
|
||||
// into one bucket -- so the raw samples are the only exact geometry there is.
|
||||
gather_raw(b, e, out_xy);
|
||||
gather_raw(b, e, x_origin, out_xy);
|
||||
return;
|
||||
}
|
||||
const u64 lead = first * span - origin; // window index the first emitted bucket starts at
|
||||
if (b < lead) gather_raw(b, std::min(lead, e), out_xy);
|
||||
if (b < lead) gather_raw(b, std::min(lead, e), x_origin, out_xy);
|
||||
|
||||
switch (mode) {
|
||||
case GatherMode::Envelope: {
|
||||
@@ -252,9 +256,9 @@ void Series::gather_impl(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy
|
||||
const MinMax m = pyramid().bucket(level, bi);
|
||||
const u64 first_sample = bi * span - origin; // >= 0: stored buckets start inside the window
|
||||
const u64 last_sample = std::min((bi + 1) * span, origin + e) - 1 - origin;
|
||||
out_xy.push_back(f32(f64(first_sample) * step)); // x relative to x0()
|
||||
out_xy.push_back(f32(shift + f64(first_sample) * step)); // x relative to x_origin
|
||||
out_xy.push_back(m.min);
|
||||
out_xy.push_back(f32(f64(last_sample) * step));
|
||||
out_xy.push_back(f32(shift + f64(last_sample) * step));
|
||||
out_xy.push_back(m.max);
|
||||
}
|
||||
break;
|
||||
@@ -269,7 +273,7 @@ void Series::gather_impl(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy
|
||||
const u64 centre = bi * span + span / 2 - origin; // inside [b, e): the bucket is wholly inside
|
||||
f32 v = 0.0f;
|
||||
copy_raw(centre, centre + 1, &v);
|
||||
out_xy.push_back(f32(f64(centre) * step)); // x relative to x0()
|
||||
out_xy.push_back(f32(shift + f64(centre) * step)); // x relative to x_origin
|
||||
out_xy.push_back(v);
|
||||
}
|
||||
break;
|
||||
@@ -283,7 +287,7 @@ void Series::gather_impl(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy
|
||||
const u32 count = pyramid().bucket_count(level, bi);
|
||||
if (count == 0) continue;
|
||||
const u64 centre = bi * span + span / 2 - origin;
|
||||
out_xy.push_back(f32(f64(centre) * step)); // x relative to x0()
|
||||
out_xy.push_back(f32(shift + f64(centre) * step)); // x relative to x_origin
|
||||
out_xy.push_back(f32(pyramid().bucket_sum(level, bi) / f64(count)));
|
||||
}
|
||||
break;
|
||||
@@ -291,7 +295,7 @@ void Series::gather_impl(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy
|
||||
}
|
||||
|
||||
const u64 trail = last * span - origin; // one past the last emitted bucket's span
|
||||
if (trail < e) gather_raw(trail, e, out_xy);
|
||||
if (trail < e) gather_raw(trail, e, x_origin, out_xy);
|
||||
}
|
||||
|
||||
} // namespace plot::data
|
||||
@@ -87,9 +87,9 @@ Range StreamSeries::y_bounds() const { return y_bounds_; }
|
||||
|
||||
const MinMaxPyramid& StreamSeries::pyramid() const { return pyramid_; }
|
||||
|
||||
void StreamSeries::gather(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy,
|
||||
void StreamSeries::gather(u32 level, u64 begin, u64 end, f64 x_origin, std::vector<f32>& out_xy,
|
||||
GatherMode mode) const {
|
||||
gather_impl(level, begin, end, out_xy, mode);
|
||||
gather_impl(level, begin, end, x_origin, out_xy, mode);
|
||||
}
|
||||
|
||||
void StreamSeries::copy_raw(u64 begin, u64 end, f32* out) const {
|
||||
|
||||
@@ -100,16 +100,16 @@ u64 XYSeries::snap_index(f64 x) const {
|
||||
: hi; // ties go to the lower index
|
||||
}
|
||||
|
||||
void XYSeries::gather(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy,
|
||||
void XYSeries::gather(u32 level, u64 begin, u64 end, f64 x_origin, std::vector<f32>& out_xy,
|
||||
GatherMode mode) const {
|
||||
const u64 n = size();
|
||||
const u64 b = std::min(begin, n);
|
||||
const u64 e = std::min(std::max(end, b), n);
|
||||
if (b >= e) return;
|
||||
|
||||
// x emitted relative to x0(): see Series::gather(). The x array is f64, so
|
||||
// x emitted relative to the caller's origin: see Series::gather(). The x array is f64, so
|
||||
// the subtraction happens wide and only the small, exact offset narrows.
|
||||
const f64 origin = x0();
|
||||
const f64 origin = x_origin;
|
||||
|
||||
if (level == 0) {
|
||||
for (u64 i = b; i < e; ++i) {
|
||||
@@ -127,7 +127,7 @@ void XYSeries::gather(u32 level, u64 begin, u64 end, std::vector<f32>& out_xy,
|
||||
// `begin`, `last` one past the last bucket wholly before `end`, and the two
|
||||
// edge spans around them are read from the raw arrays -- so no emitted
|
||||
// geometry comes from outside [begin, end), and the emitted x values are the
|
||||
// array's own coordinates relative to x0().
|
||||
// array's own coordinates relative to the caller's origin.
|
||||
const u64 span = u64{kBucket} << level;
|
||||
const u64 lend = pyramid().level_size(level);
|
||||
const u64 first = std::min(ceil_div(b, span), lend);
|
||||
|
||||
Reference in new issue
Block a user