From 1071e61e46ddf04389109cf2ef25618e6e0dae4c Mon Sep 17 00:00:00 2001 From: johanengelen Date: Sat, 2 Aug 2008 20:59:59 +0000 Subject: [PATCH] use nodetype helper function to determine nodetype within lpe-spiro --- src/live_effects/lpe-spiro.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/live_effects/lpe-spiro.cpp b/src/live_effects/lpe-spiro.cpp index 657ffc10b..6a98e6d29 100644 --- a/src/live_effects/lpe-spiro.cpp +++ b/src/live_effects/lpe-spiro.cpp @@ -160,14 +160,10 @@ LPESpiro::doEffect(SPCurve * curve) bool next_is_line = ( dynamic_cast(&*curve_it2) || dynamic_cast(&*curve_it2) || dynamic_cast(&*curve_it2) ); - Geom::Point deriv_1 = curve_it1->unitTangentAt(1); - Geom::Point deriv_2 = curve_it2->unitTangentAt(0); - double this_angle_L2 = Geom::L2(deriv_1); - double next_angle_L2 = Geom::L2(deriv_2); - double both_angles_L2 = Geom::L2(deriv_1 + deriv_2); - if ( (this_angle_L2 > 1e-6) && - (next_angle_L2 > 1e-6) && - ((this_angle_L2 + next_angle_L2 - both_angles_L2) < 1e-3) ) + + Geom::NodeType nodetype = Geom::get_nodetype(*curve_it1, *curve_it2); + + if ( nodetype == Geom::NODE_SMOOTH || nodetype == Geom::NODE_SYMM ) { if (this_is_line && !next_is_line) { path[ip].ty = ']'; -- 2.30.2