adding mirror knot

(bzr r13645.1.25)

4 files changed, 68 insertions, 19 deletions

diff --git a/src/live_effects/parameter/array.cpp b/src/live_effects/parameter/array.cpp
index 6dad9fcc8..2c3d823a5 100644
--- a/src/live_effects/parameter/array.cpp
+++ b/src/live_effects/parameter/array.cpp
@@ -60,11 +60,11 @@ sp_svg_satellite_read_d(gchar const *str, Geom::Satellite *sat){
         sat->setActive(strncmp(strarray[2],"1",1) == 0);
         sat->setHasMirror(strncmp(strarray[3],"1",1) == 0);
         sat->setHidden(strncmp(strarray[4],"1",1) == 0);
-        double time,size;
-        sp_svg_number_read_d(strarray[5], &size);
-        sp_svg_number_read_d(strarray[6], &time);
-        sat->setSize(size);
-        sat->setTime(time);
+        double ammount,angle;
+        sp_svg_number_read_d(strarray[5], &ammount);
+        sp_svg_number_read_d(strarray[6], &angle);
+        sat->setAmmount(ammount);
+        sat->setAngle(angle);
         g_strfreev (strarray);
         return 1;
     }
diff --git a/src/live_effects/parameter/array.h b/src/live_effects/parameter/array.h
index ff406d792..1a5823199 100644
--- a/src/live_effects/parameter/array.h
+++ b/src/live_effects/parameter/array.h
@@ -125,9 +125,9 @@ protected:
         str << "*";
         str << nVector.second.getHidden();
         str << "*";
-        str << nVector.second.getSize();
+        str << nVector.second.getAmmount();
         str << "*";
-        str <<nVector.second.getTime();
+        str << nVector.second.getAngle();
     }
 
     StorageType readsvg(const gchar * str);
diff --git a/src/live_effects/parameter/satellitepairarray.cpp b/src/live_effects/parameter/satellitepairarray.cpp
index bb72830d6..e6f0c03f9 100644
--- a/src/live_effects/parameter/satellitepairarray.cpp
+++ b/src/live_effects/parameter/satellitepairarray.cpp
@@ -44,10 +44,9 @@ void SatellitePairArrayParam::set_oncanvas_looks(SPKnotShapeType shape,
     knot_color = color;
 }
 
-void SatellitePairArrayParam::set_pwd2(
-    Piecewise<D2<SBasis> > const &pwd2_in)
+void SatellitePairArrayParam::set_pointwise(Geom::Pointwise *pointwise)
 {
-    last_pwd2 = pwd2_in;
+    last_pointwise = pointwise;
 }
 
 void SatellitePairArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
