diff --git a/locales/de/main.ftl b/locales/de/main.ftl index e601a7f..3060671 100644 --- a/locales/de/main.ftl +++ b/locales/de/main.ftl @@ -21,7 +21,7 @@ action-place-via = Platziere DuKo action-remove-bands = Entferne Bänder action-compare-detours = Vergleiche Umwege presort-by-pairwise-detours = Nach paarweisen Umwegen vorsortieren -squeeze-under-bands = Presse unter Bänder +squeeze-through-under-bands = Presse unter Bänder wrap-around-bands = Wickle um Bänder zoom-to-fit = Zoom automatisch einpassen show-ratsnest = Zeige Ratsnest diff --git a/locales/en-US/main.ftl b/locales/en-US/main.ftl index 94c5ae5..9b2f0b0 100644 --- a/locales/en-US/main.ftl +++ b/locales/en-US/main.ftl @@ -24,7 +24,7 @@ action-undo = Undo action-redo = Redo presort-by-pairwise-detours = Presort by Pairwise Detours -squeeze-under-bands = Squeeze under Bands +squeeze-through-under-bands = Squeeze through under Bands wrap-around-bands = Wrap around Bands zoom-to-fit = Zoom to Fit diff --git a/locales/pl/main.ftl b/locales/pl/main.ftl index a9cbfd0..0581979 100644 --- a/locales/pl/main.ftl +++ b/locales/pl/main.ftl @@ -19,4 +19,4 @@ show-bboxes = Pokaż obwiednie show-origin-destination = Pokaż pochodzenie i destynację menu-options = Opcje wrap-around-bands = Owiń wokół taśm -squeeze-under-bands = Ściśnij pod taśmami +squeeze-through-under-bands = Ściśnij pod taśmami diff --git a/src/bin/topola-egui/menu_bar.rs b/src/bin/topola-egui/menu_bar.rs index f87cfd4..a930482 100644 --- a/src/bin/topola-egui/menu_bar.rs +++ b/src/bin/topola-egui/menu_bar.rs @@ -41,7 +41,7 @@ impl MenuBar { presort_by_pairwise_detours: false, router_options: RouterOptions { wrap_around_bands: true, - squeeze_under_bands: true, + squeeze_through_under_bands: true, }, }, is_placing_via: false, @@ -199,8 +199,8 @@ impl MenuBar { tr.text("presort-by-pairwise-detours"), ); ui.checkbox( - &mut self.autorouter_options.router_options.squeeze_under_bands, - tr.text("squeeze-under-bands"), + &mut self.autorouter_options.router_options.squeeze_through_under_bands, + tr.text("squeeze-through-under-bands"), ); ui.checkbox( &mut self.autorouter_options.router_options.wrap_around_bands, diff --git a/src/bin/topola/main.rs b/src/bin/topola/main.rs index 1f072e1..3e09e69 100644 --- a/src/bin/topola/main.rs +++ b/src/bin/topola/main.rs @@ -33,7 +33,7 @@ fn main() -> Result<(), std::io::Error> { presort_by_pairwise_detours: false, router_options: RouterOptions { wrap_around_bands: true, - squeeze_under_bands: false, + squeeze_through_under_bands: false, }, }, )); diff --git a/src/router/navmesh.rs b/src/router/navmesh.rs index bb5f514..f14abb4 100644 --- a/src/router/navmesh.rs +++ b/src/router/navmesh.rs @@ -206,7 +206,7 @@ impl Navmesh { let mut gear = Into::::into(Into::::into(trianvertex)); - if options.squeeze_under_bands { + if options.squeeze_through_under_bands { Self::add_node_to_graph_and_map_as_binavvertex( &mut graph, &mut map, diff --git a/src/router/router.rs b/src/router/router.rs index 72d63ab..239ee1c 100644 --- a/src/router/router.rs +++ b/src/router/router.rs @@ -34,7 +34,7 @@ use super::{ #[derive(Debug, Clone, Copy, Serialize, Deserialize)] pub struct RouterOptions { pub wrap_around_bands: bool, - pub squeeze_under_bands: bool, + pub squeeze_through_under_bands: bool, } #[derive(Error, Debug, Clone)] diff --git a/tests/single_layer/0603_breakout/autoroute_all.cmd b/tests/single_layer/0603_breakout/autoroute_all.cmd index 784e92c..d122116 100644 --- a/tests/single_layer/0603_breakout/autoroute_all.cmd +++ b/tests/single_layer/0603_breakout/autoroute_all.cmd @@ -18,7 +18,7 @@ "presort_by_pairwise_detours": false, "router_options": { "wrap_around_bands": true, - "squeeze_under_bands": true + "squeeze_through_under_bands": true } } ] @@ -41,7 +41,7 @@ "presort_by_pairwise_detours": false, "router_options": { "wrap_around_bands": true, - "squeeze_under_bands": true + "squeeze_through_under_bands": true } } ] diff --git a/tests/single_layer/4x_3rd_order_smd_lc_filters/autoroute_signals.cmd b/tests/single_layer/4x_3rd_order_smd_lc_filters/autoroute_signals.cmd index 4285639..6f1fbd6 100644 --- a/tests/single_layer/4x_3rd_order_smd_lc_filters/autoroute_signals.cmd +++ b/tests/single_layer/4x_3rd_order_smd_lc_filters/autoroute_signals.cmd @@ -54,7 +54,7 @@ "presort_by_pairwise_detours": false, "router_options": { "wrap_around_bands": true, - "squeeze_under_bands": true + "squeeze_through_under_bands": true } } ] @@ -113,7 +113,7 @@ "presort_by_pairwise_detours": false, "router_options": { "wrap_around_bands": true, - "squeeze_under_bands": true + "squeeze_through_under_bands": true } } ] @@ -172,7 +172,7 @@ "presort_by_pairwise_detours": false, "router_options": { "wrap_around_bands": true, - "squeeze_under_bands": true + "squeeze_through_under_bands": true } } ] @@ -231,7 +231,7 @@ "presort_by_pairwise_detours": false, "router_options": { "wrap_around_bands": true, - "squeeze_under_bands": true + "squeeze_through_under_bands": true } } ] diff --git a/tests/single_layer/tht_3pin_xlr_to_tht_3pin_xlr/autoroute_all.cmd b/tests/single_layer/tht_3pin_xlr_to_tht_3pin_xlr/autoroute_all.cmd index 4057016..cf6d218 100644 --- a/tests/single_layer/tht_3pin_xlr_to_tht_3pin_xlr/autoroute_all.cmd +++ b/tests/single_layer/tht_3pin_xlr_to_tht_3pin_xlr/autoroute_all.cmd @@ -34,7 +34,7 @@ "presort_by_pairwise_detours": false, "router_options": { "wrap_around_bands": true, - "squeeze_under_bands": true + "squeeze_through_under_bands": true } } ] diff --git a/tests/single_layer/tht_diode_bridge_rectifier/autoroute_all.cmd b/tests/single_layer/tht_diode_bridge_rectifier/autoroute_all.cmd index 6f010b2..8319bd2 100644 --- a/tests/single_layer/tht_diode_bridge_rectifier/autoroute_all.cmd +++ b/tests/single_layer/tht_diode_bridge_rectifier/autoroute_all.cmd @@ -54,7 +54,7 @@ "presort_by_pairwise_detours": false, "router_options": { "wrap_around_bands": true, - "squeeze_under_bands": true + "squeeze_through_under_bands": true } } ] @@ -77,7 +77,7 @@ "presort_by_pairwise_detours": false, "router_options": { "wrap_around_bands": true, - "squeeze_under_bands": true + "squeeze_through_under_bands": true } } ]