From c056f3f32966cf413bb0c41e0e2aa83f0de560da Mon Sep 17 00:00:00 2001
From: Thierry Zamofing <thierry.zamofing@psi.ch>
Date: Mon, 18 Jul 2022 11:22:16 +0200
Subject: [PATCH] remove not implemented tab "point and shoot"

---
 CustomROI.py | 32 --------------------------------
 camera.py    |  8 ++++++++
 swissmx.py   | 17 +++--------------
 swissmx.ui   | 12 ++----------
 4 files changed, 13 insertions(+), 56 deletions(-)

diff --git a/CustomROI.py b/CustomROI.py
index cfdc8fd..1cb9288 100644
--- a/CustomROI.py
+++ b/CustomROI.py
@@ -16,38 +16,6 @@ logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 
 
-class Retangulo(ROI):
-    """
-    Rectangular ROI subclass with a single scale handle at the top-right corner.
-
-    ============== =============================================================
-    **Arguments**
-    pos            (length-2 sequence) The position of the ROI origin.
-                   See ROI().
-    size           (length-2 sequence) The size of the ROI. See ROI().
-    centered       (bool) If True, scale handles affect the ROI relative to its
-                   center, rather than its origin.
-    sideScalers    (bool) If True, extra scale handles are added at the top and
-                   right edges.
-    \**args        All extra keyword arguments are passed to ROI()
-    ============== =============================================================
-
-    """
-
-    def __init__(self, pos, size, centered=False, sideScalers=False, **args):
-        ROI.__init__(self, pos, size, **args)
-        if centered:
-            center = [0.5, 0.5]
-        else:
-            center = [0, 0]
-
-        self.addScaleRotateHandle([0, 0.5], [1, 0.5])
-        self.addScaleHandle([1, 1], center)
-        if sideScalers:
-            self.addScaleHandle([1, 0.5], [center[0], 0.5])
-            self.addScaleHandle([0.5, 1], [0.5, center[1]])
-
-
 class Grid(ROI):
     """a grid"""
 
diff --git a/camera.py b/camera.py
index 943b4ac..7b7cf91 100755
--- a/camera.py
+++ b/camera.py
@@ -120,6 +120,14 @@ class epics_cam(object):
       pv_pic=self.getPv('FPICTURE')
       sz=self._sz
       pic = pv_pic.get(count=sz[0]*sz[1], as_numpy=True).reshape(sz[::-1])
+      f=np.array(((0, 0, 0, 0, 0),
+                  (0, 1, 1, 1, 0),
+                  (0, 1, 0, 0, 0),
+                  (0, 1, 1, 0, 0),
+                  (0, 1, 0, 0, 0),
+                  (0, 0, 0, 0, 0),), pic.dtype)
+      pic[0:6, 0:5]=f*255
+
     except AttributeError as e:
       _log.warning("failed to fetch image")
     else:
diff --git a/swissmx.py b/swissmx.py
index 29da89a..a88ed3f 100755
--- a/swissmx.py
+++ b/swissmx.py
@@ -70,7 +70,6 @@ TASK_SETUP_CAMERA = "setup_camera"
 TASK_SETUP_ROI = "setup_rois"
 TASK_SAMPLE_SELECTION = "task_sample_selection"
 TASK_SCREENING = "screening"
-TASK_POINT_SHOOT = "point_shoot"
 TASK_GRID = "grid"
 TASK_PRELOCATED = "prelocated"
 TASK_HELICAL = "helical"
@@ -977,10 +976,10 @@ class Main(QMainWindow, Ui_MainWindow):
     self.ppm_fitter = np.poly1d(bx_coefs)
 
   def getFastX(self):
-    return self.tweakers["fast_x"].motor.get_position()
+    return self.tweakers["fast_x"].get_position()
 
   def getFastY(self):
-    return self.tweakers["fast_y"].motor.get_position()
+    return self.tweakers["fast_y"].get_position()
 
   def zoom_changed_cb(self, value):
     self.zoomChanged.emit(value)
@@ -1195,8 +1194,6 @@ class Main(QMainWindow, Ui_MainWindow):
           self.append_to_beam_markers(x, y, zoom_level)
       else:
         _log.warning("click combination not available")
-    elif task == TASK_POINT_SHOOT:
-      pass
     elif task == TASK_GRID:
       if shft and not (ctrl or alt):
         self.addGridRequest.emit(fx, fy)
@@ -2506,15 +2503,7 @@ class Main(QMainWindow, Ui_MainWindow):
     self._is_aborted = False
     method = self._tabs_daq_methods.currentWidget().accessibleName()
 
-    if task == TASK_POINT_SHOOT:
-      QMessageBox.information("not implemented", "not implemented")
-      self.re_connect_collect_button(
-        callback=self.collect_abort_grid,
-        accessibleName="grid_abort",
-        label="Abort",
-      )
-
-    elif task == TASK_GRID:
+    if task == TASK_GRID:
       self.re_connect_collect_button(
         callback=self.collect_abort_grid,
         accessibleName="grid_abort",
diff --git a/swissmx.ui b/swissmx.ui
index 0fb299c..6d2841a 100644
--- a/swissmx.ui
+++ b/swissmx.ui
@@ -333,16 +333,8 @@
             </sizepolicy>
            </property>
            <property name="currentIndex">
-            <number>1</number>
+            <number>0</number>
            </property>
-           <widget class="QWidget" name="_tab_daq_method_screening">
-            <property name="accessibleName">
-             <string>point_and_shoot</string>
-            </property>
-            <attribute name="title">
-             <string>Point &amp;&amp; Shoot</string>
-            </attribute>
-           </widget>
            <widget class="QWidget" name="_tab_daq_method_grid">
             <property name="accessibleName">
              <string>grid</string>
@@ -650,7 +642,7 @@
      <x>0</x>
      <y>0</y>
      <width>1814</width>
-     <height>20</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">