copy current SwissMX.conf, minor fixes
This commit is contained in:
@@ -1616,7 +1616,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
|
||||
|
||||
af_range=cfg['range']
|
||||
n=cfg['steps']
|
||||
vel=cfg['vel']
|
||||
vel=cfg['velocity']
|
||||
rng=(-af_range/2, af_range/2)
|
||||
#geo.autofocus(app._camera, self.tweakers['base_z'],rng, n,dlg)
|
||||
af=geometry.autofocus(app._camera, self.tweakers['base_z'])
|
||||
@@ -2090,7 +2090,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
|
||||
geo.least_square_plane(ptFitPlane)
|
||||
|
||||
def cb_progress(self,i,sz,dlg):
|
||||
dlg.setValue(int(sz*90/i))
|
||||
dlg.setValue(int(i*90/sz))
|
||||
if dlg.wasCanceled():
|
||||
raise AttributeError('canceled')
|
||||
|
||||
@@ -2160,7 +2160,10 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
|
||||
dlg.setMaximum(sp.points.shape[0])
|
||||
while True:
|
||||
p=sp.progress()
|
||||
if p<0 or dlg.wasCanceled():
|
||||
if p<0:
|
||||
break
|
||||
elif dlg.wasCanceled():
|
||||
dt._comm.gpascii.send_block('&1a;Gather.Enable=0')
|
||||
break
|
||||
#_log.info(f'progress {p}/{sp.points.shape[0]}')
|
||||
dlg.setValue(p)
|
||||
|
||||
Reference in New Issue
Block a user