Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta

# Conflicts:
#	tclCommands/TclCommandMillDrills.py

tclCommands/TclCommandCncjob.py

@@ -78,7 +78,7 @@ class TclCommandCncjob(TclCommandSignaled):
             ('pp', 'Name of the Geometry postprocessor. No quotes, case sensitive'),
             ('muted', 'It will not put errors in the Shell.')
         ]),
-        'examples': ['cncjob geo_name -tooldia 0.5 -z_cut -1.7 -z_move 2 -feedrate 120 -ppname_g default']
+        'examples': ['cncjob geo_name -dia 0.5 -z_cut -1.7 -z_move 2 -feedrate 120 -pp default']
     }
 
     def execute(self, args, unnamed_args):

tclCommands/TclCommandCopperClear.py

@@ -253,7 +253,7 @@ class TclCommandCopperClear(TclCommand):
                 self.app.ncclear_tool.clear_copper(ncc_obj=obj,
                                                    sel_obj=box_obj,
                                                    select_method='box',
-                                                   tooldia=tooldia,
+                                                   ncctooldia=tooldia,
                                                    overlap=overlap,
                                                    order=order,
                                                    margin=margin,

tclCommands/TclCommandCutout.py

@@ -79,7 +79,7 @@ class TclCommandCutout(TclCommand):
         if 'gaps' in args:
             gaps_par = args['gaps']
         else:
-            gaps_par = 4
+            gaps_par = "4"
 
         if 'gapsize' in args:
             gapsize_par = args['gapsize']

tclCommands/TclCommandMillDrills.py

@@ -5,11 +5,10 @@
 # MIT Licence                                              #
 # ##########################################################
 
+from ObjectCollection import *
 from tclCommands.TclCommand import TclCommandSignaled
-from FlatCAMObj import FlatCAMExcellon
-
 import math
-import collections
+
 
 class TclCommandMillDrills(TclCommandSignaled):
     """

tclCommands/TclCommandOpenGerber.py

@@ -48,7 +48,7 @@ class TclCommandOpenGerber(TclCommandSignaled):
         # How the object should be initialized
         def obj_init(gerber_obj, app_obj):
 
-            if not isinstance(gerber_obj, Geometry):
+            if not isinstance(gerber_obj, FlatCAMGerber):
                 self.raise_tcl_error('Expected FlatCAMGerber, got %s %s.' % (outname, type(gerber_obj)))
 
             # Opening the file happens here