diff --git a/src/ui/panes/pid_drawing_tool.rs b/src/ui/panes/pid_drawing_tool.rs index d102e1df82e805ccc8eb3155621c5ae3ce9da1f1..5abe0370b35f5c8533d6869edbf42c6265771d30 100644 --- a/src/ui/panes/pid_drawing_tool.rs +++ b/src/ui/panes/pid_drawing_tool.rs @@ -265,7 +265,8 @@ impl PidPane { // Append start point points.push( - self.elements[connection.start].get_ancor_point(&self.grid, connection.start_ancor), + self.elements[connection.start] + .get_anchor_point(&self.grid, connection.start_anchor), ); // Append all midpoints @@ -277,7 +278,7 @@ impl PidPane { // Append end point points.push( - self.elements[connection.end].get_ancor_point(&self.grid, connection.end_ancor), + self.elements[connection.end].get_anchor_point(&self.grid, connection.end_anchor), ); // Draw line segments @@ -379,16 +380,16 @@ impl PidPane { self.connections[conn_idx].split(segm_idx, Pos::from_pos2(&self.grid, pointer_pos)); ui.close_menu(); } - if ui.button("Change start ancor").clicked() { + if ui.button("Change start anchor").clicked() { let conn = &mut self.connections[conn_idx]; - conn.start_ancor = (conn.start_ancor + 1) - % self.elements[conn.start].symbol.get_ancor_points().len(); + conn.start_anchor = (conn.start_anchor + 1) + % self.elements[conn.start].symbol.get_anchor_points().len(); ui.close_menu(); } - if ui.button("Change end ancor").clicked() { + if ui.button("Change end anchor").clicked() { let conn = &mut self.connections[conn_idx]; - conn.end_ancor = - (conn.end_ancor + 1) % self.elements[conn.end].symbol.get_ancor_points().len(); + conn.end_anchor = (conn.end_anchor + 1) + % self.elements[conn.end].symbol.get_anchor_points().len(); ui.close_menu(); } } else { diff --git a/src/ui/panes/pid_drawing_tool/connections.rs b/src/ui/panes/pid_drawing_tool/connections.rs index 43a79ad18ef733c2370b1f9360da57619c9b4ebb..96a2d44785b2ea6cef506f62da4f323cb3679675 100644 --- a/src/ui/panes/pid_drawing_tool/connections.rs +++ b/src/ui/panes/pid_drawing_tool/connections.rs @@ -7,23 +7,23 @@ use super::{grid::LINE_DISTANCE_THRESHOLD, pos::Pos, PidPane}; pub struct Connection { /// Index of the start element pub start: usize, - pub start_ancor: usize, + pub start_anchor: usize, /// Index of the end element pub end: usize, - pub end_ancor: usize, + pub end_anchor: usize, /// Coordinates of middle points pub middle_points: Vec<Pos>, } impl Connection { - pub fn new(start: usize, start_ancor: usize, end: usize, end_ancor: usize) -> Self { + pub fn new(start: usize, start_anchor: usize, end: usize, end_anchor: usize) -> Self { Self { start, - start_ancor, + start_anchor, end, - end_ancor, + end_anchor, middle_points: Vec::new(), } } @@ -33,7 +33,7 @@ impl Connection { let mut points = Vec::new(); // Append start point - points.push(pid.elements[self.start].get_ancor_point(&pid.grid, self.start_ancor)); + points.push(pid.elements[self.start].get_anchor_point(&pid.grid, self.start_anchor)); // Append all midpoints self.middle_points @@ -42,7 +42,7 @@ impl Connection { .for_each(|p| points.push(p)); // Append end point - points.push(pid.elements[self.end].get_ancor_point(&pid.grid, self.end_ancor)); + points.push(pid.elements[self.end].get_anchor_point(&pid.grid, self.end_anchor)); // Check each segment for i in 0..(points.len() - 1) { diff --git a/src/ui/panes/pid_drawing_tool/elements.rs b/src/ui/panes/pid_drawing_tool/elements.rs index 9b7fdbc805df04c339bffc446fcdaa2691477603..8bcb7fba1f22328fb18a374889bf8a2f26054bb1 100644 --- a/src/ui/panes/pid_drawing_tool/elements.rs +++ b/src/ui/panes/pid_drawing_tool/elements.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Serialize, Deserialize, PartialEq)] pub struct Element { - /// Ancor postion in the grid, symbol center + /// Anchor postion in the grid, symbol center pub position: Pos, /// Size in grid units @@ -35,10 +35,10 @@ impl Element { (start.x <= pos.x && pos.x < end.x) && (start.y <= pos.y && pos.y < end.y) } - pub fn get_ancor_point(&self, grid: &GridInfo, idx: usize) -> Pos2 { - let ancor = self.symbol.get_ancor_points()[idx]; - let ancor = Vec2::from(ancor) * self.size as f32 * grid.size; + pub fn get_anchor_point(&self, grid: &GridInfo, idx: usize) -> Pos2 { + let anchor = self.symbol.get_anchor_points()[idx]; + let anchor = Vec2::from(anchor) * self.size as f32 * grid.size; - self.position.into_pos2(grid) + ancor + self.position.into_pos2(grid) + anchor } } diff --git a/src/ui/panes/pid_drawing_tool/symbols.rs b/src/ui/panes/pid_drawing_tool/symbols.rs index 1b7b62849f91845bb4feb3f2e5c2e8f7a4779270..c0bd2123d2af4bd827623e2c5f53421f90e040ba 100644 --- a/src/ui/panes/pid_drawing_tool/symbols.rs +++ b/src/ui/panes/pid_drawing_tool/symbols.rs @@ -42,7 +42,7 @@ impl Symbol { } } - pub fn get_ancor_points(&self) -> Vec<(f32, f32)> { + pub fn get_anchor_points(&self) -> Vec<(f32, f32)> { match self { Symbol::ManualValve => [(-0.5, 0.0), (0.5, 0.0)].into(), Symbol::CheckValve => [(-0.5, 0.0), (0.5, 0.0)].into(),