Det display

environment-designer.yml

@@ -81,3 +81,4 @@ dependencies:
     # --- Extra Qt UI packages
     - qtawesome
     - qasync
+    - dask >= 2022

src/firefly/area_detector_overlay.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>263</width>
-    <height>181</height>
+    <width>250</width>
+    <height>192</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -44,7 +44,7 @@
         <string/>
        </property>
        <property name="channel" stdset="0">
-        <string>haven://${AD}.overlays.overlay_${OV}.use</string>
+        <string>haven://${AD}-overlay-overlays-${OV}.use</string>
        </property>
       </widget>
      </item>
@@ -61,8 +61,28 @@
         <string/>
        </property>
        <property name="channel" stdset="0">
-        <string>haven://${AD}.overlays.overlay_${OV}.shape</string>
+        <string>haven://${AD}-overlay-overlays-${OV}.shape</string>
        </property>
+       <item>
+        <property name="text">
+         <string>CROSS</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>RECTANGLE</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>ELLIPSE</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>TEXT</string>
+        </property>
+       </item>
       </widget>
      </item>
     </layout>
@@ -75,7 +95,7 @@
         <string/>
        </property>
        <property name="channel" stdset="0">
-        <string>haven://${AD}.overlays.overlay_${OV}.position_y</string>
+        <string>haven://${AD}-overlay-overlays-${OV}.center_y</string>
        </property>
        <property name="orientation" stdset="0">
         <enum>Qt::Vertical</enum>
@@ -100,7 +120,7 @@
           <string/>
          </property>
          <property name="channel" stdset="0">
-          <string>haven://${AD}.overlays.overlay_${OV}.position_x</string>
+          <string>haven://${AD}-overlay-overlays-${OV}.center_x</string>
          </property>
          <property name="step_size" stdset="0">
           <number>0</number>
@@ -132,7 +152,7 @@
         <string/>
        </property>
        <property name="channel" stdset="0">
-        <string>haven://${AD}.overlays.overlay_${OV}.size_y</string>
+        <string>haven://${AD}-overlay-overlays-${OV}.size_y</string>
        </property>
        <property name="orientation" stdset="0">
         <enum>Qt::Vertical</enum>
@@ -157,7 +177,7 @@
           <string/>
          </property>
          <property name="channel" stdset="0">
-          <string>haven://${AD}.overlays.overlay_${OV}.size_x</string>
+          <string>haven://${AD}-overlay-overlays-${OV}.size_x</string>
          </property>
         </widget>
        </item>
@@ -178,6 +198,60 @@
      </item>
     </layout>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_10">
+     <item>
+      <widget class="PyDMSlider" name="PyDMSlider_9">
+       <property name="toolTip">
+        <string/>
+       </property>
+       <property name="channel" stdset="0">
+        <string>haven://${AD}-overlay-overlays-${OV}.width_y</string>
+       </property>
+       <property name="orientation" stdset="0">
+        <enum>Qt::Vertical</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_7">
+       <item>
+        <widget class="QLabel" name="label_8">
+         <property name="text">
+          <string>Width</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="PyDMSlider" name="PyDMSlider_10">
+         <property name="toolTip">
+          <string/>
+         </property>
+         <property name="channel" stdset="0">
+          <string>haven://${AD}-overlay-overlays-${OV}.width_x</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_7">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -195,6 +269,7 @@
    <class>PyDMSlider</class>
    <extends>QFrame</extends>
    <header>pydm.widgets.slider</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>

src/firefly/area_detector_roi.ui

@@ -147,7 +147,16 @@
         <string>haven://${AD}.roi${R}.min_xyz.min_y</string>
        </property>
        <property name="orientation" stdset="0">
-        <enum>Qt::Vertical</enum>
+        <number>2</number>
+       </property>
+       <property name="userMaximum" stdset="0">
+        <double>3000.000000000000000</double>
+       </property>
+       <property name="userMinimum" stdset="0">
+        <double>0.000000000000000</double>
+       </property>
+       <property name="userDefinedLimits" stdset="0">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -174,6 +183,15 @@
          <property name="step_size" stdset="0">
           <number>0</number>
          </property>
+         <property name="userMaximum" stdset="0">
+          <double>3000.000000000000000</double>
+         </property>
+         <property name="userMinimum" stdset="0">
+          <double>0.000000000000000</double>
+         </property>
+         <property name="userDefinedLimits" stdset="0">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -204,7 +222,16 @@
         <string>haven://${AD}.roi${R}.size.y</string>
        </property>
        <property name="orientation" stdset="0">
-        <enum>Qt::Vertical</enum>
+        <number>2</number>
+       </property>
+       <property name="userMaximum" stdset="0">
+        <double>3000.000000000000000</double>
+       </property>
+       <property name="userMinimum" stdset="0">
+        <double>0.000000000000000</double>
+       </property>
+       <property name="userDefinedLimits" stdset="0">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -228,6 +255,15 @@
          <property name="channel" stdset="0">
           <string>haven://${AD}.roi${R}.size.x</string>
          </property>
