From c4788c0277c45d308f9d180cde1d1a1a70d111d2 Mon Sep 17 00:00:00 2001 From: Mikolaj Wielgus Date: Sat, 15 Jun 2024 01:06:50 +0200 Subject: [PATCH] drawing: remove hardcoded layer count of 2 --- src/drawing/drawing.rs | 4 ++-- src/dsn/design.rs | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/drawing/drawing.rs b/src/drawing/drawing.rs index d06ffbc..0f9423d 100644 --- a/src/drawing/drawing.rs +++ b/src/drawing/drawing.rs @@ -78,9 +78,9 @@ pub struct Drawing { } impl Drawing { - pub fn new(rules: R) -> Self { + pub fn new(rules: R, layer_count: usize) -> Self { Self { - geometry_with_rtree: GeometryWithRtree::new(2), + geometry_with_rtree: GeometryWithRtree::new(layer_count), rules, } } diff --git a/src/dsn/design.rs b/src/dsn/design.rs index 6b041f3..b7714da 100644 --- a/src/dsn/design.rs +++ b/src/dsn/design.rs @@ -124,8 +124,11 @@ impl DsnDesign { } pub fn make_board(&self) -> Board { - let rules = DsnMesadata::from_pcb(&self.pcb); - let mut board = Board::new(Layout::new(Drawing::new(rules))); + let mesadata = DsnMesadata::from_pcb(&self.pcb); + let mut board = Board::new(Layout::new(Drawing::new( + mesadata, + self.pcb.structure.layer_vec.len(), + ))); // mapping of pin -> net prepared for adding pins let pin_nets = HashMap::::from_iter(