added helper paths and fixed some bugs

(bzr r13645.1.30)

4 files changed, 13 insertions, 3 deletions

diff --git a/src/2geom/pointwise.cpp b/src/2geom/pointwise.cpp
index 3c359eddc..0115ea103 100644
--- a/src/2geom/pointwise.cpp
+++ b/src/2geom/pointwise.cpp
@@ -124,7 +124,7 @@ Pointwise::findSatellites(int A, int B) const
 }
 
 std::vector<Satellite> 
-Pointwise::findClosingSatellites(int A, int B) const
+Pointwise::findClosingSatellites(int A) const
 {
     std::vector<Satellite> ret;
     bool finded = false;
@@ -151,7 +151,7 @@ Pointwise::findPeviousSatellites(int A, int B) const
             if(!_satellites[i].second.getIsStart()){
                 ret = findSatellites(_satellites[i-1].first, B);
             } else {
-                ret = findClosingSatellites(_satellites[i].first, B);
+                ret = findClosingSatellites(_satellites[i].first);
             }
         }
     }
diff --git a/src/2geom/pointwise.h b/src/2geom/pointwise.h
index c7426dc9d..aa907d498 100644
--- a/src/2geom/pointwise.h
+++ b/src/2geom/pointwise.h
@@ -68,7 +68,7 @@ class Pointwise
         virtual ~Pointwise();
         std::vector<Satellite> findSatellites(int A, int B = -1) const;
         std::vector<Satellite> findPeviousSatellites(int A, int B) const;
-        std::vector<Satellite> findClosingSatellites(int A, int B) const;
+        std::vector<Satellite> findClosingSatellites(int A) const;
         std::vector<std::pair<int,Satellite> > getSatellites();
         void setSatellites(std::vector<std::pair<int,Satellite> > sat);
         Piecewise<D2<SBasis> > getPwd2();
diff --git a/src/2geom/satellite.cpp b/src/2geom/satellite.cpp
index 9c253523e..c216595dc 100644
--- a/src/2geom/satellite.cpp
+++ b/src/2geom/satellite.cpp
@@ -117,6 +117,15 @@ Satellite::getTime(Geom::D2<Geom::SBasis> d2_in){
     return t;
 }
 
+double
+Satellite::getSize(Geom::D2<Geom::SBasis> d2_in){
+    double s = getAmmount();
+    if(getIsTime()){
+        s = toSize(s, d2_in);
+    }
+    return s;
+}
+
 
 Geom::Point 
 Satellite::getPosition(Geom::D2<Geom::SBasis> d2_in){
diff --git a/src/2geom/satellite.h b/src/2geom/satellite.h
index aa949a97c..48be13cc4 100644
--- a/src/2geom/satellite.h
+++ b/src/2geom/satellite.h
@@ -152,6 +152,7 @@ class Satellite
 
     void setPosition(Geom::Point p, Geom::D2<Geom::SBasis> d2_in);
     Geom::Point getPosition(Geom::D2<Geom::SBasis> curve);
+    double getSize(Geom::D2<Geom::SBasis> d2_in);
     double getTime(Geom::D2<Geom::SBasis> d2_in);
     double getOpositeTime(double A,Geom::D2<Geom::SBasis> SBasisCurve);
     double toSize(double A,Geom::D2<Geom::SBasis> d2_in);