giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Juan Pablo Caram 2017-01-27 19:52:59 -05:00
parent 93e2d953a4 1d50f6fdab
commit db59ef8edd
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tclCommands/TclCommandPanelize.py
View File

@ -1,4 +1,6 @@
from ObjectCollection import *
from copy import copy,deepcopy
import TclCommand
@ -102,19 +104,26 @@ class TclCommandPanelize(TclCommand.TclCommand):
def initialize_local(obj_init, app):
obj_init.solid_geometry = obj.solid_geometry
obj_init.offset([float(currentx), float(currenty)]),
objs.append(obj_init)
def initialize_local_excellon(obj_init, app):
FlatCAMExcellon.merge(obj, obj_init)
obj_init.offset([float(currentx), float(currenty)]),
obj_init.tools = obj.tools
# drills are offset, so they need to be deep copied
obj_init.drills = deepcopy(obj.drills)
obj_init.offset([float(currentx), float(currenty)])
obj_init.create_geometry()
objs.append(obj_init)
def initialize_geometry(obj_init, app):
FlatCAMGeometry.merge(objs, obj_init)
def initialize_excellon(obj_init, app):
# merge expects tools to exist in the target object
obj_init.tools = obj.tools.copy()
FlatCAMExcellon.merge(objs, obj_init)
objs = []
if obj is not None:
if obj is not None:
for row in range(args['rows']):
currentx = 0