diff --git a/src/primitive.rs b/src/primitive.rs index 7ca8052..7f3f648 100644 --- a/src/primitive.rs +++ b/src/primitive.rs @@ -72,35 +72,6 @@ impl<'a, W> GenericPrimitive<'a, W> { .map(|index| self.graph.node_weight(index).unwrap().retag(index)) } - pub fn prev_bend(&self) -> Option { - 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> { self.graph .neighbors_directed(self.index.node_index(), Incoming) @@ -113,35 +84,6 @@ impl<'a, W> GenericPrimitive<'a, W> { .next() } - pub fn next_bend(&self) -> Option { - 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> { self.graph .neighbors_directed(self.index.node_index(), Outgoing) diff --git a/src/tracer.rs b/src/tracer.rs index 36667a6..9d1d7ce 100644 --- a/src/tracer.rs +++ b/src/tracer.rs @@ -130,7 +130,7 @@ impl<'a> Tracer<'a> { ) -> Option { 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( self.layout .primitive(layer) @@ -139,9 +139,9 @@ impl<'a> Tracer<'a> { .unwrap() .between_ends(around_pos), ) - } else { - None - } + } else {*/ + None + //} } fn tuck_around_dot( @@ -209,13 +209,13 @@ impl<'a> Tracer<'a> { maybe_inner = Some(segbend_head.segbend.bend); self.draw().finish(head, ends.1, width)?; - self.relax_band(maybe_inner.unwrap()); + //self.relax_band(maybe_inner.unwrap()); } Ok(()) } - fn relax_band(&mut self, bend: FixedBendIndex) { + /*fn relax_band(&mut self, bend: FixedBendIndex) { let mut prev_bend = bend; while let Some(cur_bend) = self.layout.primitive(prev_bend).prev_bend() { if self.layout.primitive(cur_bend).cross_product() >= 0. { @@ -233,7 +233,7 @@ impl<'a> Tracer<'a> { prev_bend = cur_bend; } - } + }*/ fn release_bow(&mut self, bend: FixedBendIndex) { let bow = self.layout.bow(bend);