Breaking: Series::gather emits x relative to x0() and takes a GatherMode; consumers reconstruct absolute x in f64 before mapping (series.hpp documents the contract). Bugs, each pinned by a fail-before regression test: - render: f32 staging quantised epoch-time x into 128 px columns; every data-space draw now stages to_space(x) - to_space(origin) with the origin folded into the offset uniform in f64 (epoch/zero-origin twins rasterise identically) - ticks: major test was ULP-fragile and blanked epoch axes; majors are an integer-index test and are never truncated by the minor cap - gather: LOD envelope emitted buckets straddling [begin,end); ceil/floor bucket edges + raw lead/trail spans - live follow: log x axes held a linear span and zoomed every frame; span and offset now live in axis space (plot + both figure link-group paths) - input: a zero-notch wheel disarmed auto_scale on every axis; dy==0 pans x, factor == 1 / inf refused in wheel and drag zoom - render: the single text flush painted legend names over the crosshair readout panel; two batches, under flushed before the panel - data: NaN dropped from min/max unless it seeded the fold; non-finite samples are now excluded from every aggregate and from cached bounds Robustness: viewport normalisation (no clamp UB), non-finite range refusal, pyramid level cap at 57 (no shift/div UB through public gather), rounded ring capacity documented + pre-sized, GL blend func and UNPACK_ALIGNMENT save/restore, Renderer::release_gl() teardown, u64 buffer epochs, annotation captions clamped, button-aware GLFW row capture, cached figure row rects (no per-event layout), ruler-pair measurement refused, span-nonfinite guards in axis_ends. Features: XY series (sorted x, binary-search neighbours/snap, LOD over sample index); StreamSeries::freeze(); ArraySeries::push(); per-trace dash and markers (scatter at width 0) with auto or literal stride; GatherMode Envelope/Nearest/Mean via bucket_sum/sumsq; Style::line_aa_px; per-glyph text colour (readout values in trace colour); wheel-dx x pan; arrow-key pan; Escape cancels a drag and restores captured ranges; modifier-masked box zoom (Shift both, Ctrl x, Alt y); double-click reset via PointerEvent::time_s; ImGui key repeat unified; pinch gestures on Qt and GTK; pixelDelta wheel path and DevicePixelRatioChange handling; GNUInstallDirs, SOVERSION, SameMinorVersion, generated plot/version.hpp, relocatable plot.pc, licence install, FILES_MATCHING, GitHub Actions CI (debug/coverage/asan). Suite 283 -> 350 cases, 0 failed; coverage 93.9% (3730/3971) over 24 files, floor 80/90 held; ASAN preset suite green; all four demos run headless (the GTK scripted-resize check needs a window manager and fails identically on the parent commit); readme_main.cpp committed and compiles with the README command; pkg-config and find_package consumption verified from a relocated install prefix.
114 lines
5.8 KiB
C++
114 lines
5.8 KiB
C++
// SPDX-License-Identifier: MIT
|
|
// SPDX-FileCopyrightText: 2026 Martino Ferrari
|
|
|
|
#pragma once
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <plot/core/types.hpp>
|
|
#include <plot/plot/ticks.hpp>
|
|
|
|
namespace plot {
|
|
|
|
/// Where an axis sits around the plot area.
|
|
enum class AxisPlace { Bottom, Top, Left, Right };
|
|
|
|
/// How an x axis' visible window relates to the newest sample of the streaming
|
|
/// series drawn on it.
|
|
///
|
|
/// `Off` is the default and means what the library has always meant: the axis'
|
|
/// range is exactly what a caller set or what an auto-fit produced, and nothing
|
|
/// recomputes it. `Live` makes the window a *view from the live edge*: every
|
|
/// `layout()` places it at `[newest - offset - span, newest - offset]`, so new
|
|
/// samples keep arriving at the right edge and no gesture can stop them (spec §12).
|
|
///
|
|
/// While an axis is `Live` the follow path owns its range: `auto_scale` is inert on
|
|
/// that axis, and a range handed to `Plot::set_x_range` is read as a *span* and an
|
|
/// *offset behind the live edge* rather than as absolute positions. See
|
|
/// `Plot::set_x_follow()`.
|
|
enum class XFollow { Off, Live };
|
|
|
|
/// Everything a caller can say about an axis at creation time. The six fields are
|
|
/// the five of the design spec plus the label format; the trailing default keeps
|
|
/// the spec's five-field aggregate initialisation working unchanged.
|
|
struct AxisDesc {
|
|
std::string label;
|
|
Range range{0.0, 1.0};
|
|
bool auto_scale = true;
|
|
AxisPlace place = AxisPlace::Bottom;
|
|
bool log = false;
|
|
TickFormat format = TickFormat::Si;
|
|
};
|
|
|
|
/// A live axis: its range and presentation flags, plus the tick list `refresh()`
|
|
/// regenerates for the current pixel size. `auto_scale`, `log` and `follow` are
|
|
/// public because the input controller and the renderer both read and write them,
|
|
/// and because a host that lays a plot out itself has to be able to state the
|
|
/// follow mode it wants without a renderer to set it.
|
|
struct Axis {
|
|
std::string label;
|
|
Range range{0.0, 1.0};
|
|
bool auto_scale = true;
|
|
AxisPlace place = AxisPlace::Bottom;
|
|
bool log = false;
|
|
TickFormat format = TickFormat::Si;
|
|
/// Whether this axis follows the newest sample. Only meaningful on an x axis --
|
|
/// a y axis has no live edge -- and `Off` on both, so nothing changes for a
|
|
/// caller who never asks for it. See XFollow.
|
|
XFollow follow = XFollow::Off;
|
|
/// How far behind the live edge the visible window's right edge sits, in **axis
|
|
/// space**, under `XFollow::Live`: data units on a linear axis, `log10` decades
|
|
/// on a logarithmic one -- the same space the controller's pan/zoom gestures run
|
|
/// in (`to_space`/`from_space`), so a log axis scrolls and holds *decades* the
|
|
/// way a linear axis scrolls and holds units. (`to_space(live.max) -
|
|
/// to_space(hi)` is the definition: the distance the axis' own transform
|
|
/// measures between the live edge and the window's right edge.) Stored rather
|
|
/// than implied by the range, because the range is recomputed from the series'
|
|
/// newest x on every frame: this is the part of the view the user chose, so it
|
|
/// is the part that survives the recompute. Three things write it, all of them
|
|
/// through one clamp: a pan or a zoom through `Plot::set_x_range()`, which
|
|
/// derives it from the range the gesture asked for, `Plot::set_x_offset()` for a
|
|
/// caller that states it directly, and `Plot::layout()`'s placement, which
|
|
/// re-clamps it against the retained window -- measured in the same space --
|
|
/// every frame. `Plot::x_offset()` reads it back.
|
|
f64 offset = 0.0;
|
|
/// Set by an *owner* that is following this axis' window on the plot's behalf: a
|
|
/// `Figure` link group, while it follows, writes its own live edge here every frame.
|
|
/// A member's own `follow` must be `Off` (`Figure::link_x()` refuses a `Live` member
|
|
/// -- the group owns the shared window and its follow state), so without this the
|
|
/// input layer could not see that the axis is following: the controller's wheel
|
|
/// anchor would extrapolate a coordinate from the pointer instead of using the live
|
|
/// edge, and a zoom made from the axis strip would walk the window back off the edge.
|
|
///
|
|
/// `live_owner_newest` is the *owner's* edge, not this plot's: rows may be fed at
|
|
/// different rates, and a group's edge is the union of its members'. Cleared when the
|
|
/// group stops following or the row leaves it.
|
|
bool live_owner = false;
|
|
f64 live_owner_newest = 0.0;
|
|
/// Set while this plot is a member of a `Figure` x link group (`Figure::link_x()`
|
|
/// writes it, `unlink_row()` clears it). The group owns the shared x window *and*
|
|
/// its follow state -- `Figure::link_x()` refuses a `Live` member joiner -- so
|
|
/// `Plot::set_x_follow(Live)` on this axis is refused after linking too, rather
|
|
/// than letting a later call put the member's axis back into a state the group
|
|
/// cannot drive (see `Plot::set_x_follow()`).
|
|
bool link_member = false;
|
|
/// Ticks for the last `refresh()`, ascending, majors and (when asked) minors.
|
|
std::vector<Tick> ticks;
|
|
|
|
/// Regenerates `ticks` for an axis `px` pixels long, majors at least `min_px`
|
|
/// apart. `include_minors` additionally emits the grid subdivisions. Labels use
|
|
/// `format` -- `TickFormat::Time` relabels the majors with `format_time`, which
|
|
/// `generate_ticks` cannot know about.
|
|
void refresh(f32 px, f32 min_px, bool include_minors = true);
|
|
|
|
/// Writes `v` the way this axis' own tick labels are written: `format_time` on a
|
|
/// `Time` axis, `format_si` otherwise. The one rule for "how a value on this axis
|
|
/// reads", exposed so a consumer that has to caption a value the axis carries -- a
|
|
/// horizontal ruler's label -- writes it exactly as the tick beside it is written.
|
|
/// `buf` is NUL-terminated and never written past `n` bytes (both formatters
|
|
/// guarantee that).
|
|
void format_value(f64 v, char* buf, usize n) const;
|
|
};
|
|
|
|
} // namespace plot
|