diff --git a/src/main.rs b/src/main.rs index 7d630d9..5761521 100644 --- a/src/main.rs +++ b/src/main.rs @@ -181,19 +181,11 @@ impl<'a> Graph<'a> { } else { self.head_tracker = self.head_tracker + (delta_time * self.px_per_s) } - self.push(Point::new( - self.head_tracker, - self.y_origin - y, - delta_time, - )); + self.push(Point::new(self.head_tracker, self.y_origin - y, delta_time)); } Axis::Two => { // both x and y will get displaced - self.push(Point::new( - self.x_origin + x, - self.y_origin - y, - delta_time, - )) + self.push(Point::new(self.x_origin + x, self.y_origin - y, delta_time)) } } } @@ -364,7 +356,7 @@ async fn main() { let mut x = 0.; for p in &graph.points { x += p.time_since_last; - let _ = file.write_all(format!("{x},{}\n", p.y-graph.y_origin).as_bytes()); + let _ = file.write_all(format!("{x},{}\n", p.y - graph.y_origin).as_bytes()); } let _ = file.flush(); @@ -402,23 +394,24 @@ async fn main() { let (_, my) = mouse_wheel(); graph.px_per_s += 10. * my; + let mut debug = DebugWindow::new(font.as_ref()); + let params = debug.get_params(); + + // Cursor information + let (mouse_x, mouse_y) = mouse_position(); + let text = &format!("x{mouse_x}, y{}", -(mouse_y - graph.y_origin)); + let size = measure_text(text, params.font, params.font_size, params.font_scale); + draw_rectangle( + mouse_x, + mouse_y + (size.offset_y / 4.), + size.width, + -(size.height), + DARKGRAY, + ); + + draw_text_ex(text, mouse_x, mouse_y, params); // toggle debug box if show_debug { - let mut debug = DebugWindow::new(font.as_ref()); - let params = debug.get_params(); - // Debug cursor information - let (mouse_x, mouse_y) = mouse_position(); - let text = &format!("x{mouse_x}, y{}", -(mouse_y - graph.y_origin)); - let size = measure_text(text, params.font, params.font_size, params.font_scale); - draw_rectangle( - mouse_x, - mouse_y + (size.offset_y / 4.), - size.width, - -(size.height), - BLUE, - ); - draw_text_ex(text, mouse_x, mouse_y, params); - // Debug textbox debug.add_line(format!( "FPS {:04}, Frametime {:05.2}ms", @@ -431,6 +424,7 @@ async fn main() { )); debug.add_line(format!("Cursor Pos {:?}", mouse_position())); + #[allow(static_mut_refs)] if let Some(port_name) = unsafe { PORT.clone() } { debug.add_line(format!("Serial Port {port_name}, Baud Rate {BAUD_RATE}")); }