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

Don't forget to reinsert bend into R-tree if bend extension fails

This commit is contained in:
Mikolaj Wielgus 2023-09-05 04:23:26 +02:00
parent 5f37ff7616
commit 49038a4ddb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/layout.rs
View File

@ -47,8 +47,7 @@ impl Layout {
// Unnecessary retag. It should be possible to elide it. // Unnecessary retag. It should be possible to elide it.
let weight = *self.graph.node_weight(index.index).unwrap(); let weight = *self.graph.node_weight(index.index).unwrap();
let wrapper = RTreeWrapper::new(self.primitive(index).shape(), index.retag(&weight)); self.remove_from_rtree(index.retag(&weight));
assert!(self.rtree.remove(&wrapper).is_some());
self.graph.remove_node(index.index); self.graph.remove_node(index.index);
} }
@ -162,17 +161,16 @@ impl Layout {
pub fn extend_bend(&mut self, bend: BendIndex, dot: DotIndex, to: Point) -> Result<(), ()> { pub fn extend_bend(&mut self, bend: BendIndex, dot: DotIndex, to: Point) -> Result<(), ()> {
self.remove_from_rtree(bend.tag()); self.remove_from_rtree(bend.tag());
self.move_dot(dot, to)?; let result = self.move_dot(dot, to);
self.insert_into_rtree(bend.tag()); self.insert_into_rtree(bend.tag());
Ok(()) result
} }
pub fn move_dot(&mut self, dot: DotIndex, to: Point) -> Result<(), ()> { pub fn move_dot(&mut self, dot: DotIndex, to: Point) -> Result<(), ()> {
let mut cur_bend = self.primitive(dot).outer(); let mut cur_bend = self.primitive(dot).outer();
loop { loop {
match cur_bend { if let None = cur_bend {
Some(..) => (), break;
None => break,
} }
self.remove_from_rtree(cur_bend.unwrap().tag()); self.remove_from_rtree(cur_bend.unwrap().tag());
@ -191,7 +189,6 @@ impl Layout {
// Restore original state. // Restore original state.
*self.graph.node_weight_mut(dot.index).unwrap() = TaggedWeight::Dot(old_weight); *self.graph.node_weight_mut(dot.index).unwrap() = TaggedWeight::Dot(old_weight);
self.insert_into_rtree(dot.tag()); self.insert_into_rtree(dot.tag());
return Err(()); return Err(());
} }
@ -266,7 +263,10 @@ impl Layout {
fn remove_from_rtree(&mut self, index: TaggedIndex) { fn remove_from_rtree(&mut self, index: TaggedIndex) {
let shape = untag!(index, self.primitive(index).shape()); let shape = untag!(index, self.primitive(index).shape());
self.rtree.remove(&RTreeWrapper::new(shape, index)); assert!(self
.rtree
.remove(&RTreeWrapper::new(shape, index))
.is_some());
} }
pub fn dots(&self) -> impl Iterator<Item = DotIndex> + '_ { pub fn dots(&self) -> impl Iterator<Item = DotIndex> + '_ {