@@ -55,6 +54,7 @@ void SatellitePairArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
         SPItem *item)
 {
     for (unsigned int i = 0; i < _vector.size(); ++i) {
+        addKnotHolderEntitieMirrored(knotholder, desktop, item, i);
         const gchar *tip;
         tip = _("<b>Fillet</b>: <b>Ctrl+Click</b> toggle type, "
                 "<b>Shift+Click</b> open dialog, "
@@ -67,6 +67,19 @@ void SatellitePairArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
     }
 }
 
+void SatellitePairArrayParam::addKnotHolderEntitieMirrored(KnotHolder *knotholder,
+        SPDesktop *desktop,
+        SPItem *item, int i)
+{
+        const gchar *tip;
+        tip = _("<b>Mirror</b> ppp");
+        SatellitePairArrayParamKnotHolderEntity *e =
+            new SatellitePairArrayParamKnotHolderEntity(this, i + _vector.size());
+        e->create(desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, _(tip),
+                  knot_shape, knot_mode, knot_color);
+        knotholder->add(e);
+}
+
 
 SatellitePairArrayParamKnotHolderEntity::SatellitePairArrayParamKnotHolderEntity(SatellitePairArrayParam *p, unsigned int index) 
   : _pparam(p), 
@@ -80,8 +93,28 @@ void SatellitePairArrayParamKnotHolderEntity::knot_set(Point const &p,
                                               Point const &/*origin*/,
                                               guint state)
 {
-    Geom::Point const s = snap_knot_position(p, state);
-    _pparam->_vector.at(_index).second.setPosition(s,_pparam->last_pwd2[_pparam->_vector.at(_index).first]);
+    Geom::Point s = snap_knot_position(p, state);
+    int index = _index;
+    if( _index >= _pparam->_vector.size()){
+        index = _index-_pparam->_vector.size();
+    }
+    std::pair<int,Geom::Satellite> satellite = _pparam->_vector.at(index);
+    Geom::Pointwise* pointwise = _pparam->last_pointwise;
+    Geom::Piecewise<Geom::D2<Geom::SBasis> > pwd2 = pointwise->getPwd2();
+    if(_pparam->_vector.size() <= _index){
+        boost::optional<Geom::D2<Geom::SBasis> > d2_in = pointwise->getCurveIn(satellite);
+        if(d2_in){
+            double mirrorTime = Geom::nearest_point(s, *d2_in);
+            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]);
+            s = pwd2[satellite.first].valueAt(time);
+            satellite.second.setPosition(s,pwd2[satellite.first]);
+        }
+    } else {
+        satellite.second.setPosition(s,pwd2[satellite.first]);
+    }
+     _pparam->_vector.at(index) = satellite;
     SPLPEItem * splpeitem = dynamic_cast<SPLPEItem *>(item);
     if(splpeitem){
         sp_lpe_item_update_patheffect(splpeitem, false, false);
@@ -91,7 +124,24 @@ void SatellitePairArrayParamKnotHolderEntity::knot_set(Point const &p,
 Geom::Point 
 SatellitePairArrayParamKnotHolderEntity::knot_get() const
 {
-    Geom::Point const canvas_point = _pparam->_vector.at(_index).second.getPosition(_pparam->last_pwd2[_pparam->_vector.at(_index).first]);
+    Geom::Point tmpPoint;
+    int index = _index;
+    if( _index >= _pparam->_vector.size()){
+        index = _index-_pparam->_vector.size();
+    }
+    std::pair<int,Geom::Satellite> satellite = _pparam->_vector.at(index);
+    Geom::Pointwise* pointwise = _pparam->last_pointwise;
+    Geom::Piecewise<Geom::D2<Geom::SBasis> > pwd2 = pointwise->getPwd2();
+    if( _index >= _pparam->_vector.size()){
+        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));
+        }
+    } else {
+        tmpPoint = satellite.second.getPosition(pwd2[satellite.first]);
+    }
+    Geom::Point const canvas_point = tmpPoint;
     return canvas_point;
 }
 
diff --git a/src/live_effects/parameter/satellitepairarray.h b/src/live_effects/parameter/satellitepairarray.h
index ff1924829..dde844fd1 100644
--- a/src/live_effects/parameter/satellitepairarray.h
+++ b/src/live_effects/parameter/satellitepairarray.h
@@ -21,6 +21,7 @@
 #include <glib.h>
 #include "live_effects/parameter/array.h"
 #include "knot-holder-entity.h"
+#include <2geom/pointwise.h>
 
 namespace Inkscape {
 
@@ -47,10 +48,8 @@ public:
         return true;
     }
     virtual void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item);
-    void set_pwd2(Geom::Piecewise<Geom::D2<Geom::SBasis> > const &pwd2_in);
-    Geom::Piecewise<Geom::D2<Geom::SBasis> > const &get_pwd2() const {
-        return last_pwd2;
-    }
+    virtual void addKnotHolderEntitieMirrored(KnotHolder *knotholder, SPDesktop *desktop, SPItem *item, int i);
+    void set_pointwise(Geom::Pointwise *pointwise);
     friend class SatellitePairArrayParamKnotHolderEntity;
 
 private:
@@ -60,8 +59,8 @@ private:
     SPKnotShapeType knot_shape;
     SPKnotModeType knot_mode;
     guint32 knot_color;
-    
-    Geom::Piecewise<Geom::D2<Geom::SBasis> > last_pwd2;
+
+    Geom::Pointwise *last_pointwise;
 
 };