berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dsn: handle instance and pin rotations and offsets

This commit is contained in:
Mikolaj Wielgus 2024-03-17 20:16:53 +00:00
parent d58bff85fe
commit 4cb429ca6d
1 changed files with 87 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/dsn/design.rs
View File

@ -1,5 +1,6 @@
use std::collections::HashMap; use std::collections::HashMap;
use geo::{point, Point, Rotate, Translate};
use thiserror::Error; use thiserror::Error;
use crate::{ use crate::{
@ -96,8 +97,10 @@ impl DsnDesign {
); );
Self::add_circle( Self::add_circle(
&mut layout, &mut layout,
(place.x + pin.x) as f64, (place.x as f64, place.y as f64).into(),
(place.y + pin.y) as f64, place.rotation as f64,
(pin.x as f64, pin.y as f64).into(),
pin.rotate.unwrap_or(0.0) as f64,
circle.diameter as f64 / 2.0, circle.diameter as f64 / 2.0,
layer as u64, layer as u64,
*net_id as i64, *net_id as i64,
@ -112,10 +115,14 @@ impl DsnDesign {
); );
Self::add_rect( Self::add_rect(
&mut layout, &mut layout,
(place.x - pin.x + rect.x1) as f64, (place.x as f64, place.y as f64).into(),
(place.y - pin.y + rect.y1) as f64, place.rotation as f64,
(place.x - pin.x + rect.x2) as f64, (pin.x as f64, pin.y as f64).into(),
(place.y - pin.y + rect.y2) as f64, pin.rotate.unwrap_or(0.0) as f64,
rect.x1 as f64,
rect.y1 as f64,
rect.x2 as f64,
rect.y2 as f64,
layer as u64, layer as u64,
*net_id as i64, *net_id as i64,
) )
@ -129,8 +136,10 @@ impl DsnDesign {
); );
Self::add_path( Self::add_path(
&mut layout, &mut layout,
(place.x - pin.x) as f64, (place.x as f64, place.y as f64).into(),
(place.y - pin.y) as f64, place.rotation as f64,
(pin.x as f64, pin.y as f64).into(),
pin.rotate.unwrap_or(0.0) as f64,
&path.coord_vec, &path.coord_vec,
path.width as f64, path.width as f64,
layer as u64, layer as u64,
@ -146,8 +155,10 @@ impl DsnDesign {
); );
Self::add_path( Self::add_path(
&mut layout, &mut layout,
(place.x - pin.x) as f64, (place.x as f64, place.y as f64).into(),
(place.y - pin.y) as f64, place.rotation as f64,
(pin.x as f64, pin.y as f64).into(),
pin.rotate.unwrap_or(0.0) as f64,
&polygon.coord_vec, &polygon.coord_vec,
polygon.width as f64, polygon.width as f64,
layer as u64, layer as u64,
@ -183,8 +194,10 @@ impl DsnDesign {
); );
Self::add_circle( Self::add_circle(
&mut layout, &mut layout,
via.x as f64, (0.0, 0.0).into(),
via.y as f64, 0.0,
(0.0, 0.0).into(),
0.0,
circle.diameter as f64 / 2.0, circle.diameter as f64 / 2.0,
layer as u64, layer as u64,
net_id as i64, net_id as i64,
@ -199,6 +212,10 @@ impl DsnDesign {
); );
Self::add_rect( Self::add_rect(
&mut layout, &mut layout,
(0.0, 0.0).into(),
0.0,
(0.0, 0.0).into(),
0.0,
rect.x1 as f64, rect.x1 as f64,
rect.y1 as f64, rect.y1 as f64,
rect.x2 as f64, rect.x2 as f64,
@ -216,7 +233,9 @@ impl DsnDesign {
); );
Self::add_path( Self::add_path(
&mut layout, &mut layout,
(0.0, 0.0).into(),
0.0, 0.0,
(0.0, 0.0).into(),
0.0, 0.0,
&path.coord_vec, &path.coord_vec,
path.width as f64, path.width as f64,
@ -233,7 +252,9 @@ impl DsnDesign {
); );
Self::add_path( Self::add_path(
&mut layout, &mut layout,
(0.0, 0.0).into(),
0.0, 0.0,
(0.0, 0.0).into(),
0.0, 0.0,
&polygon.coord_vec, &polygon.coord_vec,
polygon.width as f64, polygon.width as f64,
@ -251,7 +272,9 @@ impl DsnDesign {
Self::add_path( Self::add_path(
&mut layout, &mut layout,
(0.0, 0.0).into(),
0.0, 0.0,
(0.0, 0.0).into(),
0.0, 0.0,
&wire.path.coord_vec, &wire.path.coord_vec,
wire.path.width as f64, wire.path.width as f64,
@ -278,9 +301,18 @@ impl DsnDesign {
} }
} }
fn add_circle(layout: &mut Layout<DsnRules>, x: f64, y: f64, r: f64, layer: u64, net: i64) { fn add_circle(
layout: &mut Layout<DsnRules>,
place_pos: Point,
place_rot: f64,
pin_pos: Point,
pin_rot: f64,
r: f64,
layer: u64,
net: i64,
) {
let circle = Circle { let circle = Circle {
pos: (x, y).into(), pos: Self::pos(place_pos, place_rot, pin_pos, pin_rot, 0.0, 0.0),
r, r,
}; };
@ -291,6 +323,10 @@ impl DsnDesign {
fn add_rect( fn add_rect(
layout: &mut Layout<DsnRules>, layout: &mut Layout<DsnRules>,
place_pos: Point,
place_rot: f64,
pin_pos: Point,
pin_rot: f64,
x1: f64, x1: f64,
y1: f64, y1: f64,
x2: f64, x2: f64,
@ -302,7 +338,7 @@ impl DsnDesign {
let dot_1_1 = layout let dot_1_1 = layout
.add_fixed_dot(FixedDotWeight { .add_fixed_dot(FixedDotWeight {
circle: Circle { circle: Circle {
pos: (x1, y1).into(), pos: Self::pos(place_pos, place_rot, pin_pos, pin_rot, x1, y1),
r: 0.5, r: 0.5,
}, },
layer, layer,
@ -312,7 +348,7 @@ impl DsnDesign {
let dot_2_1 = layout let dot_2_1 = layout
.add_fixed_dot(FixedDotWeight { .add_fixed_dot(FixedDotWeight {
circle: Circle { circle: Circle {
pos: (x2, y1).into(), pos: Self::pos(place_pos, place_rot, pin_pos, pin_rot, x2, y1),
r: 0.5, r: 0.5,
}, },
layer, layer,
@ -322,7 +358,7 @@ impl DsnDesign {
let dot_2_2 = layout let dot_2_2 = layout
.add_fixed_dot(FixedDotWeight { .add_fixed_dot(FixedDotWeight {
circle: Circle { circle: Circle {
pos: (x2, y2).into(), pos: Self::pos(place_pos, place_rot, pin_pos, pin_rot, x2, y2),
r: 0.5, r: 0.5,
}, },
layer, layer,
@ -332,7 +368,7 @@ impl DsnDesign {
let dot_1_2 = layout let dot_1_2 = layout
.add_fixed_dot(FixedDotWeight { .add_fixed_dot(FixedDotWeight {
circle: Circle { circle: Circle {
pos: (x1, y2).into(), pos: Self::pos(place_pos, place_rot, pin_pos, pin_rot, x1, y2),
r: 0.5, r: 0.5,
}, },
layer, layer,
@ -388,8 +424,10 @@ impl DsnDesign {
fn add_path( fn add_path(
layout: &mut Layout<DsnRules>, layout: &mut Layout<DsnRules>,
offset_x: f64, place_pos: Point,
offset_y: f64, place_rot: f64,
pin_pos: Point,
pin_rot: f64,
coords: &Vec<structure::Point>, coords: &Vec<structure::Point>,
width: f64, width: f64,
layer: u64, layer: u64,
@ -399,7 +437,14 @@ impl DsnDesign {
let mut prev_index = layout let mut prev_index = layout
.add_fixed_dot(FixedDotWeight { .add_fixed_dot(FixedDotWeight {
circle: Circle { circle: Circle {
pos: (offset_x + coords[0].x as f64, offset_y + coords[0].y as f64).into(), pos: Self::pos(
place_pos,
place_rot,
pin_pos,
pin_rot,
coords[0].x as f64,
coords[0].y as f64,
),
r: width / 2.0, r: width / 2.0,
}, },
layer, layer,
@ -412,7 +457,15 @@ impl DsnDesign {
let index = layout let index = layout
.add_fixed_dot(FixedDotWeight { .add_fixed_dot(FixedDotWeight {
circle: Circle { circle: Circle {
pos: (offset_x + coord.x as f64, offset_y + coord.y as f64).into(), pos: Self::pos(
place_pos,
place_rot,
pin_pos,
pin_rot,
coord.x as f64,
coord.y as f64,
)
.into(),
r: width / 2.0, r: width / 2.0,
}, },
layer, layer,
@ -428,4 +481,16 @@ impl DsnDesign {
prev_index = index; prev_index = index;
} }
} }
fn pos(
place_pos: Point,
place_rot: f64,
pin_pos: Point,
pin_rot: f64,
x: f64,
y: f64,
) -> Point {
let pos = (point! {x: x, y: y} + pin_pos).rotate_around_point(pin_rot, pin_pos);
(pos + place_pos).rotate_around_point(place_rot, place_pos)
}
} }