+         <property name="userMaximum" stdset="0">
+          <double>3000.000000000000000</double>
+         </property>
+         <property name="userMinimum" stdset="0">
+          <double>0.000000000000000</double>
+         </property>
+         <property name="userDefinedLimits" stdset="0">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
@@ -250,11 +286,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>PyDMLabel</class>
-   <extends>QLabel</extends>
-   <header>pydm.widgets.label</header>
-  </customwidget>
   <customwidget>
    <class>PyDMCheckbox</class>
    <extends>QCheckBox</extends>
@@ -263,7 +294,13 @@
   <customwidget>
    <class>PyDMSlider</class>
    <extends>QFrame</extends>
-   <header>pydm.widgets.slider</header>
+   <header location="global">pydm.widgets.slider</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>PyDMLabel</class>
+   <extends>QLabel</extends>
+   <header>pydm.widgets.label</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/firefly/area_detector_viewer.py

@@ -4,6 +4,8 @@
 import numpy as np
 import pydm
 import pyqtgraph
+from PyQt5.QtCore import pyqtSlot
+from PyQt5.QtWidgets import QCheckBox, QPushButton, PyDMLineEdit
 
 from firefly import display
 from haven import beamline
@@ -23,11 +25,35 @@ class AreaDetectorViewerDisplay(display.FireflyDisplay):
     )
     image_is_new: bool = True
 
+    def __init__(self, parent=None, args=None, macros=None):
+        super().__init__(parent=parent, args=args, macros=macros)
+
+        # Access Exposure widgets
+        self.exposure_checkbox = self.findChild(QCheckBox, "ExposureCheckBox")
+        self.exposure_push_button = self.findChild(QPushButton, "ExposurePushButton")
+
+        # Connect Exposure signals to slots
+        self.exposure_checkbox.stateChanged.connect(
+            self.handle_exposure_checkbox_change
+        )
+        self.exposure_push_button.clicked.connect(
+            self.handle_exposure_push_button_click
+        )
+
+        # Access Gain widgets
+        self.gain_line_edit = self.findChild(PyDMLineEdit, "GainLineEdit") 
+        self.gain_checkbox = self.findChild(QCheckBox, "GainCheckBox")
+        self.gain_push_button = self.findChild(QPushButton, "GainPushButton")
+
+        # Connect Gain signals to slots
+        self.gain_checkbox.stateChanged.connect(self.handle_gain_checkbox_change)
+        self.gain_push_button.clicked.connect(self.handle_gain_push_button_click)
+
     def customize_device(self):
         device_name = name = self.macros()["AD"]
         device = beamline.devices[device_name]
         self.device = device
-        img_pv = device.pva.pv_name.get(as_string=True)
+        img_pv = device.pva._name #.get(as_string=True)
         addr = f"pva://{img_pv}"
         self.image_channel = pydm.PyDMChannel(
             address=addr, value_slot=self.update_image
@@ -42,7 +68,8 @@ def customize_ui(self):
         # Set some text about the camera
         use_name = getattr(self.device, "description", None) in [self.device.name, None]
         if use_name:
-            lbl_text = self.device.cam.name
+            print(f"Available attributes in self.device:{dir(self.device.driver)}")
+            lbl_text = self.device.driver.name
         else:
             lbl_text = f"{self.device.description} ({self.device.cam.prefix})"
         self.ui.camera_description_label.setText(lbl_text)
@@ -74,6 +101,54 @@ def launch_caqtdm(self):
         log.info(f"Launching caQtDM: {cmd}")
         self._open_caqtdm_subprocess(cmd)
 
+    @pyqtSlot(int)
+    def handle_exposure_checkbox_change(self, state):
+        """
+        Handle the exposure checkbox state change.
+        Disable the push button when the checkbox is checked.
+        """
+        if state == 2:  # Checked
+            self.exposure_push_button.setEnabled(False)
+        else:  # Checkbox is unchecked
+            self.exposure_push_button.setEnabled(True)
+
+    @pyqtSlot()
+    def handle_exposure_push_button_click(self):
+        """
+        Handle the exposure push button click.
+        Disable the checkbox when the button is clicked.
+        """
+        self.exposure_checkbox.setChecked(False)
+
+    @pyqtSlot(int)
+    def handle_gain_checkbox_change(self, state):
+        """
+        Handle the gain checkbox state change.
+        Disable the push button when the checkbox is checked.
+        """
+        if state == 2:  # Checked
+            self.gain_push_button.setEnabled(False)
+        else:  # Checkbox is unchecked
+            self.gain_push_button.setEnabled(True)
+
+    @pyqtSlot()
+    def handle_gain_push_button_click(self):
+        """
+        Handle the gain push button click.
+        Disable the checkbox when the button is clicked.
+        """
+        self.gain_checkbox.setChecked(False)
+
+    @pyqtSlot(bool)
+    def update_widget_states(self, connected):
+        """
+        Enable or disable widgets based on PV connection state
+        """
+        self.exposure_push_button.setEnabled(not connected)
+        self.exposure_check_box.setEnabled(not connected)
+        self.gain_line_edit.setEnabled(not connected)
+        self.gain_push_button.setEnabled(not connected)
+        self.gain_check_box.setEnabled(not connected)
 
 # -----------------------------------------------------------------------------
 # :author:    Mark Wolfman