added mirror knots

(bzr r13645.1.26)

3 files changed, 45 insertions, 8 deletions

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]);