bec-widgets 0.113.0__py3-none-any.whl → 0.114.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # CHANGELOG
2
2
 
3
+ ## v0.114.0 (2024-10-02)
4
+
5
+ ### Feature
6
+
7
+ * feat: new 'scan_axis' signal
8
+
9
+ Signal is emitted before "scan_started", to inform about scan positioner
10
+ and (start, stop) positions. In case of multiple bundles, the signal
11
+ is emitted multiple times. ([`f084e25`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f084e2514bc9459cccaa951b79044bc25884e738))
12
+
13
+ ### Fix
14
+
15
+ * fix: prevent exception when empty string updates are coming from widget ([`04cfb1e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/04cfb1edf19437d54f07b868bcf3cfc2a35fd3bc))
16
+
17
+ * fix: use new 'scan_axis' signal, to set_x and select x axis on waveform
18
+
19
+ Fixes #361, do not try to change x axis when not permitted ([`efa2763`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/efa276358b0f5a45cce9fa84fa5f9aafaf4284f7))
20
+
3
21
  ## v0.113.0 (2024-10-02)
4
22
 
5
23
  ### Feature
@@ -140,18 +158,6 @@
140
158
 
141
159
  ## v0.105.0 (2024-09-04)
142
160
 
143
- ### Feature
144
-
145
- * feat: add dap_combobox ([`cc691d4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cc691d4039bde710e78f362d2f0e712f9e8f196f))
146
-
147
161
  ### Refactor
148
162
 
149
163
  * refactor: cleanup and renaming of slot/signals ([`0fd5cee`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0fd5cee77611b6645326eaefa68455ea8de26597))
