added mirror knots

(bzr r13645.1.26)

5 files changed, 81 insertions, 21 deletions

diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp
index 41c6a7090..d46d0f4ff 100644
--- a/src/live_effects/lpe-fillet-chamfer.cpp
+++ b/src/live_effects/lpe-fillet-chamfer.cpp
@@ -48,11 +48,13 @@ LPEFilletChamfer::LPEFilletChamfer(LivePathEffectObject *lpeobject) :
     satellitepairarrayparam_values(_("Fillet point"), _("Fillet point"), "satellitepairarrayparam_values", &wr, this),
     method(_("Method:"), _("Fillets methods"), "method", FMConverter, &wr, this, FM_AUTO),
     flexible(_("Flexible radius size (%)"), _("Flexible radius size (%)"), "flexible", &wr, this, false),
+    mirrorKnots(_("Mirror Knots"), _("Mirror Knots"), "mirrorKnots", &wr, this, true),
     pointwise()
 {
     registerParameter(&satellitepairarrayparam_values);
     registerParameter(&method);
     registerParameter(&flexible);
+    registerParameter(&mirrorKnots);
 }
 
 LPEFilletChamfer::~LPEFilletChamfer() {}
@@ -90,24 +92,36 @@ void LPEFilletChamfer::doOnApply(SPLPEItem const *lpeItem)
             --curve_end;
             int counter = 0;
             while (curve_it1 != curve_endit) {
-                Satellite satellite(F, flexible, true, false, false, 0.0, 0.0);
-                Geom::NodeType nodetype;
+                bool isStart = false;
+                if(counter == 0){
+                    isStart = true;
+                }
+                bool isClosing = false;
+                if(path_it->closed() && curve_it1 == curve_end){
+                    isClosing = true;
+                }
+                bool active = true;
+                bool hidden = false;
                 if (counter==0) {
                     if (path_it->closed()) {
-                        nodetype = get_nodetype(*curve_end, *curve_it1);
                     } else {
-                        nodetype = NODE_NONE;
+                        active = false;
                     }
-                } else {
-                    nodetype = get_nodetype((*path_it)[counter - 1], *curve_it1);
-                }
-                if (nodetype == NODE_CUSP) {
-                    satellites.push_back(std::make_pair(counterTotal, satellite));
                 }
+                Satellite satellite(F, flexible, isClosing, isStart, active, mirrorKnots, hidden, 0.0, 0.0);
+                satellites.push_back(std::make_pair(counterTotal, satellite));
                 ++curve_it1;
                 counter++;
                 counterTotal++;
             }
+            if (!path_it->closed()){
+                bool active = false;
+                bool isClosing = false;
+                bool isStart = false;
+                bool hidden = false;
+                Satellite satellite(F, flexible, isClosing, isStart, active, mirrorKnots, hidden, 0.0, 0.0);
+                satellites.push_back(std::make_pair(counterTotal, satellite));
+            }
         }
         pointwise = new Pointwise( pwd2_in,satellites);
         satellitepairarrayparam_values.param_set_and_write_new_value(satellites);
@@ -152,6 +166,10 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem)
                 }
                 changed = true;
             }
+            if(it->second.getHasMirror() != mirrorKnots){
+                it->second.setHasMirror(mirrorKnots);
+                changed = true;
+            }
         }
         if(changed){
             pointwise->setSatellites(satellites);
@@ -218,12 +236,16 @@ LPEFilletChamfer::doEffect_path(std::vector<Geom::Path> const &path_in)
             if(first == counter){
                 satVector = pointwise->findSatellites(first,1);
                 if(satVector.size()>0){
-                    time0 = satVector[0].getTime(curve_it2Fixed->toSBasis());
+                    time0 = satVector[0].getTime(path_it->begin()->duplicate()->toSBasis());
                 }
             }
 
             bool last = curve_it2 == curve_endit;
-            double time1 = sat.getOpositeTime((*curve_it1).toSBasis());
+            double s = sat.getAmmount();
+            if(sat.getIsTime()){
+                s = sat.toSize(s, curve_it2Fixed->toSBasis());
+            }
+            double time1 = sat.getOpositeTime(s,(*curve_it1).toSBasis());
             double time2 = sat.getTime(curve_it2Fixed->toSBasis());
             if(time1 <= time0){
                 time1 = time0;
@@ -249,7 +271,7 @@ LPEFilletChamfer::doEffect_path(std::vector<Geom::Path> const &path_in)
                 endArcPoint = curve_it2Fixed->pointAt(times[2]-gapHelper);
             }
             if(times[1] == times[0]){
-                startArcPoint = knotCurve1->pointAt(1-gapHelper);
+                startArcPoint = curve_it1->pointAt(times[0]+gapHelper);
             }
             double k1 = distance(startArcPoint, curve_it1->finalPoint()) * K;
             double k2 = distance(endArcPoint, curve_it2Fixed->initialPoint()) * K;
@@ -289,7 +311,7 @@ LPEFilletChamfer::doEffect_path(std::vector<Geom::Path> const &path_in)
                 endArcPoint = curve_it2Fixed->pointAt(times[2]);
             }
             if(times[1] == times[0]){
-                startArcPoint = knotCurve1->pointAt(1);
+                startArcPoint = curve_it1->pointAt(times[0]);
             }
             Line const x_line(Geom::Point(0,0),Geom::Point(1,0));
             Line const angled_line(startArcPoint,endArcPoint);
diff --git a/src/live_effects/lpe-fillet-chamfer.h b/src/live_effects/lpe-fillet-chamfer.h
index f5c4f14ea..149a2d743 100644
--- a/src/live_effects/lpe-fillet-chamfer.h
+++ b/src/live_effects/lpe-fillet-chamfer.h
@@ -43,6 +43,7 @@ public:
 private:
     EnumParam<FilletMethod> method;
     BoolParam flexible;
+    BoolParam mirrorKnots;
     Geom::Pointwise *pointwise;
 
     LPEFilletChamfer(const LPEFilletChamfer &);
diff --git a/src/live_effects/parameter/array.cpp b/src/live_effects/parameter/array.cpp
index 2c3d823a5..c00cdd8da 100644
--- a/src/live_effects/parameter/array.cpp
+++ b/src/live_effects/parameter/array.cpp
@@ -54,15 +54,17 @@ sp_svg_satellite_read_d(gchar const *str, Geom::Satellite *sat){
         return 0;
     }
     gchar ** strarray = g_strsplit(str, "*", 0);
-    if(strarray[6] && !strarray[7]){
+    if(strarray[8] && !strarray[9]){
         sat->setSatelliteType(strarray[0]);
         sat->setIsTime(strncmp(strarray[1],"1",1) == 0);
-        sat->setActive(strncmp(strarray[2],"1",1) == 0);
-        sat->setHasMirror(strncmp(strarray[3],"1",1) == 0);
-        sat->setHidden(strncmp(strarray[4],"1",1) == 0);
+        sat->setIsClosing(strncmp(strarray[2],"1",1) == 0);
+        sat->setIsStart(strncmp(strarray[3],"1",1) == 0);
+        sat->setActive(strncmp(strarray[4],"1",1) == 0);
+        sat->setHasMirror(strncmp(strarray[5],"1",1) == 0);
+        sat->setHidden(strncmp(strarray[6],"1",1) == 0);
         double ammount,angle;
-        sp_svg_number_read_d(strarray[5], &ammount);
-        sp_svg_number_read_d(strarray[6], &angle);
+        sp_svg_number_read_d(strarray[7], &ammount);
+        sp_svg_number_read_d(strarray[8], &angle);
         sat->setAmmount(ammount);
         sat->setAngle(angle);
         g_strfreev (strarray);
diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
index 1a5823199..0be155f50 100644
--- a/src/live_effects/parameter/array.h
+++ b/src/live_effects/parameter/array.h
@@ -119,6 +119,10 @@ protected:
         str << "*";
         str << nVector.second.getIsTime();
         str << "*";
+        str << nVector.second.getIsClosing();
+        str << "*";
+        str << nVector.second.getIsStart();
+        str << "*";
         str << nVector.second.getActive();
         str << "*";
         str << nVector.second.getHasMirror();
diff --git a/src/live_effects/parameter/satellitepairarray.cpp b/src/live_effects/parameter/satellitepairarray.cpp
index e6f0c03f9..7a35df28f 100644
--- a/src/live_effects/parameter/satellitepairarray.cpp
+++ b/src/live_effects/parameter/satellitepairarray.cpp
@@ -54,7 +54,9 @@ void SatellitePairArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
         SPItem *item)
 {
     for (unsigned int i = 0; i < _vector.size(); ++i) {
-        addKnotHolderEntitieMirrored(knotholder, desktop, item, i);
+        if(_vector[i].second.getHasMirror()){
+            addKnotHolderEntitieMirrored(knotholder, desktop, item, i);
+        }
         const gchar *tip;
         tip = _("<b>Fillet</b>: <b>Ctrl+Click</b> toggle type, "
                 "<b>Shift+Click</b> open dialog, "
@@ -105,10 +107,20 @@ void SatellitePairArrayParamKnotHolderEntity::knot_set(Point const &p,
         boost::optional<Geom::D2<Geom::SBasis> > d2_in = pointwise->getCurveIn(satellite);
         if(d2_in){
             double mirrorTime = Geom::nearest_point(s, *d2_in);
+            double timeStart = 0;
+            std::vector<Satellite> satVector = pointwise->findPeviousSatellites(satellite.first,1);
+            if(satVector.size()>0){
+                timeStart =  satVector[0].getTime(*d2_in);
+            }
+            if(timeStart > mirrorTime){
+                mirrorTime = timeStart;
+            }
             double size = satellite.second.toSize(mirrorTime, *d2_in);
             double lenght = Geom::length(*d2_in, Geom::EPSILON) - size;
             double time = satellite.second.toTime(lenght,pwd2[satellite.first]);
+            std::cout << time << "time\n";
             s = pwd2[satellite.first].valueAt(time);
+            std::cout << s << "s\n";
             satellite.second.setPosition(s,pwd2[satellite.first]);
         }
     } else {
@@ -136,7 +148,26 @@ SatellitePairArrayParamKnotHolderEntity::knot_get() const
         tmpPoint = satellite.second.getPosition(pwd2[satellite.first]);
         boost::optional<Geom::D2<Geom::SBasis> > d2_in = pointwise->getCurveIn(satellite);
         if(d2_in){
-            tmpPoint = (*d2_in).valueAt(satellite.second.getOpositeTime(*d2_in));
+            double s = satellite.second.getAmmount();
+            if(satellite.second.getIsTime()){
+                s = satellite.second.toSize(s, pwd2[satellite.first]);
+            }
+            double t = satellite.second.getOpositeTime(s,*d2_in);
+            if(t > 1){
+                t = 1;
+            }
+            if(t < 0){
+                t = 0;
+            }
+            double timeStart = 0;
+            std::vector<Satellite> satVector = pointwise->findPeviousSatellites(satellite.first,1);
+            if(satVector.size()>0){
+                timeStart =  satVector[0].getTime(*d2_in);
+            }
+            if(timeStart > t){
+                t = timeStart;
+            }
+            tmpPoint = (*d2_in).valueAt(t);
         }
     } else {
         tmpPoint = satellite.second.getPosition(pwd2[satellite.first]);