mirror of https://codeberg.org/topola/topola.git
fix(specctra-core): Actually use Keepouts structure
This commit is contained in:
parent
9ea058bd0a
commit
353ee9a7ab
|
|
@ -94,8 +94,8 @@ pub struct Structure {
|
||||||
pub place_boundary: Option<Boundary>,
|
pub place_boundary: Option<Boundary>,
|
||||||
#[vec("plane")]
|
#[vec("plane")]
|
||||||
pub planes: Vec<Plane>,
|
pub planes: Vec<Plane>,
|
||||||
#[vec("keepout")]
|
#[anon]
|
||||||
pub keepouts: Vec<Keepout>,
|
pub keepouts: Keepouts,
|
||||||
pub via: ViaNames,
|
pub via: ViaNames,
|
||||||
#[vec("grid")]
|
#[vec("grid")]
|
||||||
pub grids: Vec<Grid>,
|
pub grids: Vec<Grid>,
|
||||||
|
|
@ -114,7 +114,7 @@ impl<R: io::BufRead> ReadDsn<R> for Structure {
|
||||||
boundary: tokenizer.read_named(&["boundary"])?,
|
boundary: tokenizer.read_named(&["boundary"])?,
|
||||||
place_boundary: tokenizer.read_optional(&["place_boundary"])?,
|
place_boundary: tokenizer.read_optional(&["place_boundary"])?,
|
||||||
planes: tokenizer.read_named_array(&["plane"])?,
|
planes: tokenizer.read_named_array(&["plane"])?,
|
||||||
keepouts: tokenizer.read_named_array(&["keepout"])?,
|
keepouts: Keepouts::read_dsn(tokenizer)?,
|
||||||
via: tokenizer.read_named(&["via"])?,
|
via: tokenizer.read_named(&["via"])?,
|
||||||
grids: tokenizer.read_named_array(&["grid"])?,
|
grids: tokenizer.read_named_array(&["grid"])?,
|
||||||
rules: tokenizer.read_named_array(&["rule"])?,
|
rules: tokenizer.read_named_array(&["rule"])?,
|
||||||
|
|
@ -266,8 +266,8 @@ pub struct Image {
|
||||||
pub outlines: Vec<Outline>,
|
pub outlines: Vec<Outline>,
|
||||||
#[vec("pin")]
|
#[vec("pin")]
|
||||||
pub pins: Vec<Pin>,
|
pub pins: Vec<Pin>,
|
||||||
#[vec("keepout")]
|
#[anon]
|
||||||
pub keepouts: Vec<Keepout>,
|
pub keepouts: Keepouts,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(ReadDsn, WriteSes, Debug, Clone, PartialEq)]
|
#[derive(ReadDsn, WriteSes, Debug, Clone, PartialEq)]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue