try to cleanup stuff(2)
This commit is contained in:
13
swissmx.py
13
swissmx.py
@@ -2315,17 +2315,20 @@ object settings:
|
|||||||
#dlg.setAutoClose(True)
|
#dlg.setAutoClose(True)
|
||||||
#dlg.show()
|
#dlg.show()
|
||||||
dlg.setLabelText("Setup Gather/Sync");dlg+=5
|
dlg.setLabelText("Setup Gather/Sync");dlg+=5
|
||||||
use_trf=kwargs.get('use_trf', True) # do not use coordinate transformation
|
mode=kwargs.pop('mode',1)
|
||||||
if not 'mode' in kwargs:
|
|
||||||
kwargs['mode']=1
|
|
||||||
|
|
||||||
sp.setup_sync(verbose=sp.verbose&0x40, timeOfs=dt_misc['time_ofs'], timeCor=dt_misc['time_cor'])
|
sp.setup_sync(verbose=sp.verbose&0x40, timeOfs=dt_misc['time_ofs'], timeCor=dt_misc['time_cor'])
|
||||||
dlg.setLabelText("Download motion program");dlg+=5
|
dlg.setLabelText("Download motion program");dlg+=5
|
||||||
|
|
||||||
|
use_trf=kwargs.get('use_trf', True) # do not use coordinate transformation
|
||||||
|
if not use_trf:
|
||||||
|
trf=kwargs.pop('trf')
|
||||||
try:
|
try:
|
||||||
sp.setup_motion(fnPrg=fn+'.prg', **kwargs)
|
sp.setup_motion(fnPrg=fn+'.prg', mode=mode, **kwargs)
|
||||||
except BaseException as e:
|
except BaseException as e:
|
||||||
_log.error(repr(e));return
|
_log.error(repr(e));return
|
||||||
sp.setup_gather()
|
sp.setup_gather()
|
||||||
|
if not use_trf:
|
||||||
|
kwargs['trf']=trf
|
||||||
try:
|
try:
|
||||||
p=geo._fitPlane
|
p=geo._fitPlane
|
||||||
#TODO: cleanup
|
#TODO: cleanup
|
||||||
|
|||||||
Reference in New Issue
Block a user