reverted previous accidental commit (just for testing)

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

src/pycam/Geometry/PolygonExtractor.py

@@ -235,14 +235,7 @@ class PolygonExtractor:
         curr_path = Iterator(self.curr_path_list)
 
         winding = 0
-        loop_counter = 0
-        while (prev_point.remains() > 1) or (curr_point.remains() > 1):
-            loop_counter += 1
-            if loop_counter % 1000 == 999:
-                print "prev: %s" % str(prev_point.remains())
-                print "curr: %s" % str(curr_point.remains())
-                if loop_counter > 100000:
-                    break
+        while (prev_point.remains() > 0) or (curr_point.remains() > 0):
             if DEBUG_POLYGONEXTRACTOR:
                 print "num_prev=%d, num_curr=%d" \
                         % (prev_point.remains(), curr_point.remains())

src/pycam/PathGenerators/__init__.py

@@ -77,13 +77,12 @@ def get_free_paths_triangles(model, cutter, p1, p2):
 
     count = 0
     points = []
-    maybe_first_is_missing = False
     for h in hits:
         if h.dir == forward:
             if count == 0:
                 if h.d >= 0:
                     if len(points) == 0:
-                        maybe_first_is_missing = True
+                        points.append(p1)
                     points.append(h.cl)
             count += 1
         else:
@@ -92,12 +91,10 @@ def get_free_paths_triangles(model, cutter, p1, p2):
                 if h.d <= xyz_dist:
                     points.append(h.cl)
 
-    if maybe_first_is_missing:
-        points.insert(0, p1)
-        if len(points) % 2 == 1:
+    if len(points)%2 == 1:
         points.append(p2)
 
-    if len(hits) == 0:
+    if len(hits)==0:
         points.append(p1)
         points.append(p2)