From eae224916a20ea75f80471af2df057e7e74b0c9e Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Thu, 19 Feb 2015 21:59:45 +0100
Subject: reducing size in pointwise LPE data

(bzr r13645.1.18)
---
 src/2geom/satellite-enum.h              | 10 +++++-----
 src/live_effects/lpe-fillet-chamfer.cpp | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/2geom/satellite-enum.h b/src/2geom/satellite-enum.h
index 474e98547..bcd8d1bb3 100644
--- a/src/2geom/satellite-enum.h
+++ b/src/2geom/satellite-enum.h
@@ -16,11 +16,11 @@
 namespace Geom {
 
 enum SatelliteType {
-    FILLET=0,
-    INVERSE_FILLET,
-    CHAMFER,
-    INVERSE_CHAMFER,
-    INVALID_SATELLITE // This must be last)
+    F=0, //Fillet
+    IF, //Inverse Fillet
+    C, //Chamfer
+    IC, //Inverse Chamfer
+    KO // Invalid Satellite)
 };
 
 /* TODO maybe is best do next by bimap
diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 3b1b1697c..e9d9a21b1 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -262,11 +262,11 @@ LPEFilletChamfer::doEffect_path(std::vector<Geom::Path> const &path_in)
                 if (times[1] != times[0] + gapHelper) {
                     path_out.append(*knotCurve1);
                 }
-                SatelliteType type = FILLET;
+                SatelliteType type = F;
                 type = sat.getSatelliteType();
                 if(are_near(middle_point(startArcPoint,endArcPoint),curve_it1->finalPoint(), 0.0001)){
                     //path_out.appendNew<Geom::LineSegment>(endArcPoint);
-                } else if (type == CHAMFER) {
+                } else if (type == C) {
                 /*
                     unsigned int chamferSubs = type-3000;
                     Geom::Path path_chamfer;
@@ -283,7 +283,7 @@ LPEFilletChamfer::doEffect_path(std::vector<Geom::Path> const &path_in)
                     }
                     path_out.appendNew<Geom::LineSegment>(endArcPoint);
                 /*/
-                } else if (type == INVERSE_CHAMFER) {
+                } else if (type == IC) {
                    /*
                     unsigned int chamferSubs = type-4000;
                     Geom::Path path_chamfer;
@@ -301,14 +301,14 @@ LPEFilletChamfer::doEffect_path(std::vector<Geom::Path> const &path_in)
                     }
                     path_out.appendNew<Geom::LineSegment>(endArcPoint);
                 */
-                } else if (type == INVERSE_FILLET) {
+                } else if (type == IF) {
                     if((is_straight_curve(*curve_it1) && is_straight_curve(*curve_it2Fixed) && method != FM_BEZIER )|| method == FM_ARC){ 
                         ccwToggle = ccwToggle?0:1;
                         path_out.appendNew<SVGEllipticalArc>(rx, ry, angleArc, 0, ccwToggle, endArcPoint);
                     }else{
                         path_out.appendNew<Geom::CubicBezier>(inverseHandle1, inverseHandle2, endArcPoint);
                     }
-                } else if (type == FILLET){
+                } else if (type == F){
                     if((is_straight_curve(*curve_it1) && is_straight_curve(*curve_it2Fixed) && method != FM_BEZIER )|| method == FM_ARC){ 
                         path_out.appendNew<SVGEllipticalArc>(rx, ry, angleArc, 0, ccwToggle, endArcPoint);
                     } else {
-- 
cgit v1.2.3