try to cleanup stuff(3)
This commit is contained in:
19
swissmx.py
19
swissmx.py
@@ -1527,7 +1527,7 @@ class WndSwissMx(QMainWindow, Ui_MainWindow):
|
||||
if type(go)==UsrGO.Fiducial:
|
||||
continue
|
||||
t=type(go)
|
||||
if t not in(UsrGO.FixTargetFrame,UsrGO.Path):
|
||||
if t not in(UsrGO.FixTargetFrame,UsrGO.Path,UsrGO.Grid):
|
||||
_log.warning(f'{t} not supported for FixTargetFrame ->skipped:{go}')
|
||||
continue
|
||||
try:
|
||||
@@ -2025,7 +2025,7 @@ object settings:
|
||||
ofs:[.2,.2]
|
||||
width:10
|
||||
fidScl:.02
|
||||
fiducial:[[.1,.1],[[.1,2.2],[10.3,.1],[10.3,2.2]]
|
||||
fiducial:[[.1,.1],[.1,2.2],[10.3,.1],[10.3,2.2]]
|
||||
''')
|
||||
|
||||
mft._btnAdd.clicked.connect(self.module_fix_target_add_obj)
|
||||
@@ -2146,19 +2146,16 @@ object settings:
|
||||
go=UsrGO.Fiducial((fx-l/2,fy-l/2), (l, l),bz)
|
||||
go.sigRegionChangeFinished.connect(self.cb_fiducial_update_z)
|
||||
elif idx==1:
|
||||
v=geo.pos2pix((12.5, 0))
|
||||
l=np.linalg.norm(v)
|
||||
l=12.5
|
||||
#ctr=bm_pos+bm_sz/2
|
||||
#v=geo.pos2pix((12.5, 0));l=np.linalg.norm(v);l=12.5
|
||||
sz=param.pop('size',(12.5, 12.5))
|
||||
go=UsrGO.FixTargetFrame((fx-l/2,fy-l/2), (l, l), tpl='12.5x12.5',**param)
|
||||
elif idx==2:
|
||||
v=geo.pos2pix((23, 0))
|
||||
l=np.linalg.norm(v)
|
||||
l=23
|
||||
#v=geo.pos2pix((23, 0));l=np.linalg.norm(v)#l=23
|
||||
sz=param.pop('size',(23, 23))
|
||||
go=UsrGO.FixTargetFrame((fx-l/2,fy-l/2), (l, l), tpl='23.0x23.0',**param)
|
||||
elif idx==3:
|
||||
w,h=(.120*12, .120*8)
|
||||
go=UsrGO.FixTargetFrame((fx-w/2,fy-h/2), (w, h), tpl='test',**param)
|
||||
sz=param.pop('size',(.120*12, .120*8))
|
||||
go=UsrGO.FixTargetFrame((fx-sz[0]/2,fy-sz[1]/2), sz, tpl='test',**param)
|
||||
elif idx==4:
|
||||
w,h=size=param.pop('size',(30, 20))
|
||||
cnt=param.pop('cnt',(30, 22))
|
||||
|
||||
Reference in New Issue
Block a user