Merge pull request #1415 from apshu/master

Driller improvements, Manual drillmark improvement, code review improvement

bCNC/CNC.py

@@ -190,7 +190,7 @@ def load(self, filename=None):
 		def read(f):
 			while True:
 				line = f.readline()
-				if len(line)==0: raise
+				assert line , "Read an empty line, please check file IO settings"
 				line = line.strip()
 				if line: return map(float, line.split())
 
@@ -3439,6 +3439,17 @@ def drill(self, items, depth=None, peck=None, dwell=None, distance=None, number=
 			opname = "drill"
 		else:
 			opname = "drill:%g"%(depth)
+		#Incorrect peck values can block drilling cycle calculation
+		peck = peck or 0.0
+		if peck == 0.0:
+			peck = None
+		if peck is not None:
+			if math.copysign(1.0, depth) * math.copysign(1.0, peck) != -1:
+				pecksignstr = "less"
+				if math.copysign(1.0, peck) < 0:
+					pecksignstr = "greater"
+				return "Invalid peck depth value of %g. In this configuration, peck value should be %s than zero."%(peck, pecksignstr)
+		#pecking value is well defined.
 
 		undoinfo = []
 

bCNC/ToolsPage.py

@@ -822,6 +822,21 @@ def __init__(self, master):
 			("distance",  "mm" ,    "", _("Distance (mm)")),
 			("number",    "int" ,   "", _("Number"))
 		]
+		self.help = """Drill a hole in the center of the selected path or drill many holes along the selected path.
+
+MODULE PARAMETERS:
+
+* center : if checked, there is only one drill in the center of the selected path. (Otherwise drill along path)
+
+* depth : Depth of the drill. If not provided, stock material thickness is used. (usually negative value)
+
+* peck: Peck step depth. If provided, drill with peck depth step, raising the drill to z travel value. If not provided, one pass drill is generated.
+
+* dwell: Dwell time at the bottom. If pecking is defined, dwell also at lifted height.
+
+* distance: Distance between drills if drilling alog path. (Number of drills will superceed this parameter))
+
+* number: Number of drills if drilling along path. If nonzero, Parameter 'distance' has no effect."""
 		self.buttons.append("exe")
 
 	# ----------------------------------------------------------------------

bCNC/plugins/drillmark.py

@@ -183,4 +183,4 @@ def execute(self, app):
 		blocks = [block]
 		app.gcode.insBlocks(active, blocks, _("Manual drill mark"))
 		app.refresh()  # <<< refresh editor
-		app.setStatus(_("Generated: MyPlugin Result"))
+		app.setStatus(_("Generated: Manual drillmark"))