fixed some minor mistakes

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@570 bbaffbd6-741e-11dd-a85d-61de82d9cad9

src/pycam/Cutters/BaseCutter.py

@@ -23,7 +23,7 @@ along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 
 
 from pycam.Geometry.Point import Point
-from pycam.Geometry.utils import number
+from pycam.Geometry.utils import number, epsilon
 
 
 class BaseCutter(object):

src/pycam/Cutters/CylindricalCutter.py

@@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License
 along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-from pycam.Geometry.utils import INFINITE, sqrt
+from pycam.Geometry.utils import INFINITE, sqrt, epsilon
 from pycam.Geometry.Point import Point
 from pycam.Geometry.intersection import intersect_circle_plane, \
         intersect_circle_point, intersect_circle_line, \

src/pycam/Cutters/ToroidalCutter.py

@@ -22,7 +22,7 @@ along with PyCAM.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 from pycam.Geometry.Point import Point
-from pycam.Geometry.utils import INFINITE, number
+from pycam.Geometry.utils import INFINITE, number, epsilon
 from pycam.Geometry.intersection import intersect_torus_plane, \
         intersect_torus_point, intersect_circle_plane, intersect_circle_point, \
         intersect_cylinder_point, intersect_cylinder_line, intersect_circle_line
@@ -156,7 +156,7 @@ class ToroidalCutter(BaseCutter):
         scale = max(3, scale)
         for i in range(scale + 1):
             m = float(i) / scale
-            p = edge.point(m)
+            p = edge.point_with_length_multiply(m)
             (cl, ccp, cp, l) = self.intersect_torus_point(direction, p)
             if not cl:
                 continue
@@ -169,9 +169,9 @@ class ToroidalCutter(BaseCutter):
         scale2 = 10
         for i in range(1, scale2 + 1):
             m = min_m + ((float(i) / (scale2)) * 2 - 1)/scale
-            if (m < 0) or (m > 1):
+            if (m < -epsilon) or (m > 1 + epsilon):
                 continue
-            p = edge.point(m)
+            p = edge.point_with_length_multiply(m)
             (cl, ccp, cp, l) = self.intersect_torus_point(direction, p)
             if not cl:
                 continue

src/pycam/Geometry/Line.py

@@ -83,6 +83,9 @@ class Line(TransformableContainer):
         self.maxy = max(self.p1.y, self.p2.y)
         self.maxz = max(self.p1.z, self.p2.z)
 
+    def point_with_length_multiply(self, l):
+        return self.p1.add(self.dir.mul(l*self.len))
+
     def get_length_line(self, length):
         """ return a line with the same direction and the specified length
         """