From ddd8557d07491fdc63da2ea925866da1b85a9ea8 Mon Sep 17 00:00:00 2001
From: vilemnovak <blendercamofficial@gmail.com>
Date: Mon, 21 Dec 2015 18:44:57 +0100
Subject: [PATCH] more shapely fixes

-new function for filtering shapely geometry(not needed in the end, but
present...)
-pocket with distance of paths larger than cutter radius - doesnt work
as it used to, needs to be recoded, but by now, it at least DOES
something and doesnt crash....I need to rethink this.
---
 scripts/addons/cam/polygon_utils_cam.py | 41 +++++++++++++++++++-
 scripts/addons/cam/utils.py             | 50 ++++++++++++++++---------
 2 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/scripts/addons/cam/polygon_utils_cam.py b/scripts/addons/cam/polygon_utils_cam.py
index 3eab42d0..bdb04978 100644
--- a/scripts/addons/cam/polygon_utils_cam.py
+++ b/scripts/addons/cam/polygon_utils_cam.py
@@ -121,7 +121,29 @@ def polyRemoveDoubles(p,optimize_threshold):
 	#progress(time.time()-t)
 	return pnew
 	
-
+def shapelyRemoveDoubles(p,optimize_threshold):
+	optimize_threshold*=0.000001
+	#vecs=[]
+	
+	soptions=['distance','distance',0.0,5,optimize_threshold,5,optimize_threshold]
+	for ci,c in enumerate(p.boundary):# in range(0,len(p)):
+		
+		veclist=[]
+		for v in c:
+			veclist.append(Vector((v[0],v[1])))
+		#progress(len(veclist))
+		s=curve_simplify.simplify_RDP(veclist, soptions)
+		#progress(len(s))
+		nc=[]
+		for i in range(0,len(s)):
+			nc.append(c[s[i]])
+		
+		if len(nc)>2:
+			pnew.addContour(nc,p.isHole(ci))
+		else:
+			pnew.addContour(p[ci],p.isHole(ci))
+	#progress(time.time()-t)
+	return pnew
 	
 def outlinePoly(p,r,circle_detail,optimize,optimize_threshold,offset = True):
 	'''offsets or insets polygon by radius'''
@@ -264,6 +286,18 @@ def polyToMesh(name,p,z):
 	
 	return bpy.context.active_object
 
+def shapelyToMultipolygon(anydata):
+	if anydata.type == 'MultiPolygon':
+		return anydata
+	elif anydata.type == 'Polygon':
+		if not anydata.is_empty:
+			return shapely.geometry.MultiPolygon([anydata])
+		else:
+			return sgeometry.MultiPolygon()
+	else:
+		print(anydata.type, 'shapely conversion aborted')
+		return sgeometry.MultiPolygon()
+		
 def shapelyToCoords(anydata):
 	p=anydata
 	seq=[]
@@ -339,7 +373,10 @@ def shapelyToCurve(name,p,z):
 			x, y = c[num][0],c[num][1]
 			
 			polyline.points[num].co = (x, y, z, w)  
-	
+	objectdata.select = True
+	bpy.context.scene.objects.active = objectdata
+	for c in objectdata.data.splines:
+		c.use_cyclic_u=True
 	return objectdata#bpy.context.active_object
 	
 '''#outdated?
diff --git a/scripts/addons/cam/utils.py b/scripts/addons/cam/utils.py
index fe87eb67..c2e5a153 100644
--- a/scripts/addons/cam/utils.py
+++ b/scripts/addons/cam/utils.py
@@ -2541,22 +2541,27 @@ def getPath3axis(context,operation):
 
 				contours_before=len(p.boundary)
 				
+				
 				if centers==None:
 					centers=[]
-					for p in range(0,len(p)):
-						centers.append(p.centroid())
-				contours_after=len(pnew.boundary)
+					print(p.type)
+					p = shapelyToMultipolygon(p)
+					for i in range(0,len(p)):
+						centers.append(p[i].centroid)
+				
+				pnew = shapelyToMultipolygon(pnew)
+				contours_after=len(pnew)
 				newcenters=[]
 				
 				do_test=False
 				for ci in range(0,len(pnew)):
-					newcenters.append(pnew.centroid())
-					dodelat
+					newcenters.append(pnew.centroid)
+					#dodelat
 					if len(p)>ci:#comparing polygons to detect larger changes in shape
 						#print(ci,len(p))
-						bb1=p.bounds(ci)
-						bb2=pnew.boundingBox(ci)
-						d1=dist2d(newcenters[ci],centers[ci])
+						bb1=p[ci].bounds
+						bb2=pnew[ci].bounds
+						d1=dist2d((newcenters[ci].x,newcenters[ci].y),(centers[ci].x,centers[ci].y))
 						d2=0
 						for bbi in range(0,4):
 							d2=max(d2,abs(bb2[bbi]-bb1[bbi]))
@@ -2571,17 +2576,26 @@ def getPath3axis(context,operation):
 				
 				if do_test:	
 					print('testing')
-					prest=outlinePoly(p,o.cutter_diameter/2.0,o.circle_detail,o.optimize,o.optimize_threshold,False)#this estimates if there was a rest on the last cut
+					prest=p.buffer(-o.cutter_diameter/2.0,o.circle_detail)#this estimates if there was a rest on the last cut
+					#prest=outlinePoly(p,o.cutter_diameter/2.0,o.circle_detail,o.optimize,o.optimize_threshold,False)#this estimates if there was a rest on the last cut
 					
-					for ci in range(0,len(prest)):
-						bbcontour=prest.boundingBox(ci)
+					prest = shapelyToMultipolygon(prest)
+					
+					for ci,p in enumerate(prest):#.geom?
+						bbcontour=p.bounds
 						add=False
 						#if len(pnew)>ci:
+						
 						d=0
-						bb2=pnew.boundingBox()
-						bb1=prest.boundingBox()
-						for bbi in range(0,4):
-							d=max(d,abs(bb2[bbi]-bb1[bbi]))
+						bb2=pnew.bounds
+						bb1=prest.bounds
+						
+						if bb2!=():
+							for bbi in range(0,4):
+								print(bb1,bb2)
+								
+								d=max(d,abs(bb2[bbi]-bb1[bbi]))
+							#test to estimate if some of the paths might have disappeared:
 						if d>o.dist_between_paths*2:
 							add=True
 							#print('pnew boundbox vs restboundbox')
@@ -2594,8 +2608,8 @@ def getPath3axis(context,operation):
 						if add:
 							#print('adding extra contour rest')
 							#print(prest[ci])
-							rest=Polygon.Polygon(prest[ci])
-							nchunks=polyToChunks(rest,o.min.z)
+							rest=spolygon.Polygon(prest[ci])
+							nchunks=shapelyToChunks(rest,o.min.z)
 							nchunks=limitChunks(nchunks,o)
 							parentChildDist(lastchunks,nchunks,o)
 							nchunks.extend(chunksFromCurve)#appending these to the beginning, so they get milled first.
@@ -2609,10 +2623,12 @@ def getPath3axis(context,operation):
 			
 			i+=1
 		
+		#if (o.poc)#TODO inside outside!
 		if (o.movement_type=='CLIMB' and o.spindle_rotation_direction=='CW') or (o.movement_type=='CONVENTIONAL' and o.spindle_rotation_direction=='CCW'):
 			for ch in chunksFromCurve:
 				ch.points.reverse()
 				
+				
 		#if bpy.app.debug_value==1: