From 0624187021a194790a68eaabd353a6b58c65ed42 Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Wed, 14 Oct 2026 16:48:23 +0900 Subject: [PATCH 01/13] chore(rsplot): bump egui/egui-wgpu to 0.36 (wgpu 30), MSRV 1.95 wgpu 30 wraps VertexState buffers in Option and makes get_mapped_range fallible; egui renames Panel::show_inside to show and egui_kittest::create_render_state takes RendererOptions. epaint 0.36 panics when an unapplied TexturesDelta is dropped, so the headless widget tests run through test_util::HeadlessRun, which clears the delta before the output drops. --- Cargo.toml | 10 ++++---- adl2rsdm/Cargo.toml | 6 ++--- adl2rsdm/examples/local_panel.rs | 2 +- examples/aspect_ratio.rs | 2 +- examples/bootstrap.rs | 2 +- examples/colormap_norm.rs | 2 +- examples/complex_field3d.rs | 4 +-- examples/decimation.rs | 2 +- examples/error_bars.rs | 2 +- examples/fill.rs | 2 +- examples/gallery.rs | 27 +++++++++++---------- examples/high_level_active_curve_labels.rs | 4 +-- examples/high_level_clear_action.rs | 4 +-- examples/high_level_colormap.rs | 4 +-- examples/high_level_context_menu.rs | 2 +- examples/high_level_curve_legend.rs | 4 +-- examples/high_level_curves_roi.rs | 4 +-- examples/high_level_fit_widget.rs | 4 +-- examples/high_level_items_selector.rs | 4 +-- examples/high_level_legend.rs | 4 +-- examples/high_level_live_image.rs | 4 +-- examples/high_level_live_update.rs | 4 +-- examples/high_level_plot1d.rs | 4 +-- examples/high_level_plot2d.rs | 4 +-- examples/high_level_plot2d_colorbar.rs | 2 +- examples/high_level_plot_limits.rs | 4 +-- examples/high_level_plot_widget.rs | 4 +-- examples/high_level_roi_stats.rs | 4 +-- examples/high_level_scatter_mask.rs | 4 +-- examples/high_level_scatter_view.rs | 2 +- examples/high_level_shift_action.rs | 4 +-- examples/image.rs | 2 +- examples/image_and_curve.rs | 2 +- examples/labels.rs | 2 +- examples/large_image.rs | 2 +- examples/line_styles.rs | 2 +- examples/live_update.rs | 2 +- examples/log_axis.rs | 2 +- examples/markers.rs | 2 +- examples/per_vertex_color.rs | 2 +- examples/picking.rs | 2 +- examples/plot_markers.rs | 2 +- examples/rgba_image.rs | 2 +- examples/roi.rs | 2 +- examples/save_graph.rs | 2 +- examples/scalar_field_view.rs | 2 +- examples/scene3d.rs | 2 +- examples/scene3d_image.rs | 2 +- examples/scene3d_mesh.rs | 2 +- examples/scene3d_scatter.rs | 2 +- examples/scene3d_update.rs | 2 +- examples/shapes.rs | 2 +- examples/thick_lines.rs | 2 +- examples/triangles.rs | 2 +- examples/y2_axis.rs | 2 +- rsdm/Cargo.toml | 10 ++++---- rsdm/examples/rsdm_ca_panel.rs | 2 +- rsdm/examples/rsdm_local_panel.rs | 2 +- rsdm/tests/composite_z_order_render.rs | 6 ++++- rsdm/tests/widget_array_plots_render.rs | 7 +++--- rsdm/tests/widget_base_render.rs | 3 ++- rsdm/tests/widget_byte_render.rs | 3 ++- rsdm/tests/widget_drawing_render.rs | 3 ++- rsdm/tests/widget_event_plot_render.rs | 3 ++- rsdm/tests/widget_image_view_render.rs | 7 +++--- rsdm/tests/widget_justified_fill.rs | 6 ++++- rsdm/tests/widget_multi_state_render.rs | 3 ++- rsdm/tests/widget_plot_menu.rs | 3 ++- rsdm/tests/widget_plot_style_render.rs | 7 +++--- rsdm/tests/widget_plot_styling.rs | 3 ++- rsdm/tests/widget_scale_indicator_render.rs | 3 ++- rsdm/tests/widget_symbol_render.rs | 3 ++- rsdm/tests/widget_time_plot_render.rs | 9 ++++--- rsdm/tests/widget_waveform_table_render.rs | 3 ++- src/lib.rs | 2 ++ src/render/backend_wgpu.rs | 4 ++- src/render/gpu_scene3d.rs | 18 +++++++------- src/test_util.rs | 18 ++++++++++++++ src/widget/chrome.rs | 3 ++- src/widget/colorbar.rs | 3 ++- src/widget/complex_image_view.rs | 5 ++-- src/widget/histogram_colorbar.rs | 15 ++++++------ src/widget/image_stack.rs | 5 ++-- src/widget/plot_widget.rs | 9 ++++--- src/widget/print_dialog.rs | 7 +++--- src/widget/print_preview.rs | 5 ++-- src/widget/scene_window.rs | 8 +++--- tests/alpha_slider_binding.rs | 7 +++--- tests/compare_auto.rs | 3 ++- tests/compare_separator.rs | 3 ++- tests/complex_amplitude_controls.rs | 3 ++- tests/curve_caps_joins.rs | 3 ++- tests/default_colormap_gray.rs | 3 ++- tests/fit_action_flow.rs | 5 ++-- tests/image_alpha_map.rs | 3 ++- tests/image_stack_lazy.rs | 7 +++--- tests/limits_history_lifecycle.rs | 3 ++- tests/log_aspect_toggle.rs | 7 +++--- tests/marker_symbols_render.rs | 3 ++- tests/mask_pointer_offset.rs | 7 +++--- tests/median_filter_original.rs | 3 ++- tests/multi_axis_render.rs | 5 ++-- tests/position_info_snap.rs | 5 ++-- tests/reset_zoom_defaults.rs | 5 ++-- tests/roi_band_unbounded_render.rs | 3 ++- tests/roi_events.rs | 11 +++++---- tests/roi_manager_render.rs | 3 ++- tests/ruler.rs | 3 ++- tests/scalar_field_pick.rs | 5 ++-- tests/scalar_field_properties_render.rs | 3 ++- tests/scalar_field_view_render.rs | 5 ++-- tests/scatter_profile.rs | 13 +++++----- tests/scene3d_blend_render.rs | 5 ++-- tests/scene3d_cutplane_render.rs | 3 ++- tests/scene3d_fog_render.rs | 5 ++-- tests/scene3d_image_render.rs | 5 ++-- tests/scene3d_isosurface_render.rs | 3 ++- tests/scene3d_mesh_render.rs | 3 ++- tests/scene3d_overview_render.rs | 7 +++--- tests/scene3d_points_render.rs | 3 ++- tests/scene3d_render.rs | 3 ++- tests/scene3d_scatter2d_render.rs | 3 ++- tests/scene3d_textured_mesh_render.rs | 3 ++- tests/scene_pick.rs | 3 ++- tests/scene_snapshot_render.rs | 5 ++-- tests/scene_style.rs | 7 +++--- tests/scene_viewpoint_render.rs | 9 ++++--- tests/scene_widget_render.rs | 5 ++-- tests/scene_window_render.rs | 3 ++- tests/stack_profile_window.rs | 5 ++-- tests/view_limits_repair.rs | 3 ++- tests/volume_opacity_physics.rs | 3 ++- tests/volume_raycaster_render.rs | 7 +++--- 133 files changed, 342 insertions(+), 243 deletions(-) create mode 100644 src/test_util.rs diff --git a/Cargo.toml b/Cargo.toml index 321e7f6..d81119a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "rsplot" version = "0.5.6" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" license = "MIT OR Apache-2.0" description = "silx-style scientific plotting for egui, rendered with wgpu" repository = "https://github.com/physwkim/rsplot" @@ -21,8 +21,8 @@ resolver = "3" # an egui widget + egui-wgpu paint callback. wgpu types are reached through the # egui-wgpu re-export to avoid version skew (a duplicate wgpu). [dependencies] -egui = "0.34" -egui-wgpu = "0.34" +egui = "0.36" +egui-wgpu = "0.36" bytemuck = { version = "1", features = ["derive"] } # f16 encoding for the volume ray-caster's premultiplied 3D texture. Already in # the tree transitively (via wgpu), so this pins no new major version. @@ -72,8 +72,8 @@ tzdb = "0.7.3" # Only the example (an eframe app) needs a window + RenderState. [dev-dependencies] -eframe = "0.34" -egui_kittest = { version = "0.34.3", features = ["wgpu", "snapshot"] } +eframe = "0.36" +egui_kittest = { version = "0.36", features = ["wgpu", "snapshot"] } [[example]] name = "bootstrap" diff --git a/adl2rsdm/Cargo.toml b/adl2rsdm/Cargo.toml index c273600..8785e93 100644 --- a/adl2rsdm/Cargo.toml +++ b/adl2rsdm/Cargo.toml @@ -2,7 +2,7 @@ name = "adl2rsdm" version = "0.5.6" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" license = "MIT OR Apache-2.0" description = "Convert MEDM .adl screen files to RsDM (Rust) display modules" repository = "https://github.com/physwkim/rsplot" @@ -54,8 +54,8 @@ clap = { version = "4", features = ["derive"] } # `CreationContext::wgpu_render_state` the generated `new(cc)` reads. rsplot = { path = ".." } rsdm = { path = "../rsdm", default-features = false } -eframe = { version = "0.34", features = ["wgpu"] } +eframe = { version = "0.36", features = ["wgpu"] } # The behaviour gate (tests/opens.rs) drives a generated screen headlessly: # clicking a related-display button must OPEN the converted child screen (the # egui embedded-viewport fallback renders it in the same pass, no GPU needed). -egui_kittest = "0.34.3" +egui_kittest = "0.36" diff --git a/adl2rsdm/examples/local_panel.rs b/adl2rsdm/examples/local_panel.rs index 1d8ab09..6ad941a 100644 --- a/adl2rsdm/examples/local_panel.rs +++ b/adl2rsdm/examples/local_panel.rs @@ -58,7 +58,7 @@ impl App { impl eframe::App for App { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.screen.ui(ui); }); } diff --git a/examples/aspect_ratio.rs b/examples/aspect_ratio.rs index edeed71..ecd82e1 100644 --- a/examples/aspect_ratio.rs +++ b/examples/aspect_ratio.rs @@ -49,7 +49,7 @@ impl AspectApp { impl eframe::App for AspectApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { ui.checkbox( &mut self.plot.keep_aspect, "Keep data aspect ratio (square pixels)", diff --git a/examples/bootstrap.rs b/examples/bootstrap.rs index 2ed7b43..9b977bf 100644 --- a/examples/bootstrap.rs +++ b/examples/bootstrap.rs @@ -27,7 +27,7 @@ impl BootstrapApp { impl eframe::App for BootstrapApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { // The root `ui` has no margin/background; wrap it in a CentralPanel. - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/colormap_norm.rs b/examples/colormap_norm.rs index 064d15a..6152df5 100644 --- a/examples/colormap_norm.rs +++ b/examples/colormap_norm.rs @@ -119,7 +119,7 @@ impl eframe::App for NormApp { self.set_norm(render_state, norm); } - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/complex_field3d.rs b/examples/complex_field3d.rs index e89ba9b..e833ea4 100644 --- a/examples/complex_field3d.rs +++ b/examples/complex_field3d.rs @@ -79,7 +79,7 @@ impl ComplexApp { impl eframe::App for ComplexApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::Panel::top(ui.id().with("complex_toolbar")).show_inside(ui, |ui| { + egui::Panel::top(ui.id().with("complex_toolbar")).show(ui, |ui| { let current = MODES .iter() .find(|(m, _)| *m == self.mode) @@ -97,7 +97,7 @@ impl eframe::App for ComplexApp { self.apply_mode(chosen); } }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.scene.show(ui); }); } diff --git a/examples/decimation.rs b/examples/decimation.rs index d997cdd..2f112c5 100644 --- a/examples/decimation.rs +++ b/examples/decimation.rs @@ -54,7 +54,7 @@ impl DecimationApp { impl eframe::App for DecimationApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { ui.label(format!( "{N} source points — left-drag to box-zoom, double-click to reset" )); diff --git a/examples/error_bars.rs b/examples/error_bars.rs index 09e67f9..0ed88bf 100644 --- a/examples/error_bars.rs +++ b/examples/error_bars.rs @@ -69,7 +69,7 @@ impl ErrorBarsApp { impl eframe::App for ErrorBarsApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/fill.rs b/examples/fill.rs index e8551b0..6d5e63e 100644 --- a/examples/fill.rs +++ b/examples/fill.rs @@ -78,7 +78,7 @@ impl FillApp { impl eframe::App for FillApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/gallery.rs b/examples/gallery.rs index 9eb0708..836afb5 100644 --- a/examples/gallery.rs +++ b/examples/gallery.rs @@ -16,6 +16,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ Box3D, Colormap, ColormapMesh3D, ColormapName, CompareImages, Cylinder3D, FitModelChoice, FitWidget, GraphGrid, Hexagon3D, ImageGeometry, ImageView, MeshDrawMode, Plot2D, @@ -36,7 +37,7 @@ fn capture( ) { // A fresh device + installed WgpuResources per scene keeps plot ids and GPU // state independent across captures. - let render_state = create_render_state(default_wgpu_setup()); + let render_state = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&render_state); let mut scene = build(&render_state); @@ -103,14 +104,14 @@ fn main() { Box::new(move |ui: &mut egui::Ui| { egui::Panel::right("gallery_plot_widget_panel") .default_size(220.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Legends"); plot.show_legend(ui); ui.separator(); ui.heading("Active stats"); plot.show_active_stats(ui); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { plot.show_toolbar(ui); plot.show(ui); }); @@ -147,14 +148,14 @@ fn main() { Box::new(move |ui: &mut egui::Ui| { egui::Panel::right("gallery_plot2d_panel") .default_size(220.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Legends"); plot.show_legend(ui); ui.separator(); ui.heading("Active stats"); plot.show_active_stats(ui); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { plot.show_toolbar(ui); plot.show(ui); }); @@ -170,7 +171,7 @@ fn main() { .expect("image dimensions match"); view.image_plot_mut().set_graph_title("ImageView"); Box::new(move |ui: &mut egui::Ui| { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { // ImageView lays its three columns (image | profile+radar | // colorbar) out from `available_size`; reserve the two // horizontal item-spacing gaps so the right profile is not @@ -189,7 +190,7 @@ fn main() { sv.set_data(&x, &y, &values, Colormap::viridis(0.0, 1.0)) .expect("x / y / values are the same length"); Box::new(move |ui: &mut egui::Ui| { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { sv.show_toolbar(ui); sv.show(ui); }); @@ -208,7 +209,7 @@ fn main() { // The central depth slice is the brightest part of the sinc volume. sv.set_frame(sv.frame_count() / 2); Box::new(move |ui: &mut egui::Ui| { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { sv.perspective_ui(ui); sv.show_frame_controls(ui); sv.show(ui); @@ -225,7 +226,7 @@ fn main() { .expect("data matches dimensions"); cmp.set_graph_title("CompareImages — A vs B"); Box::new(move |ui: &mut egui::Ui| { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { cmp.show_toolbar(ui); cmp.show(ui); }); @@ -277,7 +278,7 @@ fn main() { plot.drain_events(); Box::new(move |ui: &mut egui::Ui| { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { plot.show_with_toolbar(ui); }); }) @@ -292,7 +293,7 @@ fn main() { assert!(view.set_data(rs, &data, n, n, n), "cubic volume is valid"); view.add_auto_isosurface(rs, mean_plus_std, egui::Color32::from_rgb(255, 70, 90)); Box::new(move |ui: &mut egui::Ui| { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { view.show(ui); }); }) @@ -308,7 +309,7 @@ fn main() { scene.set_bounds(rs, (Vec3::new(-4.0, -4.0, -1.5), Vec3::new(4.0, 4.0, 3.0))); scene.set_geometry(rs, geometry); Box::new(move |ui: &mut egui::Ui| { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { scene.show(ui); }); }) @@ -323,7 +324,7 @@ fn main() { scene.set_bounds(rs, (Vec3::ZERO, Vec3::new(1.0, 1.0, 1.0))); scene.set_geometry(rs, geometry); Box::new(move |ui: &mut egui::Ui| { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { scene.show(ui); }); }) diff --git a/examples/high_level_active_curve_labels.rs b/examples/high_level_active_curve_labels.rs index 972a300..5fdc8d1 100644 --- a/examples/high_level_active_curve_labels.rs +++ b/examples/high_level_active_curve_labels.rs @@ -161,7 +161,7 @@ impl eframe::App for ActiveLabelApp { egui::Panel::right("active_label_panel") .resizable(true) .default_size(260.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Curve legend"); // The graph legend shows each curve's icon (color, line style, // marker) and makes the clicked curve active (silx @@ -210,7 +210,7 @@ impl eframe::App for ActiveLabelApp { ui.label("Right-click the plot for Zoom Back / Reset Zoom."); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.plot.show_toolbar(ui); self.plot.show(ui); }); diff --git a/examples/high_level_clear_action.rs b/examples/high_level_clear_action.rs index 1a2c318..ef6363b 100644 --- a/examples/high_level_clear_action.rs +++ b/examples/high_level_clear_action.rs @@ -32,14 +32,14 @@ impl eframe::App for ClearActionApp { egui::Panel::right("clear_action_legend") .resizable(true) .default_size(220.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Legends"); self.plot.show_legend(ui); ui.separator(); self.plot.show_active_stats(ui); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.plot.show_toolbar_with(ui, |ui, plot| { if ui.button("Clear").clicked() { plot.clear(); diff --git a/examples/high_level_colormap.rs b/examples/high_level_colormap.rs index d22ce9b..db99961 100644 --- a/examples/high_level_colormap.rs +++ b/examples/high_level_colormap.rs @@ -90,7 +90,7 @@ impl eframe::App for ColormapApp { egui::Panel::left("colormap_controls") .resizable(false) .default_size(160.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.label("Colormap"); for (i, &(_, name)) in COLORMAPS.iter().enumerate() { if ui.radio_value(&mut self.selected_cm, i, name).changed() { @@ -135,7 +135,7 @@ impl eframe::App for ColormapApp { }); // Right: image fills the remaining central area. - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.plot.show(ui); }); } diff --git a/examples/high_level_context_menu.rs b/examples/high_level_context_menu.rs index ccfffb5..736d261 100644 --- a/examples/high_level_context_menu.rs +++ b/examples/high_level_context_menu.rs @@ -59,7 +59,7 @@ impl ContextMenuApp { impl eframe::App for ContextMenuApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { let status = self.status.clone(); self.plot.show_toolbar_with(ui, |ui, _plot| { ui.label(status); diff --git a/examples/high_level_curve_legend.rs b/examples/high_level_curve_legend.rs index bd7bf18..a2e3d55 100644 --- a/examples/high_level_curve_legend.rs +++ b/examples/high_level_curve_legend.rs @@ -130,7 +130,7 @@ impl eframe::App for CurveLegendApp { egui::Panel::right("curve_legend_panel") .resizable(true) .default_size(220.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Curve legends"); self.plot.show_legend(ui); @@ -140,7 +140,7 @@ impl eframe::App for CurveLegendApp { ui.label("Right-click a row for Set Active / Map to Y axis / Points / Lines."); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.plot.show_toolbar(ui); self.plot.show(ui); }); diff --git a/examples/high_level_curves_roi.rs b/examples/high_level_curves_roi.rs index d36a8b2..a5ddfee 100644 --- a/examples/high_level_curves_roi.rs +++ b/examples/high_level_curves_roi.rs @@ -46,14 +46,14 @@ impl eframe::App for CurvesRoiApp { egui::Panel::right("curves_roi_stats") .resizable(true) .default_size(420.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Curve ROI stats"); // One row per x-range ROI, reduced over the active curve (silx // CurvesROIWidget). Drag a ROI edge on the plot to update a row. self.plot.show_curves_roi_widget(ui, &mut self.roi_stats); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.plot.show_toolbar_with(ui, |ui, plot| { if ui.button("Reset ROIs").clicked() { reset_rois(plot); diff --git a/examples/high_level_fit_widget.rs b/examples/high_level_fit_widget.rs index dc51ed0..3999153 100644 --- a/examples/high_level_fit_widget.rs +++ b/examples/high_level_fit_widget.rs @@ -145,14 +145,14 @@ impl eframe::App for FitApp { egui::Panel::left("fit_curve_picker") .resizable(true) .default_size(220.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Curve to fit"); self.picker.ui(ui); }); // Apply any selection change to the fit widget's data. self.sync_fitted_item(); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { if !self.fit_widget.is_open() && ui.button("Open Fit Widget").clicked() { self.fit_widget.set_open(true); } diff --git a/examples/high_level_items_selector.rs b/examples/high_level_items_selector.rs index eb89ee1..340cc0f 100644 --- a/examples/high_level_items_selector.rs +++ b/examples/high_level_items_selector.rs @@ -98,7 +98,7 @@ impl eframe::App for ItemsSelectorApp { egui::Panel::right("items_selector") .resizable(true) .default_size(260.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Items"); for index in 0..self.rows.len() { let handle = self.rows[index].handle; @@ -124,7 +124,7 @@ impl eframe::App for ItemsSelectorApp { self.plot.show_active_stats(ui); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { let selected_count = self.selected.len(); self.plot.show_toolbar_with(ui, |ui, _plot| { ui.label(format!("selected: {selected_count}")); diff --git a/examples/high_level_legend.rs b/examples/high_level_legend.rs index f275654..2e18d35 100644 --- a/examples/high_level_legend.rs +++ b/examples/high_level_legend.rs @@ -168,7 +168,7 @@ impl eframe::App for LegendDemoApp { egui::Panel::right("legend_demo_panel") .resizable(true) .default_size(230.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Legends"); let response = self.plot.show_legend(ui); if let Some(handle) = response.selected { @@ -201,7 +201,7 @@ impl eframe::App for LegendDemoApp { } }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.plot.show_toolbar(ui); self.plot.show(ui); }); diff --git a/examples/high_level_live_image.rs b/examples/high_level_live_image.rs index 89bf251..dae492b 100644 --- a/examples/high_level_live_image.rs +++ b/examples/high_level_live_image.rs @@ -64,12 +64,12 @@ impl eframe::App for LiveImageApp { egui::Panel::right("live_image_stats") .resizable(true) .default_size(180.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Stats"); self.plot.show_active_stats(ui); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { let mut paused = self.paused; let phase = self.phase; self.plot.show_toolbar_with(ui, |ui, _plot| { diff --git a/examples/high_level_live_update.rs b/examples/high_level_live_update.rs index 3ae885a..3658928 100644 --- a/examples/high_level_live_update.rs +++ b/examples/high_level_live_update.rs @@ -59,12 +59,12 @@ impl eframe::App for LiveUpdateApp { egui::Panel::right("live_update_stats") .resizable(true) .default_size(180.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Stats"); self.plot.show_active_stats(ui); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { let mut paused = self.paused; let mut amplitude = self.amplitude; self.plot.show_toolbar_with(ui, |ui, _plot| { diff --git a/examples/high_level_plot1d.rs b/examples/high_level_plot1d.rs index cecaf99..1491c14 100644 --- a/examples/high_level_plot1d.rs +++ b/examples/high_level_plot1d.rs @@ -74,7 +74,7 @@ impl eframe::App for Plot1dApp { egui::Panel::right("plot1d_inspector") .resizable(true) .default_size(230.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Legends"); self.plot.show_legend(ui); ui.separator(); @@ -88,7 +88,7 @@ impl eframe::App for Plot1dApp { } }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { let scatter_present = self.plot.scatter_by_legend("sample points").is_some(); let mut phase = self.phase; let mut phase_changed = false; diff --git a/examples/high_level_plot2d.rs b/examples/high_level_plot2d.rs index 86e4260..35cfe4b 100644 --- a/examples/high_level_plot2d.rs +++ b/examples/high_level_plot2d.rs @@ -106,7 +106,7 @@ impl eframe::App for Plot2dApp { egui::Panel::right("plot2d_inspector") .resizable(true) .default_size(230.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Legends"); self.plot.show_legend(ui); ui.separator(); @@ -120,7 +120,7 @@ impl eframe::App for Plot2dApp { show_value_stats(ui, self.column_stats()); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { let mut mask_visible = self.mask_visible; let mut row = self.row; let mut column = self.column; diff --git a/examples/high_level_plot2d_colorbar.rs b/examples/high_level_plot2d_colorbar.rs index 7a7b899..820b1d0 100644 --- a/examples/high_level_plot2d_colorbar.rs +++ b/examples/high_level_plot2d_colorbar.rs @@ -58,7 +58,7 @@ impl App { impl eframe::App for App { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { let response = self.plot.show(ui); // Single-owner apply: the colorbar drag only reports the new levels; // the owner commits them to the active image's colormap. diff --git a/examples/high_level_plot_limits.rs b/examples/high_level_plot_limits.rs index 203a020..49af558 100644 --- a/examples/high_level_plot_limits.rs +++ b/examples/high_level_plot_limits.rs @@ -85,7 +85,7 @@ impl eframe::App for PlotLimitsApp { egui::Panel::left("controls") .resizable(true) .default_size(200.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Range constraints"); ui.checkbox(&mut self.constrain_range, "Enable range limits"); ui.add_enabled( @@ -136,7 +136,7 @@ impl eframe::App for PlotLimitsApp { self.apply_constraints(); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.plot.show_toolbar(ui); self.plot.show(ui); }); diff --git a/examples/high_level_plot_widget.rs b/examples/high_level_plot_widget.rs index 44bc193..0426839 100644 --- a/examples/high_level_plot_widget.rs +++ b/examples/high_level_plot_widget.rs @@ -131,7 +131,7 @@ impl eframe::App for HighLevelWidgetApp { egui::Panel::right("high_level_plot_widget_inspector") .resizable(true) .default_size(230.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Legends"); self.plot.show_legend(ui); ui.separator(); @@ -145,7 +145,7 @@ impl eframe::App for HighLevelWidgetApp { } }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { let current_demo = self.demo; let (_, requested_demo) = self.plot.show_toolbar_with(ui, |ui, _plot| { let mut requested = None; diff --git a/examples/high_level_roi_stats.rs b/examples/high_level_roi_stats.rs index 8f817e6..5099d25 100644 --- a/examples/high_level_roi_stats.rs +++ b/examples/high_level_roi_stats.rs @@ -52,7 +52,7 @@ impl eframe::App for RoiStatsApp { egui::Panel::right("roi_stats") .resizable(true) .default_size(320.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("ROI stats"); // One row per ROI, reduced over the active image's pixels inside // each ROI (silx ROIStatsWidget). The table follows the active @@ -60,7 +60,7 @@ impl eframe::App for RoiStatsApp { self.plot.show_roi_stats_widget(ui, &mut self.roi_stats); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.plot.show_toolbar_with(ui, |ui, plot| { if ui.button("Reset ROIs").clicked() { reset_rois(plot); diff --git a/examples/high_level_scatter_mask.rs b/examples/high_level_scatter_mask.rs index cd0871b..f896421 100644 --- a/examples/high_level_scatter_mask.rs +++ b/examples/high_level_scatter_mask.rs @@ -134,7 +134,7 @@ impl eframe::App for ScatterMaskApp { egui::Panel::left("scatter_mask_controls") .resizable(false) .default_size(180.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.label("Point opacity (alpha)"); let mut alpha_f = self.alpha as f32 / 255.0; if ui @@ -178,7 +178,7 @@ impl eframe::App for ScatterMaskApp { }); // Plot fills the remaining central area. - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.plot.show_toolbar(ui); self.plot.show(ui); }); diff --git a/examples/high_level_scatter_view.rs b/examples/high_level_scatter_view.rs index 10e62a3..40a1c78 100644 --- a/examples/high_level_scatter_view.rs +++ b/examples/high_level_scatter_view.rs @@ -34,7 +34,7 @@ impl ScatterViewApp { impl eframe::App for ScatterViewApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.sv.show_toolbar(ui); // `ScatterView::show` fills all remaining height, so reserve one row // at the bottom for the position-info readout before showing the diff --git a/examples/high_level_shift_action.rs b/examples/high_level_shift_action.rs index 6f98187..a0b705e 100644 --- a/examples/high_level_shift_action.rs +++ b/examples/high_level_shift_action.rs @@ -94,12 +94,12 @@ impl eframe::App for ShiftActionApp { egui::Panel::right("shift_action_legend") .resizable(true) .default_size(220.0) - .show_inside(ui, |ui| { + .show(ui, |ui| { ui.heading("Legends"); self.plot.show_legend(ui); }); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { let status = self.status.clone(); let (_, shift_clicked) = self.plot.show_toolbar_with(ui, |ui, _plot| { let shift_clicked = ui.button("Shift active curve up").clicked(); diff --git a/examples/image.rs b/examples/image.rs index fea40de..6cce9db 100644 --- a/examples/image.rs +++ b/examples/image.rs @@ -55,7 +55,7 @@ impl ImageApp { impl eframe::App for ImageApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/image_and_curve.rs b/examples/image_and_curve.rs index f828ae0..d42a91b 100644 --- a/examples/image_and_curve.rs +++ b/examples/image_and_curve.rs @@ -69,7 +69,7 @@ impl ImageCurveApp { impl eframe::App for ImageCurveApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.plot.show(ui); }); } diff --git a/examples/labels.rs b/examples/labels.rs index e9628dc..05cf09e 100644 --- a/examples/labels.rs +++ b/examples/labels.rs @@ -51,7 +51,7 @@ impl LabelsApp { impl eframe::App for LabelsApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/large_image.rs b/examples/large_image.rs index 5199158..bd19e99 100644 --- a/examples/large_image.rs +++ b/examples/large_image.rs @@ -67,7 +67,7 @@ impl LargeImageApp { impl eframe::App for LargeImageApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { ui.label(format!( "image width {} px > max_texture_dimension_2d {} → tiled; gradient must stay continuous", self.width, self.max_dim diff --git a/examples/line_styles.rs b/examples/line_styles.rs index 29288d2..a759c39 100644 --- a/examples/line_styles.rs +++ b/examples/line_styles.rs @@ -84,7 +84,7 @@ impl LineStylesApp { impl eframe::App for LineStylesApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/live_update.rs b/examples/live_update.rs index 8d096db..3ee6a07 100644 --- a/examples/live_update.rs +++ b/examples/live_update.rs @@ -133,7 +133,7 @@ impl eframe::App for LiveApp { update_image_region(&render_state, 0, 0, row, WIDTH, BAR_H, &bright); self.last_row = Some(row); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); diff --git a/examples/log_axis.rs b/examples/log_axis.rs index 3485138..87d3d05 100644 --- a/examples/log_axis.rs +++ b/examples/log_axis.rs @@ -51,7 +51,7 @@ impl LogAxisApp { impl eframe::App for LogAxisApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/markers.rs b/examples/markers.rs index d427099..40a294b 100644 --- a/examples/markers.rs +++ b/examples/markers.rs @@ -61,7 +61,7 @@ impl MarkersApp { impl eframe::App for MarkersApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/per_vertex_color.rs b/examples/per_vertex_color.rs index 1129643..eb06207 100644 --- a/examples/per_vertex_color.rs +++ b/examples/per_vertex_color.rs @@ -57,7 +57,7 @@ impl PerVertexColorApp { impl eframe::App for PerVertexColorApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/picking.rs b/examples/picking.rs index 1c17d83..403b7fa 100644 --- a/examples/picking.rs +++ b/examples/picking.rs @@ -54,7 +54,7 @@ impl PickingApp { impl eframe::App for PickingApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { let out = PlotView::new().show(ui, &mut self.plot); // Highlight the nearest vertex within 14 px of the pointer. if let Some(cursor) = out.response.hover_pos() diff --git a/examples/plot_markers.rs b/examples/plot_markers.rs index 01d1786..1b568c2 100644 --- a/examples/plot_markers.rs +++ b/examples/plot_markers.rs @@ -70,7 +70,7 @@ impl MarkerApp { impl eframe::App for MarkerApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/rgba_image.rs b/examples/rgba_image.rs index c509eac..5347d6d 100644 --- a/examples/rgba_image.rs +++ b/examples/rgba_image.rs @@ -61,7 +61,7 @@ impl RgbaApp { impl eframe::App for RgbaApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/roi.rs b/examples/roi.rs index 11e7078..9e7ed44 100644 --- a/examples/roi.rs +++ b/examples/roi.rs @@ -56,7 +56,7 @@ impl RoiApp { impl eframe::App for RoiApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { let out = PlotView::new().show(ui, &mut self.plot); // Report the bounds of whichever region's edge is being dragged. if let Some(i) = out.roi_changed { diff --git a/examples/save_graph.rs b/examples/save_graph.rs index e5fc5fa..e950459 100644 --- a/examples/save_graph.rs +++ b/examples/save_graph.rs @@ -53,7 +53,7 @@ impl SaveApp { impl eframe::App for SaveApp { fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { ui.horizontal(|ui| { if ui.button("Save PNG").clicked() && let Some(rs) = frame.wgpu_render_state() diff --git a/examples/scalar_field_view.rs b/examples/scalar_field_view.rs index 0cfe927..7ddacfd 100644 --- a/examples/scalar_field_view.rs +++ b/examples/scalar_field_view.rs @@ -43,7 +43,7 @@ impl ScalarFieldApp { impl eframe::App for ScalarFieldApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.view.show(ui); }); } diff --git a/examples/scene3d.rs b/examples/scene3d.rs index 765a037..5f05523 100644 --- a/examples/scene3d.rs +++ b/examples/scene3d.rs @@ -43,7 +43,7 @@ impl Scene3dApp { impl eframe::App for Scene3dApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.scene.show(ui); }); } diff --git a/examples/scene3d_image.rs b/examples/scene3d_image.rs index cbb1439..fc73c7d 100644 --- a/examples/scene3d_image.rs +++ b/examples/scene3d_image.rs @@ -67,7 +67,7 @@ impl ImageApp { impl eframe::App for ImageApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.scene.show(ui); }); } diff --git a/examples/scene3d_mesh.rs b/examples/scene3d_mesh.rs index 6348385..2933633 100644 --- a/examples/scene3d_mesh.rs +++ b/examples/scene3d_mesh.rs @@ -41,7 +41,7 @@ impl MeshApp { impl eframe::App for MeshApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.scene.show(ui); }); } diff --git a/examples/scene3d_scatter.rs b/examples/scene3d_scatter.rs index 81707d6..c4922b4 100644 --- a/examples/scene3d_scatter.rs +++ b/examples/scene3d_scatter.rs @@ -56,7 +56,7 @@ impl ScatterApp { impl eframe::App for ScatterApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.scene.show(ui); }); } diff --git a/examples/scene3d_update.rs b/examples/scene3d_update.rs index ff46ba1..f99f3e9 100644 --- a/examples/scene3d_update.rs +++ b/examples/scene3d_update.rs @@ -69,7 +69,7 @@ impl eframe::App for UpdateApp { // egui's monotonic clock drives the animation (no wall-clock needed). let angle = ui.input(|i| i.time) as f32 * 0.6; self.rebuild(angle); - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { self.scene.show(ui); }); ui.ctx().request_repaint(); // keep the animation running diff --git a/examples/shapes.rs b/examples/shapes.rs index a5e5b38..f8b4555 100644 --- a/examples/shapes.rs +++ b/examples/shapes.rs @@ -70,7 +70,7 @@ impl ShapeApp { impl eframe::App for ShapeApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/thick_lines.rs b/examples/thick_lines.rs index 984ed54..a9eb527 100644 --- a/examples/thick_lines.rs +++ b/examples/thick_lines.rs @@ -52,7 +52,7 @@ impl ThickLinesApp { impl eframe::App for ThickLinesApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/triangles.rs b/examples/triangles.rs index 08e677f..1887125 100644 --- a/examples/triangles.rs +++ b/examples/triangles.rs @@ -66,7 +66,7 @@ impl TriApp { impl eframe::App for TriApp { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/examples/y2_axis.rs b/examples/y2_axis.rs index b80cc27..1433179 100644 --- a/examples/y2_axis.rs +++ b/examples/y2_axis.rs @@ -60,7 +60,7 @@ impl Y2App { impl eframe::App for Y2App { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { PlotView::new().show(ui, &mut self.plot); }); } diff --git a/rsdm/Cargo.toml b/rsdm/Cargo.toml index e94e505..0106531 100644 --- a/rsdm/Cargo.toml +++ b/rsdm/Cargo.toml @@ -2,7 +2,7 @@ name = "rsdm" version = "0.5.6" edition = "2024" -rust-version = "1.92" +rust-version = "1.95" license = "MIT OR Apache-2.0" description = "PyDM-style EPICS display widgets and data engine, built on rsplot" repository = "https://github.com/physwkim/rsplot" @@ -134,15 +134,15 @@ arboard = { version = "3.6", default-features = false } [dev-dependencies] # Headless egui renderer for the widget render tests (alarm-border readback), -# pinned to the same 0.34.3 the rsplot crate's tests use so there is one egui in +# pinned to the same 0.36 the rsplot crate's tests use so there is one egui in # the tree. The `wgpu` feature provides the GPU readback (`Harness::render`); the # tests read pixels back and assert colours, the same empirical-verification # pattern as rsplot's `tests/mask_pointer_offset.rs` (no golden images). -egui_kittest = { version = "0.34.3", features = ["wgpu"] } +egui_kittest = { version = "0.36", features = ["wgpu"] } # Windowing for the runnable example panels (a wgpu `RenderState` + an event -# loop), pinned to the same 0.34 the rsplot examples use. The library never +# loop), pinned to the same 0.36 the rsplot examples use. The library never # depends on eframe — only the examples need a window. -eframe = "0.34" +eframe = "0.36" # A panel of PyDM-style widgets driven entirely by `loc://`/`fake://` channels, # so it runs with no IOC. diff --git a/rsdm/examples/rsdm_ca_panel.rs b/rsdm/examples/rsdm_ca_panel.rs index 1fffc42..c1d1e9d 100644 --- a/rsdm/examples/rsdm_ca_panel.rs +++ b/rsdm/examples/rsdm_ca_panel.rs @@ -71,7 +71,7 @@ impl CaPanel { impl eframe::App for CaPanel { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { ui.heading("RsDM ca:// panel"); ui.label("Live Channel Access PVs. Disconnected PVs show a dashed border."); ui.separator(); diff --git a/rsdm/examples/rsdm_local_panel.rs b/rsdm/examples/rsdm_local_panel.rs index 5a69b2f..acf05ac 100644 --- a/rsdm/examples/rsdm_local_panel.rs +++ b/rsdm/examples/rsdm_local_panel.rs @@ -95,7 +95,7 @@ impl LocalPanel { impl eframe::App for LocalPanel { fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) { - egui::CentralPanel::default().show_inside(ui, |ui| { + egui::CentralPanel::default().show(ui, |ui| { ui.heading("RsDM local panel (no IOC)"); ui.label( "loc:// + fake:// channels. Edit the setpoint and flags; \ diff --git a/rsdm/tests/composite_z_order_render.rs b/rsdm/tests/composite_z_order_render.rs index b96cac0..4c877f1 100644 --- a/rsdm/tests/composite_z_order_render.rs +++ b/rsdm/tests/composite_z_order_render.rs @@ -17,6 +17,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; /// Count near-black pixels (the title glyphs) inside the chip's red rectangle. fn black_over_red(raw: &[u8], width: usize, chip: egui::Rect) -> u32 { @@ -53,7 +54,10 @@ fn later_same_order_area_renders_on_top() { let chip = egui::Rect::from_min_size(egui::pos2(20.0, 8.0), egui::vec2(220.0, 40.0)); let text_pos = egui::pos2(28.0, 18.0); - let renderer = WgpuTestRenderer::from_render_state(create_render_state(default_wgpu_setup())); + let renderer = WgpuTestRenderer::from_render_state(create_render_state( + default_wgpu_setup(), + RendererOptions::default(), + )); let mut harness = Harness::builder() .with_size(egui::vec2(W as f32, H as f32)) .with_pixels_per_point(1.0) diff --git a/rsdm/tests/widget_array_plots_render.rs b/rsdm/tests/widget_array_plots_render.rs index c14d762..a017ac8 100644 --- a/rsdm/tests/widget_array_plots_render.rs +++ b/rsdm/tests/widget_array_plots_render.rs @@ -20,6 +20,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsdm::widgets::{RsdmScatterPlot, RsdmWaveformPlot}; use rsdm::{Engine, PvValue}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { let start = Instant::now(); @@ -40,7 +41,7 @@ fn count_green(raw: &[u8]) -> u32 { #[test] fn waveform_curve_renders_from_a_y_array() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); let mut plot = RsdmWaveformPlot::new(&rs, 0); @@ -91,7 +92,7 @@ fn waveform_curve_renders_from_a_y_array() { #[test] fn scatter_markers_render_from_injected_pairs() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); let mut plot = RsdmScatterPlot::new(&rs, 0); @@ -133,7 +134,7 @@ fn scatter_markers_render_from_injected_pairs() { #[test] fn empty_array_plot_renders_no_curve_color() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); let mut plot = RsdmWaveformPlot::new(&rs, 0); diff --git a/rsdm/tests/widget_base_render.rs b/rsdm/tests/widget_base_render.rs index 9b8ab43..b15e9b9 100644 --- a/rsdm/tests/widget_base_render.rs +++ b/rsdm/tests/widget_base_render.rs @@ -19,6 +19,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsdm::widgets::ChannelBase; use rsdm::{AlarmSeverity, ChannelState, Engine}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; const PPP: f32 = 1.0; const CONTENT: egui::Vec2 = egui::vec2(220.0, 80.0); @@ -54,7 +55,7 @@ struct Frame { /// Render one frame for `severity`/`connected`. fn render(severity: AlarmSeverity, connected: bool) -> Frame { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let engine = Engine::new(); let channel = engine .connect("loc://border_render_demo") diff --git a/rsdm/tests/widget_byte_render.rs b/rsdm/tests/widget_byte_render.rs index cba2065..f4b1110 100644 --- a/rsdm/tests/widget_byte_render.rs +++ b/rsdm/tests/widget_byte_render.rs @@ -18,6 +18,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsdm::widgets::RsdmByteIndicator; use rsdm::{Engine, PvValue}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; struct App { indicator: RsdmByteIndicator, @@ -49,7 +50,7 @@ struct Counts { /// Render a vertical byte indicator showing `value` over `num_bits` bits and /// count its on/off pixels. fn render(value: i64, num_bits: usize) -> Counts { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let engine = Engine::new(); // Config-bearing loc (type+init) so the connection is connected — a bare // `loc://` is disconnected until configured (R3-12), which would render the diff --git a/rsdm/tests/widget_drawing_render.rs b/rsdm/tests/widget_drawing_render.rs index d6f4833..65e17ff 100644 --- a/rsdm/tests/widget_drawing_render.rs +++ b/rsdm/tests/widget_drawing_render.rs @@ -16,6 +16,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsdm::Engine; use rsdm::widgets::{DrawingShape, RsdmDrawing}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; fn count_red(raw: &[u8]) -> u32 { raw.chunks_exact(4) @@ -24,7 +25,7 @@ fn count_red(raw: &[u8]) -> u32 { } fn render_drawing(fill: egui::Color32) -> u32 { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let engine = Engine::new(); let drawing = RsdmDrawing::new(&engine, "loc://drawing_demo", DrawingShape::Rectangle) .expect("connect") diff --git a/rsdm/tests/widget_event_plot_render.rs b/rsdm/tests/widget_event_plot_render.rs index 4baa327..6c9f887 100644 --- a/rsdm/tests/widget_event_plot_render.rs +++ b/rsdm/tests/widget_event_plot_render.rs @@ -19,6 +19,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsdm::widgets::RsdmEventPlot; use rsdm::{Engine, PvValue}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { let start = Instant::now(); @@ -41,7 +42,7 @@ fn count_red(raw: &[u8]) -> u32 { /// channel (selected by `x_idx=0`, `y_idx=1`), stepping the harness between /// updates so each is accumulated. Returns `(red_pixels, points_accumulated)`. fn render_events(samples: &[(f64, f64)]) -> (u32, usize) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); let mut plot = RsdmEventPlot::new(&rs, 0); diff --git a/rsdm/tests/widget_image_view_render.rs b/rsdm/tests/widget_image_view_render.rs index 21a489b..ffc76f1 100644 --- a/rsdm/tests/widget_image_view_render.rs +++ b/rsdm/tests/widget_image_view_render.rs @@ -24,6 +24,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsdm::widgets::RsdmImageView; use rsdm::{Engine, PvValue}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { let start = Instant::now(); @@ -57,7 +58,7 @@ fn bare(view: &mut RsdmImageView) { #[test] fn gradient_array_renders_a_color_mapped_image() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); // Config-bearing loc (type+init) so the connection connects — a bare @@ -108,7 +109,7 @@ fn gradient_array_renders_a_color_mapped_image() { #[test] fn middle_click_copies_image_and_width_channels() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); let mut view = RsdmImageView::new( @@ -167,7 +168,7 @@ fn middle_click_copies_image_and_width_channels() { #[test] fn view_without_data_renders_no_color_mapped_image() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); let mut view = RsdmImageView::new(&engine, &rs, 0, "loc://cam_empty", None) diff --git a/rsdm/tests/widget_justified_fill.rs b/rsdm/tests/widget_justified_fill.rs index 951cf41..e7ea757 100644 --- a/rsdm/tests/widget_justified_fill.rs +++ b/rsdm/tests/widget_justified_fill.rs @@ -29,6 +29,7 @@ use rsdm::widgets::{ RsdmScaleIndicator, RsdmSymbol, }; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { let start = Instant::now(); @@ -137,7 +138,7 @@ const PROBE_SIZE: u32 = 400; /// Render `show` in a [`PROBE_SIZE`]² harness, justified or plain, and return /// the raw RGBA bytes. fn pixel_probe_raw(justified: bool, show: impl FnMut(&mut egui::Ui) + 'static) -> Vec { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let renderer = WgpuTestRenderer::from_render_state(rs); let show = RefCell::new(show); let mut harness = Harness::builder() @@ -485,6 +486,7 @@ fn justified_enum_button_fits_a_narrow_medm_rect() { .with_pixels_per_point(1.0) .renderer(WgpuTestRenderer::from_render_state(create_render_state( default_wgpu_setup(), + RendererOptions::default(), ))) .build_ui(move |ui| { // The adl2rsdm `place()` shape: an Area pinned at the MEDM rect, @@ -542,6 +544,7 @@ fn justified_byte_fits_a_short_medm_rect() { .with_pixels_per_point(1.0) .renderer(WgpuTestRenderer::from_render_state(create_render_state( default_wgpu_setup(), + RendererOptions::default(), ))) .build_ui(move |ui| { egui::Area::new(ui.id().with("short_byte")) @@ -630,6 +633,7 @@ fn medm_cell_text_bbox( .with_pixels_per_point(1.0) .renderer(WgpuTestRenderer::from_render_state(create_render_state( default_wgpu_setup(), + RendererOptions::default(), ))) .build_ui(move |ui| { egui::Area::new(ui.id().with("medm_cell")) diff --git a/rsdm/tests/widget_multi_state_render.rs b/rsdm/tests/widget_multi_state_render.rs index fc30a71..e062593 100644 --- a/rsdm/tests/widget_multi_state_render.rs +++ b/rsdm/tests/widget_multi_state_render.rs @@ -20,6 +20,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsdm::Engine; use rsdm::widgets::RsdmMultiStateIndicator; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { let start = Instant::now(); @@ -41,7 +42,7 @@ fn count_green(raw: &[u8]) -> u32 { /// Render a multi-state indicator whose state `2` is green, with the channel at /// `value`, and return the count of green pixels. fn render_multi_state(value: i64) -> u32 { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let engine = Engine::new(); let address = format!("loc://multi_state_demo?type=int&init={value}"); let indicator = RsdmMultiStateIndicator::new(&engine, &address) diff --git a/rsdm/tests/widget_plot_menu.rs b/rsdm/tests/widget_plot_menu.rs index 35654c7..e837440 100644 --- a/rsdm/tests/widget_plot_menu.rs +++ b/rsdm/tests/widget_plot_menu.rs @@ -12,6 +12,7 @@ use rsdm::Engine; use rsdm::widgets::RsdmScatterPlot; use rsplot::YAxis; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; fn y_limits(plot: &RsdmScatterPlot) -> (f64, f64) { plot.plot() @@ -21,7 +22,7 @@ fn y_limits(plot: &RsdmScatterPlot) -> (f64, f64) { #[test] fn set_y_range_pins_y_and_survives_updates_then_autoscale_refits() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); diff --git a/rsdm/tests/widget_plot_style_render.rs b/rsdm/tests/widget_plot_style_render.rs index 058edce..630032c 100644 --- a/rsdm/tests/widget_plot_style_render.rs +++ b/rsdm/tests/widget_plot_style_render.rs @@ -17,6 +17,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsdm::Engine; use rsdm::widgets::{CurveStyle, RsdmScatterPlot, RsdmTimePlot}; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{AxisSide, YAxis, egui}; fn now_epoch_secs() -> f64 { @@ -43,7 +44,7 @@ fn count_color(raw: &[u8], want: [u8; 3]) -> u32 { #[test] fn set_curve_style_recolors_the_curve_on_screen() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); @@ -110,7 +111,7 @@ fn set_curve_style_binds_curve_to_extra_axis_and_autoscales_it() { // observed directly. `RsdmTimePlot` now also keeps `auto_reset_zoom` on (its // Y / y2 / extra axes refit live), but its per-frame X scroll would only add // noise to this end-to-end axis-binding check. - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); @@ -176,7 +177,7 @@ fn set_curve_style_binds_curve_to_extra_axis_and_autoscales_it() { #[test] fn set_curve_style_rejects_out_of_range_index() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); let mut plot = RsdmTimePlot::new(&rs, 0); diff --git a/rsdm/tests/widget_plot_styling.rs b/rsdm/tests/widget_plot_styling.rs index 651aab9..5ccd2d4 100644 --- a/rsdm/tests/widget_plot_styling.rs +++ b/rsdm/tests/widget_plot_styling.rs @@ -7,10 +7,11 @@ use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; use rsdm::widgets::{RsdmScatterPlot, RsdmTimePlot, RsdmWaveformPlot}; use rsplot::YAxis; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; #[test] fn builders_style_the_underlying_plot() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); // Waveform: the full surface, including both pinned ranges (MEDM cartesian diff --git a/rsdm/tests/widget_scale_indicator_render.rs b/rsdm/tests/widget_scale_indicator_render.rs index 8986ee9..ab242f0 100644 --- a/rsdm/tests/widget_scale_indicator_render.rs +++ b/rsdm/tests/widget_scale_indicator_render.rs @@ -17,6 +17,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsdm::Engine; use rsdm::widgets::RsdmScaleIndicator; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { let start = Instant::now(); @@ -37,7 +38,7 @@ fn count_red(raw: &[u8]) -> u32 { /// Render a bar-style scale over `[0, 100]` showing `init` and count red pixels. fn render_scale(init: f64) -> u32 { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let engine = Engine::new(); let address = format!("loc://scale_demo?type=float&init={init}"); let scale = RsdmScaleIndicator::new(&engine, &address) diff --git a/rsdm/tests/widget_symbol_render.rs b/rsdm/tests/widget_symbol_render.rs index b6369b0..2fc4231 100644 --- a/rsdm/tests/widget_symbol_render.rs +++ b/rsdm/tests/widget_symbol_render.rs @@ -18,6 +18,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsdm::Engine; use rsdm::widgets::{DrawingShape, RsdmSymbol}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { let start = Instant::now(); @@ -38,7 +39,7 @@ fn count_red(raw: &[u8]) -> u32 { /// Render a symbol whose state `1` is a red circle, with the channel at `value`. fn render_symbol(value: i64) -> u32 { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let engine = Engine::new(); let address = format!("loc://symbol_demo?type=int&init={value}"); let symbol = RsdmSymbol::new(&engine, &address) diff --git a/rsdm/tests/widget_time_plot_render.rs b/rsdm/tests/widget_time_plot_render.rs index 7a38b78..1b2d12f 100644 --- a/rsdm/tests/widget_time_plot_render.rs +++ b/rsdm/tests/widget_time_plot_render.rs @@ -21,6 +21,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsdm::Engine; use rsdm::widgets::{RsdmTimePlot, TimeAxisMode}; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{DataMargins, TickMode, TimeZone, YAxis, egui}; struct App { @@ -50,7 +51,7 @@ fn count_green(raw: &[u8]) -> u32 { /// Render a time plot after running `setup` on it (e.g. injecting samples) and /// return the green pixel count. fn render_with(setup: impl FnOnce(&mut RsdmTimePlot, usize)) -> u32 { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); @@ -106,7 +107,7 @@ fn y_limits_after( margins: DataMargins, setup: impl FnOnce(&mut RsdmTimePlot, usize), ) -> (f64, f64) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let engine = Engine::new(); @@ -213,7 +214,7 @@ fn empty_plot_renders_no_curve_color() { fn time_axis_mode_switches_between_relative_and_wall_clock() { // The X axis defaults to relative seconds and can switch to an absolute // wall-clock axis (the f32-safe path: relative vertices, offset tick labels). - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); // Default: numeric ticks + the "since start" unit label. @@ -250,7 +251,7 @@ fn time_axis_mode_switches_between_relative_and_wall_clock() { fn crosshair_toggle_drives_the_plot_flag() { // The hover crosshair + (x, y) readout is off by default and the builder / // runtime setter flip the underlying rsplot crosshair flag. - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let plot = RsdmTimePlot::new(&rs, 0); diff --git a/rsdm/tests/widget_waveform_table_render.rs b/rsdm/tests/widget_waveform_table_render.rs index 87d5796..0db163b 100644 --- a/rsdm/tests/widget_waveform_table_render.rs +++ b/rsdm/tests/widget_waveform_table_render.rs @@ -20,6 +20,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsdm::widgets::RsdmWaveformTable; use rsdm::{Engine, PvValue}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { let start = Instant::now(); @@ -42,7 +43,7 @@ fn count_light(raw: &[u8]) -> u32 { /// Render a 2-column waveform table over a `loc://` int-array channel, optionally /// seeded with `values`, and return the count of light (text) pixels. fn render_table(address: &str, values: Option<&[i64]>) -> u32 { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let engine = Engine::new(); let table = RsdmWaveformTable::new(&engine, address) .expect("connect") diff --git a/src/lib.rs b/src/lib.rs index d3eaf1b..d09ac5d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -13,6 +13,8 @@ pub mod core; pub mod render; +#[cfg(test)] +mod test_util; pub mod widget; /// System-printer enumeration and spooling via the `lp` / `lpstat` CLI tools, diff --git a/src/render/backend_wgpu.rs b/src/render/backend_wgpu.rs index 44a606e..45027d4 100644 --- a/src/render/backend_wgpu.rs +++ b/src/render/backend_wgpu.rs @@ -308,7 +308,9 @@ impl WgpuResources { .map_err(|e| crate::render::save::SaveError::Readback(format!("buffer map: {e}")))?; let rgba = { - let mapped = buffer.slice(..).get_mapped_range(); + let mapped = buffer.slice(..).get_mapped_range().map_err(|e| { + crate::render::save::SaveError::Readback(format!("buffer map: {e}")) + })?; rows_to_rgba8(&mapped, w, h, bpr, target_format) }; buffer.unmap(); diff --git a/src/render/gpu_scene3d.rs b/src/render/gpu_scene3d.rs index dd23cbb..d05339c 100644 --- a/src/render/gpu_scene3d.rs +++ b/src/render/gpu_scene3d.rs @@ -767,11 +767,11 @@ impl Scene3dPipeline { immediate_size: 0, }); - let vertex_buffers = [wgpu::VertexBufferLayout { + let vertex_buffers = [Some(wgpu::VertexBufferLayout { array_stride: std::mem::size_of::() as u64, step_mode: wgpu::VertexStepMode::Vertex, attributes: &SCENE3D_VERTEX_ATTRS, - }]; + })]; // Lines and triangles differ only in primitive topology; everything else // (shader, vertex layout, depth state, target) is shared. @@ -863,11 +863,11 @@ impl Scene3dPipeline { entry_point: Some("vs_main"), // No vertex buffer: corners come from vertex_index. One instance // per point carries pos/color/size/marker. - buffers: &[wgpu::VertexBufferLayout { + buffers: &[Some(wgpu::VertexBufferLayout { array_stride: std::mem::size_of::() as u64, step_mode: wgpu::VertexStepMode::Instance, attributes: &SCENE3D_POINT_ATTRS, - }], + })], compilation_options: wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { @@ -930,11 +930,11 @@ impl Scene3dPipeline { vertex: wgpu::VertexState { module: &mesh_shader, entry_point: Some("vs_main"), - buffers: &[wgpu::VertexBufferLayout { + buffers: &[Some(wgpu::VertexBufferLayout { array_stride: std::mem::size_of::() as u64, step_mode: wgpu::VertexStepMode::Vertex, attributes: &SCENE3D_MESH_ATTRS, - }], + })], compilation_options: wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { @@ -1011,11 +1011,11 @@ impl Scene3dPipeline { vertex: wgpu::VertexState { module: &image_shader, entry_point: Some("vs_main"), - buffers: &[wgpu::VertexBufferLayout { + buffers: &[Some(wgpu::VertexBufferLayout { array_stride: std::mem::size_of::() as u64, step_mode: wgpu::VertexStepMode::Vertex, attributes: &SCENE3D_IMAGE_ATTRS, - }], + })], compilation_options: wgpu::PipelineCompilationOptions::default(), }, fragment: Some(wgpu::FragmentState { @@ -1932,7 +1932,7 @@ impl Scene3dResources { rx.recv().ok()?.ok()?; let rgba = { - let mapped = buffer.slice(..).get_mapped_range(); + let mapped = buffer.slice(..).get_mapped_range().ok()?; rows_to_rgba8(&mapped, w, h, bpr, pipeline.target_format) }; buffer.unmap(); diff --git a/src/test_util.rs b/src/test_util.rs new file mode 100644 index 0000000..d4a7518 --- /dev/null +++ b/src/test_util.rs @@ -0,0 +1,18 @@ +//! Test-only helpers shared by the widget unit tests. + +/// Headless-frame runner for the unit tests: [`egui::Context::run_ui`] whose +/// output is safe to drop. No renderer applies texture deltas in a headless +/// test, and epaint 0.36 panics when an unapplied [`egui::TexturesDelta`] is +/// dropped, so every test frame comes through here, which clears the delta +/// before handing the output back. +pub trait HeadlessRun { + fn run_headless(&self, raw: egui::RawInput, f: F) -> egui::FullOutput; +} + +impl HeadlessRun for egui::Context { + fn run_headless(&self, raw: egui::RawInput, f: F) -> egui::FullOutput { + let mut out = self.run_ui(raw, f); + out.textures_delta.clear(); + out + } +} diff --git a/src/widget/chrome.rs b/src/widget/chrome.rs index 74bbfee..7b06b22 100644 --- a/src/widget/chrome.rs +++ b/src/widget/chrome.rs @@ -1960,6 +1960,7 @@ pub fn draw_colorbar(painter: &Painter, rect: Rect, cmap: &Colormap, style: &Sty #[cfg(test)] mod tests { use super::*; + use crate::test_util::HeadlessRun; #[test] fn roi_appearance_resolves_color_fallback_and_name() { @@ -2660,7 +2661,7 @@ mod tests { let ctx = egui::Context::default(); let mut galley = None; - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { galley = Some(ui.painter().layout_no_wrap( "Temperature [\u{b0}C]".to_owned(), FontId::proportional(12.0), diff --git a/src/widget/colorbar.rs b/src/widget/colorbar.rs index 366d9c4..6fb3a16 100644 --- a/src/widget/colorbar.rs +++ b/src/widget/colorbar.rs @@ -653,6 +653,7 @@ pub(crate) fn format_end_label(v: f64) -> String { mod tests { use super::*; use crate::core::colormap::Colormap; + use crate::test_util::HeadlessRun; // --- tick_frac (silx _TickBar._getRelativePosition) ------------------- @@ -913,7 +914,7 @@ mod tests { let ctx = egui::Context::default(); let mut galley = None; - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { galley = Some(ui.painter().layout_no_wrap( "Intensity [counts]".to_owned(), FontId::proportional(TICK_FONT_SIZE), diff --git a/src/widget/complex_image_view.rs b/src/widget/complex_image_view.rs index 44b56e4..627daa7 100644 --- a/src/widget/complex_image_view.rs +++ b/src/widget/complex_image_view.rs @@ -538,6 +538,7 @@ impl ComplexImageView { #[cfg(test)] mod tests { use super::*; + use crate::test_util::HeadlessRun; const PI: f32 = std::f32::consts::PI; @@ -552,7 +553,7 @@ mod tests { current: ComplexMode, ) -> Vec<(ComplexMode, egui::Rect)> { let mut rects = Vec::new(); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { ui.horizontal(|ui| { for mode in ComplexMode::ALL { let r = ui.selectable_label(current == mode, mode.label()); @@ -571,7 +572,7 @@ mod tests { raw: egui::RawInput, ) -> Option { let mut picked = None; - let _ = ctx.run_ui(raw, |ui| { + let _ = ctx.run_headless(raw, |ui| { picked = mode_toolbar_ui(ui, current); }); picked diff --git a/src/widget/histogram_colorbar.rs b/src/widget/histogram_colorbar.rs index 4dcf7d0..11f8167 100644 --- a/src/widget/histogram_colorbar.rs +++ b/src/widget/histogram_colorbar.rs @@ -540,6 +540,7 @@ struct HandleColumns { #[cfg(test)] mod tests { use super::*; + use crate::test_util::HeadlessRun; // ── axis_range ────────────────────────────────────────────────────── @@ -722,7 +723,7 @@ mod tests { // Exercises the full ui() render path (gradient loop, histogram bars, // handles, labels, per-handle interact) headlessly; no input, so no drag. let ctx = egui::Context::default(); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { let bar = HistogramColorBar::new(Colormap::viridis(0.0, 1.0)) .with_data_range((0.0, 1.0)) .with_histogram(Some((vec![3, 7, 2], vec![0.0, 0.33, 0.66, 1.0]))) @@ -737,7 +738,7 @@ mod tests { // Pinned bounds inset well inside the allocated box: the strip aligns to // the bounds (image data-area guides) and nothing panics / clips. let ctx = egui::Context::default(); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { let origin = ui.max_rect().top(); let bar = HistogramColorBar::new(Colormap::viridis(0.0, 1.0)) .with_data_range((0.0, 1.0)) @@ -753,7 +754,7 @@ mod tests { // Embedded form: render into a fixed gutter rect (as PlotView does for a // chrome colorbar) rather than allocating from the layout cursor. let ctx = egui::Context::default(); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { let origin = ui.max_rect().left_top(); let gutter = Rect::from_min_max( pos2(origin.x + 300.0, origin.y + 20.0), @@ -774,7 +775,7 @@ mod tests { // %.2e). The label gutter is measured from the drawn value, so the wide // scientific label must lay out inside the column without panicking. let ctx = egui::Context::default(); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { let bar = HistogramColorBar::new(Colormap::viridis(0.062, 1.0)) .with_data_range((0.0, 1.0)) .with_histogram(Some((vec![9, 4, 1], vec![0.0, 0.33, 0.66, 1.0]))) @@ -802,7 +803,7 @@ mod tests { let ctx = egui::Context::default(); let mut gutter = Rect::NOTHING; - let output = ctx.run_ui(egui::RawInput::default(), |ui| { + let output = ctx.run_headless(egui::RawInput::default(), |ui| { let origin = ui.max_rect().left_top(); gutter = Rect::from_min_max( pos2(origin.x + 10.0, origin.y + 10.0), @@ -838,7 +839,7 @@ mod tests { // All-equal data + vmin==vmax + no histogram + tiny rect: the degenerate // axis and clamp paths must not panic. let ctx = egui::Context::default(); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { let bar = HistogramColorBar::new(Colormap::viridis(5.0, 5.0)) .with_data_range((5.0, 5.0)) .with_histogram(None) @@ -852,7 +853,7 @@ mod tests { // Log colormap with a non-positive-inclusive data range exercises the // log positivity guards in axis_range / value_to_frac during paint. let ctx = egui::Context::default(); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { let cmap = Colormap::viridis(1.0, 1000.0).with_normalization(Normalization::Log); let bar = HistogramColorBar::new(cmap) .with_data_range((-2.0, 1000.0)) diff --git a/src/widget/image_stack.rs b/src/widget/image_stack.rs index e8d3c19..b32d156 100644 --- a/src/widget/image_stack.rs +++ b/src/widget/image_stack.rs @@ -996,6 +996,7 @@ impl ImageStack { #[cfg(test)] mod tests { use super::*; + use crate::test_util::HeadlessRun; fn frame(label: &str) -> Option { Some(Frame::new( @@ -1461,7 +1462,7 @@ mod tests { let mut prev = egui::Rect::NOTHING; let mut next = egui::Rect::NOTHING; let mut last = egui::Rect::NOTHING; - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { ui.horizontal(|ui| { first = ui.button("⏮").rect; prev = ui.button("◀").rect; @@ -1482,7 +1483,7 @@ mod tests { raw: egui::RawInput, ) -> Option { let mut action = None; - let _ = ctx.run_ui(raw, |ui| { + let _ = ctx.run_headless(raw, |ui| { action = navigation_toolbar_ui(ui, current, len); }); action diff --git a/src/widget/plot_widget.rs b/src/widget/plot_widget.rs index b2d41c1..8f5c989 100644 --- a/src/widget/plot_widget.rs +++ b/src/widget/plot_widget.rs @@ -1646,6 +1646,7 @@ fn commit(plot: &mut Plot, next: interaction::Limits, next_y2: Option<(f64, f64) mod tests { use super::*; use crate::core::plot::Plot; + use crate::test_util::HeadlessRun; /// Drive a headless egui frame with the given raw input, run `show`, and /// return the resulting [`PlotResponse`] and its data area. The wgpu paint @@ -1656,7 +1657,7 @@ mod tests { raw: egui::RawInput, ) -> (PlotResponse, Rect) { let mut captured: Option<(PlotResponse, Rect)> = None; - let _ = ctx.run_ui(raw, |ui| { + let _ = ctx.run_headless(raw, |ui| { let resp = PlotView::new().show(ui, plot); let area = resp.transform.area; captured = Some((resp, area)); @@ -1745,7 +1746,7 @@ mod tests { events, ..screen_input(screen) }; - ctx.run_ui(raw, |ui| { + ctx.run_headless(raw, |ui| { let mut ext = |ui: &mut Ui| { let _ = ui.button("Custom entry"); }; @@ -1796,7 +1797,7 @@ mod tests { raw: egui::RawInput, ) -> (DrawResponse, Rect) { let mut captured: Option<(DrawResponse, Rect)> = None; - let _ = ctx.run_ui(raw, |ui| { + let _ = ctx.run_headless(raw, |ui| { let resp = PlotView::new().show_with_draw( ui, plot, @@ -2530,7 +2531,7 @@ mod tests { raw: egui::RawInput, ) -> (PlotResponse, Rect) { let mut captured: Option<(PlotResponse, Rect)> = None; - let _ = ctx.run_ui(raw, |ui| { + let _ = ctx.run_headless(raw, |ui| { let resp = PlotView::new().show_with_interaction(ui, plot, mode); let area = resp.transform.area; captured = Some((resp, area)); diff --git a/src/widget/print_dialog.rs b/src/widget/print_dialog.rs index bef0e5f..880cf8c 100644 --- a/src/widget/print_dialog.rs +++ b/src/widget/print_dialog.rs @@ -164,6 +164,7 @@ impl PrintDialog { #[cfg(test)] mod tests { use super::*; + use crate::test_util::HeadlessRun; #[test] fn preselected_index_uses_default_when_valid() { @@ -197,7 +198,7 @@ mod tests { fn show_closed_returns_none_without_rendering() { let ctx = egui::Context::default(); let mut dlg = PrintDialog::new(); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { assert!(dlg.show(ui.ctx()).is_none()); }); } @@ -209,14 +210,14 @@ mod tests { let ctx = egui::Context::default(); let mut dlg = PrintDialog::new(); dlg.open_with(Vec::new(), None); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { assert!(dlg.show(ui.ctx()).is_none()); }); assert!(dlg.is_open()); let mut dlg = PrintDialog::new(); dlg.open_with(vec!["Office".into(), "Lab".into()], Some(1)); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { assert!(dlg.show(ui.ctx()).is_none()); }); assert!(dlg.is_open()); diff --git a/src/widget/print_preview.rs b/src/widget/print_preview.rs index d269b42..aa49f12 100644 --- a/src/widget/print_preview.rs +++ b/src/widget/print_preview.rs @@ -562,6 +562,7 @@ impl PrintPreview { #[cfg(test)] mod tests { use super::*; + use crate::test_util::HeadlessRun; fn approx(a: f32, b: f32) { assert!((a - b).abs() < 1e-3, "expected {b}, got {a}"); @@ -731,7 +732,7 @@ mod tests { "comment", CommentPosition::Center, ); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { pv.show(ui.ctx()); }); assert!(pv.is_open()); @@ -742,7 +743,7 @@ mod tests { fn show_closed_is_a_noop() { let ctx = egui::Context::default(); let mut pv = PrintPreview::new(); - let _ = ctx.run_ui(egui::RawInput::default(), |ui| { + let _ = ctx.run_headless(egui::RawInput::default(), |ui| { pv.show(ui.ctx()); }); assert!(!pv.is_open()); diff --git a/src/widget/scene_window.rs b/src/widget/scene_window.rs index 8f3dc92..cb22ea9 100644 --- a/src/widget/scene_window.rs +++ b/src/widget/scene_window.rs @@ -95,7 +95,7 @@ impl SceneWindow { /// interaction and painting. Returns the egui [`Response`] of the scene rect. pub fn show(&mut self, ui: &mut Ui, render_state: &RenderState) -> Response { // Toolbar (top): viewpoint presets + a properties-panel toggle. - egui::Panel::top(ui.id().with("scene_window_toolbar")).show_inside(ui, |ui| { + egui::Panel::top(ui.id().with("scene_window_toolbar")).show(ui, |ui| { ui.horizontal(|ui| { viewpoint_menu(ui, self.view.scene_mut()); ui.checkbox(&mut self.show_properties, "Properties"); @@ -106,7 +106,7 @@ impl SceneWindow { if self.show_properties { egui::Panel::left(ui.id().with("scene_window_properties")) .default_size(PROPERTIES_WIDTH) - .show_inside(ui, |ui| { + .show(ui, |ui| { self.properties.ui(ui, &mut self.view, render_state); }); } @@ -115,13 +115,13 @@ impl SceneWindow { // scene rect it picks against is only known after the central panel lays // out, so the update below feeds the next frame (one-frame lag, the // idiomatic egui immediate-mode trade-off). - egui::Panel::bottom(ui.id().with("scene_window_position_info")).show_inside(ui, |ui| { + egui::Panel::bottom(ui.id().with("scene_window_position_info")).show(ui, |ui| { self.position_info.ui(ui); }); // Scene fills the rest. let response = egui::CentralPanel::default() - .show_inside(ui, |ui| self.view.show(ui)) + .show(ui, |ui| self.view.show(ui)) .inner; // Update the readout from the cursor over the scene (silx diff --git a/tests/alpha_slider_binding.rs b/tests/alpha_slider_binding.rs index 2b8d8c3..ced6270 100644 --- a/tests/alpha_slider_binding.rs +++ b/tests/alpha_slider_binding.rs @@ -23,6 +23,7 @@ use std::rc::Rc; use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ ActiveImageAlphaSlider, AutoscaleMode, Colormap, ImageSpec, ItemHandle, NamedItemAlphaSlider, PlotWidget, @@ -33,7 +34,7 @@ use rsplot::{ /// and the image handle. No frame is rendered — the image-alpha API needs only /// the GPU upload, not the transform. fn plot_with_image(alpha0: f32, legend: Option<&str>) -> (PlotWidget, ItemHandle) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = PlotWidget::new(&rs, 0); let pixels = [1.0f32, 2.0, 3.0, 4.0, 5.0, 6.0]; @@ -134,7 +135,7 @@ type ActiveSliderBundle = ( /// slider's response rect each frame so a drag can target the track. Renders two /// frames so the plot transform is cached. fn active_slider_harness(alpha0: f32, with_image: bool) -> ActiveSliderBundle { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = PlotWidget::new(&rs, 0); if with_image { @@ -233,7 +234,7 @@ fn dragging_the_active_image_slider_writes_alpha_back_to_the_image() { #[test] fn named_item_slider_binds_by_legend_and_disables_for_unknown() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = PlotWidget::new(&rs, 0); let pixels = [1.0f32, 2.0, 3.0, 4.0, 5.0, 6.0]; diff --git a/tests/compare_auto.rs b/tests/compare_auto.rs index e88520e..de76ac5 100644 --- a/tests/compare_auto.rs +++ b/tests/compare_auto.rs @@ -15,6 +15,7 @@ use std::rc::Rc; use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Colormap, CompareAlignment, CompareImages}; /// A sum of Gaussian blobs at distinct positions/scales — a SIFT-friendly @@ -66,7 +67,7 @@ fn harness_auto( a: Vec, b: Vec, ) -> (Rc>, Harness<'static>) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut view = CompareImages::new(&rs, 0); diff --git a/tests/compare_separator.rs b/tests/compare_separator.rs index 592e7d1..e3d2eb5 100644 --- a/tests/compare_separator.rs +++ b/tests/compare_separator.rs @@ -15,6 +15,7 @@ use std::rc::Rc; use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Colormap, CompareImages, CompareMode, YAxis}; /// Build a harness around a `CompareImages` in the given mode, render two frames @@ -24,7 +25,7 @@ use rsplot::{Colormap, CompareImages, CompareMode, YAxis}; /// position is valid and the composite is well-defined; the exact pixel values /// do not matter — only that the separator maps to `split`. fn harness_for(mode: CompareMode) -> (Rc>, Harness<'static>) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut view = CompareImages::new(&rs, 0); diff --git a/tests/complex_amplitude_controls.rs b/tests/complex_amplitude_controls.rs index 001b2c1..5e90312 100644 --- a/tests/complex_amplitude_controls.rs +++ b/tests/complex_amplitude_controls.rs @@ -17,6 +17,7 @@ use egui_kittest::Harness; use egui_kittest::kittest::Queryable; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ComplexImageView, ComplexMode}; /// A `ComplexImageView` over a 2×2 complex field whose maximum modulus is @@ -25,7 +26,7 @@ use rsplot::{ComplexImageView, ComplexMode}; /// once before the first frame. Returns the shared view, the captured controls /// rect is not needed (widgets are queried by accesskit). fn view_harness() -> (Rc>, Harness<'static>) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut view = ComplexImageView::new(&rs, 0); // max |z| = |(3,4)| = 5.0; the rest are smaller. diff --git a/tests/curve_caps_joins.rs b/tests/curve_caps_joins.rs index d582e01..11f8bb7 100644 --- a/tests/curve_caps_joins.rs +++ b/tests/curve_caps_joins.rs @@ -16,6 +16,7 @@ use std::rc::Rc; use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32, Pos2}; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{CurveSpec, PlotWidget, YAxis}; const W: usize = 400; @@ -35,7 +36,7 @@ fn is_red(px: [u8; 4]) -> bool { /// returning the raw RGBA framebuffer and the `data_to_pixel` projection of each /// `probe` data point (the cached display transform after rendering). fn render_curve(x: &[f64], y: &[f64], probes: &[(f64, f64)]) -> (Vec, Vec) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = PlotWidget::new(&rs, 0); diff --git a/tests/default_colormap_gray.rs b/tests/default_colormap_gray.rs index 0fcccc2..4f035f7 100644 --- a/tests/default_colormap_gray.rs +++ b/tests/default_colormap_gray.rs @@ -6,11 +6,12 @@ //! (real or software). use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Colormap, ColormapName, Normalization, Plot2D, PlotWidget}; #[test] fn plot_default_image_colormap_is_gray_linear() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let plot = PlotWidget::new(&rs, 0); diff --git a/tests/fit_action_flow.rs b/tests/fit_action_flow.rs index 42114d3..813e92a 100644 --- a/tests/fit_action_flow.rs +++ b/tests/fit_action_flow.rs @@ -8,6 +8,7 @@ use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{FitWidget, Plot1D}; /// A plot showing a straight line over x = 0..100, zoomed to [20, 40]. @@ -22,7 +23,7 @@ fn zoomed_line_plot(rs: &egui_wgpu::RenderState) -> (Plot1D, rsplot::ItemHandle) #[test] fn fit_target_seeds_range_from_visible_x_window() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let (plot, handle) = zoomed_line_plot(&rs); let mut fit = FitWidget::new(&rs, 1); @@ -45,7 +46,7 @@ fn fit_target_seeds_range_from_visible_x_window() { #[test] fn fit_overlay_appears_updates_in_place_and_hides_without_result() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let (mut plot, handle) = zoomed_line_plot(&rs); let mut fit = FitWidget::new(&rs, 1); diff --git a/tests/image_alpha_map.rs b/tests/image_alpha_map.rs index 307b480..4e86cdb 100644 --- a/tests/image_alpha_map.rs +++ b/tests/image_alpha_map.rs @@ -23,6 +23,7 @@ use std::rc::Rc; use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Colormap, ImageSpec, PlotWidget, YAxis}; const W: usize = 400; @@ -70,7 +71,7 @@ fn render(alpha_map: Option>) -> (u32, u32) { /// (the `(-1, 2)` levels keep the uniform `0.5` texel at the mid teal, so the /// detector is unchanged and only the alpha map's survival is under test). fn render_after(alpha_map: Option>, relevel: Option<(f64, f64)>) -> (u32, u32) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = PlotWidget::new(&rs, 0); diff --git a/tests/image_stack_lazy.rs b/tests/image_stack_lazy.rs index 43c5bbd..1af7559 100644 --- a/tests/image_stack_lazy.rs +++ b/tests/image_stack_lazy.rs @@ -19,6 +19,7 @@ use egui_kittest::Harness; use egui_kittest::kittest::Queryable; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Frame, FrameLoader, ImageStack}; /// Synthesise a `width×height` ramp frame from a `"WxH"` source string, or @@ -94,7 +95,7 @@ fn harness_lazy( loader: Arc, sources: Vec, ) -> (Rc>, Harness<'static>) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut stack = ImageStack::new(&rs, 0); @@ -190,7 +191,7 @@ fn lazy_load_failure_is_terminal_and_not_retried() { #[test] fn prefetch_loads_neighbours_without_navigating() { let loader = Arc::new(CountingLoader::new()); - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut stack = ImageStack::new(&rs, 0); @@ -234,7 +235,7 @@ fn prefetch_loads_neighbours_without_navigating() { #[test] fn lazy_table_shows_urls_and_remove_realigns() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut stack = ImageStack::new(&rs, 0); diff --git a/tests/limits_history_lifecycle.rs b/tests/limits_history_lifecycle.rs index 1cfe361..6f5771b 100644 --- a/tests/limits_history_lifecycle.rs +++ b/tests/limits_history_lifecycle.rs @@ -7,11 +7,12 @@ //! Needs a GPU (real or software); mirrors `tests/roi_events.rs`' harness. use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Plot1D, PlotInteractionMode}; #[test] fn entering_zoom_mode_clears_limits_history() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = Plot1D::new(&rs, 0); diff --git a/tests/log_aspect_toggle.rs b/tests/log_aspect_toggle.rs index 75257eb..d2eb3f7 100644 --- a/tests/log_aspect_toggle.rs +++ b/tests/log_aspect_toggle.rs @@ -12,10 +12,11 @@ use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; use rsplot::Plot1D; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; #[test] fn y_log_toggle_snaps_to_positive_data_range() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = Plot1D::new(&rs, 0); @@ -36,7 +37,7 @@ fn y_log_toggle_snaps_to_positive_data_range() { #[test] fn x_log_toggle_with_no_positive_data_lands_on_1_100() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = Plot1D::new(&rs, 0); @@ -53,7 +54,7 @@ fn x_log_toggle_with_no_positive_data_lands_on_1_100() { #[test] fn keep_aspect_toggle_forces_reset_zoom_once() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = Plot1D::new(&rs, 0); diff --git a/tests/marker_symbols_render.rs b/tests/marker_symbols_render.rs index c731ba6..9370739 100644 --- a/tests/marker_symbols_render.rs +++ b/tests/marker_symbols_render.rs @@ -19,6 +19,7 @@ use std::rc::Rc; use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32, Pos2}; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{PlotWidget, Symbol, YAxis}; const W: usize = 400; @@ -36,7 +37,7 @@ fn is_red(px: [u8; 4]) -> bool { /// the `data_to_pixel` projection of each marker center (the cached display /// transform after rendering). fn render_markers(markers: &[(Symbol, f64, f64)]) -> (Vec, Vec) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = PlotWidget::new(&rs, 0); diff --git a/tests/mask_pointer_offset.rs b/tests/mask_pointer_offset.rs index e79f99f..dacbd22 100644 --- a/tests/mask_pointer_offset.rs +++ b/tests/mask_pointer_offset.rs @@ -17,6 +17,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Colormap, MaskTool, MaskToolsWidget, Plot2D, PlotInteractionMode, Transform, egui}; use std::cell::RefCell; use std::rc::Rc; @@ -143,7 +144,7 @@ fn pencil_paints_under_the_click_not_left_of_it() { } fn run_case(ppp: f32) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let app = Rc::new(RefCell::new(App::new(&rs))); @@ -283,7 +284,7 @@ fn overlay_aligns_with_chrome_in_mirror_of_example() { // Retina ppp (the reporter's display): the overlay drift only surfaced at // ppp != 1.0 in the toolbar-overflow regime. let ppp = 2.0f32; - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let app = Rc::new(RefCell::new(MirrorApp::new(&rs))); @@ -381,7 +382,7 @@ fn overlay_aligns_with_chrome_in_mirror_of_example() { /// previously never drove the shape-draw path, so shapes were invisible). #[test] fn rectangle_tool_masks_the_dragged_region() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let app = Rc::new(RefCell::new(App::new(&rs))); diff --git a/tests/median_filter_original.rs b/tests/median_filter_original.rs index 7536436..12c0e19 100644 --- a/tests/median_filter_original.rs +++ b/tests/median_filter_original.rs @@ -9,6 +9,7 @@ use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; use rsplot::actions::analysis::median_filter_2d; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{AutoscaleMode, Colormap, ImageSpec, ItemHandle, PlotWidget}; const W: usize = 5; @@ -25,7 +26,7 @@ fn hot_pixel_data() -> Vec { } fn plot_with_image(data: &[f64]) -> (PlotWidget, ItemHandle) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = PlotWidget::new(&rs, 0); let pixels: Vec = data.iter().map(|&v| v as f32).collect(); diff --git a/tests/multi_axis_render.rs b/tests/multi_axis_render.rs index 9b0dee5..c3526f6 100644 --- a/tests/multi_axis_render.rs +++ b/tests/multi_axis_render.rs @@ -16,6 +16,7 @@ use std::rc::Rc; use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32}; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{AxisSide, Plot1D, YAxis}; fn count_red(raw: &[u8]) -> u32 { @@ -29,7 +30,7 @@ fn count_red(raw: &[u8]) -> u32 { /// range `[100, 200]`; otherwise it stays on the left axis pinned to `[0, 1]`. /// Returns the red pixel count. fn render(bind_extra: bool) -> u32 { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = Plot1D::new(&rs, 0); @@ -69,7 +70,7 @@ fn render(bind_extra: bool) -> u32 { #[test] fn extra_axis_api_autoscales_and_toggles() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = Plot1D::new(&rs, 0); diff --git a/tests/position_info_snap.rs b/tests/position_info_snap.rs index bb3ef3e..f3d75b3 100644 --- a/tests/position_info_snap.rs +++ b/tests/position_info_snap.rs @@ -18,6 +18,7 @@ use std::rc::Rc; use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{PlotWidget, SnappingMode}; /// A `PlotWidget` populated by `build`, rendered twice through the kittest+wgpu @@ -36,7 +37,7 @@ fn plot_rendered_at( pixels_per_point: f32, build: impl FnOnce(&mut PlotWidget), ) -> (Rc>, Harness<'static>) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = PlotWidget::new(&rs, 0); build(&mut plot); @@ -327,7 +328,7 @@ fn snap_radius_scales_with_pixels_per_point() { fn uncached_transform_yields_no_snap() { // A widget that has never rendered has no cached transform, so data→pixel // projection fails and snapping returns None rather than panicking. - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = PlotWidget::new(&rs, 0); let xs: Vec = (0..=10).map(|i| i as f64).collect(); diff --git a/tests/reset_zoom_defaults.rs b/tests/reset_zoom_defaults.rs index e1e67ab..579ac96 100644 --- a/tests/reset_zoom_defaults.rs +++ b/tests/reset_zoom_defaults.rs @@ -10,11 +10,12 @@ use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Plot1D, YAxis}; #[test] fn right_axis_only_plot_refits_on_reset() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = Plot1D::new(&rs, 0); @@ -39,7 +40,7 @@ fn right_axis_only_plot_refits_on_reset() { #[test] fn itemless_reset_lands_on_silx_home_view() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = Plot1D::new(&rs, 0); diff --git a/tests/roi_band_unbounded_render.rs b/tests/roi_band_unbounded_render.rs index 0ad26e6..5388280 100644 --- a/tests/roi_band_unbounded_render.rs +++ b/tests/roi_band_unbounded_render.rs @@ -26,6 +26,7 @@ use std::rc::Rc; use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32}; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ManagedRoi, PlotWidget, Roi, RoiInteractionMode, YAxis}; const W: usize = 400; @@ -51,7 +52,7 @@ fn red_columns(raw: &[u8]) -> Vec { /// rejects stray anti-aliased specks so the column reflects a real thick line or /// edge. Leftmost is `W` (sentinel, past the right edge) when nothing qualifies. fn render(mode: RoiInteractionMode) -> (usize, u32) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = PlotWidget::new(&rs, 0); diff --git a/tests/roi_events.rs b/tests/roi_events.rs index ce718fd..00341c1 100644 --- a/tests/roi_events.rs +++ b/tests/roi_events.rs @@ -5,6 +5,7 @@ //! API and the events it pushes are asserted. use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{PlotEvent, PlotWidget, Roi, RoiInteractionMode}; fn rect(x: f64) -> Roi { @@ -26,7 +27,7 @@ fn arc() -> Roi { #[test] fn remove_roi_emits_about_to_be_removed_before_removal() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut plot = PlotWidget::new(&rs, 0); assert_eq!(plot.add_roi(rect(0.0)), 0); @@ -53,7 +54,7 @@ fn remove_roi_emits_about_to_be_removed_before_removal() { #[test] fn clear_rois_emits_rois_cleared() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut plot = PlotWidget::new(&rs, 0); plot.add_roi(rect(0.0)); plot.add_roi(rect(2.0)); @@ -70,7 +71,7 @@ fn clear_rois_emits_rois_cleared() { #[test] fn save_then_load_round_trips_rois_through_the_widget() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut plot = PlotWidget::new(&rs, 0); plot.add_roi(rect(0.0)); plot.add_roi(rect(2.0)); @@ -114,7 +115,7 @@ fn save_then_load_round_trips_rois_through_the_widget() { #[test] fn set_roi_interaction_mode_switches_mode_and_emits_event() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut plot = PlotWidget::new(&rs, 0); plot.add_roi(arc()); plot.drain_events(); @@ -160,7 +161,7 @@ fn set_roi_interaction_mode_switches_mode_and_emits_event() { #[test] fn remove_roi_out_of_range_emits_nothing() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut plot = PlotWidget::new(&rs, 0); plot.add_roi(rect(0.0)); plot.drain_events(); diff --git a/tests/roi_manager_render.rs b/tests/roi_manager_render.rs index a4a2dd3..ce727c7 100644 --- a/tests/roi_manager_render.rs +++ b/tests/roi_manager_render.rs @@ -22,6 +22,7 @@ use egui_kittest::Harness; use egui_kittest::kittest::Queryable; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{PlotWidget, Roi}; const W: f32 = 360.0; @@ -39,7 +40,7 @@ fn rect_desc(x: (f64, f64), y: (f64, f64)) -> String { #[test] fn roi_manager_table_renders_rows_and_click_makes_current() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); // Two ROIs at distinct positions → distinct geometry labels, so each row's diff --git a/tests/ruler.rs b/tests/ruler.rs index 46db892..1dbf618 100644 --- a/tests/ruler.rs +++ b/tests/ruler.rs @@ -14,13 +14,14 @@ use std::rc::Rc; use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{PlotInteractionMode, PlotWidget, Roi, RoiDrawKind, RulerToolButton, YAxis}; /// Build a harness around a bare `PlotWidget` with a fixed data range /// (x,y ∈ [0,10]) so data↔pixel mapping is deterministic, render two frames so /// the transform is cached, and return the shared widget + harness. fn harness() -> (Rc>, Harness<'static>) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut plot = PlotWidget::new(&rs, 0); diff --git a/tests/scalar_field_pick.rs b/tests/scalar_field_pick.rs index ba3b437..8bad35e 100644 --- a/tests/scalar_field_pick.rs +++ b/tests/scalar_field_pick.rs @@ -7,6 +7,7 @@ use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{CameraFace, FieldPickItem, ScalarFieldView, Vec3}; const N: usize = 5; @@ -33,7 +34,7 @@ fn ramp_z() -> Vec { /// `RenderState` — needed only to build/upload the geometry here — need not /// outlive this helper. fn front_field_view(id: u64, cut_z: f32, visible: bool) -> ScalarFieldView { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut view = ScalarFieldView::new(&rs, id); assert!( view.set_data(&rs, &ramp_z(), N, N, N), @@ -90,7 +91,7 @@ fn pick_on_an_isosurface_reports_the_isosurface_item() { // R3-11: with the cut plane hidden and a single iso-surface at level 2 over // the z-ramp, the front-view centre ray crosses the surface, so the pick // names the Isosurface item — the other silx Item-field label. - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut view = ScalarFieldView::new(&rs, 40); assert!( view.set_data(&rs, &ramp_z(), N, N, N), diff --git a/tests/scalar_field_properties_render.rs b/tests/scalar_field_properties_render.rs index 7d2cede..73a0b77 100644 --- a/tests/scalar_field_properties_render.rs +++ b/tests/scalar_field_properties_render.rs @@ -9,6 +9,7 @@ use egui_kittest::kittest::Queryable; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ScalarFieldProperties, ScalarFieldView}; use std::cell::RefCell; use std::rc::Rc; @@ -59,7 +60,7 @@ impl PanelApp { #[test] fn scalar_field_properties_panel_drives_the_view() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(PanelApp::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs.clone()); diff --git a/tests/scalar_field_view_render.rs b/tests/scalar_field_view_render.rs index 22ad745..c150735 100644 --- a/tests/scalar_field_view_render.rs +++ b/tests/scalar_field_view_render.rs @@ -17,6 +17,7 @@ use rsplot::ScalarFieldView; use rsplot::egui; use rsplot::egui::Color32; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use std::cell::RefCell; use std::rc::Rc; @@ -71,7 +72,7 @@ impl IsoApp { #[test] fn scalar_field_view_renders_isosurface_and_clear_removes_it() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(IsoApp::new(&rs))); // Clone the render state so the test body can still rebuild geometry after // the renderer takes ownership (both handles share the same GPU + renderer). @@ -107,7 +108,7 @@ fn scalar_field_view_renders_isosurface_and_clear_removes_it() { #[test] fn scalar_field_view_frames_camera_only_on_first_set_data() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut view = ScalarFieldView::new(&rs, 6); assert!( diff --git a/tests/scatter_profile.rs b/tests/scatter_profile.rs index 987c010..41036c8 100644 --- a/tests/scatter_profile.rs +++ b/tests/scatter_profile.rs @@ -14,6 +14,7 @@ use std::rc::Rc; use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Colormap, ScatterView, YAxis}; /// A triangle of scattered points carrying the affine field `v = x + 2y`, plus a @@ -28,7 +29,7 @@ fn affine_scatter() -> (Vec, Vec, Vec) { #[test] fn show_line_profile_opens_window_for_an_in_hull_segment() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut view = ScatterView::new(&rs, 0); @@ -53,7 +54,7 @@ fn show_line_profile_opens_window_for_an_in_hull_segment() { #[test] fn show_line_profile_is_a_noop_for_an_out_of_hull_segment() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut view = ScatterView::new(&rs, 0); @@ -76,7 +77,7 @@ fn show_line_profile_is_a_noop_for_an_out_of_hull_segment() { #[test] fn show_line_profile_without_data_is_a_noop() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut view = ScatterView::new(&rs, 0); @@ -87,7 +88,7 @@ fn show_line_profile_without_data_is_a_noop() { #[test] fn profile_mode_drag_samples_a_profile_and_opens_the_window() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut view = ScatterView::new(&rs, 0); @@ -153,7 +154,7 @@ fn scatter_view_stats_run_over_the_value_array() { // scatter's *value* array with (x, y) as position axes — not the marker // curve's y positions. Exercises the ScatterView Points-arm retained-data // wiring end-to-end through PlotWidget::feed_all_stats. - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut view = ScatterView::new(&rs, 0); @@ -177,7 +178,7 @@ fn scatter_view_stats_run_over_the_value_array() { #[test] fn disarming_profile_mode_closes_the_window() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut view = ScatterView::new(&rs, 0); diff --git a/tests/scene3d_blend_render.rs b/tests/scene3d_blend_render.rs index 239b74e..0ffdc43 100644 --- a/tests/scene3d_blend_render.rs +++ b/tests/scene3d_blend_render.rs @@ -12,6 +12,7 @@ use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Camera, Scene3dGeometry, Vec3, install_scene3d, set_scene3d, snapshot_scene3d}; const SIZE: (u32, u32) = (100, 100); @@ -41,7 +42,7 @@ fn centre_triangle_verts(z: f32) -> [[f32; 3]; 3] { #[test] fn translucent_triangle_composites_over_the_background() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); install_scene3d(&rs); // A 50 %-alpha blue triangle over screen centre. @@ -70,7 +71,7 @@ fn translucent_triangle_composites_over_the_background() { #[test] fn translucent_mesh_composites_over_the_background() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); install_scene3d(&rs); // A 50 %-alpha blue lit mesh facing the camera over screen centre. diff --git a/tests/scene3d_cutplane_render.rs b/tests/scene3d_cutplane_render.rs index 1df4b55..4157116 100644 --- a/tests/scene3d_cutplane_render.rs +++ b/tests/scene3d_cutplane_render.rs @@ -16,6 +16,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32}; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ Camera, Colormap, ScalarField3D, Scene3dGeometry, Vec3, install_scene3d, paint_scene3d, set_scene3d, @@ -86,7 +87,7 @@ impl App { #[test] fn scene3d_cutplane_renders_colormapped_slice() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(App::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs); diff --git a/tests/scene3d_fog_render.rs b/tests/scene3d_fog_render.rs index e3b0404..36117ec 100644 --- a/tests/scene3d_fog_render.rs +++ b/tests/scene3d_fog_render.rs @@ -8,6 +8,7 @@ use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ Camera, Scene3dFog, Scene3dGeometry, Scene3dShading, Vec3, install_scene3d, set_scene3d, snapshot_scene3d, snapshot_scene3d_with, @@ -36,7 +37,7 @@ fn centre_pixel(rgba: &[u8]) -> (u8, u8, u8) { #[test] fn linear_fog_fades_far_geometry_toward_background() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); install_scene3d(&rs); // A red triangle at the FAR side of the unit-cube bounds (z = -1; camera z @@ -84,7 +85,7 @@ fn linear_fog_fades_far_geometry_toward_background() { #[test] fn specular_term_activates_with_shininess() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); install_scene3d(&rs); // A dark lit mesh facing the camera: normal (0,0,1) reflects the headlight diff --git a/tests/scene3d_image_render.rs b/tests/scene3d_image_render.rs index 2968298..0b8b382 100644 --- a/tests/scene3d_image_render.rs +++ b/tests/scene3d_image_render.rs @@ -19,6 +19,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32}; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ Camera, ImageInterpolation, Scene3dGeometry, Scene3dImageLayer, Vec3, install_scene3d, paint_scene3d, set_scene3d, @@ -90,7 +91,7 @@ impl App { #[test] fn scene3d_image_quad_projects_its_texels() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(App::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs); @@ -214,7 +215,7 @@ impl DepthHoleApp { #[test] fn transparent_front_texel_does_not_occlude_geometry_behind() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(DepthHoleApp::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs); diff --git a/tests/scene3d_isosurface_render.rs b/tests/scene3d_isosurface_render.rs index 9c6b5bd..6898bca 100644 --- a/tests/scene3d_isosurface_render.rs +++ b/tests/scene3d_isosurface_render.rs @@ -14,6 +14,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32}; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ Camera, DEFAULT_ISOSURFACE_COLOR, ScalarField3D, Scene3dGeometry, Vec3, install_scene3d, paint_scene3d, set_scene3d, @@ -76,7 +77,7 @@ impl App { #[test] fn scene3d_isosurface_renders_lit_gold_cube() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(App::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs); diff --git a/tests/scene3d_mesh_render.rs b/tests/scene3d_mesh_render.rs index 44a24f4..7baebf4 100644 --- a/tests/scene3d_mesh_render.rs +++ b/tests/scene3d_mesh_render.rs @@ -19,6 +19,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32}; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Camera, Scene3dGeometry, Vec3, install_scene3d, paint_scene3d, set_scene3d}; use std::cell::RefCell; use std::rc::Rc; @@ -75,7 +76,7 @@ impl App { #[test] fn scene3d_mesh_is_shaded_by_its_normal() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(App::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs); diff --git a/tests/scene3d_overview_render.rs b/tests/scene3d_overview_render.rs index c6a808b..d674b09 100644 --- a/tests/scene3d_overview_render.rs +++ b/tests/scene3d_overview_render.rs @@ -6,6 +6,7 @@ //! `setOrientationIndicatorVisible` (`:320-336`). use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{OVERVIEW_SIZE_PX, SceneWidget}; const W: u32 = 300; @@ -25,7 +26,7 @@ fn diff_pixels(a: &[u8], b: &[u8], width: u32) -> Vec<(u32, u32)> { #[test] fn indicator_is_on_by_default_and_toggles() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut w = SceneWidget::new(&rs, 61); // silx viewports = [viewport, overview] by default (Plot3DWidget.py:165). assert!(w.is_orientation_indicator_visible()); @@ -37,7 +38,7 @@ fn indicator_is_on_by_default_and_toggles() { #[test] fn indicator_draws_only_in_the_top_right_corner() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut w = SceneWidget::new(&rs, 62); let on = w.snapshot(&rs, (W, H)).expect("snapshot"); w.set_orientation_indicator_visible(false); @@ -73,7 +74,7 @@ fn indicator_draws_only_in_the_top_right_corner() { #[test] fn indicator_skipped_when_target_smaller_than_its_viewport() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut w = SceneWidget::new(&rs, 63); let small = (OVERVIEW_SIZE_PX - 20, OVERVIEW_SIZE_PX - 20); let on = w.snapshot(&rs, small).expect("snapshot"); diff --git a/tests/scene3d_points_render.rs b/tests/scene3d_points_render.rs index 1bc02c8..c01185a 100644 --- a/tests/scene3d_points_render.rs +++ b/tests/scene3d_points_render.rs @@ -20,6 +20,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32}; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ Camera, PointMarker, Scene3dGeometry, Vec3, install_scene3d, paint_scene3d, set_scene3d, }; @@ -83,7 +84,7 @@ impl App { #[test] fn scene3d_renders_sized_billboard_point_markers() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(App::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs); diff --git a/tests/scene3d_render.rs b/tests/scene3d_render.rs index 8d66479..161a491 100644 --- a/tests/scene3d_render.rs +++ b/tests/scene3d_render.rs @@ -24,6 +24,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32}; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Camera, Scene3dGeometry, Vec3, install_scene3d, paint_scene3d, set_scene3d}; use std::cell::RefCell; use std::rc::Rc; @@ -99,7 +100,7 @@ impl App { #[test] fn scene3d_renders_depth_tested_geometry_and_lines() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(App::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs); diff --git a/tests/scene3d_scatter2d_render.rs b/tests/scene3d_scatter2d_render.rs index bea746b..4a10258 100644 --- a/tests/scene3d_scatter2d_render.rs +++ b/tests/scene3d_scatter2d_render.rs @@ -15,6 +15,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32}; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ Camera, Colormap, ColormapName, Scatter2D, Scatter2DVisualization, Scene3dGeometry, Vec3, install_scene3d, paint_scene3d, set_scene3d, @@ -74,7 +75,7 @@ impl App { /// Render one Scatter2D visualization mode and return the count of non-black /// (rendered-content) pixels inside the scene rect. fn coloured_pixels(mode: Scatter2DVisualization) -> usize { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(App::new(&rs, mode))); let renderer = WgpuTestRenderer::from_render_state(rs); diff --git a/tests/scene3d_textured_mesh_render.rs b/tests/scene3d_textured_mesh_render.rs index 6356479..8a2e63b 100644 --- a/tests/scene3d_textured_mesh_render.rs +++ b/tests/scene3d_textured_mesh_render.rs @@ -23,6 +23,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui::{self, Color32}; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ Camera, ImageInterpolation, Scene3dGeometry, Scene3dTexturedMesh, Vec3, install_scene3d, paint_scene3d, set_scene3d, @@ -96,7 +97,7 @@ impl App { #[test] fn scene3d_textured_mesh_interpolates_uvs_over_a_triangle() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(App::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs); diff --git a/tests/scene_pick.rs b/tests/scene_pick.rs index 9bd1047..3f41c14 100644 --- a/tests/scene_pick.rs +++ b/tests/scene_pick.rs @@ -7,6 +7,7 @@ use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ CameraFace, ImageInterpolation, PointMarker, Scatter2D, Scatter2DVisualization, Scatter3D, Scene3dGeometry, Scene3dImageLayer, Scene3dTexturedMesh, ScenePickKind, SceneWidget, Vec3, @@ -44,7 +45,7 @@ fn cut_plane_quad(z: f32) -> Scene3dTexturedMesh { /// CPU geometry + camera, so the `RenderState` (only needed to install the scene /// resources at construction) need not outlive this helper. fn front_view_widget(id: u64, geometry: Scene3dGeometry) -> SceneWidget { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut w = SceneWidget::new(&rs, id); w.set_geometry(&rs, geometry); w.set_viewpoint(CameraFace::Front); // look along -Z through the box centre diff --git a/tests/scene_snapshot_render.rs b/tests/scene_snapshot_render.rs index df41438..7a4e556 100644 --- a/tests/scene_snapshot_render.rs +++ b/tests/scene_snapshot_render.rs @@ -9,6 +9,7 @@ use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; use rsplot::ScalarFieldView; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; use rsplot::encode_png; fn blob() -> Vec { @@ -34,7 +35,7 @@ fn count_magenta(raw: &[u8], iw: usize, ih: usize) -> usize { #[test] fn snapshot_captures_isosurface_and_encodes_png() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut view = ScalarFieldView::new(&rs, 7); assert!( view.set_data(&rs, &blob(), 5, 5, 5), @@ -68,7 +69,7 @@ fn snapshot_captures_isosurface_and_encodes_png() { #[test] fn snapshot_size_tracks_requested_pixels() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut view = ScalarFieldView::new(&rs, 8); assert!(view.set_data(&rs, &blob(), 5, 5, 5), "valid data"); view.add_isosurface(&rs, 0.5, Color32::from_rgb(255, 0, 255)); diff --git a/tests/scene_style.rs b/tests/scene_style.rs index 17c5cdd..655d045 100644 --- a/tests/scene_style.rs +++ b/tests/scene_style.rs @@ -8,10 +8,11 @@ use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; use rsplot::SceneWidget; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; #[test] fn default_style_matches_silx() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let w = SceneWidget::new(&rs, 41); // silx background (0.2, 0.2, 0.2, 1.0) → grey 51, not the previous grey 30. assert_eq!(w.background(), Color32::from_gray(51)); @@ -22,7 +23,7 @@ fn default_style_matches_silx() { #[test] fn foreground_and_text_color_setters_round_trip() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut w = SceneWidget::new(&rs, 42); w.set_foreground_color(&rs, Color32::from_rgb(10, 20, 30)); assert_eq!(w.foreground_color(), Color32::from_rgb(10, 20, 30)); @@ -37,7 +38,7 @@ fn foreground_and_text_color_setters_round_trip() { fn axes_labels_default_empty_and_update_selectively() { // silx `setAxesLabels(xlabel=None, ...)` leaves unset axes unchanged // (items/core.py:702-717); Text2D labels default to empty strings. - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut w = SceneWidget::new(&rs, 43); assert_eq!(w.axes_labels(), ("", "", "")); w.set_axes_labels(Some("X (mm)"), None, Some("Z")); diff --git a/tests/scene_viewpoint_render.rs b/tests/scene_viewpoint_render.rs index dfa9d5e..adcbd06 100644 --- a/tests/scene_viewpoint_render.rs +++ b/tests/scene_viewpoint_render.rs @@ -14,6 +14,7 @@ use egui_kittest::kittest::Queryable; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{CameraFace, SceneWidget, Vec3, viewpoint_menu}; use std::cell::RefCell; use std::rc::Rc; @@ -39,7 +40,7 @@ fn expected_offset(face: CameraFace) -> Vec3 { #[test] fn viewpoint_presets_orient_camera_along_expected_axis() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut scene = SceneWidget::new(&rs, 0); scene.set_bounds(&rs, UNIT); let center = scene.center(); @@ -68,7 +69,7 @@ fn viewpoint_presets_orient_camera_along_expected_axis() { fn fresh_scene_opens_on_the_front_view_like_silx() { // silx's viewport camera opens face-on down -Z (viewport.py:221-223, // camera.py:50): eye on the +Z side, not the (1,1,1) 'side' three-quarter. - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut scene = SceneWidget::new(&rs, 7); scene.set_bounds(&rs, UNIT); let center = scene.center(); @@ -83,7 +84,7 @@ fn fresh_scene_opens_on_the_front_view_like_silx() { #[test] fn rotate_scene_orbits_around_the_center_preserving_radius() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut scene = SceneWidget::new(&rs, 1); scene.set_bounds(&rs, UNIT); let center = scene.center(); @@ -126,7 +127,7 @@ impl MenuApp { #[test] fn viewpoint_menu_click_reorients_the_camera() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(MenuApp::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs.clone()); diff --git a/tests/scene_widget_render.rs b/tests/scene_widget_render.rs index ed76c44..fb2d120 100644 --- a/tests/scene_widget_render.rs +++ b/tests/scene_widget_render.rs @@ -13,6 +13,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsplot::egui; use rsplot::egui::Color32; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{Box3D, Scene3dGeometry, SceneWidget, Vec3}; use std::cell::RefCell; use std::rc::Rc; @@ -65,7 +66,7 @@ fn classify(raw: &[u8], iw: usize, ih: usize) -> (usize, usize, usize, usize) { #[test] fn scene_widget_renders_axes_and_orbits_on_drag() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(App::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs); @@ -162,7 +163,7 @@ impl ContentApp { #[test] fn scene_widget_forwards_and_renders_content_mesh() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(ContentApp::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs); diff --git a/tests/scene_window_render.rs b/tests/scene_window_render.rs index d24ac90..2e46bef 100644 --- a/tests/scene_window_render.rs +++ b/tests/scene_window_render.rs @@ -12,6 +12,7 @@ use rsplot::SceneWindow; use rsplot::egui; use rsplot::egui::Color32; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use std::cell::RefCell; use std::rc::Rc; @@ -66,7 +67,7 @@ impl WindowApp { #[test] fn scene_window_composes_toolbar_scene_and_properties() { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(WindowApp::new(&rs))); let renderer = WgpuTestRenderer::from_render_state(rs.clone()); diff --git a/tests/stack_profile_window.rs b/tests/stack_profile_window.rs index 99512c6..4267a79 100644 --- a/tests/stack_profile_window.rs +++ b/tests/stack_profile_window.rs @@ -14,6 +14,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::egui; use rsplot::egui::Color32; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{ Colormap, ProfileLabels, ProfileMethod, ProfileMode, Roi, StackProfileDimension, StackView, YAxis, @@ -39,7 +40,7 @@ fn sample_volume() -> (Vec, [usize; 3]) { /// Build a harness around a `StackView` holding [`sample_volume`], render two /// frames so the transform is cached, and return the shared widget + harness. fn harness() -> (Rc>, Harness<'static>) { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut view = StackView::new(&rs, 0); @@ -347,7 +348,7 @@ fn two_d_profile_requires_a_volume_not_flat_frames() { // In flat-frames mode (`set_stack`, no 3D volume) the 2D stacked profile has // no source, so it produces nothing (silx ImageStack always carries the 3D // array; our flat-frames convenience does not). - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); let mut view = StackView::new(&rs, 0); let frames = vec![vec![1.0f32; 4 * 3], vec![2.0f32; 4 * 3]]; diff --git a/tests/view_limits_repair.rs b/tests/view_limits_repair.rs index 300e7a2..f241b1e 100644 --- a/tests/view_limits_repair.rs +++ b/tests/view_limits_repair.rs @@ -11,13 +11,14 @@ //! Needs a GPU (real or software); mirrors `tests/limits_history_lifecycle.rs`. use egui_kittest::wgpu::{create_render_state, default_wgpu_setup}; +use rsplot::egui_wgpu::RendererOptions; use rsplot::{AxisSide, Plot1D, YAxis}; const F32_SAFE_MAX: f64 = 1e37; const F32_SAFE_MIN: f64 = -1e37; fn widget() -> Plot1D { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); rsplot::install(&rs); Plot1D::new(&rs, 0) } diff --git a/tests/volume_opacity_physics.rs b/tests/volume_opacity_physics.rs index f43cec8..c124790 100644 --- a/tests/volume_opacity_physics.rs +++ b/tests/volume_opacity_physics.rs @@ -27,6 +27,7 @@ use egui_kittest::Harness; use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_setup}; use rsplot::VolumeRaycaster; use rsplot::egui; +use rsplot::egui_wgpu::RendererOptions; use std::cell::RefCell; use std::rc::Rc; use std::sync::Mutex; @@ -63,7 +64,7 @@ fn centre_red(depth: usize, alpha: u8, steps: u32) -> u8 { /// The centre pixel's ray crosses the box through its middle, so its chord is /// the slab's Z extent — `depth / 16` of a unit, by `volume_bounds`. fn centre_rgb(depth: usize, voxel: [u8; 4], steps: u32) -> [u8; 3] { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut view = VolumeRaycaster::new(&rs, 11); view.set_volume(&rs, &slab(depth, voxel), depth, 16, 16); view.set_steps(steps); diff --git a/tests/volume_raycaster_render.rs b/tests/volume_raycaster_render.rs index 4c72576..cb8100a 100644 --- a/tests/volume_raycaster_render.rs +++ b/tests/volume_raycaster_render.rs @@ -9,6 +9,7 @@ use egui_kittest::wgpu::{WgpuTestRenderer, create_render_state, default_wgpu_set use rsplot::VolumeRaycaster; use rsplot::egui; use rsplot::egui_wgpu::RenderState; +use rsplot::egui_wgpu::RendererOptions; use std::cell::RefCell; use std::rc::Rc; use std::sync::Mutex; @@ -61,7 +62,7 @@ impl App { } fn red_pixels_for(rgba: [u8; 4]) -> usize { - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let app = Rc::new(RefCell::new(App::new(&rs, rgba))); let renderer = WgpuTestRenderer::from_render_state(rs); let app_ui = app.clone(); @@ -100,7 +101,7 @@ fn red_pixels_of(rs: &RenderState, view: VolumeRaycaster) -> usize { #[test] fn remove_keeps_the_texture_while_another_same_id_view_lives() { let _gpu = GPU.lock().unwrap_or_else(|e| e.into_inner()); - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut uploader = VolumeRaycaster::new(&rs, 21); uploader.set_volume(&rs, &solid(16, [255, 0, 0, 255]), 16, 16, 16); @@ -122,7 +123,7 @@ fn remove_keeps_the_texture_while_another_same_id_view_lives() { #[test] fn dropping_the_last_view_frees_the_texture() { let _gpu = GPU.lock().unwrap_or_else(|e| e.into_inner()); - let rs = create_render_state(default_wgpu_setup()); + let rs = create_render_state(default_wgpu_setup(), RendererOptions::default()); let mut uploader = VolumeRaycaster::new(&rs, 22); uploader.set_volume(&rs, &solid(16, [255, 0, 0, 255]), 16, 16, 16); From 45b4a1965fa8450e7ffbc335578b82fca60dc9ca Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Wed, 14 Oct 2026 16:52:35 +0900 Subject: [PATCH 02/13] chore: convert constant-size chunks_exact to as_chunks rustc 1.98 clippy adds chunks_exact_to_as_chunks (MSRV-gated on as_chunks, stable since 1.88), so -D warnings fails on every constant-size chunks_exact at the old MSRV too. Runtime-sized calls (elem_size, rows) are not flagged and stay. --- .../src/data_plugins/epics_plugins/pva_codec.rs | 2 +- .../data_plugins/epics_plugins/pva_plugin.rs | 12 ++++++++---- rsdm/tests/composite_z_order_render.rs | 2 +- rsdm/tests/widget_array_plots_render.rs | 4 +++- rsdm/tests/widget_byte_render.rs | 2 +- rsdm/tests/widget_drawing_render.rs | 4 +++- rsdm/tests/widget_event_plot_render.rs | 4 +++- rsdm/tests/widget_image_view_render.rs | 4 +++- rsdm/tests/widget_justified_fill.rs | 14 +++++++++----- rsdm/tests/widget_multi_state_render.rs | 4 +++- rsdm/tests/widget_plot_style_render.rs | 4 +++- rsdm/tests/widget_scale_indicator_render.rs | 4 +++- rsdm/tests/widget_symbol_render.rs | 4 +++- rsdm/tests/widget_time_plot_render.rs | 4 +++- rsdm/tests/widget_waveform_table_render.rs | 4 +++- src/core/fitting.rs | 6 ++++-- src/core/roi_io.rs | 2 +- src/core/scene3d/marching_cubes.rs | 8 ++++++-- src/render/gpu_scene3d.rs | 4 ++-- src/render/save.rs | 17 +++++++++++++---- src/render/scene3d_items.rs | 14 +++++++++----- src/render/volume_raycaster.rs | 4 +++- src/widget/scene_widget.rs | 4 +++- tests/image_alpha_map.rs | 2 +- tests/multi_axis_render.rs | 4 +++- tests/roi_band_unbounded_render.rs | 2 +- tests/scene3d_overview_render.rs | 6 ++++-- 27 files changed, 100 insertions(+), 45 deletions(-) diff --git a/rsdm/src/data_plugins/epics_plugins/pva_codec.rs b/rsdm/src/data_plugins/epics_plugins/pva_codec.rs index fa3aa06..08a5c55 100644 --- a/rsdm/src/data_plugins/epics_plugins/pva_codec.rs +++ b/rsdm/src/data_plugins/epics_plugins/pva_codec.rs @@ -909,7 +909,7 @@ mod tests { .expect("encode rgb jpeg"); let out = decompress("jpeg", &stream, rgb.len(), 1).unwrap(); assert!( - out.chunks_exact(3).all(|p| p[0].abs_diff(10) <= 8 + out.as_chunks::<3>().0.iter().all(|p| p[0].abs_diff(10) <= 8 && p[1].abs_diff(200) <= 8 && p[2].abs_diff(60) <= 8), "rgb pixels off by more than 8" diff --git a/rsdm/src/data_plugins/epics_plugins/pva_plugin.rs b/rsdm/src/data_plugins/epics_plugins/pva_plugin.rs index 06650d2..4c731e8 100644 --- a/rsdm/src/data_plugins/epics_plugins/pva_plugin.rs +++ b/rsdm/src/data_plugins/epics_plugins/pva_plugin.rs @@ -839,15 +839,19 @@ fn decoded_bytes_to_pv( NdElemKind::U64 => ints(|c| u64::from_le_bytes(c.try_into().expect("8B")) as i64), NdElemKind::F32 => PvValue::FloatArray( bytes - .chunks_exact(4) - .map(|c| f64::from(f32::from_le_bytes(c.try_into().expect("4B")))) + .as_chunks::<4>() + .0 + .iter() + .map(|c| f64::from(f32::from_le_bytes(*c))) .collect::>() .into(), ), NdElemKind::F64 => PvValue::FloatArray( bytes - .chunks_exact(8) - .map(|c| f64::from_le_bytes(c.try_into().expect("8B"))) + .as_chunks::<8>() + .0 + .iter() + .map(|c| f64::from_le_bytes(*c)) .collect::>() .into(), ), diff --git a/rsdm/tests/composite_z_order_render.rs b/rsdm/tests/composite_z_order_render.rs index 4c877f1..f61c328 100644 --- a/rsdm/tests/composite_z_order_render.rs +++ b/rsdm/tests/composite_z_order_render.rs @@ -23,7 +23,7 @@ use rsplot::egui_wgpu::RendererOptions; fn black_over_red(raw: &[u8], width: usize, chip: egui::Rect) -> u32 { let mut black = 0u32; let mut red = 0u32; - for (i, px) in raw.chunks_exact(4).enumerate() { + for (i, px) in raw.as_chunks::<4>().0.iter().enumerate() { let (x, y) = ((i % width) as f32, (i / width) as f32); if !chip.contains(egui::pos2(x, y)) { continue; diff --git a/rsdm/tests/widget_array_plots_render.rs b/rsdm/tests/widget_array_plots_render.rs index a017ac8..4607e47 100644 --- a/rsdm/tests/widget_array_plots_render.rs +++ b/rsdm/tests/widget_array_plots_render.rs @@ -34,7 +34,9 @@ fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { } fn count_green(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| px[0] < 80 && px[1] > 200 && px[2] < 80) .count() as u32 } diff --git a/rsdm/tests/widget_byte_render.rs b/rsdm/tests/widget_byte_render.rs index f4b1110..854ada8 100644 --- a/rsdm/tests/widget_byte_render.rs +++ b/rsdm/tests/widget_byte_render.rs @@ -86,7 +86,7 @@ fn render(value: i64, num_bits: usize) -> Counts { let raw = image.as_raw(); let (mut green, mut grey) = (0u32, 0u32); - for px in raw.chunks_exact(4) { + for px in raw.as_chunks::<4>().0 { let (r, g, b) = (px[0], px[1], px[2]); if r < 80 && g > 200 && b < 80 { green += 1; diff --git a/rsdm/tests/widget_drawing_render.rs b/rsdm/tests/widget_drawing_render.rs index 65e17ff..77a6038 100644 --- a/rsdm/tests/widget_drawing_render.rs +++ b/rsdm/tests/widget_drawing_render.rs @@ -19,7 +19,9 @@ use rsplot::egui; use rsplot::egui_wgpu::RendererOptions; fn count_red(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| px[0] > 200 && px[1] < 80 && px[2] < 80) .count() as u32 } diff --git a/rsdm/tests/widget_event_plot_render.rs b/rsdm/tests/widget_event_plot_render.rs index 6c9f887..12efbad 100644 --- a/rsdm/tests/widget_event_plot_render.rs +++ b/rsdm/tests/widget_event_plot_render.rs @@ -33,7 +33,9 @@ fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { } fn count_red(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| px[0] > 200 && px[1] < 80 && px[2] < 80) .count() as u32 } diff --git a/rsdm/tests/widget_image_view_render.rs b/rsdm/tests/widget_image_view_render.rs index ffc76f1..5ac4d18 100644 --- a/rsdm/tests/widget_image_view_render.rs +++ b/rsdm/tests/widget_image_view_render.rs @@ -40,7 +40,9 @@ fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { /// Count pixels whose channels are clearly separated — i.e. colour-mapped image /// pixels (viridis purple/green/yellow), not the grey plot chrome or background. fn count_colorful(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| { let mx = i32::from(px[0].max(px[1]).max(px[2])); let mn = i32::from(px[0].min(px[1]).min(px[2])); diff --git a/rsdm/tests/widget_justified_fill.rs b/rsdm/tests/widget_justified_fill.rs index e7ea757..cdfa72d 100644 --- a/rsdm/tests/widget_justified_fill.rs +++ b/rsdm/tests/widget_justified_fill.rs @@ -43,13 +43,17 @@ fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { } fn count_red(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| px[0] > 200 && px[1] < 80 && px[2] < 80) .count() as u32 } fn count_green(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| px[0] < 80 && px[1] > 200 && px[2] < 80) .count() as u32 } @@ -176,7 +180,7 @@ fn pixel_probe( /// threshold) in a [`PROBE_SIZE`]-wide probe image. `(0, 0)` when none. fn white_bbox(raw: &[u8]) -> (u32, u32) { let (mut x0, mut y0, mut x1, mut y1) = (u32::MAX, u32::MAX, 0u32, 0u32); - for (i, px) in raw.chunks_exact(4).enumerate() { + for (i, px) in raw.as_chunks::<4>().0.iter().enumerate() { if px[0] > 230 && px[1] > 230 && px[2] > 230 { let (x, y) = (i as u32 % PROBE_SIZE, i as u32 / PROBE_SIZE); x0 = x0.min(x); @@ -439,7 +443,7 @@ fn match_bbox( is_match: impl Fn(&[u8]) -> bool, ) -> Option<(usize, usize, usize, usize)> { let mut bbox: Option<(usize, usize, usize, usize)> = None; - for (i, px) in raw.chunks_exact(4).enumerate() { + for (i, px) in raw.as_chunks::<4>().0.iter().enumerate() { if is_match(px) { let (x, y) = (i % width, i / width); bbox = Some(match bbox { @@ -664,7 +668,7 @@ fn medm_cell_text_bbox( // Confine the scan to the cell interior: outside it lies the dark harness // panel, which would swallow the band into rows 0..39. let (mut top, mut bottom, mut left, mut right) = (usize::MAX, 0usize, usize::MAX, 0usize); - for (i, px) in raw.chunks_exact(4).enumerate() { + for (i, px) in raw.as_chunks::<4>().0.iter().enumerate() { let (x, y) = (i % 110, i / 110); if x_scan.contains(&x) && (10..30).contains(&y) && px[0] < 70 && px[1] < 70 && px[2] < 70 { top = top.min(y); diff --git a/rsdm/tests/widget_multi_state_render.rs b/rsdm/tests/widget_multi_state_render.rs index e062593..0c20e5b 100644 --- a/rsdm/tests/widget_multi_state_render.rs +++ b/rsdm/tests/widget_multi_state_render.rs @@ -34,7 +34,9 @@ fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { } fn count_green(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| px[1] > 200 && px[0] < 80 && px[2] < 80) .count() as u32 } diff --git a/rsdm/tests/widget_plot_style_render.rs b/rsdm/tests/widget_plot_style_render.rs index 630032c..872d477 100644 --- a/rsdm/tests/widget_plot_style_render.rs +++ b/rsdm/tests/widget_plot_style_render.rs @@ -28,7 +28,9 @@ fn now_epoch_secs() -> f64 { } fn count_color(raw: &[u8], want: [u8; 3]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| { let dominant = |c: usize| { if want[c] > 200 { diff --git a/rsdm/tests/widget_scale_indicator_render.rs b/rsdm/tests/widget_scale_indicator_render.rs index ab242f0..e42b4fc 100644 --- a/rsdm/tests/widget_scale_indicator_render.rs +++ b/rsdm/tests/widget_scale_indicator_render.rs @@ -31,7 +31,9 @@ fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { } fn count_red(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| px[0] > 200 && px[1] < 80 && px[2] < 80) .count() as u32 } diff --git a/rsdm/tests/widget_symbol_render.rs b/rsdm/tests/widget_symbol_render.rs index 2fc4231..4ae6a4a 100644 --- a/rsdm/tests/widget_symbol_render.rs +++ b/rsdm/tests/widget_symbol_render.rs @@ -32,7 +32,9 @@ fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { } fn count_red(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| px[0] > 200 && px[1] < 80 && px[2] < 80) .count() as u32 } diff --git a/rsdm/tests/widget_time_plot_render.rs b/rsdm/tests/widget_time_plot_render.rs index 1b2d12f..f2cfe13 100644 --- a/rsdm/tests/widget_time_plot_render.rs +++ b/rsdm/tests/widget_time_plot_render.rs @@ -43,7 +43,9 @@ fn now_epoch_secs() -> f64 { /// Pure-green (curve colour) pixel count in an RGBA frame. fn count_green(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| px[0] < 80 && px[1] > 200 && px[2] < 80) .count() as u32 } diff --git a/rsdm/tests/widget_waveform_table_render.rs b/rsdm/tests/widget_waveform_table_render.rs index 0db163b..4450e9c 100644 --- a/rsdm/tests/widget_waveform_table_render.rs +++ b/rsdm/tests/widget_waveform_table_render.rs @@ -35,7 +35,9 @@ fn wait_for(mut cond: impl FnMut() -> bool, timeout: Duration) -> bool { /// Light pixels — the rendered glyphs/widget chrome on egui's dark default theme. fn count_light(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| px[0] > 150 && px[1] > 150 && px[2] > 150) .count() as u32 } diff --git a/src/core/fitting.rs b/src/core/fitting.rs index 44a9101..7b03a6d 100644 --- a/src/core/fitting.rs +++ b/src/core/fitting.rs @@ -2585,7 +2585,7 @@ pub fn fit_in_range( pub fn multi_gaussian_model(x: &[f64], params: &[f64]) -> Vec { let inv = 1.0 / fwhm_to_sigma_factor(); let mut y = vec![0.0_f64; x.len()]; - for triple in params.chunks_exact(3) { + for triple in params.as_chunks::<3>().0 { let (height, centroid, fwhm) = (triple[0], triple[1], triple[2]); let sigma = fwhm * inv; if sigma == 0.0 { @@ -4133,7 +4133,9 @@ mod tests { /// Find the fitted triple whose centre is nearest `target`. fn nearest_peak(params: &[f64], target: f64) -> [f64; 3] { params - .chunks_exact(3) + .as_chunks::<3>() + .0 + .iter() .min_by(|a, b| { (a[1] - target) .abs() diff --git a/src/core/roi_io.rs b/src/core/roi_io.rs index d13b36a..fee49d2 100644 --- a/src/core/roi_io.rs +++ b/src/core/roi_io.rs @@ -311,7 +311,7 @@ fn roi_from_type_and_geom(type_name: &str, g: &[f64]) -> Result return Err(RoiIoError::BadGeometry); } Roi::Polygon { - vertices: g.chunks_exact(2).map(|c| (c[0], c[1])).collect(), + vertices: g.as_chunks::<2>().0.iter().map(|c| (c[0], c[1])).collect(), } } "cross" => { diff --git a/src/core/scene3d/marching_cubes.rs b/src/core/scene3d/marching_cubes.rs index 59d592e..8af8491 100644 --- a/src/core/scene3d/marching_cubes.rs +++ b/src/core/scene3d/marching_cubes.rs @@ -165,7 +165,9 @@ impl MarchingCubes { /// Vertices as `(z, y, x)` triples. pub fn vertices_zyx(&self) -> Vec<[f32; 3]> { self.vertices - .chunks_exact(3) + .as_chunks::<3>() + .0 + .iter() .map(|c| [c[0], c[1], c[2]]) .collect() } @@ -173,7 +175,9 @@ impl MarchingCubes { /// Normals as `(nz, ny, nx)` triples. pub fn normals_zyx(&self) -> Vec<[f32; 3]> { self.normals - .chunks_exact(3) + .as_chunks::<3>() + .0 + .iter() .map(|c| [c[0], c[1], c[2]]) .collect() } diff --git a/src/render/gpu_scene3d.rs b/src/render/gpu_scene3d.rs index d05339c..fca0c37 100644 --- a/src/render/gpu_scene3d.rs +++ b/src/render/gpu_scene3d.rs @@ -399,14 +399,14 @@ impl Scene3dGeometry { /// Used by [`crate::SceneWidget::pick`]. pub fn pick_triangles(&self) -> Vec<[Vec3; 3]> { let mut out = Vec::with_capacity(self.triangles.len() / 3 + self.meshes.len() / 3); - for tri in self.triangles.chunks_exact(3) { + for tri in self.triangles.as_chunks::<3>().0 { out.push([ Vec3::from_array(tri[0].pos), Vec3::from_array(tri[1].pos), Vec3::from_array(tri[2].pos), ]); } - for tri in self.meshes.chunks_exact(3) { + for tri in self.meshes.as_chunks::<3>().0 { out.push([ Vec3::from_array(tri[0].pos), Vec3::from_array(tri[1].pos), diff --git a/src/render/save.rs b/src/render/save.rs index ee8cc67..9dcb608 100644 --- a/src/render/save.rs +++ b/src/render/save.rs @@ -113,7 +113,12 @@ pub(crate) fn rows_to_rgba8( let src = &mapped[row * bpr..row * bpr + row_bytes]; let dst = &mut out[row * row_bytes..(row + 1) * row_bytes]; if swap { - for (s, d) in src.chunks_exact(4).zip(dst.chunks_exact_mut(4)) { + for (s, d) in src + .as_chunks::<4>() + .0 + .iter() + .zip(dst.as_chunks_mut::<4>().0.iter_mut()) + { d[0] = s[2]; d[1] = s[1]; d[2] = s[0]; @@ -148,7 +153,7 @@ pub fn encode_png(rgba: &[u8], width: u32, height: u32) -> Result, png:: pub fn rgba_to_rgb(rgba: &[u8], width: u32, height: u32) -> Vec { let n = (width as usize) * (height as usize); let mut out = Vec::with_capacity(n * 3); - for px in rgba.chunks_exact(4).take(n) { + for px in rgba.as_chunks::<4>().0.iter().take(n) { out.push(px[0]); out.push(px[1]); out.push(px[2]); @@ -1500,7 +1505,9 @@ mod tests { let hex: String = body.chars().filter(|c| c.is_ascii_hexdigit()).collect(); let decoded: Vec = hex .as_bytes() - .chunks_exact(2) + .as_chunks::<2>() + .0 + .iter() .map(|pair| u8::from_str_radix(std::str::from_utf8(pair).unwrap(), 16).unwrap()) .collect(); assert_eq!(decoded, rgba_to_rgb(&rgba, 2, 2)); @@ -1548,7 +1555,9 @@ mod tests { let hex: String = hex.chars().filter(|c| c.is_ascii_hexdigit()).collect(); let decoded: Vec = hex .as_bytes() - .chunks_exact(2) + .as_chunks::<2>() + .0 + .iter() .map(|pair| u8::from_str_radix(std::str::from_utf8(pair).unwrap(), 16).unwrap()) .collect(); assert_eq!(decoded, rgba_to_rgb(&rgba, 2, 2)); diff --git a/src/render/scene3d_items.rs b/src/render/scene3d_items.rs index 5456a73..c6fbf47 100644 --- a/src/render/scene3d_items.rs +++ b/src/render/scene3d_items.rs @@ -633,7 +633,7 @@ fn expand_triangles( let mut tris = Vec::new(); match mode { MeshDrawMode::Triangles => { - for c in stream.chunks_exact(3) { + for c in stream.as_chunks::<3>().0 { tris.push([c[0], c[1], c[2]]); } } @@ -2950,7 +2950,7 @@ fn append_solid_isosurfaces( else { continue; }; - for tri in indices.chunks_exact(3) { + for tri in indices.as_chunks::<3>().0 { let p = iso_triangle_positions(&vertices, tri); let n = iso_triangle_normals(&normals, tri); geometry.add_mesh_triangle(p, iso.color, n); @@ -2982,7 +2982,7 @@ fn append_colormapped_isosurface( return; }; let (colormap, alpha) = (iso.colormap(), iso.alpha()); - for tri in indices.chunks_exact(3) { + for tri in indices.as_chunks::<3>().0 { let p = iso_triangle_positions(&vertices, tri); let n = iso_triangle_normals(&normals, tri); let rgba = [0usize, 1, 2].map(|k| { @@ -4716,7 +4716,9 @@ mod tests { sf.append_to(&mut g); g.textured_meshes[0] .pixels - .chunks_exact(4) + .as_chunks::<4>() + .0 + .iter() .filter(|c| c[3] == 0) .count() }; @@ -4730,7 +4732,9 @@ mod tests { sf.append_to(&mut g); let opaque = g.textured_meshes[0] .pixels - .chunks_exact(4) + .as_chunks::<4>() + .0 + .iter() .filter(|c| c[3] == 255) .count(); assert!(opaque > 0, "above-min block texels stay opaque"); diff --git a/src/render/volume_raycaster.rs b/src/render/volume_raycaster.rs index edc4a45..17f0b67 100644 --- a/src/render/volume_raycaster.rs +++ b/src/render/volume_raycaster.rs @@ -74,7 +74,9 @@ pub fn volume_bounds(depth: usize, height: usize, width: usize) -> ([f32; 3], [f /// ~0.05% relative, so the recovered RGB is exact to well under one 8-bit step /// at every coverage down to 1/255. fn premultiply_rgba(rgba: &[u8]) -> Vec { - rgba.chunks_exact(4) + rgba.as_chunks::<4>() + .0 + .iter() .flat_map(|px| { let a = f32::from(px[3]) / 255.0; let texel = [ diff --git a/src/widget/scene_widget.rs b/src/widget/scene_widget.rs index a3f241d..8940684 100644 --- a/src/widget/scene_widget.rs +++ b/src/widget/scene_widget.rs @@ -770,7 +770,9 @@ impl SceneWidget { for (mesh, tm) in self.content.textured_meshes.iter().enumerate() { let tris: Vec<[Vec3; 3]> = tm .vertices - .chunks_exact(3) + .as_chunks::<3>() + .0 + .iter() .map(|t| { [ Vec3::from_array(t[0]), diff --git a/tests/image_alpha_map.rs b/tests/image_alpha_map.rs index 4e86cdb..e2297b6 100644 --- a/tests/image_alpha_map.rs +++ b/tests/image_alpha_map.rs @@ -46,7 +46,7 @@ fn is_teal(px: &[u8]) -> bool { /// `(teal pixels in the left third of the frame, teal pixels in the right third)`. fn teal_left_right(raw: &[u8]) -> (u32, u32) { let (mut left, mut right) = (0u32, 0u32); - for (i, px) in raw.chunks_exact(4).enumerate() { + for (i, px) in raw.as_chunks::<4>().0.iter().enumerate() { if is_teal(px) { let col = i % W; if col < W / 3 { diff --git a/tests/multi_axis_render.rs b/tests/multi_axis_render.rs index c3526f6..2a71430 100644 --- a/tests/multi_axis_render.rs +++ b/tests/multi_axis_render.rs @@ -20,7 +20,9 @@ use rsplot::egui_wgpu::RendererOptions; use rsplot::{AxisSide, Plot1D, YAxis}; fn count_red(raw: &[u8]) -> u32 { - raw.chunks_exact(4) + raw.as_chunks::<4>() + .0 + .iter() .filter(|px| px[0] > 200 && px[1] < 80 && px[2] < 80) .count() as u32 } diff --git a/tests/roi_band_unbounded_render.rs b/tests/roi_band_unbounded_render.rs index 5388280..0b1d558 100644 --- a/tests/roi_band_unbounded_render.rs +++ b/tests/roi_band_unbounded_render.rs @@ -40,7 +40,7 @@ fn is_red(px: &[u8]) -> bool { /// frame, indexed by image column `0..W`. fn red_columns(raw: &[u8]) -> Vec { let mut cols = vec![0u32; W]; - for (i, px) in raw.chunks_exact(4).enumerate() { + for (i, px) in raw.as_chunks::<4>().0.iter().enumerate() { if is_red(px) { cols[i % W] += 1; } diff --git a/tests/scene3d_overview_render.rs b/tests/scene3d_overview_render.rs index d674b09..687dd4e 100644 --- a/tests/scene3d_overview_render.rs +++ b/tests/scene3d_overview_render.rs @@ -16,8 +16,10 @@ const H: u32 = 240; /// (`width`-wide tightly packed RGBA8, top row first). fn diff_pixels(a: &[u8], b: &[u8], width: u32) -> Vec<(u32, u32)> { assert_eq!(a.len(), b.len()); - a.chunks_exact(4) - .zip(b.chunks_exact(4)) + a.as_chunks::<4>() + .0 + .iter() + .zip(b.as_chunks::<4>().0.iter()) .enumerate() .filter(|(_, (pa, pb))| pa != pb) .map(|(i, _)| (i as u32 % width, i as u32 / width)) From c2b0b3fab5d51159cf2f023bd37803350221d23e Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Wed, 14 Oct 2026 17:56:51 +0900 Subject: [PATCH 03/13] feat(widget): add form helpers for Qt-style dialog rows silx dialogs are QFormLayouts; plain rows can't align a label column or stretch a field against trailing buttons. widget::form gives label/fill/group in one egui pass (no retained state, no egui_flex dep) and the colormap/print/limits dialogs now use them. --- src/widget/colormap_dialog.rs | 18 ++++++---- src/widget/form.rs | 64 +++++++++++++++++++++++++++++++++++ src/widget/high_level.rs | 5 ++- src/widget/limits_widget.rs | 4 +-- src/widget/mod.rs | 1 + src/widget/print_dialog.rs | 3 +- 6 files changed, 85 insertions(+), 10 deletions(-) create mode 100644 src/widget/form.rs diff --git a/src/widget/colormap_dialog.rs b/src/widget/colormap_dialog.rs index f720e13..387d590 100644 --- a/src/widget/colormap_dialog.rs +++ b/src/widget/colormap_dialog.rs @@ -182,11 +182,15 @@ impl ColormapDialog { let signals = crate::widget::detached::show_detached(ctx, id, "Colormap", size, pos, |ui| { + // Form rows (silx ColormapDialog is a QFormLayout): fixed + // label column, combos stretching to the dialog width. + const LABEL_W: f32 = 100.0; ui.horizontal(|ui| { - ui.label("Name:"); + crate::widget::form::label(ui, LABEL_W, "Name:"); let prev_name = self.name; egui::ComboBox::from_id_salt("cmap_name") .selected_text(self.name.label()) + .width(ui.available_width()) .show_ui(ui, |ui| { for &name in &ColormapName::ALL { ui.selectable_value(&mut self.name, name, name.label()); @@ -198,10 +202,11 @@ impl ColormapDialog { }); ui.horizontal(|ui| { - ui.label("Normalization:"); + crate::widget::form::label(ui, LABEL_W, "Normalization:"); let prev_norm = self.normalization; egui::ComboBox::from_id_salt("cmap_norm") .selected_text(format!("{:?}", self.normalization)) + .width(ui.available_width()) .show_ui(ui, |ui| { ui.selectable_value( &mut self.normalization, @@ -232,7 +237,7 @@ impl ColormapDialog { if self.normalization == Normalization::Gamma { ui.horizontal(|ui| { - ui.label("Gamma:"); + crate::widget::form::label(ui, LABEL_W, "Gamma:"); let prev = self.gamma; ui.add( egui::DragValue::new(&mut self.gamma) @@ -252,7 +257,7 @@ impl ColormapDialog { // egui Color32 (unmultiplied sRGBA) so the stored bytes match the // colormap's `nan_color` exactly. ui.horizontal(|ui| { - ui.label("NaN color:"); + crate::widget::form::label(ui, LABEL_W, "NaN color:"); let [r, g, b, a] = self.nan_color; let mut color = egui::Color32::from_rgba_unmultiplied(r, g, b, a); if ui.color_edit_button_srgba(&mut color).changed() { @@ -306,10 +311,11 @@ impl ColormapDialog { // autoscale (silx `Colormap.setAutoscaleMode`). if self.vmin_auto || self.vmax_auto { ui.horizontal(|ui| { - ui.label("Mode:"); + crate::widget::form::label(ui, LABEL_W, "Mode:"); let prev_mode = self.autoscale_mode; egui::ComboBox::from_id_salt("cmap_autoscale_mode") .selected_text(self.autoscale_mode.label()) + .width(ui.available_width()) .show_ui(ui, |ui| { for mode in AutoscaleMode::ALL { ui.selectable_value( @@ -326,7 +332,7 @@ impl ColormapDialog { if self.autoscale_mode == AutoscaleMode::Percentile { ui.horizontal(|ui| { - ui.label("Percentiles:"); + crate::widget::form::label(ui, LABEL_W, "Percentiles:"); let (prev_lo, prev_hi) = self.percentiles; ui.add( egui::DragValue::new(&mut self.percentiles.0) diff --git a/src/widget/form.rs b/src/widget/form.rs new file mode 100644 index 0000000..04bceb3 --- /dev/null +++ b/src/widget/form.rs @@ -0,0 +1,64 @@ +//! Qt-style form-layout helpers, used by the dialog widgets and exported for +//! applications building silx-style forms on top of rsplot. silx's dialogs +//! are `QFormLayout`s — labels in one aligned column, fields stretching to +//! the dialog edge, action buttons hugging the right — which plain +//! left-to-right rows don't reproduce: every row's field starts where its +//! own label ends, and a field can't know how much width trailing buttons +//! will need. +//! +//! Layout model (one pass, no retained state): inside a `ui.horizontal` row, +//! [`label`] occupies a fixed-width cell so stacked rows align; [`fill`] +//! lays its trailing widgets from the row's right edge inward, then hands +//! the space left in the middle to the field closure as a left-to-right +//! `Ui` — size a widget to `ui.available_width()` there to stretch it up to +//! the trailing widgets (Qt's field stretch). + +use egui::{Align, Layout, Ui}; + +/// A fixed-width, left-aligned, vertically centered cell: the generic column +/// building block ([`label`] is `cell` holding a `ui.label`). Content wider +/// than `width` widens the cell rather than truncating. +pub fn cell(ui: &mut Ui, width: f32, add_contents: impl FnOnce(&mut Ui) -> R) -> R { + let h = ui.spacing().interact_size.y; + ui.allocate_ui_with_layout( + egui::vec2(width, h), + Layout::left_to_right(Align::Center), + |ui| { + ui.set_min_size(egui::vec2(width, h)); + add_contents(ui) + }, + ) + .inner +} + +/// The fixed label column of a form row: a `width`-wide [`cell`] holding a +/// label, so stacked rows align their fields like a `QFormLayout` label +/// column. Returns the label's response (for hover text). +pub fn label(ui: &mut Ui, width: f32, text: impl Into) -> egui::Response { + cell(ui, width, |ui| ui.label(text)) +} + +/// Fill the rest of a form row: `trailing` is laid out from the row's right +/// edge inward (right-aligned buttons, delete boxes), then `field` receives +/// what is left in the middle as a left-to-right `Ui`. A field sized to +/// `ui.available_width()` stretches exactly up to the trailing widgets; a +/// fixed-size field simply sits left in the gap. Pass an empty `trailing` +/// closure when the row has no trailing widgets. +pub fn fill(ui: &mut Ui, trailing: impl FnOnce(&mut Ui), field: impl FnOnce(&mut Ui) -> R) -> R { + ui.with_layout(Layout::right_to_left(Align::Center), |ui| { + trailing(ui); + ui.with_layout(Layout::left_to_right(Align::Center), field) + .inner + }) + .inner +} + +/// A `ui.group` spanning the available width, like a `QGroupBox` stacked in +/// a dialog (egui groups shrink-wrap to their content, which leaves ragged +/// right edges when boxes stack). +pub fn group(ui: &mut Ui, add_contents: impl FnOnce(&mut Ui) -> R) -> egui::InnerResponse { + ui.group(|ui| { + ui.set_width(ui.available_width()); + add_contents(ui) + }) +} diff --git a/src/widget/high_level.rs b/src/widget/high_level.rs index 5cbb74e..647f314 100644 --- a/src/widget/high_level.rs +++ b/src/widget/high_level.rs @@ -5982,7 +5982,10 @@ impl PlotWidget { egui::vec2(260.0, 110.0), None, |ui| { - let edit = ui.add(egui::TextEdit::singleline(&mut buffer).desired_width(200.0)); + // span the dialog width (a fixed width leaves a ragged gap) + let edit = ui.add( + egui::TextEdit::singleline(&mut buffer).desired_width(ui.available_width()), + ); // Enter in the field applies, matching a dialog's default button. if edit.lost_focus() && ui.input(|i| i.key_pressed(egui::Key::Enter)) { apply = true; diff --git a/src/widget/limits_widget.rs b/src/widget/limits_widget.rs index 9f0a738..41a2b31 100644 --- a/src/widget/limits_widget.rs +++ b/src/widget/limits_widget.rs @@ -85,7 +85,7 @@ impl LimitsWidget { size, pos, |ui| { - ui.group(|ui| { + crate::widget::form::group(ui, |ui| { ui.heading("X Axis"); ui.horizontal(|ui| { ui.label("Min:"); @@ -108,7 +108,7 @@ impl LimitsWidget { } }); - ui.group(|ui| { + crate::widget::form::group(ui, |ui| { ui.heading("Y Axis"); ui.horizontal(|ui| { ui.label("Min:"); diff --git a/src/widget/mod.rs b/src/widget/mod.rs index 4829655..49f3884 100644 --- a/src/widget/mod.rs +++ b/src/widget/mod.rs @@ -14,6 +14,7 @@ pub mod complex_image_view; pub mod curves_roi_widget; pub mod detached; pub mod fit_widget; +pub mod form; pub mod high_level; pub mod histogram_colorbar; pub mod image_stack; diff --git a/src/widget/print_dialog.rs b/src/widget/print_dialog.rs index 880cf8c..1920985 100644 --- a/src/widget/print_dialog.rs +++ b/src/widget/print_dialog.rs @@ -105,7 +105,7 @@ impl PrintDialog { let signals = crate::widget::detached::show_detached(ctx, id, "Print", size, pos, |ui| { ui.horizontal(|ui| { - ui.label("Printer:"); + crate::widget::form::label(ui, 60.0, "Printer:"); if self.printer_names.is_empty() { ui.label("No printers found"); } else { @@ -116,6 +116,7 @@ impl PrintDialog { .unwrap_or_default(); egui::ComboBox::from_id_salt("print_dialog_printer") .selected_text(current) + .width(ui.available_width()) .show_ui(ui, |ui| { for (i, name) in self.printer_names.iter().enumerate() { ui.selectable_value(&mut self.selected, i, name); From b99d9b2c7107526121aa433251c04a67e9ecc6a0 Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Thu, 15 Oct 2026 12:37:00 +0900 Subject: [PATCH 04/13] perf(render): defer sync_gpu_items to one flush per frame Every item mutation (add_curve, remove, set_item_z, set_item_visible, update_curve, clear_items) re-cloned all visible CurveData and rebuilt every GpuCurve, so N sequential mutations rebuilt the scene N times. WgpuBackend now only marks scene_dirty; flush_scene syncs once from Plot1D::show_inner and save_graph. Unchanged z/visibility writes no longer dirty the scene. --- src/render/backend_wgpu.rs | 45 ++++++++++++++++++++++++++++++-------- src/widget/high_level.rs | 3 +++ 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/src/render/backend_wgpu.rs b/src/render/backend_wgpu.rs index 45027d4..f5db353 100644 --- a/src/render/backend_wgpu.rs +++ b/src/render/backend_wgpu.rs @@ -357,6 +357,13 @@ pub struct WgpuBackend { /// Draw-order z-value per item. Default `0.0`. Within each GPU item type /// (images, curves), items are sorted ascending by z before drawing. item_z: HashMap, + /// Set when an item mutation invalidated the GPU curve/image set; + /// [`flush_scene`](Self::flush_scene) rebuilds once per frame. Deferring + /// the rebuild is what makes a batch of mutations (clearing and re-adding + /// N curves, re-ordering every z) cost one scene sync instead of one *per + /// mutation* — the per-mutation sync made every rebuild O(N²) in GPU + /// buffer creation. `Cell` so the `&self` save path can flush too. + scene_dirty: std::cell::Cell, } impl WgpuBackend { @@ -376,6 +383,16 @@ impl WgpuBackend { last_data_area: None, item_visible: HashMap::new(), item_z: HashMap::new(), + scene_dirty: std::cell::Cell::new(false), + } + } + + /// Rebuild the GPU curve/image set if any mutation invalidated it since the + /// last flush. Called once per frame by the widget before drawing, and by + /// the save paths before reading pixels back; a no-op when nothing changed. + pub fn flush_scene(&self) { + if self.scene_dirty.replace(false) { + self.sync_gpu_items(); } } @@ -413,9 +430,12 @@ impl WgpuBackend { let Some(v) = self.item_visible.get_mut(&handle) else { return false; }; + if *v == visible { + return true; + } *v = visible; self.sync_plot_items(); - self.sync_gpu_items(); + self.scene_dirty.set(true); true } @@ -432,8 +452,11 @@ impl WgpuBackend { let Some(v) = self.item_z.get_mut(&handle) else { return false; }; + if *v == z { + return true; + } *v = z; - self.sync_gpu_items(); + self.scene_dirty.set(true); true } @@ -561,7 +584,7 @@ impl WgpuBackend { handle, data: curve_data_from_spec(curve), }; - self.sync_gpu_items(); + self.scene_dirty.set(true); true } @@ -579,7 +602,7 @@ impl WgpuBackend { data: image_data_from_spec(image), }; self.sync_plot_items(); - self.sync_gpu_items(); + self.scene_dirty.set(true); true } @@ -625,7 +648,7 @@ impl WgpuBackend { self.item_visible.clear(); self.item_z.clear(); self.sync_plot_items(); - self.sync_gpu_items(); + self.scene_dirty.set(true); } } @@ -638,7 +661,7 @@ impl Backend for WgpuBackend { handle, data: curve_data_from_spec(curve), }); - self.sync_gpu_items(); + self.scene_dirty.set(true); handle } @@ -649,7 +672,7 @@ impl Backend for WgpuBackend { data: image_data_from_spec(image), }); self.sync_plot_items(); - self.sync_gpu_items(); + self.scene_dirty.set(true); handle } @@ -691,7 +714,7 @@ impl Backend for WgpuBackend { self.item_visible.remove(&item); self.item_z.remove(&item); self.sync_plot_items(); - self.sync_gpu_items(); + self.scene_dirty.set(true); } removed } @@ -814,10 +837,13 @@ impl Backend for WgpuBackend { fn replot(&mut self) { self.sync_plot_items(); - self.sync_gpu_items(); + self.scene_dirty.set(true); } fn save_graph(&self, path: &std::path::Path, size: (u32, u32)) -> Result<(), Self::SaveError> { + // The readback renders from the installed GPU state, so pending item + // mutations must land first (a save can run with no frame in between). + self.flush_scene(); crate::render::save::save_graph(&self.render_state, &self.plot, size, path) } @@ -828,6 +854,7 @@ impl Backend for WgpuBackend { format: crate::render::save::SaveFormat, dpi: u32, ) -> Result<(), Self::SaveError> { + self.flush_scene(); crate::render::save::save_graph_with_format( &self.render_state, &self.plot, diff --git a/src/widget/high_level.rs b/src/widget/high_level.rs index 647f314..6fd987a 100644 --- a/src/widget/high_level.rs +++ b/src/widget/high_level.rs @@ -3833,6 +3833,9 @@ impl PlotWidget { // silx devicePixelRatio analog for the snap radius (PositionInfo.py:229-237). self.last_pixels_per_point = ui.ctx().pixels_per_point(); self.sync_active_axis_labels(); + // Land any pending item mutations in the GPU scene exactly once per + // frame (see `WgpuBackend::flush_scene`). + self.backend.flush_scene(); let mut view = PlotView::new(); if let Some(ext) = menu_ext { view = view.with_context_menu(ext); From c0111907e818b4050cf8b0883e3a987f8e52598c Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Thu, 15 Oct 2026 17:32:43 +0900 Subject: [PATCH 05/13] fix(widget): use U+2026 for the compact-toolbar overflow label U+22EF (midline ellipsis) is missing from egui's bundled UI font and from common fallbacks (Noto Sans Regular included), so the overflow menu button rendered as the tofu box; U+2026 is covered. --- src/widget/high_level.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/widget/high_level.rs b/src/widget/high_level.rs index 6fd987a..df9d149 100644 --- a/src/widget/high_level.rs +++ b/src/widget/high_level.rs @@ -3753,7 +3753,7 @@ pub struct PlotWidget { /// returns `None` for lack of a cached transform). last_pixels_per_point: f32, /// Whether the control toolbar renders compact — the essential buttons - /// plus a "⋯" overflow menu holding the rest — or the full flat row. + /// plus a "…" overflow menu holding the rest — or the full flat row. /// Compact by default so the toolbar stays a single line and the plot /// keeps its height. toolbar_compact: bool, @@ -6570,7 +6570,7 @@ impl PlotWidget { if self.toolbar_compact { // Everything else folds into one overflow menu so the toolbar // stays a single row and the plot keeps its height. - ui.menu_button("⋯", |ui| { + ui.menu_button("…", |ui| { ui.set_max_width(240.0); ui.horizontal_wrapped(|ui| { self.show_toolbar_extended(ui, out); @@ -6600,7 +6600,7 @@ impl PlotWidget { } /// The non-essential control-toolbar buttons: rendered flat in the row - /// when the toolbar is full, or inside the "⋯" overflow menu when compact + /// when the toolbar is full, or inside the "…" overflow menu when compact /// ([`Self::set_toolbar_compact`]). fn show_toolbar_extended(&mut self, ui: &mut egui::Ui, out: &mut ToolbarResponse) { if toolbar_icon_button(ui, ToolbarIcon::ZoomIn, false, "Zoom in").clicked() { @@ -6790,12 +6790,12 @@ impl PlotWidget { } /// Whether the control toolbar is compact — the essential buttons plus a - /// "⋯" overflow menu (the default) — or the full flat row. + /// "…" overflow menu (the default) — or the full flat row. pub fn toolbar_compact(&self) -> bool { self.toolbar_compact } - /// Choose between the compact control toolbar (essential buttons + "⋯" + /// Choose between the compact control toolbar (essential buttons + "…" /// overflow menu, the default) and the full flat row. pub fn set_toolbar_compact(&mut self, compact: bool) { self.toolbar_compact = compact; From 2241f0fdff45a6eadf580d90c222fec6334ac1e6 Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Thu, 15 Oct 2026 18:38:38 +0900 Subject: [PATCH 06/13] docs: state the font-coverage requirement for widget glyph labels The ROI descriptions and style selector and the image-compare toolbar use arrows and box-drawing glyphs egui's default fonts lack; hosts must append a broad-coverage fallback font or those labels render as tofu. --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 11dc942..60db654 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,11 @@ There are two API layers: - egui / egui-wgpu **0.34**. `rsplot` re-exports `egui` and `egui_wgpu` (`rsplot::egui`, `rsplot::egui_wgpu`) so downstreams can stay on the same versions without skew. +- Some widget labels use glyphs beyond egui's default fonts — `→` in the ROI + manager descriptions, `─ ╌ ┈` in the ROI line-style selector, `═` in the + image-compare toolbar — which render as the missing-glyph box (□) without a + fallback. Append a broad-coverage font (e.g. DejaVu Sans) to each egui font + family (`FontDefinitions`), as a *last* entry so it only fills the gaps. ## Quick start From 1e43a1089db95add28eecfd8e6db7c1d5dd08773 Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Thu, 15 Oct 2026 19:37:42 +0900 Subject: [PATCH 07/13] fix(widget): elide gutter labels to their run in draw_labels A title or axis label longer than the plot's gutter run was drawn at full length and hit the widget clip rect mid-glyph on a narrow plot. Title, x, y, y2 and extra-axis labels now lay out single-line with U+2026 truncation bounded by the run around their center. --- src/widget/chrome.rs | 46 +++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/src/widget/chrome.rs b/src/widget/chrome.rs index 7b06b22..62c94bd 100644 --- a/src/widget/chrome.rs +++ b/src/widget/chrome.rs @@ -781,6 +781,7 @@ pub fn draw_extra_y_ticks( text, FontId::proportional(12.0), style.text, + area.height(), ); } } @@ -813,26 +814,32 @@ pub fn draw_labels( let title_font = FontId::proportional(14.0); let label_font = FontId::proportional(12.0); + // A label longer than its gutter run is elided with '…' rather than drawn + // full length: centered on the data area, an overlong title or axis label + // would otherwise hit the widget clip rect mid-glyph on a narrow plot (and + // run under the colorbar / y2 gutters before that). + let h_max = 2.0 * (area.center().x - full.left()).min(full.right() - area.center().x); if let Some(t) = labels.title { - painter.text( - pos2(area.center().x, full.top() + 2.0), - Align2::CENTER_TOP, - t, - title_font, + let galley = elided_singleline(painter, t, title_font, style.text, h_max); + let size = galley.size(); + painter.galley( + pos2(area.center().x - size.x * 0.5, full.top() + 2.0), + galley, style.text, ); } if let Some(t) = labels.x { - painter.text( - pos2(area.center().x, full.bottom() - 2.0), - Align2::CENTER_BOTTOM, - t, - label_font.clone(), + let galley = elided_singleline(painter, t, label_font.clone(), style.text, h_max); + let size = galley.size(); + painter.galley( + pos2(area.center().x - size.x * 0.5, full.bottom() - 2.0 - size.y), + galley, style.text, ); } // Left Y label: rotate a quarter turn counter-clockwise (reads bottom→top), // centered in the left gutter strip. + let v_max = 2.0 * (area.center().y - full.top()).min(full.bottom() - area.center().y); if let Some(t) = labels.y { draw_rotated_label( painter, @@ -841,6 +848,7 @@ pub fn draw_labels( t, label_font.clone(), style.text, + v_max, ); } // Right y2 label: rotate a quarter turn clockwise (reads top→bottom), @@ -853,6 +861,7 @@ pub fn draw_labels( t, label_font, style.text, + v_max, ); } } @@ -874,14 +883,29 @@ fn draw_rotated_label( text: &str, font: FontId, color: Color32, + max_len: f32, ) { - let galley = painter.layout_no_wrap(text.to_owned(), font, color); + let galley = elided_singleline(painter, text, font, color, max_len); let pos = center - galley.rect.center().to_vec2(); painter.add(egui::Shape::Text( TextShape::new(pos, galley, color).with_angle_and_anchor(angle, Align2::CENTER_CENTER), )); } +/// Lay out `text` on one line, elided with '…' so it never exceeds `max_w` — +/// the bound a gutter label gets from its run along the widget edge. +fn elided_singleline( + painter: &Painter, + text: &str, + font: FontId, + color: Color32, + max_w: f32, +) -> std::sync::Arc { + let mut job = egui::text::LayoutJob::simple_singleline(text.to_owned(), font, color); + job.wrap = egui::text::TextWrapping::truncate_at_width(max_w.max(0.0)); + painter.layout_job(job) +} + /// Format a coordinate with decimals scaled to the visible span. fn format_coord(v: f64, lo: f64, hi: f64) -> String { let span = (hi - lo).abs(); From ace9d6217f032ce9dbeb11d74843a65e9a8edf5e Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Thu, 15 Oct 2026 19:55:18 +0900 Subject: [PATCH 08/13] fix(widget): cull overlapping tick labels with LabelCull The adaptive density targets labels per inch but never measures label extent, so a small plot's two-tick minimum can still collide. Skip the text of any label whose span overlaps the last kept one (X, Y, y2 and extra-Y gutters); tick marks are never culled. --- src/widget/chrome.rs | 132 +++++++++++++++++++++++++++++++------------ 1 file changed, 97 insertions(+), 35 deletions(-) diff --git a/src/widget/chrome.rs b/src/widget/chrome.rs index 62c94bd..fe0c8ba 100644 --- a/src/widget/chrome.rs +++ b/src/widget/chrome.rs @@ -564,6 +564,35 @@ pub fn draw_axes( ); } +/// Greedy tick-label culling along one axis: [`admit`](Self::admit) keeps a +/// label whose pixel span clears the last kept label by [`GAP`](Self::GAP) and +/// drops it otherwise. Tick positions arrive monotonically (ascending or +/// descending pixels), so checking only the last kept span suffices. Tick +/// *marks* are never culled — only their text — so a plot too small for every +/// label sheds labels instead of overlapping them (the adaptive density counts +/// labels per inch but never measures label extent, so at small sizes its +/// minimum of 2 ticks can still collide). +#[derive(Default)] +struct LabelCull { + last: Option<(f32, f32)>, +} + +impl LabelCull { + /// Minimum clear pixels between adjacent labels. + const GAP: f32 = 3.0; + + fn admit(&mut self, lo: f32, hi: f32) -> bool { + let fits = match self.last { + None => true, + Some((kept_lo, kept_hi)) => lo > kept_hi + Self::GAP || hi < kept_lo - Self::GAP, + }; + if fits { + self.last = Some((lo, hi)); + } + fits + } +} + /// As [`draw_axes`] but honoring the X-axis [`TickMode`]: with /// [`TickMode::TimeSeries`] the X tick positions and labels are produced by /// [`dtime_ticks`] (epoch-seconds data values) laid out in `x_time_zone`'s @@ -653,34 +682,40 @@ pub fn draw_axes_with_x_tick_mode( ); // X ticks + labels below the bottom edge. + let mut x_cull = LabelCull::default(); for (xv, label) in &xticks { let px = t.data_to_pixel(*xv, t.y.min).x; painter.line_segment( [pos2(px, area.bottom()), pos2(px, area.bottom() + tick_len)], axis, ); - painter.text( - pos2(px, area.bottom() + tick_len + 2.0), - Align2::CENTER_TOP, - label, - font.clone(), - style.text, - ); + let galley = painter.layout_no_wrap(label.clone(), font.clone(), style.text); + let half_w = galley.size().x * 0.5; + if x_cull.admit(px - half_w, px + half_w) { + painter.galley( + pos2(px - half_w, area.bottom() + tick_len + 2.0), + galley, + style.text, + ); + } } // Y ticks + labels left of the left edge. + let mut y_cull = LabelCull::default(); for (yv, label) in &yticks { let py = t.data_to_pixel(t.x.min, *yv).y; painter.line_segment( [pos2(area.left() - tick_len, py), pos2(area.left(), py)], axis, ); - painter.text( - pos2(area.left() - tick_len - 3.0, py), - Align2::RIGHT_CENTER, - label, - font.clone(), - style.text, - ); + let galley = painter.layout_no_wrap(label.clone(), font.clone(), style.text); + let size = galley.size(); + if y_cull.admit(py - size.y * 0.5, py + size.y * 0.5) { + painter.galley( + pos2(area.left() - tick_len - 3.0 - size.x, py - size.y * 0.5), + galley, + style.text, + ); + } } } @@ -694,19 +729,22 @@ pub fn draw_y2_ticks(painter: &Painter, t: &Transform, style: &Style) { let font = FontId::proportional(11.0); let tick_len = 4.0; + let mut cull = LabelCull::default(); for (yv, label) in axis_ticks(&t.y, 6) { let py = t.data_to_pixel(t.x.min, yv).y; painter.line_segment( [pos2(area.right(), py), pos2(area.right() + tick_len, py)], axis, ); - painter.text( - pos2(area.right() + tick_len + 3.0, py), - Align2::LEFT_CENTER, - label, - font.clone(), - style.text, - ); + let galley = painter.layout_no_wrap(label, font.clone(), style.text); + let half_h = galley.size().y * 0.5; + if cull.admit(py - half_h, py + half_h) { + painter.galley( + pos2(area.right() + tick_len + 3.0, py - half_h), + galley, + style.text, + ); + } } } @@ -735,34 +773,38 @@ pub fn draw_extra_y_ticks( // y2, whose spine is the data-area frame), so draw one. painter.vline(baseline_x, area.y_range(), axis); + let mut cull = LabelCull::default(); for (yv, label) in axis_ticks(&t.y, 6) { let py = t.data_to_pixel(t.x.min, yv).y; + let galley = painter.layout_no_wrap(label, font.clone(), style.text); + let size = galley.size(); + let keep = cull.admit(py - size.y * 0.5, py + size.y * 0.5); match side { AxisSide::Right => { painter.line_segment( [pos2(baseline_x, py), pos2(baseline_x + tick_len, py)], axis, ); - painter.text( - pos2(baseline_x + tick_len + 3.0, py), - Align2::LEFT_CENTER, - label, - font.clone(), - style.text, - ); + if keep { + painter.galley( + pos2(baseline_x + tick_len + 3.0, py - size.y * 0.5), + galley, + style.text, + ); + } } AxisSide::Left => { painter.line_segment( [pos2(baseline_x - tick_len, py), pos2(baseline_x, py)], axis, ); - painter.text( - pos2(baseline_x - tick_len - 3.0, py), - Align2::RIGHT_CENTER, - label, - font.clone(), - style.text, - ); + if keep { + painter.galley( + pos2(baseline_x - tick_len - 3.0 - size.x, py - size.y * 0.5), + galley, + style.text, + ); + } } } } @@ -1986,6 +2028,26 @@ mod tests { use super::*; use crate::test_util::HeadlessRun; + #[test] + fn label_cull_drops_overlapping_and_keeps_spaced() { + let mut c = LabelCull::default(); + assert!(c.admit(0.0, 10.0)); + assert!(!c.admit(8.0, 18.0)); // overlaps the kept span + assert!(!c.admit(11.0, 21.0)); // clears it but not by GAP + assert!(c.admit(14.0, 24.0)); // clears GAP + assert!(!c.admit(20.0, 30.0)); // compares against the last KEPT span + } + + #[test] + fn label_cull_handles_descending_runs() { + // Y labels walk down in data order but up in pixels (or vice versa); + // admit must work for a monotone run in either direction. + let mut c = LabelCull::default(); + assert!(c.admit(90.0, 100.0)); + assert!(!c.admit(85.0, 95.0)); + assert!(c.admit(70.0, 80.0)); + } + #[test] fn roi_appearance_resolves_color_fallback_and_name() { use crate::core::roi::{ManagedRoi, RoiLineStyle}; From a38775708cb647baaa93159828b3cd3d754ee5f6 Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Fri, 16 Oct 2026 07:50:01 +0900 Subject: [PATCH 09/13] fix(widget): keep a range ROI's name label inside the data area draw_roi anchored the Rect/HRange/VRange label above the rect's top edge, which for a VRange is the data area's top edge: the label landed in the title gutter, over the plot title. The anchor is now clamped to ROI_LABEL_INSET below the area top. --- src/widget/chrome.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/widget/chrome.rs b/src/widget/chrome.rs index fe0c8ba..8132725 100644 --- a/src/widget/chrome.rs +++ b/src/widget/chrome.rs @@ -122,6 +122,11 @@ const CBAR_INTERACTIVE_WIDTH: f32 = 175.0; // Extra gutter claimed by an axis title / label when present. const TITLE_H: f32 = 18.0; const LABEL_H: f32 = 16.0; +// Least distance from the data area's top edge at which a Rect/HRange/VRange +// ROI's name label is anchored: the 11 pt label row plus its 3 px padding, so +// the label (drawn above its anchor) stays inside the area instead of over the +// title gutter. See [`draw_roi`]. +const ROI_LABEL_INSET: f32 = 16.0; /// What chrome the plot needs space reserved for. Drives [`layout`]'s gutter /// sizes so titles/labels, a colorbar, and a y2 axis all get room. @@ -1374,7 +1379,12 @@ pub fn draw_roi( r.right_bottom(), r.left_bottom(), ]); - Some(egui::pos2(r.center().x, r.top())) + // The label sits above the top edge, so a rect whose top is at the + // data area's top — every VRange, which spans the full height — + // would put it in the title gutter, over the title. Keep the anchor + // at least one label height inside the area. + let y = r.top().max(t.area.top() + ROI_LABEL_INSET); + Some(egui::pos2(r.center().x, y)) } }; From b2333c4533f173132bb60438f5f5ea862c21dab4 Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Fri, 16 Oct 2026 07:52:24 +0900 Subject: [PATCH 10/13] fix(render): honour the chrome colour in set_background_colors The wgpu backend stored only the data background and dropped the first argument, so a caller switching a plot to a light canvas over a dark host panel got dark (foreground-override) tick labels on the still-dark gutters. Plot gains `background`; PlotView paints the whole widget rect with it under the data layer when set, and leaves the panel fill showing through when it is not. --- src/core/plot.rs | 5 +++++ src/render/backend_wgpu.rs | 3 ++- src/widget/plot_widget.rs | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/core/plot.rs b/src/core/plot.rs index f2c0661..d176384 100644 --- a/src/core/plot.rs +++ b/src/core/plot.rs @@ -319,6 +319,10 @@ pub struct Plot { pub id: PlotId, /// Data-area background color (maps to silx `setBackgroundColors`' data background). pub data_background: Color32, + /// Chrome background color — the surround behind the gutters, axes and + /// labels (silx `setBackgroundColors`' first colour). `None` (the default) + /// paints nothing there, so the host panel's fill shows through. + pub background: Option, /// Data-space limits `(x_min, x_max, y_min, y_max)`. pub limits: (f64, f64, f64, f64), /// Margins reserving extra space inside the chrome gutters. Zero by default. @@ -568,6 +572,7 @@ impl Plot { Self { id, data_background: Color32::from_rgb(16, 16, 24), + background: None, limits: (0.0, 1.0, 0.0, 1.0), margins: Margins::ZERO, colormap: None, diff --git a/src/render/backend_wgpu.rs b/src/render/backend_wgpu.rs index f5db353..e501066 100644 --- a/src/render/backend_wgpu.rs +++ b/src/render/backend_wgpu.rs @@ -797,7 +797,8 @@ impl Backend for WgpuBackend { self.plot.grid_color = Some(grid); } - fn set_background_colors(&mut self, _background: Color32, data_background: Color32) { + fn set_background_colors(&mut self, background: Color32, data_background: Color32) { + self.plot.background = Some(background); self.plot.data_background = data_background; } diff --git a/src/widget/plot_widget.rs b/src/widget/plot_widget.rs index 8f5c989..dec172a 100644 --- a/src/widget/plot_widget.rs +++ b/src/widget/plot_widget.rs @@ -397,6 +397,14 @@ impl<'a> PlotView<'a> { .with_overrides(plot.foreground, plot.grid_color); let painter = ui.painter(); + // Chrome background (silx `setBackgroundColors`' first colour): the + // surround behind the gutters, painted under everything else. With + // `None` the host panel's fill shows through, as before the colour + // was honoured — a light data area over a dark panel left the tick + // labels (dark, per the foreground override) unreadable. + if let Some(bg) = plot.background { + painter.rect_filled(rect, egui::CornerRadius::ZERO, bg); + } // Data layer (wgpu), clipped to the data area: clear, image, then curve. painter.add(egui_wgpu::Callback::new_paint_callback( area, From b130eb3ba76ff323fcdbfe76cbcafd57fa0a1e28 Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Fri, 16 Oct 2026 12:03:28 +0900 Subject: [PATCH 11/13] docs(readme): state egui 0.36 and MSRV 1.95 under Requirements --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 60db654..d90be10 100644 --- a/README.md +++ b/README.md @@ -92,10 +92,10 @@ There are two API layers: ## Requirements -- A recent Rust toolchain (edition 2024; `rust-version = 1.92`). +- A recent Rust toolchain (edition 2024; `rust-version = 1.95`). - An egui application running on the **wgpu** renderer — `rsplot` renders through an `egui_wgpu` paint callback and needs the wgpu `RenderState`. -- egui / egui-wgpu **0.34**. `rsplot` re-exports `egui` and `egui_wgpu` +- egui / egui-wgpu **0.36**. `rsplot` re-exports `egui` and `egui_wgpu` (`rsplot::egui`, `rsplot::egui_wgpu`) so downstreams can stay on the same versions without skew. - Some widget labels use glyphs beyond egui's default fonts — `→` in the ROI From 6ca831c87b8d1ce4d8f61b53e9c131e8da0d2777 Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Fri, 16 Oct 2026 12:04:05 +0900 Subject: [PATCH 12/13] chore(release): 0.6.0 --- CHANGELOG.md | 43 ++++++++++++++++++++++++++++++++++++++++++- Cargo.toml | 2 +- adl2rsdm/Cargo.toml | 2 +- rsdm/Cargo.toml | 4 ++-- 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccc5b3d..78c710b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,46 @@ library), **rsdm** (a PyDM-style EPICS display layer built on rsplot), and ## [Unreleased] +## [0.6.0] - 2026-10-16 + +### Changed + +- **egui / egui-wgpu 0.36 (wgpu 30)**, MSRV **1.95**. `rsplot` re-exports + `egui`, so downstreams move to 0.36 with it — hence the minor bump. Adapted: + wgpu 30's `Option` vertex buffers and fallible `get_mapped_range`, egui's + `Panel::show_inside` → `show`, `egui_kittest::create_render_state` taking + `RendererOptions`; the headless widget tests run through + `test_util::HeadlessRun`, since epaint 0.36 panics when an unapplied + `TexturesDelta` is dropped. +- **rsplot**: `WgpuBackend` defers `sync_gpu_items` to one `flush_scene` per + frame, so N item mutations (add / remove / update, z, visibility, clear) + rebuild the GPU scene once instead of N times; unchanged z / visibility + writes no longer dirty the scene. +- **rsplot**: the title and the x, y, y2 and extra-axis labels lay out + single-line and elide with `…` to their gutter run instead of being clipped + mid-glyph on a narrow plot; overlapping tick labels are culled on every + gutter (tick marks never). +- **rsplot**: the compact-toolbar overflow button uses U+2026, which egui's + bundled font covers (U+22EF rendered as the tofu box). + +### Added + +- **rsplot**: `widget::form` — label / fill / group helpers for Qt-style + (`QFormLayout`) dialog rows in one egui pass; the colormap, print and + limits dialogs use them. +- **rsplot**: a whole-widget plot background: `set_background_colors`' first + argument was dropped, so a light canvas over a dark host panel got dark + tick labels on still-dark gutters. When set, `PlotView` paints the widget + rect with it under the data layer. +- Documented that hosts must append a broad-coverage fallback font for the + arrow and box-drawing glyphs the ROI descriptions, the style selector and + the image-compare toolbar use. + +### Fixed + +- **rsplot**: a range ROI's name label stays inside the data area instead of + landing in the title gutter over the plot title. + ## [0.5.6] - 2026-07-19 ### Changed @@ -542,7 +582,8 @@ instead of Qt `.ui` XML. - rsplot is now the root of a three-crate workspace; `rsdm` reaches egui/wgpu through `rsplot::egui` to keep a single egui/wgpu in the tree. -[Unreleased]: https://github.com/physwkim/rsplot/compare/v0.5.6...HEAD +[Unreleased]: https://github.com/physwkim/rsplot/compare/v0.6.0...HEAD +[0.6.0]: https://github.com/physwkim/rsplot/compare/v0.5.6...v0.6.0 [0.5.6]: https://github.com/physwkim/rsplot/compare/v0.5.5...v0.5.6 [0.5.5]: https://github.com/physwkim/rsplot/compare/v0.5.4...v0.5.5 [0.5.4]: https://github.com/physwkim/rsplot/compare/v0.5.3...v0.5.4 diff --git a/Cargo.toml b/Cargo.toml index d81119a..b80976f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rsplot" -version = "0.5.6" +version = "0.6.0" edition = "2024" rust-version = "1.95" license = "MIT OR Apache-2.0" diff --git a/adl2rsdm/Cargo.toml b/adl2rsdm/Cargo.toml index 8785e93..3192d28 100644 --- a/adl2rsdm/Cargo.toml +++ b/adl2rsdm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "adl2rsdm" -version = "0.5.6" +version = "0.6.0" edition = "2024" rust-version = "1.95" license = "MIT OR Apache-2.0" diff --git a/rsdm/Cargo.toml b/rsdm/Cargo.toml index 0106531..edf76c4 100644 --- a/rsdm/Cargo.toml +++ b/rsdm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rsdm" -version = "0.5.6" +version = "0.6.0" edition = "2024" rust-version = "1.95" license = "MIT OR Apache-2.0" @@ -54,7 +54,7 @@ calc = ["dep:evalexpr", "dep:epics-base-rs"] # `version` (alongside `path`) is required so `cargo publish` records a # crates.io dependency on the published rsplot; the path is used for local # workspace builds. Keep this in lockstep with rsplot's version. -rsplot = { path = "..", version = "0.5.6" } +rsplot = { path = "..", version = "0.6.0" } # Async runtime for the data engine. The connection tasks live on a tokio # runtime the `Engine` owns; widgets read shared state on the GUI thread. `net` # is enabled so `enable_all()` (and the EPICS backends, later) work. From 029715106654fa1c6569cec4669ac0a388d3a9c2 Mon Sep 17 00:00:00 2001 From: Sang Woo Kim Date: Fri, 16 Oct 2026 12:57:05 +0900 Subject: [PATCH 13/13] fix(rsdm): depend on rust-zstd 0.4, the 0.1 line is yanked rust-zstd 0.1.0 was the only 0.1 release and is yanked, so a fresh resolve of the workspace (CI, any crates.io user) fails on rsdm's optional blosc ZSTD dependency; only the untracked Cargo.lock kept it building here. 0.4 keeps the compress(data, level) / decompress(data) signatures the codec calls. --- CHANGELOG.md | 2 ++ rsdm/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78c710b..fac8a49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,8 @@ library), **rsdm** (a PyDM-style EPICS display layer built on rsplot), and gutter (tick marks never). - **rsplot**: the compact-toolbar overflow button uses U+2026, which egui's bundled font covers (U+22EF rendered as the tofu box). +- **rsdm**: the `pva` feature's blosc ZSTD sub-codec uses `rust-zstd` 0.4; + 0.1.0, the only 0.1 release, was yanked, so a fresh resolve of rsdm failed. ### Added diff --git a/rsdm/Cargo.toml b/rsdm/Cargo.toml index edf76c4..d05a7e8 100644 --- a/rsdm/Cargo.toml +++ b/rsdm/Cargo.toml @@ -109,7 +109,7 @@ flate2 = { version = "1", optional = true } # The blosc ZSTD sub-codec — the same pure-Rust zstd implementation rust-hdf5's # `zstd` feature uses (its `default-features = false` drops the rayon # parallelism, matching rust-hdf5's own declaration). -rust-zstd = { version = "0.1", optional = true, default-features = false } +rust-zstd = { version = "0.4", optional = true, default-features = false } # The blosc SNAPPY sub-codec (raw snappy per split, `snappy_uncompress` in # c-blosc's snappy_wrap_decompress) — the crate rust-hdf5's blosc feature uses. snap = { version = "1", optional = true }