150
-
151
- * refactor(logger): changed prints to logger calls ([`3a5d7d0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3a5d7d07966ab9b38ba33bda0bed38c30f500c66))
152
-
153
- ## v0.104.0 (2024-09-04)
154
-
155
- ### Fix
156
-
157
- * fix(scan_control): SafeSlot applied to run_scan to avoid faulty scan requests ([`9047916`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/90479167fb5cae393c884e71a80fcfdb48a76427))
PKG-INFO CHANGED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: bec_widgets
3
- Version: 0.113.0
3
+ Version: 0.114.0
4
4
  Summary: BEC Widgets
5
5
  Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
6
6
  Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets
@@ -721,22 +721,6 @@
721
721
  </tabstops>
722
722
  <resources/>
723
723
  <connections>
724
- <connection>
725
- <sender>device_combobox</sender>
726
- <signal>currentTextChanged(QString)</signal>
727
- <receiver>dap_combo_box</receiver>
728
- <slot>select_x_axis(QString)</slot>
729
- <hints>
730
- <hint type="sourcelabel">
731
- <x>162</x>
732
- <y>170</y>
733
- </hint>
734
- <hint type="destinationlabel">
735
- <x>467</x>
736
- <y>170</y>
737
- </hint>
738
- </hints>
739
- </connection>
740
724
  <connection>
741
725
  <sender>device_combobox_2</sender>
742
726
  <signal>currentTextChanged(QString)</signal>
@@ -801,22 +785,6 @@
801
785
  </hint>
802
786
  </hints>
803
787
  </connection>
804
- <connection>
805
- <sender>device_combobox</sender>
806
- <signal>currentTextChanged(QString)</signal>
807
- <receiver>bec_waveform_widget</receiver>
808
- <slot>set_x(QString)</slot>
809
- <hints>
810
- <hint type="sourcelabel">
811
- <x>162</x>
812
- <y>170</y>
813
- </hint>
814
- <hint type="destinationlabel">
815
- <x>1099</x>
816
- <y>258</y>
817
- </hint>
818
- </hints>
819
- </connection>
820
788
  <connection>
821
789
  <sender>toggle_switch</sender>
822
790
  <signal>enabled(bool)</signal>
@@ -865,5 +833,55 @@
865
833
  </hint>
866
834
  </hints>
867
835
  </connection>
836
+ <!--
837
+ <connection>
838
+ <sender>device_combobox</sender>
839
+ <signal>currentTextChanged(QString)</signal>
840
+ <receiver>bec_waveform_widget</receiver>
841
+ <slot>set_x(QString)</slot>
842
+ <hints>
843
+ <hint type="sourcelabel">
844
+ <x>297</x>
845
+ <y>170</y>
846
+ </hint>
847
+ <hint type="destinationlabel">
848
+ <x>467</x>
849
+ <y>170</y>
850
+ </hint>
851
+ </hints>
852
+ </connection>
853
+ -->
854
+ <connection>
855
+ <sender>scan_control</sender>
856
+ <signal>scan_axis(QString,double,double)</signal>
857
+ <receiver>bec_waveform_widget</receiver>
858
+ <slot>set_x(QString)</slot>
859
+ <hints>
860
+ <hint type="sourcelabel">
861
+ <x>244</x>
862
+ <y>348</y>
863
+ </hint>
864
+ <hint type="destinationlabel">
865
+ <x>1140</x>
866
+ <y>491</y>
867
+ </hint>
868
+ </hints>
869
+ </connection>
870
+ <connection>
871
+ <sender>scan_control</sender>
872
+ <signal>scan_axis(QString,double,double)</signal>
873
+ <receiver>dap_combo_box</receiver>
874
+ <slot>select_x_axis(QString)</slot>
875
+ <hints>
876
+ <hint type="sourcelabel">
877
+ <x>244</x>
878
+ <y>322</y>
879
+ </hint>
880
+ <hint type="destinationlabel">
881
+ <x>909</x>
882
+ <y>189</y>
883
+ </hint>
884
+ </hints>
885
+ </connection>
868
886
  </connections>
869
887
  </ui>
@@ -467,6 +467,10 @@ class BECWaveform(BECPlotBase):
467
467
  - Custom signal name of device from BEC.
468
468
  x_entry(str): Entry of the x signal.
469
469
  """
470
+ if not x_name:
471
+ # this can happen, if executed by a signal from a widget
472
+ return
473
+
470
474
  curve_configs = self.config.curves
471
475
  curve_ids = list(curve_configs.keys())
472
476
  curve_configs = list(curve_configs.values())
@@ -631,6 +635,13 @@ class BECWaveform(BECPlotBase):
631
635
  x_name = mode if mode is not None else "best_effort"
632
636
  self.x_axis_mode["name"] = x_name
633
637
 
638
+ if not x_name or not y_name:
639
+ # can happen if executed from a signal from a widget ;
640
+ # the code above has to be executed to set some other
641
+ # variables, but it cannot continue if both names are
642
+ # not set properly -> exit here
643
+ return
644
+
634
645
  # 3. Check - Get entry if not provided and validate
635
646
  x_entry, y_entry, z_entry = self._validate_signal_entries(
636
647
  x_name, y_name, z_name, x_entry, y_entry, z_entry, validate_bec
@@ -42,6 +42,7 @@ class ScanControl(BECWidget, QWidget):
42
42
 
43
43
  scan_started = Signal()
44
44
  scan_selected = Signal(str)
45
+ scan_axis = Signal(str, float, float)
45
46
 
46
47
  def __init__(
47
48
  self,
@@ -503,10 +504,12 @@ class ScanControl(BECWidget, QWidget):
503
504
  @SafeSlot(popup_error=True)
504
505
  def run_scan(self):
505
506
  """Starts the selected scan with the given parameters."""
506
- self.scan_started.emit()
507
507
  args, kwargs = self.get_scan_parameters()
508
+ for device, start, stop in zip(*[iter(args)] * 3):
509
+ self.scan_axis.emit(device.name, start, stop)
508
510
  scan_function = getattr(self.scans, self.comboBox_scan_selection.currentText())
509
511
  if callable(scan_function):
512
+ self.scan_started.emit()
510
513
  scan_function(*args, **kwargs)
511
514
 
512
515
  def cleanup(self):
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: bec_widgets
3
- Version: 0.113.0
3
+ Version: 0.114.0
4
4
  Summary: BEC Widgets
5
5
  Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
6
6
  Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets
@@ -2,11 +2,11 @@
2
2
  .gitlab-ci.yml,sha256=Dc1iDjsc72UxdUtihx4uSZU0lrTQeR8hZwGx1MQBfKE,8432
3
3
  .pylintrc,sha256=eeY8YwSI74oFfq6IYIbCqnx3Vk8ZncKaatv96n_Y8Rs,18544
4
4
  .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
5
- CHANGELOG.md,sha256=MsTSF60CZ8CIFVa6uxezN4uFqtKKwx3EtNpXThid_0g,6989
5
+ CHANGELOG.md,sha256=06P9erwb3p2hA4hQ27h0elkTHFpST9T7rinaGlvt3Cs,7266
6
6
  LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
7
- PKG-INFO,sha256=C4C8XhGH6pOZ-_r4CnJWLdDM-x8W0u4MwToUKkVTD0I,1334
7
+ PKG-INFO,sha256=iQY_5jzjQVBoqJm95jI_R39aZ2xWxsSVwagxUQOzdx8,1334
8
8
  README.md,sha256=Od69x-RS85Hph0-WwWACwal4yUd67XkEn4APEfHhHFw,2649
9
- pyproject.toml,sha256=i4en2BSq0FQlp72LBk4g93_t1N4lyRd3UCXW_oeFCuQ,2544
9
+ pyproject.toml,sha256=gXCxP3PKeyd1s1-icN5yGEyZ-dPmyHDpefkRVsaku10,2544
10
10
  .git_hooks/pre-commit,sha256=n3RofIZHJl8zfJJIUomcMyYGFi_rwq4CC19z0snz3FI,286
11
11
  .gitlab/issue_templates/bug_report_template.md,sha256=gAuyEwl7XlnebBrkiJ9AqffSNOywmr8vygUFWKTuQeI,386
12
12
  .gitlab/issue_templates/documentation_update_template.md,sha256=FHLdb3TS_D9aL4CYZCjyXSulbaW5mrN2CmwTaeLPbNw,860
@@ -17,7 +17,7 @@ bec_widgets/applications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
17
17
  bec_widgets/applications/alignment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
18
18
  bec_widgets/applications/alignment/alignment_1d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
19
19
  bec_widgets/applications/alignment/alignment_1d/alignment_1d.py,sha256=V3blVi6iZbZBfzd7hzAk1ZGdSwiV2C6ZvZr9OUBAfNg,11293
20
- bec_widgets/applications/alignment/alignment_1d/alignment_1d.ui,sha256=-ZrQelty_vHKPICgtOmoxRsLp13StOOwegTuJp0Xshw,27154
20
+ bec_widgets/applications/alignment/alignment_1d/alignment_1d.ui,sha256=qgYZnT78MZmugVdTWUJSQNlAOJW278d2wEZ9bGXe94s,27537
21
21
  bec_widgets/assets/app_icons/BEC-General-App.png,sha256=hc2ktly53DZAbl_rE3cb-vdRa5gtdCmBEjfwm2y5P4g,447581
22
22
  bec_widgets/assets/app_icons/alignment_1d.png,sha256=5VouaWieb4lVv3wUBNHaO5ovUW2Fk25aTKYQzOWy0mg,2071069
23
23
  bec_widgets/assets/app_icons/bec_widgets_icon.png,sha256=K8dgGwIjalDh9PRHUsSQBqgdX7a00nM3igZdc20pkYM,1747017
@@ -169,7 +169,7 @@ bec_widgets/widgets/figure/plots/image/image_processor.py,sha256=GeTtWjbldy6VejM
169
169
  bec_widgets/widgets/figure/plots/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
170
170
  bec_widgets/widgets/figure/plots/motor_map/motor_map.py,sha256=AiDq4bmcEoj9PlkRQtHCk-5cwvOFGPBcfxPNNr8E53Y,18399
171
171
  bec_widgets/widgets/figure/plots/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
172
- bec_widgets/widgets/figure/plots/waveform/waveform.py,sha256=wESdww5oTdAfVsW4M_kOZlxvEy5fFKKlDaf7NQuXXts,56296
172
+ bec_widgets/widgets/figure/plots/waveform/waveform.py,sha256=N3sF0TWJblsznTU8ZSt8QNvoXo7CZEiuDZymJsQUZzA,56708
173
173
  bec_widgets/widgets/figure/plots/waveform/waveform_curve.py,sha256=RUo4GfXwlaCei8BBvWBQF3IEB8h-KgpvaHur6JUvT6s,8682
174
174
  bec_widgets/widgets/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
175
175
  bec_widgets/widgets/image/bec_image_widget.pyproject,sha256=PHisdBo5_5UCApd27GkizzqgfdjsDx2bFZa_p9LiSW8,30
@@ -217,7 +217,7 @@ bec_widgets/widgets/ring_progress_bar/ring_progress_bar.pyproject,sha256=ZNYDnKD
217
217
  bec_widgets/widgets/ring_progress_bar/ring_progress_bar_plugin.py,sha256=-rw9ZSThgAH0Ubbr3X-L5x-ZqMXUGnauyFb4OmfUvD4,1394
218
218
  bec_widgets/widgets/scan_control/__init__.py,sha256=IOfHl15vxb_uC6KN62-PeUzbBha_vQyqkkXbJ2HU674,38
219
219
  bec_widgets/widgets/scan_control/register_scan_control.py,sha256=xUX2yR0-MaIMg9_y9qe50yDDphzsh2x1b5PMrF90yPM,475
220
- bec_widgets/widgets/scan_control/scan_control.py,sha256=wW_UwZbu9wgzRHTaB4gjtcr7txz9Hy27aKruNmMmK2w,19180
220
+ bec_widgets/widgets/scan_control/scan_control.py,sha256=xR043qG1biFePq7bmfZZTcCvoQovObDe9cjRj-B-ylA,19343
221
221
  bec_widgets/widgets/scan_control/scan_control.pyproject,sha256=eTgVDFKToIH8_BbJjM2RvbOLr7HnYoidX0SAHx640DM,30
222
222
  bec_widgets/widgets/scan_control/scan_control_plugin.py,sha256=7GaqmaRgbwIPjVoXcyKVDl8UpfqC2weViup-YFfzUsM,1270
223
223
  bec_widgets/widgets/scan_control/scan_group_box.py,sha256=H2QQFvRlmpF-lilmRRNB-vsAcYQkDYhbHZo32hPRVr8,10488
@@ -262,8 +262,8 @@ bec_widgets/widgets/website/register_website_widget.py,sha256=LIQJpV9uqcBiPR9cEA
262
262
  bec_widgets/widgets/website/website.py,sha256=42pncCc_zI2eqeMArIurVmPUukRo5bTxa2h1Skah-io,3012
263
263
  bec_widgets/widgets/website/website_widget.pyproject,sha256=scOiV3cV1_BjbzpPzy2N8rIJL5P2qIZz8ObTJ-Uvdtg,25
264
264
  bec_widgets/widgets/website/website_widget_plugin.py,sha256=pz38_C2cZ0yvPPS02wdIPcmhFo_yiwUhflsASocAPQQ,1341
265
- bec_widgets-0.113.0.dist-info/METADATA,sha256=C4C8XhGH6pOZ-_r4CnJWLdDM-x8W0u4MwToUKkVTD0I,1334
266
- bec_widgets-0.113.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
267
- bec_widgets-0.113.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
268
- bec_widgets-0.113.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
269
- bec_widgets-0.113.0.dist-info/RECORD,,
265
+ bec_widgets-0.114.0.dist-info/METADATA,sha256=iQY_5jzjQVBoqJm95jI_R39aZ2xWxsSVwagxUQOzdx8,1334
266
+ bec_widgets-0.114.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
267
+ bec_widgets-0.114.0.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
268
+ bec_widgets-0.114.0.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
269
+ bec_widgets-0.114.0.dist-info/RECORD,,
pyproject.toml CHANGED
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "bec_widgets"
7
- version = "0.113.0"
7
+ version = "0.114.0"
8
8
  description = "BEC Widgets"
9
9
  requires-python = ">=3.10"
10
10
  classifiers = [