diff --git a/crates/topola-egui/src/appearance_panel.rs b/crates/topola-egui/src/appearance_panel.rs index b752d59..ca4051d 100644 --- a/crates/topola-egui/src/appearance_panel.rs +++ b/crates/topola-egui/src/appearance_panel.rs @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: MIT -use topola::board::{mesadata::AccessMesadata, Board}; +use topola::board::{AccessMesadata, Board}; pub struct AppearancePanel { // TODO: diff --git a/crates/topola-egui/src/overlay.rs b/crates/topola-egui/src/overlay.rs index 3376906..3cc7e63 100644 --- a/crates/topola-egui/src/overlay.rs +++ b/crates/topola-egui/src/overlay.rs @@ -11,7 +11,7 @@ use topola::{ ratsnest::Ratsnest, selection::{BboxSelectionKind, Selection}, }, - board::{mesadata::AccessMesadata, Board}, + board::{AccessMesadata, Board}, drawing::{ graph::{GetLayer, MakePrimitive}, primitive::MakePrimitiveShape, diff --git a/crates/topola-egui/src/viewport.rs b/crates/topola-egui/src/viewport.rs index 0cfcc82..fa8f4f7 100644 --- a/crates/topola-egui/src/viewport.rs +++ b/crates/topola-egui/src/viewport.rs @@ -13,7 +13,7 @@ use topola::{ execution::Command, invoker::{GetGhosts, GetMaybeNavcord, GetMaybeNavmesh, GetObstacles, Invoker}, }, - board::mesadata::AccessMesadata, + board::AccessMesadata, drawing::{ graph::{MakePrimitive, PrimitiveIndex}, primitive::MakePrimitiveShape, diff --git a/src/autorouter/autoroute.rs b/src/autorouter/autoroute.rs index 5152991..4a1a0f9 100644 --- a/src/autorouter/autoroute.rs +++ b/src/autorouter/autoroute.rs @@ -10,11 +10,11 @@ use std::ops::ControlFlow; use petgraph::graph::EdgeIndex; use crate::{ - board::mesadata::AccessMesadata, - drawing::{band::BandTermsegIndex, collect::Collect, graph::PrimitiveIndex}, + board::AccessMesadata, + drawing::{band::BandTermsegIndex, graph::PrimitiveIndex, Collect}, geometry::primitive::PrimitiveShape, layout::LayoutEdit, - router::{navcord::NavcordStepper, navmesh::Navmesh, route::RouteStepper, Router}, + router::{navcord::NavcordStepper, navmesh::Navmesh, RouteStepper, Router}, stepper::Step, }; diff --git a/src/autorouter/autorouter.rs b/src/autorouter/autorouter.rs index 20c53d7..e07c15f 100644 --- a/src/autorouter/autorouter.rs +++ b/src/autorouter/autorouter.rs @@ -10,7 +10,7 @@ use spade::InsertionError; use thiserror::Error; use crate::{ - board::{mesadata::AccessMesadata, Board}, + board::{AccessMesadata, Board}, drawing::{band::BandTermsegIndex, dot::FixedDotIndex, Infringement}, layout::{via::ViaWeight, LayoutEdit}, router::{astar::AstarError, navmesh::NavmeshError, RouterOptions}, diff --git a/src/autorouter/compare_detours.rs b/src/autorouter/compare_detours.rs index 758faf7..42f919a 100644 --- a/src/autorouter/compare_detours.rs +++ b/src/autorouter/compare_detours.rs @@ -10,7 +10,7 @@ use std::ops::ControlFlow; use petgraph::graph::EdgeIndex; use crate::{ - board::mesadata::AccessMesadata, + board::AccessMesadata, drawing::graph::PrimitiveIndex, geometry::{primitive::PrimitiveShape, shape::MeasureLength}, graph::MakeRef, diff --git a/src/autorouter/execution.rs b/src/autorouter/execution.rs index d7f6529..ae323e9 100644 --- a/src/autorouter/execution.rs +++ b/src/autorouter/execution.rs @@ -8,7 +8,7 @@ use enum_dispatch::enum_dispatch; use serde::{Deserialize, Serialize}; use crate::{ - board::mesadata::AccessMesadata, + board::AccessMesadata, layout::{via::ViaWeight, LayoutEdit}, stepper::Step, }; diff --git a/src/autorouter/invoker.rs b/src/autorouter/invoker.rs index f729e71..051fe13 100644 --- a/src/autorouter/invoker.rs +++ b/src/autorouter/invoker.rs @@ -12,7 +12,7 @@ use enum_dispatch::enum_dispatch; use thiserror::Error; use crate::{ - board::mesadata::AccessMesadata, + board::AccessMesadata, drawing::graph::PrimitiveIndex, geometry::{edit::ApplyGeometryEdit, primitive::PrimitiveShape}, router::{navcord::NavcordStepper, navmesh::Navmesh}, diff --git a/src/autorouter/measure_length.rs b/src/autorouter/measure_length.rs index e235731..cd9b009 100644 --- a/src/autorouter/measure_length.rs +++ b/src/autorouter/measure_length.rs @@ -7,7 +7,7 @@ //! the length of specified band selections. use crate::{ - board::mesadata::AccessMesadata, + board::AccessMesadata, drawing::graph::PrimitiveIndex, geometry::{primitive::PrimitiveShape, shape::MeasureLength as MeasureLengthTrait}, graph::MakeRef, diff --git a/src/autorouter/place_via.rs b/src/autorouter/place_via.rs index 67c9c76..9425cba 100644 --- a/src/autorouter/place_via.rs +++ b/src/autorouter/place_via.rs @@ -7,7 +7,7 @@ //! checks if the via has already been placed. use crate::{ - board::mesadata::AccessMesadata, + board::AccessMesadata, drawing::graph::PrimitiveIndex, geometry::primitive::PrimitiveShape, layout::{via::ViaWeight, LayoutEdit}, diff --git a/src/autorouter/pointroute.rs b/src/autorouter/pointroute.rs index 55b70be..c4fa96f 100644 --- a/src/autorouter/pointroute.rs +++ b/src/autorouter/pointroute.rs @@ -7,14 +7,14 @@ use std::ops::ControlFlow; use geo::Point; use crate::{ - board::mesadata::AccessMesadata, + board::AccessMesadata, drawing::{ band::BandTermsegIndex, dot::{FixedDotIndex, FixedDotWeight}, }, layout::LayoutEdit, math::Circle, - router::{route::RouteStepper, Router}, + router::{RouteStepper, Router}, stepper::Step, }; diff --git a/src/autorouter/remove_bands.rs b/src/autorouter/remove_bands.rs index 8f73279..758d7aa 100644 --- a/src/autorouter/remove_bands.rs +++ b/src/autorouter/remove_bands.rs @@ -5,7 +5,7 @@ //! Provides functionality to remove bands from the layout. use crate::{ - board::mesadata::AccessMesadata, + board::AccessMesadata, drawing::graph::PrimitiveIndex, geometry::primitive::PrimitiveShape, layout::LayoutEdit, diff --git a/src/autorouter/selection.rs b/src/autorouter/selection.rs index b26c249..a3678cf 100644 --- a/src/autorouter/selection.rs +++ b/src/autorouter/selection.rs @@ -8,10 +8,10 @@ use rstar::AABB; use serde::{Deserialize, Serialize}; use crate::{ - board::{mesadata::AccessMesadata, BandName, Board, ResolvedSelector}, + board::{AccessMesadata, BandName, Board, ResolvedSelector}, drawing::{ - collect::Collect, graph::{GetLayer, MakePrimitive, PrimitiveIndex}, + Collect, }, geometry::{ shape::{AccessShape, Shape}, diff --git a/src/board/mod.rs b/src/board/mod.rs index 7952477..0fab29f 100644 --- a/src/board/mod.rs +++ b/src/board/mod.rs @@ -6,9 +6,7 @@ //! between nodes, pins, and bands, as well as handle metadata and geometric data //! for layout construction. -pub mod mesadata { - pub use specctra_core::mesadata::AccessMesadata; -} +pub use specctra_core::mesadata::AccessMesadata; use std::{cmp::Ordering, collections::BTreeMap}; @@ -17,14 +15,13 @@ use derive_getters::Getters; use serde::{Deserialize, Serialize}; use crate::{ - board::mesadata::AccessMesadata, drawing::{ band::BandUid, bend::{BendIndex, BendWeight}, - collect::Collect, dot::{DotIndex, DotWeight, FixedDotIndex, FixedDotWeight}, graph::{GetLayer, GetMaybeNet, PrimitiveIndex, PrimitiveWeight}, seg::{FixedSegIndex, FixedSegWeight, SegIndex, SegWeight}, + Collect, }, geometry::{edit::ApplyGeometryEdit, shape::AccessShape, GenericNode}, graph::GenericIndex, diff --git a/src/drawing/mod.rs b/src/drawing/mod.rs index a2dd841..4b3ef35 100644 --- a/src/drawing/mod.rs +++ b/src/drawing/mod.rs @@ -6,16 +6,19 @@ pub mod graph; pub mod band; pub mod bend; -pub mod cane; -pub mod collect; +mod cane; +mod collect; pub mod dot; mod drawing; pub mod gear; -pub mod guide; +mod guide; pub mod head; pub mod loose; pub mod primitive; pub use specctra_core::rules; pub mod seg; +pub use cane::Cane; +pub use collect::Collect; pub use drawing::*; +pub use guide::Guide; diff --git a/src/interactor/activity.rs b/src/interactor/activity.rs index ddbec1d..d16e7f9 100644 --- a/src/interactor/activity.rs +++ b/src/interactor/activity.rs @@ -14,7 +14,7 @@ use crate::{ GetGhosts, GetMaybeNavcord, GetMaybeNavmesh, GetObstacles, Invoker, InvokerError, }, }, - board::mesadata::AccessMesadata, + board::AccessMesadata, drawing::graph::PrimitiveIndex, geometry::primitive::PrimitiveShape, interactor::interaction::{InteractionError, InteractionStepper}, diff --git a/src/interactor/interaction.rs b/src/interactor/interaction.rs index f414311..e6866f5 100644 --- a/src/interactor/interaction.rs +++ b/src/interactor/interaction.rs @@ -8,7 +8,7 @@ use thiserror::Error; use crate::{ autorouter::invoker::{GetGhosts, GetMaybeNavcord, GetMaybeNavmesh, GetObstacles}, - board::mesadata::AccessMesadata, + board::AccessMesadata, drawing::graph::PrimitiveIndex, geometry::primitive::PrimitiveShape, router::{navcord::NavcordStepper, navmesh::Navmesh}, diff --git a/src/interactor/interactor.rs b/src/interactor/interactor.rs index 47aee5e..59d2b71 100644 --- a/src/interactor/interactor.rs +++ b/src/interactor/interactor.rs @@ -13,7 +13,7 @@ use crate::{ invoker::{Invoker, InvokerError}, Autorouter, }, - board::{mesadata::AccessMesadata, Board}, + board::{AccessMesadata, Board}, interactor::activity::{ ActivityContext, ActivityError, ActivityStepperWithStatus, InteractiveInput, }, diff --git a/src/layout/layout.rs b/src/layout/layout.rs index a884544..27b4432 100644 --- a/src/layout/layout.rs +++ b/src/layout/layout.rs @@ -12,7 +12,6 @@ use crate::{ drawing::{ band::BandTermsegIndex, bend::{BendIndex, BendWeight, LooseBendWeight}, - cane::Cane, dot::{DotIndex, DotWeight, FixedDotIndex, FixedDotWeight, LooseDotIndex, LooseDotWeight}, gear::GearIndex, graph::{GetMaybeNet, IsInLayer, MakePrimitive, PrimitiveIndex, PrimitiveWeight}, @@ -22,7 +21,7 @@ use crate::{ FixedSegIndex, FixedSegWeight, LoneLooseSegIndex, LoneLooseSegWeight, SegIndex, SegWeight, SeqLooseSegIndex, SeqLooseSegWeight, }, - Drawing, DrawingEdit, DrawingException, Infringement, + Cane, Drawing, DrawingEdit, DrawingException, Infringement, }, geometry::{edit::ApplyGeometryEdit, shape::Shape, GenericNode}, graph::{GenericIndex, GetPetgraphIndex}, diff --git a/src/router/draw.rs b/src/router/draw.rs index 7ec6a70..6e305d4 100644 --- a/src/router/draw.rs +++ b/src/router/draw.rs @@ -15,12 +15,11 @@ use crate::{ dot::{DotIndex, FixedDotIndex, LooseDotIndex, LooseDotWeight}, gear::GearIndex, graph::{GetLayer, GetMaybeNet, MakePrimitive}, - guide::Guide, head::{CaneHead, GetFace, Head}, primitive::GetOtherJoint, rules::AccessRules, seg::{LoneLooseSegWeight, SeqLooseSegWeight}, - DrawingException, Infringement, + DrawingException, Guide, Infringement, }, layout::{Layout, LayoutEdit}, math::{Circle, NoTangents}, diff --git a/src/router/mod.rs b/src/router/mod.rs index 766ca2c..5ac13f5 100644 --- a/src/router/mod.rs +++ b/src/router/mod.rs @@ -7,7 +7,8 @@ pub mod draw; pub mod navcord; pub mod navcorder; pub mod navmesh; -pub mod route; -pub mod router; +mod route; +mod router; +pub use route::RouteStepper; pub use router::*; diff --git a/src/router/router.rs b/src/router/router.rs index b9c5784..e9a8446 100644 --- a/src/router/router.rs +++ b/src/router/router.rs @@ -12,11 +12,10 @@ use crate::{ band::BandTermsegIndex, dot::{DotIndex, FixedDotIndex}, graph::{MakePrimitive, PrimitiveIndex}, - guide::Guide, head::GetFace, primitive::MakePrimitiveShape, rules::AccessRules, - Collision, DrawingException, Infringement, + Collision, DrawingException, Guide, Infringement, }, geometry::{ primitive::PrimitiveShape, diff --git a/src/specctra/design.rs b/src/specctra/design.rs index 97e764e..fef3bb1 100644 --- a/src/specctra/design.rs +++ b/src/specctra/design.rs @@ -11,7 +11,7 @@ use std::collections::{btree_map::Entry as BTreeMapEntry, BTreeMap}; use geo::{point, Point, Rotate}; use crate::{ - board::{mesadata::AccessMesadata, Board}, + board::{AccessMesadata, Board}, drawing::{ dot::FixedDotWeight, graph::{GetLayer, GetMaybeNet, MakePrimitive}, diff --git a/tests/common/mod.rs b/tests/common/mod.rs index c4bdd68..04781b0 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -11,7 +11,7 @@ use topola::{ invoker::{Invoker, InvokerError}, Autorouter, }, - board::{mesadata::AccessMesadata, Board}, + board::{AccessMesadata, Board}, drawing::{ dot::FixedDotIndex, graph::{GetLayer, GetMaybeNet}, diff --git a/tests/multilayer.rs b/tests/multilayer.rs index 513789b..7d9b8c2 100644 --- a/tests/multilayer.rs +++ b/tests/multilayer.rs @@ -4,7 +4,7 @@ use topola::{ autorouter::{execution::Command, invoker::InvokerError, AutorouterError}, - board::mesadata::AccessMesadata, + board::AccessMesadata, layout::via::ViaWeight, math::Circle, };