towards document type

swissmx.py

@@ -407,8 +407,8 @@ class SwissMxWnd(QMainWindow, Ui_MainWindow):
       self._goGrid=grid=pg.GridItem()  # green grid and labels
       grid.opts['pen']=QPen(QColor(0, 255, 0))
       grid.opts['textPen']=QPen(QColor(0, 255, 0))
-    tr.reset()
-    grid.setTransform(tr)  # assign transform
+    #tr.reset()
+    #grid.setTransform(tr)  # assign transform
     vb.addItem(grid)
 
     #--- beam marker ---
@@ -424,13 +424,13 @@ class SwissMxWnd(QMainWindow, Ui_MainWindow):
 
     #--- testing scan grid ---
     self.track_objects() # first call is needed to initialize the structure self._goTracked
-    #go=UsrGO.Grid((120, -100), (200, 150), (30, 22), 2)
-    go=UsrGO.Grid((120, -100), (1000, 500), (10, 5), 2)
-    go.setTransform(tr)  # assign transform
-    vb.addItem(go)
-    self._goTracked['objLst'].append(go)
-    self.track_objects() #tracking now the objects
-    #UsrGO.obj_tree(vb)
+    # #go=UsrGO.Grid((120, -100), (200, 150), (30, 22), 2)
+    # go=UsrGO.Grid((120, -100), (1000, 500), (10, 5), 2)
+    # go.setTransform(tr)  # assign transform
+    # vb.addItem(go)
+    # self._goTracked['objLst'].append(go)
+    # self.track_objects() #tracking now the objects
+    # #UsrGO.obj_tree(vb)
 
   def init_actions(self):
     app = QApplication.instance()
@@ -964,7 +964,11 @@ class SwissMxWnd(QMainWindow, Ui_MainWindow):
         px=p2+p1
         mm=geo.pix2pos(px)
         _log.debug(f'{px} -> {mm}')
-        fx_motor, fy_motor, bx_motor, bz_motor, omega_motor=self.get_gonio_tweakers()
+
+        fx_motor=self.tweakers["fast_x"]
+        fy_motor=self.tweakers["fast_y"]
+        #bz=self.tweakers["base_z"].get_rbv()
+        #fx_motor, fy_motor, bx_motor, bz_motor, omega_motor=self.get_gonio_tweakers()
         #fx=fx_motor.get_position()
         #fy=fy_motor.get_position()
         #dx=(x-bx)/ppm
@@ -1538,7 +1542,7 @@ class SwissMxWnd(QMainWindow, Ui_MainWindow):
     self._moduleFixTarget =mft = ModuleFixTarget.WndFixTarget(self,data)
     tab = self._tabs_daq_methods.insertTab(0,mft,'Fix Target')
     mft._btnAdd.clicked.connect(self.module_fix_target_add_obj)
-
+    mft._btnDelAll.clicked.connect(self.module_fix_target_del_all_obj)
 
     #tab.layout().addWidget(mft)
     mft.prefixSelected.connect(lambda prefix: self._le_prefix.setText(prefix))
@@ -1613,37 +1617,48 @@ class SwissMxWnd(QMainWindow, Ui_MainWindow):
     mft=self._moduleFixTarget
     fx=self.tweakers["fast_x"].get_rbv()
     fy=self.tweakers["fast_y"].get_rbv()
-    #cz=self.tweakers["fast_y"].get_rbv()
+    bz=self.tweakers["base_z"].get_rbv()
     app=QApplication.instance()
     geo=app._geometry
     oc=geo._opt_ctr
+    bm_pos=self._goBeamMarker.pos()
+    bm_sz=self._goBeamMarker.size()
     idx=mft._cbType.currentIndex()
     param=mft._txtParam.text()
 
     #cb.addItems(["Fiducial", "FixTarget(12.5x12.5)", "FixTarget(23.0x23.0)", "FixTarget(<param>)", "Grid(<param>)"])
 
     if idx==0:
-      go=UsrGO.Fiducial((120, -100), (200, 150),(1,2,3))
+      go=UsrGO.Fiducial(bm_pos+bm_sz/2-(20, 20), (40, 40),(fx,fy,bz))
     elif idx==1:
       v=geo.pos2pix((12.5, 0))
       l=np.linalg.norm(v)
-      go=UsrGO.FixTargetFrame(-oc, (l, l), tpl='12.5x12.5')
+      go=UsrGO.FixTargetFrame(bm_pos+bm_sz/2-(l/2,l/2), (l, l), tpl='12.5x12.5')
     elif idx==2:
       v=geo.pos2pix((23, 0))
       l=np.linalg.norm(v)
-      go=UsrGO.FixTargetFrame(-oc, (l, l), tpl='23.0x23.0')
+      go=UsrGO.FixTargetFrame(bm_pos+bm_sz/2-(l/2,l/2), (l, l), tpl='23.0x23.0')
     elif idx==3:
-      go=UsrGO.FixTargetFrame((120, -100), (200, 150), tpl='test')
+      go=UsrGO.FixTargetFrame(bm_pos+bm_sz/2-(200/2,150/2), (200, 150), tpl='test')
     elif idx==4:
-      go=UsrGO.Grid((120, -100), (200, 150), (30, 22), 2)
+      go=UsrGO.Grid(bm_pos+bm_sz/2-(200/2,150/2), (200, 150), (30, 22), 2)
     else:
+      _log.error('index not handeled')
 
-      _log.error('set xstep 0..2 for tests')
     self.vb.addItem(go)
     obj=self._goTracked['objLst']
     obj.append(go)
     mft._tree.setData(obj)
 
+  def module_fix_target_del_all_obj(self):
+    mft=self._moduleFixTarget
+    vb=self.vb
+    objLst=self._goTracked['objLst']
+    for go in objLst:
+      vb.removeItem(go)
+    objLst.clear()
+    mft._tree.setData(objLst)
+
   #  **************** OBSOLETE AND/OR OLD STUFF ****************
 
 
@@ -3407,9 +3422,9 @@ if __name__=="__main__":
 
     startupWin.set(60, f'start main window')
 
-    main = SwissMxWnd()
-    main.show()
-    startupWin._wnd.finish(main)
+    app._mainWnd=wnd=SwissMxWnd()
+    wnd.show()
+    startupWin._wnd.finish(wnd)
 
     # needed so pycharm can restart application
     signal.signal(signal.SIGINT, sigint_handler)