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

primitive: Remove `.prev_bend()` and `.next_bend()` for now 

Commented out the experimental code parts that use tem.
This commit is contained in:
Mikolaj Wielgus 2023-10-22 05:34:44 +00:00
parent 0dac23f018
commit d5acfaccb5
2 changed files with 7 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/primitive.rs
View File

@ -72,35 +72,6 @@ impl<'a, W> GenericPrimitive<'a, W> {
.map(|index| self.graph.node_weight(index).unwrap().retag(index)) .map(|index| self.graph.node_weight(index).unwrap().retag(index))
} }
pub fn prev_bend(&self) -> Option<FixedBendIndex> {
let mut prev_index = self.index.node_index();
while let Some(index) = self
.graph
.neighbors_directed(prev_index, Incoming)
// Ensure subsequent unwrap doesn't panic.
.filter(|ni| self.graph.find_edge(*ni, prev_index).is_some())
// Filter out non-End edges.
.filter(|ni| {
self.graph
.edge_weight(self.graph.find_edge(*ni, prev_index).unwrap())
.unwrap()
.is_fixed_end()
})
.next()
{
let _weight = *self.graph.node_weight(index).unwrap();
if let Some(Weight::FixedBend(..)) = self.graph.node_weight(index) {
return Some(FixedBendIndex::new(index));
}
prev_index = index;
}
None
}
fn prev_node(&self) -> Option<NodeIndex<usize>> { fn prev_node(&self) -> Option<NodeIndex<usize>> {
self.graph self.graph
.neighbors_directed(self.index.node_index(), Incoming) .neighbors_directed(self.index.node_index(), Incoming)
@ -113,35 +84,6 @@ impl<'a, W> GenericPrimitive<'a, W> {
.next() .next()
} }
pub fn next_bend(&self) -> Option<FixedBendIndex> {
let mut prev_index = self.index.node_index();
while let Some(index) = self
.graph
.neighbors_directed(prev_index, Outgoing)
// Ensure subsequent unwrap doesn't panic.
.filter(|ni| self.graph.find_edge(prev_index, *ni).is_some())
// Filter out non-End edges.
.filter(|ni| {
self.graph
.edge_weight(self.graph.find_edge(prev_index, *ni).unwrap())
.unwrap()
.is_fixed_end()
})
.next()
{
let _weight = *self.graph.node_weight(index).unwrap();
if let Some(Weight::FixedBend(..)) = self.graph.node_weight(index) {
return Some(FixedBendIndex::new(index));
}
prev_index = index;
}
None
}
fn next_node(&self) -> Option<NodeIndex<usize>> { fn next_node(&self) -> Option<NodeIndex<usize>> {
self.graph self.graph
.neighbors_directed(self.index.node_index(), Outgoing) .neighbors_directed(self.index.node_index(), Outgoing)

14
src/tracer.rs
View File

@ -130,7 +130,7 @@ impl<'a> Tracer<'a> {
) -> Option<bool> { ) -> Option<bool> {
let around_pos = self.layout.primitive(around).weight().circle.pos; let around_pos = self.layout.primitive(around).weight().circle.pos;
if Some(layer) != self.layout.primitive(head.dot()).prev_bend() { /*if Some(layer) != self.layout.primitive(head.dot()).prev_bend() {
Some( Some(
self.layout self.layout
.primitive(layer) .primitive(layer)
@ -139,9 +139,9 @@ impl<'a> Tracer<'a> {
.unwrap() .unwrap()
.between_ends(around_pos), .between_ends(around_pos),
) )
} else { } else {*/
None None
} //}
} }
fn tuck_around_dot( fn tuck_around_dot(
@ -209,13 +209,13 @@ impl<'a> Tracer<'a> {
maybe_inner = Some(segbend_head.segbend.bend); maybe_inner = Some(segbend_head.segbend.bend);
self.draw().finish(head, ends.1, width)?; self.draw().finish(head, ends.1, width)?;
self.relax_band(maybe_inner.unwrap()); //self.relax_band(maybe_inner.unwrap());
} }
Ok(()) Ok(())
} }
fn relax_band(&mut self, bend: FixedBendIndex) { /*fn relax_band(&mut self, bend: FixedBendIndex) {
let mut prev_bend = bend; let mut prev_bend = bend;
while let Some(cur_bend) = self.layout.primitive(prev_bend).prev_bend() { while let Some(cur_bend) = self.layout.primitive(prev_bend).prev_bend() {
if self.layout.primitive(cur_bend).cross_product() >= 0. { if self.layout.primitive(cur_bend).cross_product() >= 0. {
@ -233,7 +233,7 @@ impl<'a> Tracer<'a> {
prev_bend = cur_bend; prev_bend = cur_bend;
} }
} }*/
fn release_bow(&mut self, bend: FixedBendIndex) { fn release_bow(&mut self, bend: FixedBendIndex) {
let bow = self.layout.bow(bend); let bow = self.layout.bow(bend);