- started moving operations into seperate functions

scripts/addons/cam/utils.py

@@ -2058,23 +2058,14 @@ def addBridges(ch,o):
 				ch.points[p[0]]=p[1]
 			for pi in range(len(insertpoints)-1,-1,-1):
 				ch.points.insert(insertpoints[pi][0],insertpoints[pi][1])
-#this is the main function.
-#FIXME: split strategies into separate file!
-#def cutoutStrategy(o):
-
-
-def getPath3axis(context,operation):
-	s=bpy.context.scene
-	o=operation
-	getBounds(o)
-	
 
 ###########cutout strategy is completely here:
-	if o.strategy=='CUTOUT':
+def strategy_cutout( o ):
 	#ob=bpy.context.active_object
+	print('operation: cutout')
 	offset=True
 	if o.cut_type=='ONLINE' and o.onlycurves==True:#is separate to allow open curves :)
-			print('separe')
+		print('separate')
 		chunksFromCurve=[]
 		for ob in o.objects:
 			chunksFromCurve.extend(curveToChunks(ob))
@@ -2174,11 +2165,10 @@ def getPath3axis(context,operation):
 		for chl in extendorder:
 			chunks.append(chl[0])
 
-		
-
 	chunksToMesh(chunks,o)
 
-	elif o.strategy=='CURVE':
+def strategy_curve( o ):
+	print('operation: curve')
 	pathSamples=[]
 	getOperationSources(o)
 	if not o.onlycurves:
@@ -2196,9 +2186,8 @@ def getPath3axis(context,operation):
 			
 	chunksToMesh(pathSamples,o)
 	
-		
+def strategy_proj_curve( s, o ):
-		
+	print('operation: projected curve')
-	if o.strategy=='PROJECTED_CURVE':
 	pathSamples = []
 	chunks = []
 	ob = bpy.data.objects[o.curve_object]
@@ -2251,7 +2240,6 @@ def getPath3axis(context,operation):
 				ep -= vece
 				ch.endpoints.append(ep)
 						
-					
 				ch.rotations.append((0,0,0))
 				
 				vec = sp - ep
@@ -2259,7 +2247,6 @@ def getPath3axis(context,operation):
 				ch.points[i] = sp.copy()
 			
 			
-			
 	if o.use_layers:
 		n = math.ceil(-(ch.depth/o.stepdown))
 		layers = []
@@ -2278,8 +2265,28 @@ def getPath3axis(context,operation):
 	#	ch.points=ch.endpoints
 	chunksToMesh(chunks,o)
 
+def strategy_pocket( o ):
 	
-	if o.strategy=='POCKET':	
+	
+#this is the main function.
+#FIXME: split strategies into separate file!
+#def cutoutStrategy(o):
+def getPath3axis(context, operation):
+	s=bpy.context.scene
+	o=operation
+	getBounds(o)
+	
+	
+	if o.strategy=='CUTOUT':
+		strategy_cutout( o )
+		
+	elif o.strategy=='CURVE':
+		strategy_curve( o )
+				
+	elif o.strategy=='PROJECTED_CURVE':
+		strategy_proj_curve(s, o)
+		
+	elif o.strategy=='POCKET':	
 		p=getObjectOutline(o.cutter_diameter/2,o,False)
 		all=Polygon.Polygon(p)
 		approxn=(min(o.max.x-o.min.x,o.max.y-o.min.y)/o.dist_between_paths)/2
@@ -2834,6 +2841,7 @@ def getPath3axis(context,operation):
 		chunks=sortChunks(chunks,o)
 		print(chunks)
 		chunksToMesh(chunks,o)
+		
 	elif o.strategy=='MEDIAL_AXIS':
 		print('doing highly experimental stuff')