From efa276358b0f5a45cce9fa84fa5f9aafaf4284f7 Mon Sep 17 00:00:00 2001
From: Mathias Guijarro <mathias.guijarro@psi.ch>
Date: Wed, 2 Oct 2024 16:05:09 +0200
Subject: [PATCH] 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
---
 .../alignment/alignment_1d/alignment_1d.ui    | 82 +++++++++++--------
 1 file changed, 50 insertions(+), 32 deletions(-)

diff --git a/bec_widgets/applications/alignment/alignment_1d/alignment_1d.ui b/bec_widgets/applications/alignment/alignment_1d/alignment_1d.ui
index 4972f1dd..77ea31c7 100644
--- a/bec_widgets/applications/alignment/alignment_1d/alignment_1d.ui
+++ b/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>