Revert changes

1 files changed, 208 insertions, 229 deletions

diff --git a/src/live_effects/lpe-dash-stroke.cpp b/src/live_effects/lpe-dash-stroke.cpp
index dd4efcbc2..dd30d05a4 100644
--- a/src/live_effects/lpe-dash-stroke.cpp
+++ b/src/live_effects/lpe-dash-stroke.cpp
@@ -12,48 +12,28 @@
 namespace Inkscape {
 namespace LivePathEffect {
 
-static const Util::EnumData<DashArraymethod> DashArraymethodData[] = {
-    { DA_LENGHT    , N_("Lenght")    , "lenght"  }, 
-    { DA_PERCENTAGE, N_("Percentage"), "percent" }
-};
-static const Util::EnumDataConverter<DashArraymethod> DAConverter(DashArraymethodData, DA_END);
-
-static const Util::EnumData<DashAdjustArraymethod> DashAdjustArraymethodData[] = {
-    { DD_NONE            , N_("None")            , "none"             }, 
-    { DD_STRETCH         , N_("Stretch")         , "stretch"          }, 
-    { DD_STRETCH_DASHES  , N_("Stretch dashes")  , "stretch_dashes"   }, 
-    { DD_STRETCH_GAPS    , N_("Stretch gaps")    , "stretch_gaps"     }, 
-    { DD_COMPRESS        , N_("Compress")        , "compress"         }, 
-    { DD_COMPRESS_DASHES , N_("Compress dashes") , "compress_dashes"  }, 
-    { DD_COMPRESS_GAPS   , N_("Compress gaps")   , "compress_gaps"    }
-};
-static const Util::EnumDataConverter<DashAdjustArraymethod> DDConverter(DashAdjustArraymethodData, DD_END);
-
 LPEDashStroke::LPEDashStroke(LivePathEffectObject *lpeobject)
     : Effect(lpeobject),
-     unit(_("Unit"), _("Unit"), "unit", &wr, this, "px"),
-     method(_("Value type:"), _("% or units"),"method", DAConverter, &wr, this, DA_LENGHT),
-     dash_adjust(_("Adjust"), _("Adjustments for dahes and gaps"), "dash_adjust", DDConverter, &wr, this, DD_NONE),
-     stroke_dasharray(_("Dash Array"), _("Coma separated values for dashes and holes"), "stroke_dasharray", &wr, this,"1,1"),
-     stroke_dashoffset(_("Dash offset"), _("Dash offset"), "stroke_dashoffset", &wr, this, 0.0),
-     stroke_dashcorner(_("Dash corner"), _("Dash corner"), "stroke_dashcorner", &wr, this, 0.0),
-     message(_("Info Box"), _("Important messages"), "message", &wr, this, _("Add <b>\"Fill Between Many LPE\"</b> to add fill."))
+    numberdashes(_("Number of dashes"), _("Number of dashes"), "numberdashes", &wr, this, 3),
+    holefactor(_("Hole factor"), _("Hole factor"), "holefactor", &wr, this, 0.0),
+    splitsegments(_("Use segments"), _("Use segments"), "splitsegments", &wr, this, true),
+    halfextreme(_("Half start/end"), _("Start and end of each segment has half size"), "halfextreme", &wr, this, true),
+    unifysegment(_("Unify dashes"), _("Approximately unify the dashes length using the minimal length segment"), "unifysegment", &wr, this, true),
+    message(_("Info Box"), _("Important messages"), "message", &wr, this, _("Add <b>\"Fill Between Many LPE\"</b> to add fill."))
 {
-    registerParameter(&unit);
-    registerParameter(&method);
-    registerParameter(&dash_adjust);
-    registerParameter(&stroke_dasharray);
-    registerParameter(&stroke_dashoffset);
-    registerParameter(&stroke_dashcorner);
+    registerParameter(&numberdashes);
+    registerParameter(&holefactor);
+    registerParameter(&splitsegments);
+    registerParameter(&halfextreme);
+    registerParameter(&unifysegment);
     registerParameter(&message);
-    stroke_dashoffset.param_set_range(-999999999, 999999999);
-    stroke_dashoffset.param_set_increments(1, 1);
-    stroke_dashoffset.param_set_digits(5);
-    stroke_dashcorner.param_set_range(-999999999, 999999999);
-    stroke_dashcorner.param_set_increments(1, 1);
-    stroke_dashcorner.param_set_digits(5);
+    numberdashes.param_set_range(2, 999999999);
+    numberdashes.param_set_increments(1, 1);
+    numberdashes.param_set_digits(0);
+    holefactor.param_set_range(-0.99999, 0.99999);
+    holefactor.param_set_increments(0.01, 0.01);
+    holefactor.param_set_digits(5);
     message.param_set_min_height(30);
-    stroke_dasharray.param_hide_canvas_text();
 }
 
 LPEDashStroke::~LPEDashStroke() = default;
@@ -95,198 +75,197 @@ LPEDashStroke::timeAtLength(double const A, Geom::Piecewise<Geom::D2<Geom::SBasi
 Geom::PathVector
 LPEDashStroke::doEffect_path(Geom::PathVector const & path_in){
     Geom::PathVector const pv = pathv_to_linear_and_cubic_beziers(path_in);
-    return pv;
-//    Geom::PathVector result;
-//    for (Geom::PathVector::const_iterator path_it = pv.begin(); path_it != pv.end(); ++path_it) {
-//        if (path_it->empty()) {
-//            continue;
-//        }
-//        Geom::Path::const_iterator curve_it1 = path_it->begin();
-//        Geom::Path::const_iterator curve_it2 = ++(path_it->begin());
-//        Geom::Path::const_iterator curve_endit = path_it->end_default();
-//        if (path_it->closed()) {
-//          const Geom::Curve &closingline = path_it->back_closed(); 
-//          // the closing line segment is always of type 
-//          // Geom::LineSegment.
-//          if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
-//            // closingline.isDegenerate() did not work, because it only checks for
-//            // *exact* zero length, which goes wrong for relative coordinates and
-//            // rounding errors...
-//            // the closing line segment has zero-length. So stop before that one!
-//            curve_endit = path_it->end_open();
-//          }
-//        }
-//        size_t numberdashes_fixed = numberdashes;
-//        if(!splitsegments) {
-//            numberdashes_fixed++;
-//        }
-//        size_t numberholes = numberdashes_fixed - 1;
-//        size_t ammount = numberdashes_fixed + numberholes;
-//        if (halfextreme) {
-//            ammount--;
-//        }
-//        double base = 1/(double)ammount;
-//        double globaldash =  base * numberdashes_fixed * (1 + holefactor);
-//        if (halfextreme) { 
-//            globaldash =  base * (numberdashes_fixed - 1) * (1 + holefactor);
-//        }
-//        double globalhole =  1-globaldash;
-//        double dashpercent = globaldash/numberdashes_fixed;
-//        if (halfextreme) { 
-//           dashpercent = globaldash/(numberdashes_fixed -1);
-//        }
-//        double holepercent = globalhole/numberholes;
-//        double dashsize_fixed = 0;
-//        double holesize_fixed = 0;
-//        Geom::Piecewise<Geom::D2<Geom::SBasis> > pwd2 = (*path_it).toPwSb();
-//        double lenght_pwd2 = length (pwd2);
-//        double minlenght = lenght_pwd2;
-//        if(unifysegment) {
-//            while (curve_it1 != curve_endit) {
-//                double lenght_segment = (*curve_it1).length();
-//                if (lenght_segment < minlenght) {
-//                    minlenght = lenght_segment;
-//                    dashsize_fixed = (*curve_it1).length() * dashpercent;
-//                    holesize_fixed = (*curve_it1).length() * holepercent;
-//                } 
-//                ++curve_it1;
-//                ++curve_it2;
-//            } 
-//            curve_it1 = path_it->begin();
-//            curve_it2 = ++(path_it->begin());
-//            curve_endit = path_it->end_default();
-//        }
-//        size_t p_index = 0;
-//        size_t start_index = result.size();
-//        if(splitsegments) {
-//            while (curve_it1 != curve_endit) {
-//                Geom::Path segment = (*path_it).portion(p_index, p_index + 1);
-//                if(unifysegment) {
-//                    double integral;
-//                    double fractional = modf((*curve_it1).length()/(dashsize_fixed + holesize_fixed), &integral);
-//                    numberdashes_fixed = (size_t)integral + 1;
-//                    numberholes = numberdashes_fixed - 1;
-//                    ammount = numberdashes_fixed + numberholes;
-//                    if (halfextreme) {
-//                        ammount--;
-//                    }
-//                    base = 1/(double)ammount;
-//                    globaldash =  base * numberdashes_fixed * (1 + holefactor);
-//                    if (halfextreme) { 
-//                        globaldash =  base * (numberdashes_fixed - 1) * (1 + holefactor);
-//                    }
-//                    globalhole =  1-globaldash;
-//                    dashpercent = globaldash/numberdashes_fixed;
-//                    if (halfextreme) { 
-//                       dashpercent = globaldash/(numberdashes_fixed -1);
-//                    }
-//                    holepercent = globalhole/numberholes;
-//                }
-//                double dashsize = (*curve_it1).length() * dashpercent;
-//                double holesize = (*curve_it1).length() * holepercent;
-//                if ((*curve_it1).isLineSegment()) {
-//                    if (result.size() && Geom::are_near(segment.initialPoint(),result[result.size()-1].finalPoint())) {
-//                        result[result.size()-1].setFinal(segment.initialPoint());
-//                        if (halfextreme) {
-//                            result[result.size()-1].append(segment.portion(0.0, dashpercent/2.0));
-//                        } else {
-//                            result[result.size()-1].append(segment.portion(0.0, dashpercent));
-//                        }
-//                    } else {
-//                        if (halfextreme) {
-//                            result.push_back(segment.portion(0.0, dashpercent/2.0));
-//                        } else {
-//                            result.push_back(segment.portion(0.0, dashpercent));
-//                        }
-//                    }
-//                    
-//                    double start = dashpercent + holepercent;
-//                    if (halfextreme) {
-//                        start = (dashpercent/2.0) + holepercent;
-//                    }
-//                    while (start  < 1) {
-//                        if (start + dashpercent > 1) {
-//                            result.push_back(segment.portion(start, 1));
-//                        } else {
-//                            result.push_back(segment.portion(start, start + dashpercent));
-//                        }
-//                        start += dashpercent + holepercent;
-//                    }
-//                } else if (!(*curve_it1).isLineSegment()) {
-//                    double start = 0.0;
-//                    double end = 0.0;
-//                    if (halfextreme) {
-//                        end = timeAtLength(dashsize/2.0,segment);
-//                    } else {
-//                        end = timeAtLength(dashsize,segment);
-//                    }
-//                    if (result.size() && Geom::are_near(segment.initialPoint(),result[result.size()-1].finalPoint())) {
-//                        result[result.size()-1].setFinal(segment.initialPoint());
-//                        result[result.size()-1].append(segment.portion(start, end));
-//                    } else {
-//                        result.push_back(segment.portion(start, end));
-//                    }
-//                    double startsize = dashsize + holesize;
-//                    if (halfextreme) {
-//                        startsize = (dashsize/2.0) + holesize;
-//                    }
-//                    double endsize = startsize + dashsize;
-//                    start = timeAtLength(startsize,segment);
-//                    end   = timeAtLength(endsize,segment);
-//                    while (start  < 1 && start  > 0) {
-//                        result.push_back(segment.portion(start, end));
-//                        startsize = endsize + holesize;
-//                        endsize = startsize + dashsize;
-//                        start = timeAtLength(startsize,segment);
-//                        end   = timeAtLength(endsize,segment);
-//                    }
-//                }
-//                if (curve_it2 == curve_endit) {
-//                    if (path_it->closed()) {
-//                        Geom::Path end = result[result.size()-1];
-//                        end.setFinal(result[start_index].initialPoint());
-//                        end.append(result[start_index]);
-//                        result[start_index] = end;
-//                    }
-//                }
-//                p_index ++;
-//                ++curve_it1;
-//                ++curve_it2;
-//            } 
-//        } else {
-//            double start = 0.0;
-//            double end = 0.0;
-//            double dashsize = lenght_pwd2 * dashpercent;
-//            double holesize = lenght_pwd2 * holepercent;
-//            if (halfextreme) {
-//                end = timeAtLength(dashsize/2.0,pwd2);
-//            } else {
-//                end = timeAtLength(dashsize,pwd2);
-//            }
-//            result.push_back((*path_it).portion(start, end));
-//            double startsize = dashsize + holesize;
-//            if (halfextreme) {
-//                startsize = (dashsize/2.0) + holesize;
-//            }
-//            double endsize = startsize + dashsize;
-//            start = timeAtLength(startsize,pwd2);
-//            end   = timeAtLength(endsize,pwd2);
-//            while (start  < (*path_it).size() && start  > 0) {
-//                result.push_back((*path_it).portion(start, end));
-//                startsize = endsize + holesize;
-//                endsize = startsize + dashsize;
-//                start = timeAtLength(startsize,pwd2);
-//                end   = timeAtLength(endsize,pwd2);
-//            }
-//            if (path_it->closed()) {
-//                Geom::Path end = result[result.size()-1];
-//                end.setFinal(result[start_index].initialPoint());
-//                end.append(result[start_index]);
-//                result[start_index] = end;
-//            }
-//        }
-//    }
-//  return result;
+    Geom::PathVector result;
+    for (Geom::PathVector::const_iterator path_it = pv.begin(); path_it != pv.end(); ++path_it) {
+        if (path_it->empty()) {
+            continue;
+        }
+        Geom::Path::const_iterator curve_it1 = path_it->begin();
+        Geom::Path::const_iterator curve_it2 = ++(path_it->begin());
+        Geom::Path::const_iterator curve_endit = path_it->end_default();
+        if (path_it->closed()) {
+          const Geom::Curve &closingline = path_it->back_closed(); 
+          // the closing line segment is always of type 
+          // Geom::LineSegment.
+          if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
+            // closingline.isDegenerate() did not work, because it only checks for
+            // *exact* zero length, which goes wrong for relative coordinates and
+            // rounding errors...
+            // the closing line segment has zero-length. So stop before that one!
+            curve_endit = path_it->end_open();
+          }
+        }
+        size_t numberdashes_fixed = numberdashes;
+        if(!splitsegments) {
+            numberdashes_fixed++;
+        }
+        size_t numberholes = numberdashes_fixed - 1;
+        size_t ammount = numberdashes_fixed + numberholes;
+        if (halfextreme) {
+            ammount--;
+        }
+        double base = 1/(double)ammount;
+        double globaldash =  base * numberdashes_fixed * (1 + holefactor);
+        if (halfextreme) { 
+            globaldash =  base * (numberdashes_fixed - 1) * (1 + holefactor);
+        }
+        double globalhole =  1-globaldash;
+        double dashpercent = globaldash/numberdashes_fixed;
+        if (halfextreme) { 
+           dashpercent = globaldash/(numberdashes_fixed -1);
+        }
+        double holepercent = globalhole/numberholes;
+        double dashsize_fixed = 0;
+        double holesize_fixed = 0;
+        Geom::Piecewise<Geom::D2<Geom::SBasis> > pwd2 = (*path_it).toPwSb();
+        double lenght_pwd2 = length (pwd2);
+        double minlenght = lenght_pwd2;
+        if(unifysegment) {
+            while (curve_it1 != curve_endit) {
+                double lenght_segment = (*curve_it1).length();
+                if (lenght_segment < minlenght) {
+                    minlenght = lenght_segment;
+                    dashsize_fixed = (*curve_it1).length() * dashpercent;
+                    holesize_fixed = (*curve_it1).length() * holepercent;
+                } 
+                ++curve_it1;
+                ++curve_it2;
+            } 
+            curve_it1 = path_it->begin();
+            curve_it2 = ++(path_it->begin());
+            curve_endit = path_it->end_default();
+        }
+        size_t p_index = 0;
+        size_t start_index = result.size();
+        if(splitsegments) {
+            while (curve_it1 != curve_endit) {
+                Geom::Path segment = (*path_it).portion(p_index, p_index + 1);
+                if(unifysegment) {
+                    double integral;
+                    double fractional = modf((*curve_it1).length()/(dashsize_fixed + holesize_fixed), &integral);
+                    numberdashes_fixed = (size_t)integral + 1;
+                    numberholes = numberdashes_fixed - 1;
+                    ammount = numberdashes_fixed + numberholes;
+                    if (halfextreme) {
+                        ammount--;
+                    }
+                    base = 1/(double)ammount;
+                    globaldash =  base * numberdashes_fixed * (1 + holefactor);
+                    if (halfextreme) { 
+                        globaldash =  base * (numberdashes_fixed - 1) * (1 + holefactor);
+                    }
+                    globalhole =  1-globaldash;
+                    dashpercent = globaldash/numberdashes_fixed;
+                    if (halfextreme) { 
+                       dashpercent = globaldash/(numberdashes_fixed -1);
+                    }
+                    holepercent = globalhole/numberholes;
+                }
+                double dashsize = (*curve_it1).length() * dashpercent;
+                double holesize = (*curve_it1).length() * holepercent;
+                if ((*curve_it1).isLineSegment()) {
+                    if (result.size() && Geom::are_near(segment.initialPoint(),result[result.size()-1].finalPoint())) {
+                        result[result.size()-1].setFinal(segment.initialPoint());
+                        if (halfextreme) {
+                            result[result.size()-1].append(segment.portion(0.0, dashpercent/2.0));
+                        } else {
+                            result[result.size()-1].append(segment.portion(0.0, dashpercent));
+                        }
+                    } else {
+                        if (halfextreme) {
+                            result.push_back(segment.portion(0.0, dashpercent/2.0));
+                        } else {
+                            result.push_back(segment.portion(0.0, dashpercent));
+                        }
+                    }
+                    
+                    double start = dashpercent + holepercent;
+                    if (halfextreme) {
+                        start = (dashpercent/2.0) + holepercent;
+                    }
+                    while (start  < 1) {
+                        if (start + dashpercent > 1) {
+                            result.push_back(segment.portion(start, 1));
+                        } else {
+                            result.push_back(segment.portion(start, start + dashpercent));
+                        }
+                        start += dashpercent + holepercent;
+                    }
+                } else if (!(*curve_it1).isLineSegment()) {
+                    double start = 0.0;
+                    double end = 0.0;
+                    if (halfextreme) {
+                        end = timeAtLength(dashsize/2.0,segment);
+                    } else {
+                        end = timeAtLength(dashsize,segment);
+                    }
+                    if (result.size() && Geom::are_near(segment.initialPoint(),result[result.size()-1].finalPoint())) {
+                        result[result.size()-1].setFinal(segment.initialPoint());
+                        result[result.size()-1].append(segment.portion(start, end));
+                    } else {
+                        result.push_back(segment.portion(start, end));
+                    }
+                    double startsize = dashsize + holesize;
+                    if (halfextreme) {
+                        startsize = (dashsize/2.0) + holesize;
+                    }
+                    double endsize = startsize + dashsize;
+                    start = timeAtLength(startsize,segment);
+                    end   = timeAtLength(endsize,segment);
+                    while (start  < 1 && start  > 0) {
+                        result.push_back(segment.portion(start, end));
+                        startsize = endsize + holesize;
+                        endsize = startsize + dashsize;
+                        start = timeAtLength(startsize,segment);
+                        end   = timeAtLength(endsize,segment);
+                    }
+                }
+                if (curve_it2 == curve_endit) {
+                    if (path_it->closed()) {
+                        Geom::Path end = result[result.size()-1];
+                        end.setFinal(result[start_index].initialPoint());
+                        end.append(result[start_index]);
+                        result[start_index] = end;
+                    }
+                }
+                p_index ++;
+                ++curve_it1;
+                ++curve_it2;
+            } 
+        } else {
+            double start = 0.0;
+            double end = 0.0;
+            double dashsize = lenght_pwd2 * dashpercent;
+            double holesize = lenght_pwd2 * holepercent;
+            if (halfextreme) {
+                end = timeAtLength(dashsize/2.0,pwd2);
+            } else {
+                end = timeAtLength(dashsize,pwd2);
+            }
+            result.push_back((*path_it).portion(start, end));
+            double startsize = dashsize + holesize;
+            if (halfextreme) {
+                startsize = (dashsize/2.0) + holesize;
+            }
+            double endsize = startsize + dashsize;
+            start = timeAtLength(startsize,pwd2);
+            end   = timeAtLength(endsize,pwd2);
+            while (start  < (*path_it).size() && start  > 0) {
+                result.push_back((*path_it).portion(start, end));
+                startsize = endsize + holesize;
+                endsize = startsize + dashsize;
+                start = timeAtLength(startsize,pwd2);
+                end   = timeAtLength(endsize,pwd2);
+            }
+            if (path_it->closed()) {
+                Geom::Path end = result[result.size()-1];
+                end.setFinal(result[start_index].initialPoint());
+                end.append(result[start_index]);
+                result[start_index] = end;
+            }
+        }
+    }
+    return result;
 }
 
 }; //namespace LivePathEffect