umber 0.3.1__tar.gz → 0.3.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {umber-0.3.1 → umber-0.3.2}/Cargo.lock +2 -2
- {umber-0.3.1 → umber-0.3.2}/Cargo.toml +1 -1
- {umber-0.3.1 → umber-0.3.2}/PKG-INFO +23 -16
- {umber-0.3.1 → umber-0.3.2}/README-ZH.md +22 -15
- {umber-0.3.1 → umber-0.3.2}/README.md +22 -15
- {umber-0.3.1 → umber-0.3.2}/THIRD-PARTY-LICENSES.txt +2 -2
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/category_label_tests.rs +1 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/header_tests.rs +23 -2
- umber-0.3.2/crates/umber-core/src/label_cache_tests.rs +125 -0
- umber-0.3.2/crates/umber-core/src/layout/cache_tests.rs +87 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/layout/grid.rs +1 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/layout/mod.rs +99 -2
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/layout/panel.rs +32 -9
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/mesh.rs +360 -1
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/pipeline.rs +301 -29
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/render/image.rs +74 -26
- umber-0.3.2/crates/umber-core/src/render/image_encoding_tests.rs +506 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/stats/bin2d.rs +30 -11
- {umber-0.3.1 → umber-0.3.2}/pyproject.toml +4 -0
- {umber-0.3.1 → umber-0.3.2}/LICENSE-APACHE +0 -0
- {umber-0.3.1 → umber-0.3.2}/LICENSE-MIT +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/Cargo.toml +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/LICENSE-APACHE +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/LICENSE-MIT +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/README.md +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/Geist-Regular.ttf +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/Geist-SemiBold.ttf +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/IBMPlexSans-Regular.ttf +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/IBMPlexSans-SemiBold.ttf +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/Inter-Regular.ttf +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/Inter-SemiBold.ttf +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/JetBrainsMono-Regular.ttf +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/JetBrainsMono-SemiBold.ttf +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/LICENSES/Geist-OFL.txt +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/LICENSES/IBMPlexSans-OFL.txt +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/LICENSES/Inter-OFL.txt +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/LICENSES/JetBrainsMono-OFL.txt +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/LICENSES/SourceSerif4-OFL.txt +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/MANIFEST.md +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/SourceSerif4-Regular.ttf +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/fonts/SourceSerif4-SemiBold.ttf +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/binning.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/bubble_fit.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/bubble_fit_tests.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/bubble_scale.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/bubbles_tests.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/cmap/tables.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/cmap.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/color.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/color_by_tests.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/color_scale.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/coverage.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/downsample.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/area.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/band.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/bar.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/bar_shape.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/box_plot.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/bubbles.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/cells.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/chrome.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/clip/mod.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/colorbar.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/error_bars.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/fill.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/heatmap.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/hexbin.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/hist.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/legend.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/line.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/mapping.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/marker.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/mesh.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/mod.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/rule.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/scatter.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/stacked_area.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/stem.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/step.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/stroke.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/area.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/band.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/bar.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/baseline.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/box_plot.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/cells.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/chrome.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/clip.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/downsample.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/error_bars.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/hist.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/horizontal.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/line.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/mapping.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/marker.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/marks.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/mod.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/oracle.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/raster.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/rule.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/scatter.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/stacked_area.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/stem.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/step.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/tests/violin.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/draw/violin.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/error.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/exact/dyadic.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/exact/expansion.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/exact/mod.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/figure.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/fonts.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/geometry.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/layout/colorbar.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/layout/inset.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/layout/legend.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/layout/nudge.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/layout/placement.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/layout/program.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/legend.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/legend_position_tests.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/legend_swatch_tests.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/lib.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/axes.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/axes_mut.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/axis_data.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/band.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/bar.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/box_plot.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/bubbles.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/color_by.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/error_bars.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/figure.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/grid.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/heatmap.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/hist.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/mark.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/mod.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/render.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/rule.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/share.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/share_tests.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/stacked_area.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/stem.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/step.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/ticks.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/validation.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/model/violin.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/render/mod.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/render/normalize.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/render/png.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/render/snapshots/umber_core__render__svg__tests__fill_stroke_and_markers_snapshot.snap +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/render/svg.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/resolve/data_limits_tests.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/resolve/horizontal_tests.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/resolve/nice_ticks_tests.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/resolve.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/scale.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/scene.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/scene_text.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/size.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/snapshots/umber_core__draw__tests__chrome_snapshot.snap +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/stacking.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/stats.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/test_support/image.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/test_support/mod.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/test_support/polygon.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/test_support/scene.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/cmap.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/font.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/guard.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/layout.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/library.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/marks.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/mod.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/outline.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/runs.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/shaping.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/style.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/system/index.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/system/lookup.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/system/mod.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/system/shaping.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/tests/cmap.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/tests/fallback.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/tests/fixtures.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/tests/layout.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/tests/malformed.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/tests/mod.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/tests/outline.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/tests/runs.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/tests/shaping.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/tests/system_fallback.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/text/tests/system_index.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/theme.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/tick_format.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/ticks.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/time/tests.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/time.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/src/time_axes_tests.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-core/tests/fixtures/fallback-only.ttf +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/Cargo.toml +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/cmap.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/color.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/enums.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/errors.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/figure.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/lib.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/scale.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/size.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/test_support.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/theme.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/ticks.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/crates/umber-py/src/values.rs +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/__init__.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_ansi.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_args.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_axes.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_cell.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_cmap.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_color.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_color_by.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_enums.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_errors.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_figure.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_highlight.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_quick.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_report.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_scale.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_series.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_size.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_theme.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_ticks.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_time.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_types.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_umber.pyi +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/_values.py +0 -0
- {umber-0.3.1 → umber-0.3.2}/python/umber/py.typed +0 -0
|
@@ -956,7 +956,7 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee"
|
|
|
956
956
|
|
|
957
957
|
[[package]]
|
|
958
958
|
name = "umber-core"
|
|
959
|
-
version = "0.3.
|
|
959
|
+
version = "0.3.2"
|
|
960
960
|
dependencies = [
|
|
961
961
|
"criterion",
|
|
962
962
|
"fontdb",
|
|
@@ -973,7 +973,7 @@ dependencies = [
|
|
|
973
973
|
|
|
974
974
|
[[package]]
|
|
975
975
|
name = "umber-py"
|
|
976
|
-
version = "0.3.
|
|
976
|
+
version = "0.3.2"
|
|
977
977
|
dependencies = [
|
|
978
978
|
"pyo3",
|
|
979
979
|
"umber-core",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: umber
|
|
3
|
-
Version: 0.3.
|
|
3
|
+
Version: 0.3.2
|
|
4
4
|
Classifier: Development Status :: 3 - Alpha
|
|
5
5
|
Classifier: Programming Language :: Python :: 3 :: Only
|
|
6
6
|
Classifier: Programming Language :: Python :: 3.12
|
|
@@ -32,13 +32,15 @@ Project-URL: Source, https://github.com/TJ-Junhao/umber
|
|
|
32
32
|
|
|
33
33
|
# umber
|
|
34
34
|
|
|
35
|
+
[](https://codecov.io/gh/TJ-Junhao/umber)
|
|
36
|
+
|
|
35
37
|
umber is a plotting library for Python with a rendering core written in Rust. It draws line, step, scatter, area, stacked area, bar, histogram, box, violin, bubble, error bar, band, stem, reference-line, heatmap, mesh, 2-D histogram and hexbin charts on numeric, log, category and time axes, alone or on a grid of panels with shared axes. It has colormaps and colorbars, careful typography, three built-in themes, and PNG or SVG output.
|
|
36
38
|
|
|
37
39
|
[简体中文](https://github.com/TJ-Junhao/umber/blob/main/README-ZH.md)
|
|
38
40
|
|
|
39
41
|

|
|
40
42
|
|
|
41
|
-
- **Fast on large data.** Rendering runs in Rust: a 1,000,000-point line renders to PNG in about
|
|
43
|
+
- **Fast on large data.** Rendering runs in Rust: a 1,000,000-point line renders to PNG in about 74 ms and a 100,000-point scatter in about 83 ms on a standard GitHub Actions runner, 2.8× and 3.5× faster than matplotlib (see [Performance](#performance)).
|
|
42
44
|
- **Explicit.** Every option is a typed value (`Color`, `Size`, `Dash`, `TickFormat`, …). There are no format strings, no positional style arguments and no silent conversions.
|
|
43
45
|
- **Fails fast, pointing at the problem.** Invalid input raises at the call that caused it, with a message, a hint and the offending argument highlighted in the traceback.
|
|
44
46
|
- **Statically typed.** Category and numeric axes are distinct types: calling `bar` on a numeric axes is reported by pyright and mypy before the code runs.
|
|
@@ -264,20 +266,25 @@ ax.bar(["a", "b"], [1, 2]) # pyright and mypy: bar() needs Axes[str, float]
|
|
|
264
266
|
|
|
265
267
|
## Performance
|
|
266
268
|
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
| Case |
|
|
270
|
-
| --- | ---: |
|
|
271
|
-
| 1,000,000-point line → PNG |
|
|
272
|
-
| 1,000,000-point line on a time axis → PNG |
|
|
273
|
-
| 1,000,000-point line → SVG |
|
|
274
|
-
| 100,000-point scatter → PNG |
|
|
275
|
-
| Histogram of 1,000,000 values → PNG |
|
|
276
|
-
| 2-D histogram of 1,000,000 points, 100 × 100 bins → PNG |
|
|
277
|
-
| Hexbin of 1,000,000 points, grid size 50 → PNG |
|
|
278
|
-
| Heatmap of 1,000 × 1,000 cells → PNG |
|
|
279
|
-
| Heatmap of 1,000 × 1,000 cells → SVG |
|
|
280
|
-
| 4 × 5 grid, one 10,000-point line per panel → PNG |
|
|
269
|
+
End-to-end Python timings next to matplotlib 3.11.2 (Agg backend, default style), from the call that builds the figure to the encoded bytes. Figures are 6 × 4 in, PNG at 200 dpi, with the same input data for both. Each value is the median of 8 runs after a warm-up, with each library in its own process. Measured with umber 0.3.2 on GitHub Actions `ubuntu-latest` (AMD EPYC 9V74, 4 vCPUs, Python 3.12, NumPy 2.5) by the [Python bench workflow](https://github.com/TJ-Junhao/umber/actions/workflows/python-bench.yml) ([this run](https://github.com/TJ-Junhao/umber/actions/runs/39101279625)); the script is `scripts/bench/python_vs_matplotlib.py`. GitHub assigns different CPU models to the same runner label, so absolute times vary between runs; the speed-ups, measured side by side on one machine, are the figures to compare.
|
|
270
|
+
|
|
271
|
+
| Case | umber | matplotlib | Speed-up |
|
|
272
|
+
| --- | ---: | ---: | ---: |
|
|
273
|
+
| 1,000,000-point line → PNG | 74 ms | 205 ms | 2.8× |
|
|
274
|
+
| 1,000,000-point line on a time axis → PNG | 91 ms | 220 ms | 2.4× |
|
|
275
|
+
| 1,000,000-point line → SVG | 24 ms | 65 ms | 2.7× |
|
|
276
|
+
| 100,000-point scatter → PNG | 83 ms | 291 ms | 3.5× |
|
|
277
|
+
| Histogram of 1,000,000 values → PNG | 32 ms | 64 ms | 2.0× |
|
|
278
|
+
| 2-D histogram of 1,000,000 points, 100 × 100 bins → PNG | 100 ms | 168 ms | 1.7× |
|
|
279
|
+
| Hexbin of 1,000,000 points, grid size 50 → PNG | 127 ms | 141 ms | 1.1× |
|
|
280
|
+
| Heatmap of 1,000 × 1,000 cells → PNG | 194 ms | 252 ms | 1.3× |
|
|
281
|
+
| Heatmap of 1,000 × 1,000 cells → SVG | 175 ms | 443 ms | 2.5× |
|
|
282
|
+
| 4 × 5 grid, one 10,000-point line per panel → PNG | 180 ms | 552 ms | 3.1× |
|
|
283
|
+
| 1,000-point line with a second series, title, labels and legend → PNG | 22 ms | 81 ms | 3.7× |
|
|
284
|
+
| 5-bar chart → PNG | 12 ms | 44 ms | 3.6× |
|
|
285
|
+
| `import` in a fresh interpreter | 66 ms | 310 ms | 4.7× |
|
|
286
|
+
|
|
287
|
+
Pinned to one CPU, only the scatter plot is notably slower: 125 ms (2.3×). The 4 × 5 grid uses a 12 × 8 in figure. The script's docstring lists where the two libraries do different work, for example the hexbin grids, which are built differently.
|
|
281
288
|
|
|
282
289
|
Lines with sorted numeric or time x values are downsampled when they have more than four points per pixel column of the plot (counted at a nominal 300 dpi), keeping the first, last, minimum and maximum point in each column, which is visually lossless. Large scatter plots are composited on up to 8 threads; the output is the same for any number of threads.
|
|
283
290
|
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
# umber
|
|
2
2
|
|
|
3
|
+
[](https://codecov.io/gh/TJ-Junhao/umber)
|
|
4
|
+
|
|
3
5
|
umber 是一个 Python 绘图库,渲染核心用 Rust 编写。它可以绘制折线图、阶梯图、散点图、面积图、堆叠面积图、柱状图、直方图、箱线图、小提琴图、气泡图、误差棒、区间带、杆状图、参考线、热力图、网格色块图(mesh)、二维直方图和六边形分箱图(hexbin),支持数值轴、对数轴、类别轴和时间轴,可以单独成图,也可以排成共享坐标轴的多面板网格。它提供 colormap 和 colorbar,排版考究,内置三套主题,输出 PNG 或 SVG。
|
|
4
6
|
|
|
5
7
|
[English](https://github.com/TJ-Junhao/umber/blob/main/README.md)
|
|
6
8
|
|
|
7
9
|

|
|
8
10
|
|
|
9
|
-
- **大数据量也快。** 渲染在 Rust
|
|
11
|
+
- **大数据量也快。** 渲染在 Rust 中完成:在标准的 GitHub Actions runner 上,100 万个点的折线渲染成 PNG 约 74 ms,10 万个点的散点图约 83 ms,分别比 matplotlib 快 2.8× 和 3.5×(见[性能](#性能))。
|
|
10
12
|
- **显式。** 每个选项都是有类型的值(`Color`、`Size`、`Dash`、`TickFormat` 等)。没有格式字符串,没有位置式的样式参数,也没有隐式转换。
|
|
11
13
|
- **尽早报错,并指出问题所在。** 非法输入在引发它的那次调用处就报错,附带说明、提示,并在 traceback 中高亮出错的参数。
|
|
12
14
|
- **静态类型。** 类别轴和数值轴是不同的类型:在数值轴上调用 `bar`,pyright 和 mypy 在运行前就会报错。
|
|
@@ -232,20 +234,25 @@ ax.bar(["a", "b"], [1, 2]) # pyright 和 mypy 报错:bar() 需要 Axes[str, f
|
|
|
232
234
|
|
|
233
235
|
## 性能
|
|
234
236
|
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
| 场景 |
|
|
238
|
-
| --- | ---: |
|
|
239
|
-
| 100 万点折线 → PNG |
|
|
240
|
-
| 时间轴上的 100 万点折线 → PNG |
|
|
241
|
-
| 100 万点折线 → SVG |
|
|
242
|
-
| 10 万点散点图 → PNG |
|
|
243
|
-
| 100 万个值的直方图 → PNG |
|
|
244
|
-
| 100 万个点的二维直方图,100 × 100 个 bin → PNG |
|
|
245
|
-
| 100 万个点的六边形分箱图,grid size 50 → PNG |
|
|
246
|
-
| 1,000 × 1,000 个格子的热力图 → PNG |
|
|
247
|
-
| 1,000 × 1,000 个格子的热力图 → SVG |
|
|
248
|
-
| 4 × 5 网格,每格一条 1 万个点的折线 → PNG |
|
|
237
|
+
以下是与 matplotlib 3.11.2(Agg 后端、默认样式)对比的 Python 端到端耗时,从构建图形的调用开始,到得到编码后的字节为止。图幅 6 × 4 英寸,PNG 为 200 dpi,两者使用相同的输入数据。每个数值是预热一次后 8 次运行的中位数,两个库各在独立的进程中运行。测量环境为 umber 0.3.2,GitHub Actions `ubuntu-latest`(AMD EPYC 9V74,4 个 vCPU,Python 3.12,NumPy 2.5),由 [Python bench workflow](https://github.com/TJ-Junhao/umber/actions/workflows/python-bench.yml) 运行([本次运行](https://github.com/TJ-Junhao/umber/actions/runs/39101279625));脚本为 `scripts/bench/python_vs_matplotlib.py`。同一个 runner 标签每次可能分到不同型号的 CPU,所以绝对耗时会随运行变化;在同一台机器上交替测得的加速比才是可比较的数字。
|
|
238
|
+
|
|
239
|
+
| 场景 | umber | matplotlib | 加速比 |
|
|
240
|
+
| --- | ---: | ---: | ---: |
|
|
241
|
+
| 100 万点折线 → PNG | 74 ms | 205 ms | 2.8× |
|
|
242
|
+
| 时间轴上的 100 万点折线 → PNG | 91 ms | 220 ms | 2.4× |
|
|
243
|
+
| 100 万点折线 → SVG | 24 ms | 65 ms | 2.7× |
|
|
244
|
+
| 10 万点散点图 → PNG | 83 ms | 291 ms | 3.5× |
|
|
245
|
+
| 100 万个值的直方图 → PNG | 32 ms | 64 ms | 2.0× |
|
|
246
|
+
| 100 万个点的二维直方图,100 × 100 个 bin → PNG | 100 ms | 168 ms | 1.7× |
|
|
247
|
+
| 100 万个点的六边形分箱图,grid size 50 → PNG | 127 ms | 141 ms | 1.1× |
|
|
248
|
+
| 1,000 × 1,000 个格子的热力图 → PNG | 194 ms | 252 ms | 1.3× |
|
|
249
|
+
| 1,000 × 1,000 个格子的热力图 → SVG | 175 ms | 443 ms | 2.5× |
|
|
250
|
+
| 4 × 5 网格,每格一条 1 万个点的折线 → PNG | 180 ms | 552 ms | 3.1× |
|
|
251
|
+
| 1,000 个点的折线加第二条序列、标题、坐标轴标签和图例 → PNG | 22 ms | 81 ms | 3.7× |
|
|
252
|
+
| 5 根柱子的柱状图 → PNG | 12 ms | 44 ms | 3.6× |
|
|
253
|
+
| 在新解释器中 `import` | 66 ms | 310 ms | 4.7× |
|
|
254
|
+
|
|
255
|
+
绑定到单个 CPU 时,只有散点图明显变慢:125 ms(2.3×)。4 × 5 网格使用 12 × 8 英寸的图幅。两个库在哪些场景下做的工作不同(例如六边形分箱的网格构建方式不同),见脚本的 docstring。
|
|
249
256
|
|
|
250
257
|
对于 x 值有序的数值或时间折线,按 300 dpi 的标称分辨率计算绘图区的像素列数,点数超过列数的四倍时按列降采样,保留每列的首点、末点、最小值和最大值,视觉上无损。大型散点图最多使用 8 个线程合成;无论用几个线程,输出都完全相同。
|
|
251
258
|
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
# umber
|
|
2
2
|
|
|
3
|
+
[](https://codecov.io/gh/TJ-Junhao/umber)
|
|
4
|
+
|
|
3
5
|
umber is a plotting library for Python with a rendering core written in Rust. It draws line, step, scatter, area, stacked area, bar, histogram, box, violin, bubble, error bar, band, stem, reference-line, heatmap, mesh, 2-D histogram and hexbin charts on numeric, log, category and time axes, alone or on a grid of panels with shared axes. It has colormaps and colorbars, careful typography, three built-in themes, and PNG or SVG output.
|
|
4
6
|
|
|
5
7
|
[简体中文](https://github.com/TJ-Junhao/umber/blob/main/README-ZH.md)
|
|
6
8
|
|
|
7
9
|

|
|
8
10
|
|
|
9
|
-
- **Fast on large data.** Rendering runs in Rust: a 1,000,000-point line renders to PNG in about
|
|
11
|
+
- **Fast on large data.** Rendering runs in Rust: a 1,000,000-point line renders to PNG in about 74 ms and a 100,000-point scatter in about 83 ms on a standard GitHub Actions runner, 2.8× and 3.5× faster than matplotlib (see [Performance](#performance)).
|
|
10
12
|
- **Explicit.** Every option is a typed value (`Color`, `Size`, `Dash`, `TickFormat`, …). There are no format strings, no positional style arguments and no silent conversions.
|
|
11
13
|
- **Fails fast, pointing at the problem.** Invalid input raises at the call that caused it, with a message, a hint and the offending argument highlighted in the traceback.
|
|
12
14
|
- **Statically typed.** Category and numeric axes are distinct types: calling `bar` on a numeric axes is reported by pyright and mypy before the code runs.
|
|
@@ -232,20 +234,25 @@ ax.bar(["a", "b"], [1, 2]) # pyright and mypy: bar() needs Axes[str, float]
|
|
|
232
234
|
|
|
233
235
|
## Performance
|
|
234
236
|
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
| Case |
|
|
238
|
-
| --- | ---: |
|
|
239
|
-
| 1,000,000-point line → PNG |
|
|
240
|
-
| 1,000,000-point line on a time axis → PNG |
|
|
241
|
-
| 1,000,000-point line → SVG |
|
|
242
|
-
| 100,000-point scatter → PNG |
|
|
243
|
-
| Histogram of 1,000,000 values → PNG |
|
|
244
|
-
| 2-D histogram of 1,000,000 points, 100 × 100 bins → PNG |
|
|
245
|
-
| Hexbin of 1,000,000 points, grid size 50 → PNG |
|
|
246
|
-
| Heatmap of 1,000 × 1,000 cells → PNG |
|
|
247
|
-
| Heatmap of 1,000 × 1,000 cells → SVG |
|
|
248
|
-
| 4 × 5 grid, one 10,000-point line per panel → PNG |
|
|
237
|
+
End-to-end Python timings next to matplotlib 3.11.2 (Agg backend, default style), from the call that builds the figure to the encoded bytes. Figures are 6 × 4 in, PNG at 200 dpi, with the same input data for both. Each value is the median of 8 runs after a warm-up, with each library in its own process. Measured with umber 0.3.2 on GitHub Actions `ubuntu-latest` (AMD EPYC 9V74, 4 vCPUs, Python 3.12, NumPy 2.5) by the [Python bench workflow](https://github.com/TJ-Junhao/umber/actions/workflows/python-bench.yml) ([this run](https://github.com/TJ-Junhao/umber/actions/runs/39101279625)); the script is `scripts/bench/python_vs_matplotlib.py`. GitHub assigns different CPU models to the same runner label, so absolute times vary between runs; the speed-ups, measured side by side on one machine, are the figures to compare.
|
|
238
|
+
|
|
239
|
+
| Case | umber | matplotlib | Speed-up |
|
|
240
|
+
| --- | ---: | ---: | ---: |
|
|
241
|
+
| 1,000,000-point line → PNG | 74 ms | 205 ms | 2.8× |
|
|
242
|
+
| 1,000,000-point line on a time axis → PNG | 91 ms | 220 ms | 2.4× |
|
|
243
|
+
| 1,000,000-point line → SVG | 24 ms | 65 ms | 2.7× |
|
|
244
|
+
| 100,000-point scatter → PNG | 83 ms | 291 ms | 3.5× |
|
|
245
|
+
| Histogram of 1,000,000 values → PNG | 32 ms | 64 ms | 2.0× |
|
|
246
|
+
| 2-D histogram of 1,000,000 points, 100 × 100 bins → PNG | 100 ms | 168 ms | 1.7× |
|
|
247
|
+
| Hexbin of 1,000,000 points, grid size 50 → PNG | 127 ms | 141 ms | 1.1× |
|
|
248
|
+
| Heatmap of 1,000 × 1,000 cells → PNG | 194 ms | 252 ms | 1.3× |
|
|
249
|
+
| Heatmap of 1,000 × 1,000 cells → SVG | 175 ms | 443 ms | 2.5× |
|
|
250
|
+
| 4 × 5 grid, one 10,000-point line per panel → PNG | 180 ms | 552 ms | 3.1× |
|
|
251
|
+
| 1,000-point line with a second series, title, labels and legend → PNG | 22 ms | 81 ms | 3.7× |
|
|
252
|
+
| 5-bar chart → PNG | 12 ms | 44 ms | 3.6× |
|
|
253
|
+
| `import` in a fresh interpreter | 66 ms | 310 ms | 4.7× |
|
|
254
|
+
|
|
255
|
+
Pinned to one CPU, only the scatter plot is notably slower: 125 ms (2.3×). The 4 × 5 grid uses a 12 × 8 in figure. The script's docstring lists where the two libraries do different work, for example the hexbin grids, which are built differently.
|
|
249
256
|
|
|
250
257
|
Lines with sorted numeric or time x values are downsampled when they have more than four points per pixel column of the plot (counted at a nominal 300 dpi), keeping the first, last, minimum and maximum point in each column, which is visually lossless. Large scatter plots are composited on up to 8 threads; the output is the same for any number of threads.
|
|
251
258
|
|
|
@@ -592,7 +592,7 @@ MIT License
|
|
|
592
592
|
================================================================================
|
|
593
593
|
|
|
594
594
|
Used by:
|
|
595
|
-
- umber-core 0.3.
|
|
595
|
+
- umber-core 0.3.2
|
|
596
596
|
|
|
597
597
|
MIT License
|
|
598
598
|
|
|
@@ -622,7 +622,7 @@ MIT License
|
|
|
622
622
|
================================================================================
|
|
623
623
|
|
|
624
624
|
Used by:
|
|
625
|
-
- umber-py 0.3.
|
|
625
|
+
- umber-py 0.3.2
|
|
626
626
|
|
|
627
627
|
MIT License
|
|
628
628
|
|
|
@@ -549,7 +549,15 @@ fn merged_legend_follows_figure_title_alignment() {
|
|
|
549
549
|
f.title("Figure").subtitle("Summary");
|
|
550
550
|
let groups = ShareGroups::new(&f);
|
|
551
551
|
let panels = panels(&f, &groups, &lib);
|
|
552
|
-
let planned = plan(
|
|
552
|
+
let planned = plan(
|
|
553
|
+
&f,
|
|
554
|
+
&panels,
|
|
555
|
+
&groups,
|
|
556
|
+
&lib,
|
|
557
|
+
"Figure.to_scene()",
|
|
558
|
+
&layout::LabelCache::new(&lib),
|
|
559
|
+
)
|
|
560
|
+
.unwrap();
|
|
553
561
|
let entries = planned.header.legend.entries();
|
|
554
562
|
let left = entries.first().unwrap().swatch.x;
|
|
555
563
|
let last = entries.last().unwrap();
|
|
@@ -581,7 +589,15 @@ fn figure_title_is_one_and_a_half_title_sizes() {
|
|
|
581
589
|
f.title("Figure");
|
|
582
590
|
let groups = ShareGroups::new(&f);
|
|
583
591
|
let panels = panels(&f, &groups, &lib);
|
|
584
|
-
let planned = plan(
|
|
592
|
+
let planned = plan(
|
|
593
|
+
&f,
|
|
594
|
+
&panels,
|
|
595
|
+
&groups,
|
|
596
|
+
&lib,
|
|
597
|
+
"Figure.to_scene()",
|
|
598
|
+
&layout::LabelCache::new(&lib),
|
|
599
|
+
)
|
|
600
|
+
.unwrap();
|
|
585
601
|
let title = planned.header.title.unwrap();
|
|
586
602
|
assert_eq!(
|
|
587
603
|
title.style.size,
|
|
@@ -735,6 +751,7 @@ fn merged_rows_wrap_and_align_independently_in_both_styles() {
|
|
|
735
751
|
&groups,
|
|
736
752
|
&lib,
|
|
737
753
|
"Figure.to_scene()",
|
|
754
|
+
&layout::LabelCache::new(&lib),
|
|
738
755
|
)
|
|
739
756
|
.unwrap();
|
|
740
757
|
let rows: Vec<_> = planned
|
|
@@ -824,6 +841,7 @@ fn direct_lines_stay_on_panels_and_other_kinds_merge() {
|
|
|
824
841
|
&groups,
|
|
825
842
|
&lib,
|
|
826
843
|
"Figure.to_scene()",
|
|
844
|
+
&layout::LabelCache::new(&lib),
|
|
827
845
|
)
|
|
828
846
|
.unwrap();
|
|
829
847
|
assert_eq!(planned.header.legend.entries().len(), 1);
|
|
@@ -844,6 +862,7 @@ fn direct_lines_stay_on_panels_and_other_kinds_merge() {
|
|
|
844
862
|
&groups,
|
|
845
863
|
&lib,
|
|
846
864
|
"Figure.to_scene()",
|
|
865
|
+
&layout::LabelCache::new(&lib),
|
|
847
866
|
)
|
|
848
867
|
.unwrap();
|
|
849
868
|
let labels: Vec<_> = planned
|
|
@@ -900,6 +919,7 @@ fn per_panel_legends_do_not_follow_title_alignment() {
|
|
|
900
919
|
&groups,
|
|
901
920
|
&lib,
|
|
902
921
|
"Figure.to_scene()",
|
|
922
|
+
&layout::LabelCache::new(&lib),
|
|
903
923
|
)
|
|
904
924
|
.unwrap();
|
|
905
925
|
assert!(planned.header.legend.is_empty());
|
|
@@ -956,6 +976,7 @@ fn figure_header_joins_single_and_grid_height_needs() {
|
|
|
956
976
|
&groups,
|
|
957
977
|
&lib,
|
|
958
978
|
"Figure.to_scene()",
|
|
979
|
+
&layout::LabelCache::new(&lib),
|
|
959
980
|
)
|
|
960
981
|
.unwrap();
|
|
961
982
|
assert_eq!(planned.header.bottom, PADDING + 22.5 * 1.25 + 8.0);
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
//! Category layout with and without reuse of measured labels.
|
|
2
|
+
|
|
3
|
+
use super::*;
|
|
4
|
+
use crate::render::{SvgText, render_png, render_svg};
|
|
5
|
+
use crate::{BarOptions, Grid, GridIndex, HeatmapOptions, Placement, ScaleKind, Share};
|
|
6
|
+
|
|
7
|
+
fn category_figures() -> Vec<Figure> {
|
|
8
|
+
let names: Vec<_> = (0..200).map(|i| format!("c{i}")).collect();
|
|
9
|
+
let mut figures = Vec::new();
|
|
10
|
+
for theme in [
|
|
11
|
+
Theme::pigment(),
|
|
12
|
+
Theme::graphite(),
|
|
13
|
+
Theme::midnight().with_font_scale(1.2).unwrap(),
|
|
14
|
+
] {
|
|
15
|
+
for horizontal in [false, true] {
|
|
16
|
+
let mut figure = Figure::new(6.0, 4.0, theme.clone()).unwrap();
|
|
17
|
+
let (x, y) = if horizontal {
|
|
18
|
+
(ScaleKind::Linear, ScaleKind::Category)
|
|
19
|
+
} else {
|
|
20
|
+
(ScaleKind::Category, ScaleKind::Linear)
|
|
21
|
+
};
|
|
22
|
+
figure
|
|
23
|
+
.add_axes(x, y)
|
|
24
|
+
.unwrap()
|
|
25
|
+
.bar(names.clone(), &vec![1.0; 200], BarOptions::default())
|
|
26
|
+
.unwrap();
|
|
27
|
+
figures.push(figure);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
let mut figure = Figure::with_grid(
|
|
31
|
+
10.0,
|
|
32
|
+
6.0,
|
|
33
|
+
Theme::pigment(),
|
|
34
|
+
Grid::new(2, 2).unwrap().with_share_x(Share::All),
|
|
35
|
+
)
|
|
36
|
+
.unwrap();
|
|
37
|
+
let labels: Vec<_> = (0..40).map(|i| format!("日 e\u{301} {i}")).collect();
|
|
38
|
+
for row in 0..2 {
|
|
39
|
+
for col in 0..2 {
|
|
40
|
+
figure
|
|
41
|
+
.add_axes_at(
|
|
42
|
+
Placement {
|
|
43
|
+
row: GridIndex::At(row),
|
|
44
|
+
col: GridIndex::At(col),
|
|
45
|
+
..Placement::default()
|
|
46
|
+
},
|
|
47
|
+
ScaleKind::Category,
|
|
48
|
+
ScaleKind::Linear,
|
|
49
|
+
)
|
|
50
|
+
.unwrap()
|
|
51
|
+
.bar(labels.clone(), &vec![1.0; 40], BarOptions::default())
|
|
52
|
+
.unwrap();
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
figures.push(figure);
|
|
56
|
+
let mut figure = Figure::new(6.0, 4.0, Theme::pigment()).unwrap();
|
|
57
|
+
let short: Vec<_> = (0..30).map(|i| format!("x{i}")).collect();
|
|
58
|
+
figure
|
|
59
|
+
.add_axes(ScaleKind::Category, ScaleKind::Category)
|
|
60
|
+
.unwrap()
|
|
61
|
+
.heatmap(
|
|
62
|
+
&short,
|
|
63
|
+
&short,
|
|
64
|
+
&(0..900).map(|i| (i % 23) as f64).collect::<Vec<_>>(),
|
|
65
|
+
HeatmapOptions::default(),
|
|
66
|
+
)
|
|
67
|
+
.unwrap();
|
|
68
|
+
figures.push(figure);
|
|
69
|
+
figures
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
#[test]
|
|
73
|
+
fn cached_category_scenes_svg_and_png_are_byte_identical() {
|
|
74
|
+
let lib = FontLibrary::bundled();
|
|
75
|
+
for (i, figure) in category_figures().iter().enumerate() {
|
|
76
|
+
let cached = scene(figure, &lib, "Figure.to_scene()").unwrap();
|
|
77
|
+
let uncached = scene_with_labels(
|
|
78
|
+
figure,
|
|
79
|
+
&lib,
|
|
80
|
+
"Figure.to_scene()",
|
|
81
|
+
&layout::LabelCache::uncached(&lib),
|
|
82
|
+
)
|
|
83
|
+
.unwrap();
|
|
84
|
+
assert_eq!(cached, uncached, "scene {i}");
|
|
85
|
+
for text in [SvgText::Outlines, SvgText::Editable] {
|
|
86
|
+
assert_eq!(
|
|
87
|
+
render_svg(&cached, text),
|
|
88
|
+
render_svg(&uncached, text),
|
|
89
|
+
"SVG {i}"
|
|
90
|
+
);
|
|
91
|
+
}
|
|
92
|
+
assert_eq!(
|
|
93
|
+
render_png(&cached, 72).unwrap(),
|
|
94
|
+
render_png(&uncached, 72).unwrap(),
|
|
95
|
+
"PNG {i}"
|
|
96
|
+
);
|
|
97
|
+
assert_eq!(
|
|
98
|
+
cached,
|
|
99
|
+
scene(figure, &lib, "Figure.to_scene()").unwrap(),
|
|
100
|
+
"fresh cache {i}"
|
|
101
|
+
);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
#[test]
|
|
106
|
+
fn concurrent_category_scenes_do_not_share_a_cache() {
|
|
107
|
+
let lib = FontLibrary::bundled();
|
|
108
|
+
let figures = category_figures();
|
|
109
|
+
let expected: Vec<_> = figures
|
|
110
|
+
.iter()
|
|
111
|
+
.map(|f| scene(f, &lib, "Figure.to_scene()").unwrap())
|
|
112
|
+
.collect();
|
|
113
|
+
std::thread::scope(|scope| {
|
|
114
|
+
let handles: Vec<_> = figures
|
|
115
|
+
.iter()
|
|
116
|
+
.map(|figure| {
|
|
117
|
+
let lib = &lib;
|
|
118
|
+
scope.spawn(move || scene(figure, lib, "Figure.to_scene()").unwrap())
|
|
119
|
+
})
|
|
120
|
+
.collect();
|
|
121
|
+
for (handle, expected) in handles.into_iter().zip(expected) {
|
|
122
|
+
assert_eq!(handle.join().unwrap(), expected);
|
|
123
|
+
}
|
|
124
|
+
});
|
|
125
|
+
}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
//! A label cache keeps all shaping inputs and only unplaced measurements.
|
|
2
|
+
|
|
3
|
+
use super::*;
|
|
4
|
+
|
|
5
|
+
#[test]
|
|
6
|
+
fn cache_keys_keep_style_bits_text_and_unplaced_layout() {
|
|
7
|
+
let lib = FontLibrary::bundled();
|
|
8
|
+
let cache = LabelCache::new(&lib);
|
|
9
|
+
let text = "a\u{301} ffi 012日";
|
|
10
|
+
let regular = Styles::new(&Theme::pigment()).tick;
|
|
11
|
+
let styles = [
|
|
12
|
+
regular,
|
|
13
|
+
TextStyle {
|
|
14
|
+
font: crate::Font::Inter,
|
|
15
|
+
..regular
|
|
16
|
+
},
|
|
17
|
+
TextStyle {
|
|
18
|
+
weight: Weight::SemiBold,
|
|
19
|
+
..regular
|
|
20
|
+
},
|
|
21
|
+
TextStyle {
|
|
22
|
+
size: f32::from_bits(regular.size.to_bits() + 1),
|
|
23
|
+
..regular
|
|
24
|
+
},
|
|
25
|
+
TextStyle {
|
|
26
|
+
tabular_figures: false,
|
|
27
|
+
..regular
|
|
28
|
+
},
|
|
29
|
+
];
|
|
30
|
+
for style in styles {
|
|
31
|
+
let expected = measure(&lib, text, style);
|
|
32
|
+
assert_eq!(
|
|
33
|
+
cache.width(text, style).to_bits(),
|
|
34
|
+
expected.width().to_bits()
|
|
35
|
+
);
|
|
36
|
+
assert_eq!(
|
|
37
|
+
cache.width(text, style).to_bits(),
|
|
38
|
+
expected.width().to_bits()
|
|
39
|
+
);
|
|
40
|
+
let mut first = cache.measure(text, style);
|
|
41
|
+
first.x = 123.0;
|
|
42
|
+
first.y = 456.0;
|
|
43
|
+
let again = cache.measure(text, style);
|
|
44
|
+
assert_eq!(again.text, expected.text);
|
|
45
|
+
assert_eq!(again.style, expected.style);
|
|
46
|
+
assert_eq!(
|
|
47
|
+
format!("{:?}", again.layout),
|
|
48
|
+
format!("{:?}", expected.layout)
|
|
49
|
+
);
|
|
50
|
+
assert_eq!(
|
|
51
|
+
(again.x.to_bits(), again.y.to_bits()),
|
|
52
|
+
(0.0_f64.to_bits(), 0.0_f64.to_bits())
|
|
53
|
+
);
|
|
54
|
+
}
|
|
55
|
+
assert_eq!(cache.labels.borrow().len(), styles.len());
|
|
56
|
+
assert!(
|
|
57
|
+
cache
|
|
58
|
+
.labels
|
|
59
|
+
.borrow()
|
|
60
|
+
.values()
|
|
61
|
+
.all(|labels| labels.len() == 1)
|
|
62
|
+
);
|
|
63
|
+
let long = "W".repeat(5000);
|
|
64
|
+
for text in ["", "ffi", &long] {
|
|
65
|
+
let expected = measure(&lib, text, regular);
|
|
66
|
+
assert_eq!(
|
|
67
|
+
cache.width(text, regular).to_bits(),
|
|
68
|
+
expected.width().to_bits()
|
|
69
|
+
);
|
|
70
|
+
let label = cache.measure(text, regular);
|
|
71
|
+
assert_eq!(label.text, expected.text);
|
|
72
|
+
assert_eq!(
|
|
73
|
+
format!("{:?}", label.layout),
|
|
74
|
+
format!("{:?}", expected.layout)
|
|
75
|
+
);
|
|
76
|
+
}
|
|
77
|
+
assert_eq!(
|
|
78
|
+
cache
|
|
79
|
+
.labels
|
|
80
|
+
.borrow()
|
|
81
|
+
.values()
|
|
82
|
+
.map(HashMap::len)
|
|
83
|
+
.sum::<usize>(),
|
|
84
|
+
styles.len() + 3
|
|
85
|
+
);
|
|
86
|
+
assert!(LabelCache::new(&lib).labels.borrow().is_empty());
|
|
87
|
+
}
|