bec-widgets 0.113.0__tar.gz → 0.114.0__tar.gz

{bec_widgets-0.113.0 → bec_widgets-0.114.0}/CHANGELOG.md

@@ -1,5 +1,23 @@
 # CHANGELOG
 
+## v0.114.0 (2024-10-02)
+
+### Feature
+
+* feat: new 'scan_axis' signal
+
+Signal is emitted before "scan_started", to inform about scan positioner
+and (start, stop) positions. In case of multiple bundles, the signal
+is emitted multiple times. ([`f084e25`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f084e2514bc9459cccaa951b79044bc25884e738))
+
+### Fix
+
+* fix: prevent exception when empty string updates are coming from widget ([`04cfb1e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/04cfb1edf19437d54f07b868bcf3cfc2a35fd3bc))
+
+* fix: use new 'scan_axis' signal, to set_x and select x axis on waveform
+
+Fixes #361, do not try to change x axis when not permitted ([`efa2763`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/efa276358b0f5a45cce9fa84fa5f9aafaf4284f7))
+
 ## v0.113.0 (2024-10-02)
 
 ### Feature
@@ -140,18 +158,6 @@
 
 ## v0.105.0 (2024-09-04)
 
-### Feature
-
-* feat: add dap_combobox ([`cc691d4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cc691d4039bde710e78f362d2f0e712f9e8f196f))
-
 ### Refactor
 
 * refactor: cleanup and renaming of slot/signals ([`0fd5cee`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0fd5cee77611b6645326eaefa68455ea8de26597))
-
-* refactor(logger): changed prints to logger calls ([`3a5d7d0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3a5d7d07966ab9b38ba33bda0bed38c30f500c66))
-
-## v0.104.0 (2024-09-04)
-
-### Fix
-
-* fix(scan_control): SafeSlot applied to run_scan to avoid faulty scan requests ([`9047916`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/90479167fb5cae393c884e71a80fcfdb48a76427))

{bec_widgets-0.113.0 → bec_widgets-0.114.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.113.0
+Version: 0.114.0
 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-0.113.0 → bec_widgets-0.114.0}/bec_widgets/applications/alignment/alignment_1d/alignment_1d.ui

@@ -721,22 +721,6 @@
  </tabstops>
  <resources/>
  <connections>
-  <connection>
-   <sender>device_combobox</sender>
-   <signal>currentTextChanged(QString)</signal>
-   <receiver>dap_combo_box</receiver>
-   <slot>select_x_axis(QString)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>162</x>
-     <y>170</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>467</x>
-     <y>170</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>device_combobox_2</sender>
    <signal>currentTextChanged(QString)</signal>
@@ -801,22 +785,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>device_combobox</sender>
-   <signal>currentTextChanged(QString)</signal>
-   <receiver>bec_waveform_widget</receiver>
-   <slot>set_x(QString)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>162</x>
-     <y>170</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>1099</x>
-     <y>258</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>toggle_switch</sender>
    <signal>enabled(bool)</signal>
@@ -865,5 +833,55 @@
     </hint>
    </hints>
   </connection>
+  <!--
+  <connection>
+   <sender>device_combobox</sender>
+   <signal>currentTextChanged(QString)</signal>
+   <receiver>bec_waveform_widget</receiver>
+   <slot>set_x(QString)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>297</x>
+     <y>170</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>467</x>
+     <y>170</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>
+   <hints>
+    <hint type="sourcelabel">
+     <x>244</x>
+     <y>348</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>1140</x>
+     <y>491</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>
+   <hints>
+    <hint type="sourcelabel">
+     <x>244</x>
+     <y>322</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>909</x>
+     <y>189</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>

{bec_widgets-0.113.0 → bec_widgets-0.114.0}/bec_widgets/widgets/figure/plots/waveform/waveform.py

@@ -467,6 +467,10 @@ class BECWaveform(BECPlotBase):
                 - Custom signal name of device from BEC.
             x_entry(str): Entry of the x signal.
         """
+        if not x_name:
+            # this can happen, if executed by a signal from a widget
+            return
+
         curve_configs = self.config.curves
         curve_ids = list(curve_configs.keys())
         curve_configs = list(curve_configs.values())
@@ -631,6 +635,13 @@ class BECWaveform(BECPlotBase):
             x_name = mode if mode is not None else "best_effort"
             self.x_axis_mode["name"] = x_name
 
+        if not x_name or not y_name:
+            # can happen if executed from a signal from a widget ;
+            # the code above has to be executed to set some other
+            # variables, but it cannot continue if both names are
+            # not set properly -> exit here
+            return
+
         # 3. Check - Get entry if not provided and validate
         x_entry, y_entry, z_entry = self._validate_signal_entries(
             x_name, y_name, z_name, x_entry, y_entry, z_entry, validate_bec

{bec_widgets-0.113.0 → bec_widgets-0.114.0}/bec_widgets/widgets/scan_control/scan_control.py

@@ -42,6 +42,7 @@ class ScanControl(BECWidget, QWidget):
 
     scan_started = Signal()
     scan_selected = Signal(str)
+    scan_axis = Signal(str, float, float)
 
     def __init__(
         self,
@@ -503,10 +504,12 @@ class ScanControl(BECWidget, QWidget):
     @SafeSlot(popup_error=True)
     def run_scan(self):
         """Starts the selected scan with the given parameters."""
-        self.scan_started.emit()
         args, kwargs = self.get_scan_parameters()
+        for device, start, stop in zip(*[iter(args)] * 3):
+            self.scan_axis.emit(device.name, start, stop)
         scan_function = getattr(self.scans, self.comboBox_scan_selection.currentText())
         if callable(scan_function):
+            self.scan_started.emit()
             scan_function(*args, **kwargs)
 
     def cleanup(self):

{bec_widgets-0.113.0 → bec_widgets-0.114.0}/pyproject.toml

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