mirror of
https://github.com/bec-project/bec_widgets.git
synced 2025-07-14 11:41:49 +02:00
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
This commit is contained in:
@ -721,22 +721,6 @@
|
|||||||
</tabstops>
|
</tabstops>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections>
|
<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>
|
<connection>
|
||||||
<sender>device_combobox_2</sender>
|
<sender>device_combobox_2</sender>
|
||||||
<signal>currentTextChanged(QString)</signal>
|
<signal>currentTextChanged(QString)</signal>
|
||||||
@ -801,22 +785,6 @@
|
|||||||
</hint>
|
</hint>
|
||||||
</hints>
|
</hints>
|
||||||
</connection>
|
</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>
|
<connection>
|
||||||
<sender>toggle_switch</sender>
|
<sender>toggle_switch</sender>
|
||||||
<signal>enabled(bool)</signal>
|
<signal>enabled(bool)</signal>
|
||||||
@ -865,5 +833,55 @@
|
|||||||
</hint>
|
</hint>
|
||||||
</hints>
|
</hints>
|
||||||
</connection>
|
</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>
|
</connections>
|
||||||
</ui>
|
</ui>
|
||||||
|
Reference in New Issue
Block a user