Просмотр исходного кода

- fixed the TclCommand MillHoles

Marius Stanciu 6 лет назад
Родитель
Сommit
4440298327
3 измененных файлов с 6 добавлено и 3 удалено
  1. 4 2
      FlatCAMObj.py
  2. 1 0
      README.md
  3. 1 1
      tclCommands/TclCommandMillHoles.py

+ 4 - 2
FlatCAMObj.py

@@ -2633,8 +2633,10 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
 
 
         for tool in tools:
         for tool in tools:
             if tooldia > self.tools[tool]["C"]:
             if tooldia > self.tools[tool]["C"]:
-                self.app.inform.emit('[ERROR_NOTCL] %s' %
-                                     _("Milling tool for DRILLS is larger than hole size. Cancelled."))
+                self.app.inform.emit('[ERROR_NOTCL] %s %s: %s' % (
+                    _("Milling tool for DRILLS is larger than hole size. Cancelled.",
+                      str(tool))
+                ))
                 return False, "Error: Milling tool is larger than hole."
                 return False, "Error: Milling tool is larger than hole."
 
 
         def geo_init(geo_obj, app_obj):
         def geo_init(geo_obj, app_obj):

+ 1 - 0
README.md

@@ -15,6 +15,7 @@ CAD program, and create G-Code for Isolation routing.
 - whenever a Gerber file is deleted, the mark_shapes objects are deleted also
 - whenever a Gerber file is deleted, the mark_shapes objects are deleted also
 - made faster the Gerber parser for the case of having a not valid geometry when loading a Gerber file without buffering
 - made faster the Gerber parser for the case of having a not valid geometry when loading a Gerber file without buffering
 - updated code in self.on_view_source() to make it more responsive
 - updated code in self.on_view_source() to make it more responsive
+- fixed the TclCommand MillHoles
 
 
 10.09.2019
 10.09.2019
 
 

+ 1 - 1
tclCommands/TclCommandMillHoles.py

@@ -82,7 +82,7 @@ class TclCommandMillHoles(TclCommandSignaled):
             del args['name']
             del args['name']
 
 
             # This runs in the background... Is blocking handled?
             # This runs in the background... Is blocking handled?
-            success, msg = obj.generate_milling(**args)
+            success, msg = obj.generate_milling_drills(**args)
 
 
         except Exception as e:
         except Exception as e:
             self.raise_tcl_error("Operation failed: %s" % str(e))
             self.raise_tcl_error("Operation failed: %s" % str(e))