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

drawing: rename remnants of the s/layout/drawing rename

This commit is contained in:
Mikolaj Wielgus 2024-04-04 13:50:39 +00:00
parent 0e553fd0ba
commit 8f9abae921
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/draw.rs
View File

@ -43,8 +43,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
self.guide().segbend_head(from).into() self.guide().segbend_head(from).into()
} }
#[debug_ensures(ret.is_ok() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() + 1))] #[debug_ensures(ret.is_ok() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() + 1))]
#[debug_ensures(ret.is_err() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))] #[debug_ensures(ret.is_err() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
pub fn finish_in_dot( pub fn finish_in_dot(
&mut self, &mut self,
head: Head, head: Head,
@ -58,8 +58,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
let head = self let head = self
.extend_head(head, tangent.start_point()) .extend_head(head, tangent.start_point())
.map_err(|err| DrawException::CannotFinishIn(into, err.into()))?; .map_err(|err| DrawException::CannotFinishIn(into, err.into()))?;
let layer = head.face().primitive(self.layout.layout()).layer(); let layer = head.face().primitive(self.layout.drawing()).layer();
let maybe_net = head.face().primitive(self.layout.layout()).maybe_net(); let maybe_net = head.face().primitive(self.layout.drawing()).maybe_net();
match head.face() { match head.face() {
DotIndex::Fixed(dot) => { DotIndex::Fixed(dot) => {
@ -92,8 +92,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
Ok::<(), DrawException>(()) Ok::<(), DrawException>(())
} }
#[debug_ensures(ret.is_ok() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() + 4))] #[debug_ensures(ret.is_ok() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() + 4))]
#[debug_ensures(ret.is_err() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))] #[debug_ensures(ret.is_err() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
pub fn segbend_around_dot( pub fn segbend_around_dot(
&mut self, &mut self,
head: Head, head: Head,
@ -137,8 +137,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
)) ))
} }
#[debug_ensures(ret.is_ok() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() + 4))] #[debug_ensures(ret.is_ok() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() + 4))]
#[debug_ensures(ret.is_err() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))] #[debug_ensures(ret.is_err() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
pub fn segbend_around_bend( pub fn segbend_around_bend(
&mut self, &mut self,
head: Head, head: Head,
@ -182,8 +182,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
)) ))
} }
#[debug_ensures(ret.is_ok() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() + 4))] #[debug_ensures(ret.is_ok() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() + 4))]
#[debug_ensures(ret.is_err() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))] #[debug_ensures(ret.is_err() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
fn segbend_around( fn segbend_around(
&mut self, &mut self,
head: Head, head: Head,
@ -198,7 +198,7 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
self.segbend(head, around, to, cw, width, offset) self.segbend(head, around, to, cw, width, offset)
} }
#[debug_ensures(self.layout.layout().node_count() == old(self.layout.layout().node_count()))] #[debug_ensures(self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
fn extend_head(&mut self, head: Head, to: Point) -> Result<Head, Infringement> { fn extend_head(&mut self, head: Head, to: Point) -> Result<Head, Infringement> {
if let Head::Segbend(head) = head { if let Head::Segbend(head) = head {
self.layout.move_dot(head.face.into(), to)?; self.layout.move_dot(head.face.into(), to)?;
@ -208,8 +208,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
} }
} }
#[debug_ensures(ret.is_ok() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() + 4))] #[debug_ensures(ret.is_ok() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() + 4))]
#[debug_ensures(ret.is_err() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))] #[debug_ensures(ret.is_err() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
fn segbend( fn segbend(
&mut self, &mut self,
head: Head, head: Head,
@ -219,8 +219,8 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
width: f64, width: f64,
offset: f64, offset: f64,
) -> Result<SegbendHead, LayoutException> { ) -> Result<SegbendHead, LayoutException> {
let layer = head.face().primitive(self.layout.layout()).layer(); let layer = head.face().primitive(self.layout.drawing()).layer();
let maybe_net = head.face().primitive(self.layout.layout()).maybe_net(); let maybe_net = head.face().primitive(self.layout.drawing()).maybe_net();
let segbend = self.layout.insert_segbend( let segbend = self.layout.insert_segbend(
head.face(), head.face(),
around, around,
@ -248,19 +248,19 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
Ok::<SegbendHead, LayoutException>(SegbendHead { Ok::<SegbendHead, LayoutException>(SegbendHead {
face: self face: self
.layout .layout
.layout() .drawing()
.primitive(segbend.bend) .primitive(segbend.bend)
.other_joint(segbend.dot), .other_joint(segbend.dot),
segbend, segbend,
}) })
} }
#[debug_ensures(ret.is_some() -> self.layout.layout().node_count() == old(self.layout.layout().node_count() - 4))] #[debug_ensures(ret.is_some() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count() - 4))]
#[debug_ensures(ret.is_none() -> self.layout.layout().node_count() == old(self.layout.layout().node_count()))] #[debug_ensures(ret.is_none() -> self.layout.drawing().node_count() == old(self.layout.drawing().node_count()))]
pub fn undo_segbend(&mut self, head: SegbendHead) -> Option<Head> { pub fn undo_segbend(&mut self, head: SegbendHead) -> Option<Head> {
let prev_dot = self let prev_dot = self
.layout .layout
.layout() .drawing()
.primitive(head.segbend.seg) .primitive(head.segbend.seg)
.other_joint(head.segbend.dot.into()); .other_joint(head.segbend.dot.into());
@ -269,6 +269,6 @@ impl<'a, R: RulesTrait> Draw<'a, R> {
} }
fn guide(&self) -> Guide<R> { fn guide(&self) -> Guide<R> {
Guide::new(self.layout.layout()) Guide::new(self.layout.drawing())
} }
} }

2
src/layout/layout.rs
View File

@ -107,7 +107,7 @@ impl<R: RulesTrait> Layout<R> {
0.0 0.0
} }
pub fn layout(&self) -> &Drawing<R> { pub fn drawing(&self) -> &Drawing<R> {
&self.drawing &self.drawing
} }

8
src/router.rs
View File

@ -119,13 +119,13 @@ impl<'a, RO: RouterObserverTrait<R>, R: RulesTrait> AstarStrategy<&Mesh, f64>
fn estimate_cost(&mut self, vertex: VertexIndex) -> f64 { fn estimate_cost(&mut self, vertex: VertexIndex) -> f64 {
self.observer.on_estimate(&self.tracer, vertex); self.observer.on_estimate(&self.tracer, vertex);
let start_point = PrimitiveIndex::from(vertex) let start_point = PrimitiveIndex::from(vertex)
.primitive(self.tracer.layout.layout()) .primitive(self.tracer.layout.drawing())
.shape() .shape()
.center(); .center();
let end_point = self let end_point = self
.tracer .tracer
.layout .layout
.layout() .drawing()
.primitive(self.to) .primitive(self.to)
.shape() .shape()
.center(); .center();
@ -148,8 +148,8 @@ impl<R: RulesTrait> Router<R> {
// XXX: Should we actually store the mesh? May be useful for debugging, but doesn't look // XXX: Should we actually store the mesh? May be useful for debugging, but doesn't look
// right. // right.
//self.mesh.triangulate(&self.layout)?; //self.mesh.triangulate(&self.layout)?;
let mut mesh = Mesh::new(self.layout.layout()); let mut mesh = Mesh::new(self.layout.drawing());
mesh.generate(self.layout.layout()) mesh.generate(self.layout.drawing())
.map_err(|err| RoutingError { .map_err(|err| RoutingError {
from, from,
to, to,