bec-widgets 1.0.0__tar.gz → 1.0.2__tar.gz

{bec_widgets-1.0.0 → bec_widgets-1.0.2}/CHANGELOG.md

@@ -1,6 +1,20 @@
 # CHANGELOG
 
 
+## v1.0.2 (2024-10-22)
+
+### Bug Fixes
+
+* fix(scan_control): scan args signal fixed to emit list instead of hardcoded structure ([`4f5448c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4f5448cf51a204e077af162c7f0aed1f1a60e57a))
+
+
+## v1.0.1 (2024-10-22)
+
+### Bug Fixes
+
+* fix(waveform): added support for live_data and data access ([`7469c89`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7469c892c8076fc09e61f173df6920c551241cec))
+
+
 ## v1.0.0 (2024-10-18)
 
 ### Breaking
@@ -153,14 +167,6 @@ is emitted multiple times. ([`f084e25`](https://gitlab.psi.ch/bec/bec_widgets/-/
 
 * refactor: allow hiding of arg/kwarg boxes ([`efe90eb`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/efe90eb163e2123a5b4d0bb59f66025a569336ad))
 
-* refactor: add proxy to waveform to limit the dap_request frequency ([`5c74037`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5c740371d86d9b1b341bc3c4d8bdf62027aa089b))
-
-* refactor: update dap_model also if x and y axis are selected ([`28ee385`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/28ee3856be2c47a63182b16454ece37a0ec04811))
-
-* refactor: linear_region_selector accepts log_x data ([`7cc0726`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7cc07263982a171744ff87adb10ea77585764b71))
-
-* refactor: use accent colors for bec_status_box icons; closes #338 ([`e039304`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e039304fd3ee03dc4a3fa22a69c207139e0c0d28))
-
 ### Testing
 
 * test: add tests for scan_status_callback ([`dc0c825`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/dc0c825fd594c093a24543ff803d6c6564010e92))

{bec_widgets-1.0.0 → bec_widgets-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 1.0.0
+Version: 1.0.2
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets

{bec_widgets-1.0.0 → bec_widgets-1.0.2}/bec_widgets/applications/alignment/alignment_1d/alignment_1d.ui

@@ -215,42 +215,18 @@
           <layout class="QVBoxLayout" name="verticalLayout_3">
            <item>
             <widget class="ScanControl" name="scan_control">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>1</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
              <property name="current_scan" stdset="0">
               <string>line_scan</string>
              </property>
              <property name="hide_arg_box" stdset="0">
               <bool>false</bool>
              </property>
-             <property name="hide_kwarg_boxes" stdset="0">
-              <bool>false</bool>
-             </property>
-             <property name="hide_scan_control_buttons" stdset="0">
-              <bool>false</bool>
-             </property>
              <property name="hide_scan_selection_combobox" stdset="0">
               <bool>true</bool>
              </property>
              <property name="hide_add_remove_buttons" stdset="0">
               <bool>true</bool>
              </property>
-             <property name="hide_args_group" stdset="0">
-              <bool>false</bool>
-             </property>
-             <property name="hide_kwargs_group" stdset="0">
-              <bool>false</bool>
-             </property>
             </widget>
            </item>
            <item>
@@ -440,54 +416,54 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>ToggleSwitch</class>
+   <class>DapComboBox</class>
    <extends>QWidget</extends>
-   <header>toggle_switch</header>
+   <header>dap_combo_box</header>
   </customwidget>
   <customwidget>
-   <class>BECWaveformWidget</class>
+   <class>StopButton</class>
    <extends>QWidget</extends>
-   <header>bec_waveform_widget</header>
+   <header>stop_button</header>
   </customwidget>
   <customwidget>
-   <class>BECStatusBox</class>
+   <class>WebsiteWidget</class>
    <extends>QWidget</extends>
-   <header>bec_status_box</header>
+   <header>website_widget</header>
   </customwidget>
   <customwidget>
-   <class>WebsiteWidget</class>
+   <class>BECQueue</class>
    <extends>QWidget</extends>
-   <header>website_widget</header>
+   <header>bec_queue</header>
   </customwidget>
   <customwidget>
-   <class>StopButton</class>
+   <class>ScanControl</class>
    <extends>QWidget</extends>
-   <header>stop_button</header>
+   <header>scan_control</header>
   </customwidget>
   <customwidget>
-   <class>LMFitDialog</class>
+   <class>ToggleSwitch</class>
    <extends>QWidget</extends>
-   <header>lm_fit_dialog</header>
+   <header>toggle_switch</header>
   </customwidget>
   <customwidget>
-   <class>PositionerGroup</class>
+   <class>BECProgressBar</class>
    <extends>QWidget</extends>
-   <header>positioner_group</header>
+   <header>bec_progress_bar</header>
   </customwidget>
   <customwidget>
-   <class>ScanControl</class>
+   <class>DarkModeButton</class>
    <extends>QWidget</extends>
-   <header>scan_control</header>
+   <header>dark_mode_button</header>
   </customwidget>
   <customwidget>
-   <class>BECQueue</class>
+   <class>PositionerGroup</class>
    <extends>QWidget</extends>
-   <header>bec_queue</header>
+   <header>positioner_group</header>
   </customwidget>
   <customwidget>
-   <class>BECProgressBar</class>
+   <class>BECWaveformWidget</class>
    <extends>QWidget</extends>
-   <header>bec_progress_bar</header>
+   <header>bec_waveform_widget</header>
   </customwidget>
   <customwidget>
    <class>DeviceComboBox</class>
@@ -495,14 +471,14 @@
    <header>device_combobox</header>
   </customwidget>
   <customwidget>
-   <class>DarkModeButton</class>
+   <class>LMFitDialog</class>
    <extends>QWidget</extends>
-   <header>dark_mode_button</header>
+   <header>lm_fit_dialog</header>
   </customwidget>
   <customwidget>
-   <class>DapComboBox</class>
+   <class>BECStatusBox</class>
    <extends>QWidget</extends>
-   <header>dap_combo_box</header>
+   <header>bec_status_box</header>
   </customwidget>
  </customwidgets>
  <resources/>
@@ -514,12 +490,12 @@
    <slot>toogle_roi_select(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>529</x>
-     <y>728</y>
+     <x>1042</x>
+     <y>212</y>
     </hint>
     <hint type="destinationlabel">
-     <x>1099</x>
-     <y>96</y>
+     <x>1416</x>
+     <y>322</y>
     </hint>
    </hints>
   </connection>
@@ -546,12 +522,12 @@
    <slot>plot(QString)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>297</x>
-     <y>170</y>
+     <x>577</x>
+     <y>215</y>
     </hint>
     <hint type="destinationlabel">
-     <x>1099</x>
-     <y>201</y>
+     <x>1416</x>
+     <y>427</y>
     </hint>
    </hints>
   </connection>
@@ -562,12 +538,12 @@
    <slot>select_y_axis(QString)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>297</x>
-     <y>170</y>
+     <x>577</x>
+     <y>215</y>
     </hint>
     <hint type="destinationlabel">
-     <x>467</x>
-     <y>170</y>
+     <x>909</x>
+     <y>215</y>
     </hint>
    </hints>
   </connection>
@@ -578,60 +554,60 @@
    <slot>add_dap(QString,QString,QString)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>467</x>
-     <y>170</y>
+     <x>909</x>
+     <y>215</y>
     </hint>
     <hint type="destinationlabel">
-     <x>1099</x>
-     <y>221</y>
+     <x>1416</x>
+     <y>447</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>scan_control</sender>
-   <signal>scan_axis(QString,double,double)</signal>
-   <receiver>bec_waveform_widget</receiver>
-   <slot>set_x(QString)</slot>
+   <signal>device_selected(QString)</signal>
+   <receiver>positioner_group</receiver>
+   <slot>set_positioners(QString)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>244</x>
-     <y>348</y>
+     <x>230</x>
+     <y>306</y>
     </hint>
     <hint type="destinationlabel">
-     <x>1140</x>
-     <y>491</y>
+     <x>187</x>
+     <y>926</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>scan_control</sender>
-   <signal>scan_axis(QString,double,double)</signal>
-   <receiver>dap_combo_box</receiver>
-   <slot>select_x_axis(QString)</slot>
+   <signal>device_selected(QString)</signal>
+   <receiver>bec_waveform_widget</receiver>
+   <slot>set_x(QString)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>244</x>
-     <y>322</y>
+     <x>187</x>
+     <y>356</y>
     </hint>
     <hint type="destinationlabel">
-     <x>909</x>
-     <y>189</y>
+     <x>972</x>
+     <y>509</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>scan_control</sender>
    <signal>device_selected(QString)</signal>
-   <receiver>positioner_group</receiver>
-   <slot>set_positioners(QString)</slot>
+   <receiver>dap_combo_box</receiver>
+   <slot>select_x_axis(QString)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>227</x>
-     <y>337</y>
+     <x>187</x>
+     <y>356</y>
     </hint>
     <hint type="destinationlabel">
-     <x>227</x>
-     <y>676</y>
+     <x>794</x>
+     <y>202</y>
     </hint>
    </hints>
   </connection>

{bec_widgets-1.0.0 → bec_widgets-1.0.2}/bec_widgets/widgets/figure/plots/waveform/waveform.py

@@ -1302,7 +1302,11 @@ class BECWaveform(BECPlotBase):
         Update the scan curves with the data from the scan segment.
         """
         try:
-            data = self.scan_item.data
+            data = (
+                self.scan_item.live_data
+                if hasattr(self.scan_item, "live_data")  # backward compatibility
+                else self.scan_item.data
+            )
         except AttributeError:
             return
 
@@ -1355,8 +1359,14 @@ class BECWaveform(BECPlotBase):
             list|np.ndarray|None: X data for the curve.
         """
         x_data = None
+        live_data = (
+            self.scan_item.live_data
+            if hasattr(self.scan_item, "live_data")
+            else self.scan_item.data
+        )
         if self._x_axis_mode["name"] == "timestamp":
-            timestamps = self.scan_item.data[y_name][y_entry].timestamps
+
+            timestamps = live_data[y_name][y_entry].timestamps
 
             x_data = timestamps
             return x_data
@@ -1376,7 +1386,7 @@ class BECWaveform(BECPlotBase):
             else:
                 x_name = self.scan_item.status_message.info["scan_report_devices"][0]
                 x_entry = self.entry_validator.validate_signal(x_name, None)
-                x_data = self.scan_item.data[x_name][x_entry].val
+                x_data = live_data[x_name][x_entry].val
                 self._x_axis_mode["label_suffix"] = f" [auto: {x_name}-{x_entry}]"
                 current_label = "" if self.config.axis.x_label is None else self.config.axis.x_label
                 self.plot_item.setLabel(
@@ -1387,7 +1397,7 @@ class BECWaveform(BECPlotBase):
             x_name = curve.config.signals.x.name
             x_entry = curve.config.signals.x.entry
             try:
-                x_data = self.scan_item.data[x_name][x_entry].val
+                x_data = live_data[x_name][x_entry].val
             except TypeError:
                 x_data = []
         return x_data

{bec_widgets-1.0.0 → bec_widgets-1.0.2}/bec_widgets/widgets/scan_control/scan_control.py

@@ -45,7 +45,7 @@ class ScanControl(BECWidget, QWidget):
     scan_started = Signal()
     scan_selected = Signal(str)
     device_selected = Signal(str)
-    scan_axis = Signal(str, float, float)
+    scan_args = Signal(list)
 
     def __init__(
         self,
@@ -457,8 +457,7 @@ class ScanControl(BECWidget, QWidget):
     def run_scan(self):
         """Starts the selected scan with the given parameters."""
         args, kwargs = self.get_scan_parameters()
-        for device, start, stop in zip(*[iter(args)] * 3):
-            self.scan_axis.emit(device.name, start, stop)
+        self.scan_args.emit(args)
         scan_function = getattr(self.scans, self.comboBox_scan_selection.currentText())
         if callable(scan_function):
             self.scan_started.emit()

{bec_widgets-1.0.0 → bec_widgets-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "1.0.0"
+version = "1.0.2"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [