fix: increase WPM y-label range to at least 5 (#93)

* Increase WPM y-label range to at least 5 * Ignore the case where the WPM vector is empty * style(ui): change comment on chart rendering code --------- Co-authored-by: bolphen <unknown> Co-authored-by: Max Niederman <[email protected]>
max-niederman · Sep 30, 2023 · 5b33304 · 5b33304
1 parent 9790d54
commit 5b33304
Showing 1 changed file with 44 additions and 38 deletions.
diff --git a/src/ui.rs b/src/ui.rs
@@ -291,44 +291,50 @@ impl ThemedWidget for &results::Results {
             })
             .collect();
 
-        let wpm_sma_min = wpm_sma
-            .iter()
-            .map(|(_, x)| x)
-            .fold(f64::INFINITY, |a, &b| a.min(b));
-        let wpm_sma_max = wpm_sma
-            .iter()
-            .map(|(_, x)| x)
-            .fold(f64::NEG_INFINITY, |a, &b| a.max(b));
-
-        let wpm_datasets = vec![Dataset::default()
-            .name("WPM")
-            .marker(Marker::Braille)
-            .graph_type(GraphType::Line)
-            .style(theme.results_chart)
-            .data(&wpm_sma)];
-
-        let wpm_chart = Chart::new(wpm_datasets)
-            .block(Block::default().title(vec![Span::styled("Chart", theme.title)]))
-            .x_axis(
-                Axis::default()
-                    .title(Span::styled("Keypresses", theme.results_chart_x))
-                    .bounds([0.0, self.timing.per_event.len() as f64]),
-            )
-            .y_axis(
-                Axis::default()
-                    .title(Span::styled(
-                        "WPM (10-keypress rolling average)",
-                        theme.results_chart_y,
-                    ))
-                    .bounds([wpm_sma_min, wpm_sma_max])
-                    .labels(
-                        (wpm_sma_min as u16..wpm_sma_max as u16)
-                            .step_by(5)
-                            .map(|n| Span::raw(format!("{}", n)))
-                            .collect(),
-                    ),
-            );
-        wpm_chart.render(res_chunks[1], buf);
+        // Render the chart if possible
+        if !wpm_sma.is_empty() {
+            let wpm_sma_min = wpm_sma
+                .iter()
+                .map(|(_, x)| x)
+                .fold(f64::INFINITY, |a, &b| a.min(b));
+            let wpm_sma_max = wpm_sma
+                .iter()
+                .map(|(_, x)| x)
+                .fold(f64::NEG_INFINITY, |a, &b| a.max(b));
+
+            let wpm_datasets = vec![Dataset::default()
+                .name("WPM")
+                .marker(Marker::Braille)
+                .graph_type(GraphType::Line)
+                .style(theme.results_chart)
+                .data(&wpm_sma)];
+
+            let y_label_min = wpm_sma_min as u16;
+            let y_label_max = (wpm_sma_max as u16).max(y_label_min + 6);
+
+            let wpm_chart = Chart::new(wpm_datasets)
+                .block(Block::default().title(vec![Span::styled("Chart", theme.title)]))
+                .x_axis(
+                    Axis::default()
+                        .title(Span::styled("Keypresses", theme.results_chart_x))
+                        .bounds([0.0, self.timing.per_event.len() as f64]),
+                )
+                .y_axis(
+                    Axis::default()
+                        .title(Span::styled(
+                            "WPM (10-keypress rolling average)",
+                            theme.results_chart_y,
+                        ))
+                        .bounds([wpm_sma_min, wpm_sma_max])
+                        .labels(
+                            (y_label_min..y_label_max)
+                                .step_by(5)
+                                .map(|n| Span::raw(format!("{}", n)))
+                                .collect(),
+                        ),
+                );
+            wpm_chart.render(res_chunks[1], buf);
+        }
     }
 }