add DAQ params, better autofocus

pyqtUsrObj.py

@@ -66,11 +66,30 @@ def obj_info(obj,p=''):
   except AttributeError:
     pass
 
-class Marker(pg.ROI):
+class UsrROI(pg.ROI):
+  def __init__(self, pos, size, **kargs):
+    pg.ROI.__init__(self, pos, size, **kargs)
+
+  def cb_toggle_movable(self):
+    self.translatable=not self.translatable
+
+  def contextMenuEvent(self, event):
+    #pg.ROI.contextMenuEvent(self,event)
+    _log.debug('ContextMenu')
+    menu = QMenu("ctx")
+    act=menu.addAction('locked')
+    act.setCheckable(True)
+    act.setChecked(not self.translatable)
+    act.triggered.connect(self.cb_toggle_movable)
+    #menu.addAction('center in view')
+    #menu.addAction('delete')
+    menu.exec(event.screenPos())
+
+class Marker(UsrROI):
   """A crosshair ROI whose position is at the center of the crosshairs. By default, it is scalable, rotatable and translatable."""
 
   def __init__(self, pos, size, mode, **kargs):
-    pg.ROI.__init__(self, pos, size, **kargs)
+    UsrROI.__init__(self, pos, size, **kargs)
     self._mode=mode
     #widget.signal.connect(slot_function)
     #self.sigRegionChangeFinished.connect(self.OnRgnChanged)
@@ -147,24 +166,6 @@ class Marker(pg.ROI):
     p.setTransform(tr)
     return ofx,ofy
 
-class UsrROI(pg.ROI):
-  def __init__(self, pos, size, **kargs):
-    pg.ROI.__init__(self, pos, size, **kargs)
-
-  def cb_toggle_movable(self):
-    self.translatable=not self.translatable
-
-  def contextMenuEvent(self, event):
-    #pg.ROI.contextMenuEvent(self,event)
-    _log.debug('ContextMenu')
-    menu = QMenu("ctx")
-    act=menu.addAction('locked')
-    act.setCheckable(True)
-    act.setChecked(not self.translatable)
-    act.triggered.connect(self.cb_toggle_movable)
-    #menu.addAction('center in view')
-    #menu.addAction('delete')
-    menu.exec(event.screenPos())
 
 class Fiducial(UsrROI):
   def __init__(self, pos, size, z:float, **kargs):