zenithsiz/zsw
1
0
Fork 0
mirror of https://github.com/Zenithsiz/zsw.git synced 2026-02-03 09:50:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed chart stacking sometimes resulting in floating bars.

Browse Source
This commit is contained in:
Filipe Rodrigues 2025-09-18 00:17:18 +01:00
parent 2edcce509c
commit a93626525d
Signed by: zenithsiz
SSH Key Fingerprint: SHA256:Mb5ppb3Sh7IarBO/sBTXLHbYEOz37hJAlslLQPPAPaU
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
zsw/src/menu/metrics/frame_times.rs
View File

@ -132,19 +132,26 @@ fn draw_display_settings<T>(ui: &mut egui::Ui, frame_times: &mut FrameTimes<T>)
fn add_frame_time_chart<T, D>(
frame_times: &FrameTimes<T>,
display: &FrameTimesDisplay,
prev_charts: &[egui_plot::BarChart],
prev_heights: &mut [f64],
duration_idx: &D,
) -> egui_plot::BarChart
where
D: DurationIdx<T>,
{
let bars = match display {
FrameTimesDisplay::TimeGraph { .. } => frame_times
FrameTimesDisplay::TimeGraph { stack_charts } => frame_times
.iter()
.enumerate()
.filter_map(|(frame_idx, frame_time)| {
let height = duration_idx.duration_of(frame_time)?.as_millis_f64();
Some(egui_plot::Bar::new(frame_idx as f64, height).width(1.0))
let mut bar = egui_plot::Bar::new(frame_idx as f64, height).width(1.0);
if *stack_charts {
bar = bar.base_offset(prev_heights[frame_idx]);
prev_heights[frame_idx] += height;
}
Some(bar)
})
.collect(),
FrameTimesDisplay::Histogram { time_scale } => {
@ -172,13 +179,7 @@ where
},
};
let mut chart = egui_plot::BarChart::new(duration_idx.name(), bars);
if let FrameTimesDisplay::TimeGraph { stack_charts } = display &&
*stack_charts
{
chart = chart.stack_on(&prev_charts.iter().collect::<Vec<_>>());
}
chart
egui_plot::BarChart::new(duration_idx.name(), bars)
}
/// Duration index

9
zsw/src/menu/metrics/frame_times/render.rs
View File

@ -11,11 +11,10 @@ use {
pub fn draw(ui: &mut egui::Ui, render_frame_times: &mut FrameTimes<RenderFrameTime>) {
let display = super::draw_display_settings(ui, render_frame_times);
let mut charts = vec![];
for duration_idx in DurationIdx::iter() {
let chart = super::add_frame_time_chart(render_frame_times, &display, &charts, &duration_idx);
charts.push(chart);
}
let mut prev_heights = vec![0.0; render_frame_times.len()];
let charts = DurationIdx::iter().map(|duration_idx| {
super::add_frame_time_chart(render_frame_times, &display, &mut prev_heights, &duration_idx)
});
super::draw_plot(ui, &display, charts);
}

12
zsw/src/menu/metrics/frame_times/render_panels.rs
View File

@ -100,14 +100,12 @@ pub fn draw(ui: &mut egui::Ui, render_frame_times: &mut FrameTimes<RenderPanelsF
.map(move |inner| DurationIdx::Panels { panel_idx, inner })
}),
)
.sorted()
.collect::<Vec<_>>();
.sorted();
let mut charts = vec![];
for duration_idx in duration_idxs {
let chart = super::add_frame_time_chart(render_frame_times, &display, &charts, &duration_idx);
charts.push(chart);
}
let mut prev_heights = vec![0.0; render_frame_times.len()];
let charts = duration_idxs.map(|duration_idx| {
super::add_frame_time_chart(render_frame_times, &display, &mut prev_heights, &duration_idx)
});
super::draw_plot(ui, &display, charts);
}