- Added adaptive laser cutting option

- Recent menu, justified with directory entries

CNC.py

@@ -635,6 +635,7 @@ def save(self, filename=None):
 class CNC:
 	inch           = False
 	lasercutter    = False
+	laseradaptive  = False
 	acceleration_x = 25.0	# mm/s^2
 	acceleration_y = 25.0	# mm/s^2
 	acceleration_z = 25.0	# mm/s^2
@@ -770,6 +771,8 @@ def loadConfig(config):
 		except: pass
 		try: CNC.lasercutter    = bool(int(config.get(section, "lasercutter")))
 		except: pass
+		try: CNC.laseradaptive  = bool(int(config.get(section, "laseradaptive")))
+		except: pass
 		try: CNC.doublesizeicon = bool(int(config.get(section, "doublesizeicon")))
 		except: pass
 		try: CNC.acceleration_x = float(config.get(section, "acceleration_x"))
@@ -967,7 +970,10 @@ def garc(g, x=None, y=None, z=None, i=None, j=None, k=None, **args):
 	@staticmethod
 	def zenter(z):
 		if CNC.lasercutter:
-			return "m3"
+			if CNC.laseradaptive:
+				return "m4"
+			else:
+				return "m3"
 		else:
 			return "g1 %s %s"%(CNC.fmt("z",z), CNC.fmt("f",CNC.vars["cutfeedz"]))
 

FilePage.py

@@ -39,10 +39,12 @@ def createMenu(self):
 		for i in range(Utils._maxRecent):
 			filename = Utils.getRecent(i)
 			if filename is None: break
-			fn = os.path.basename(filename)
+			path = os.path.dirname(filename)
+			fn   = os.path.basename(filename)
 			menu.add_command(label="%d %s"%(i+1, fn),
 				compound=LEFT,
 				image=Utils.icons["new"],
+				accelerator=path, # Show as accelerator in order to be aligned
 				command=lambda s=self,i=i: s.event_generate("<<Recent%d>>"%(i)))
 		if i==0: # no entry
 			self.event_generate("<<Open>>")

ToolsPage.py

@@ -508,7 +508,8 @@ def __init__(self, master):
 		self.name = "CNC"
 		self.variables = [
 			("units"         , "bool", 0    , _("Units (inches)"))   ,
-			("lasercutter"   , "bool", 0    , _("Lasercutter"))   ,
+			("lasercutter"   , "bool", 0    , _("Laser Cutter"))   ,
+			("laseradaptive" , "bool", 0    , _("Laser Adaptive Power"))   ,
 			("doublesizeicon", "bool", 0    , _("Double Size Icon"))   ,
 			("acceleration_x", "mm"  , 25.0 , _("Acceleration x"))   ,
 			("acceleration_y", "mm"  , 25.0 , _("Acceleration y"))   ,

bCNC.ini

@@ -127,6 +127,7 @@ command.2 = G53 G0 X[prbx] Y[prby] Z[prbz]
 [CNC]
 units = 0
 lasercutter = 0
+laseradaptive = 0
 doublesizeicon = 0
 acceleration_x = 25
 acceleration_y = 25

bCNC.py

@@ -5,8 +5,8 @@
 # Author: [email protected]
 # Date: 24-Aug-2014
 
-__version__ = "0.9.9"
-__date__    = "24 Mar 2017"
+__version__ = "0.9.10"
+__date__    = "3 Aug 2017"
 __author__  = "Vasilis Vlachoudis"
 __email__   = "[email protected]"
 
@@ -2477,13 +2477,19 @@ def usage(rc):
 						r = 0
 			if r<0:
 				# display list of recent files
+				maxlen = 10
+				for i in range(Utils._maxRecent):
+					try: filename = Utils.getRecent(i)
+					except: continue
+					maxlen = max(maxlen, len(os.path.basename(filename)))
+
 				sys.stdout.write("Recent files:\n")
 				for i in range(Utils._maxRecent):
 					filename = Utils.getRecent(i)
 					if filename is None: break
 					d  = os.path.dirname(filename)
 					fn = os.path.basename(filename)
-					sys.stdout.write("  %2d: %-10s\t%s\n"%(i+1,fn,d))
+					sys.stdout.write("  %2d: %-*s  %s\n"%(i+1,maxlen,fn,d))
 
 				try:
 					sys.stdout.write("Select one: ")