parouby
/
acoused
mirror of https://forgemia.inra.fr/theophile.terraz/acoused
1
0
Fork 0
Code Issues Packages Projects Releases Activity

Information groupbox is re-organized. Frequency combobox and kt spinbox are moved to the top: it's more efficient for the user to change the kt.

dev-brahim
brahim 2024-09-16 16:12:56 +02:00
parent 5493f92832
commit 18b98201e1
1 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
View/acoustic_data_tab.py
View File

@ -1495,47 +1495,47 @@ class AcousticDataTab(QWidget):
self.label_hour_acoustic_file.show() self.label_hour_acoustic_file.show()
self.gridLayout_goupbox_info.addWidget(self.label_hour_acoustic_file, 1, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_hour_acoustic_file, 1, 1, 1, 1)
self.label_temperature.show()
self.gridLayout_goupbox_info.addWidget(self.label_temperature, 2, 0, 1, 1)
self.spinbox_temperature.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_temperature, 2, 1, 1, 1)
self.label_speed_of_sound.show()
self.gridLayout_goupbox_info.addWidget(self.label_speed_of_sound, 3, 0, 1, 1)
self.spinbox_speed_of_sound.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_speed_of_sound, 3, 1, 1, 1)
self.label_sound_attenuation.show()
self.gridLayout_goupbox_info.addWidget(self.label_sound_attenuation, 4, 0, 1, 1)
self.spinbox_sound_attenuation.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_sound_attenuation, 4, 1, 1, 1)
self.label_freq.show() self.label_freq.show()
self.gridLayout_goupbox_info.addWidget(self.label_freq, 5, 0, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_freq, 2, 0, 1, 1)
self.combobox_frequency_information.show() self.combobox_frequency_information.show()
self.gridLayout_goupbox_info.addWidget(self.combobox_frequency_information, 5, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.combobox_frequency_information, 2, 1, 1, 1)
self.label_profiles.show()
self.gridLayout_goupbox_info.addWidget(self.label_profiles, 6, 0, 1, 1)
self.label_profiles_per_sec.show()
self.gridLayout_goupbox_info.addWidget(self.label_profiles_per_sec, 7, 0, 1, 1)
self.label_cells.show()
self.gridLayout_goupbox_info.addWidget(self.label_cells, 8, 0, 1, 1)
self.label_cell_size.show()
self.gridLayout_goupbox_info.addWidget(self.label_cell_size, 9, 0, 1, 1)
self.label_pulse_length.show()
self.gridLayout_goupbox_info.addWidget(self.label_pulse_length, 10, 0, 1, 1)
self.label_pings_per_sec.show()
self.gridLayout_goupbox_info.addWidget(self.label_pings_per_sec, 11, 0, 1, 1)
self.label_pings_per_profile.show()
self.gridLayout_goupbox_info.addWidget(self.label_pings_per_profile, 12, 0, 1, 1)
self.label_kt.show() self.label_kt.show()
self.gridLayout_goupbox_info.addWidget(self.label_kt, 13, 0, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_kt, 3, 0, 1, 1)
self.spinbox_kt.show() self.spinbox_kt.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_kt, 13, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.spinbox_kt, 3, 1, 1, 1)
self.checkbox_kt.show() self.checkbox_kt.show()
self.gridLayout_goupbox_info.addWidget(self.checkbox_kt, 13, 2, 1, 1) self.gridLayout_goupbox_info.addWidget(self.checkbox_kt, 3, 2, 1, 1)
self.label_temperature.show()
self.gridLayout_goupbox_info.addWidget(self.label_temperature, 4, 0, 1, 1)
self.spinbox_temperature.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_temperature, 4, 1, 1, 1)
self.label_speed_of_sound.show()
self.gridLayout_goupbox_info.addWidget(self.label_speed_of_sound, 5, 0, 1, 1)
self.spinbox_speed_of_sound.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_speed_of_sound, 5, 1, 1, 1)
self.label_sound_attenuation.show()
self.gridLayout_goupbox_info.addWidget(self.label_sound_attenuation, 6, 0, 1, 1)
self.spinbox_sound_attenuation.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_sound_attenuation, 6, 1, 1, 1)
self.label_profiles.show()
self.gridLayout_goupbox_info.addWidget(self.label_profiles, 7, 0, 1, 1)
self.label_profiles_per_sec.show()
self.gridLayout_goupbox_info.addWidget(self.label_profiles_per_sec, 8, 0, 1, 1)
self.label_cells.show()
self.gridLayout_goupbox_info.addWidget(self.label_cells, 9, 0, 1, 1)
self.label_cell_size.show()
self.gridLayout_goupbox_info.addWidget(self.label_cell_size, 10, 0, 1, 1)
self.label_pulse_length.show()
self.gridLayout_goupbox_info.addWidget(self.label_pulse_length, 11, 0, 1, 1)
self.label_pings_per_sec.show()
self.gridLayout_goupbox_info.addWidget(self.label_pings_per_sec, 12, 0, 1, 1)
self.label_pings_per_profile.show()
self.gridLayout_goupbox_info.addWidget(self.label_pings_per_profile, 13, 0, 1, 1)
self.label_rx.show() self.label_rx.show()
self.gridLayout_goupbox_info.addWidget(self.label_rx, 14, 0, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_rx, 14, 0, 1, 1)
@ -1607,47 +1607,47 @@ class AcousticDataTab(QWidget):
self.label_hour_acoustic_file.show() self.label_hour_acoustic_file.show()
self.gridLayout_goupbox_info.addWidget(self.label_hour_acoustic_file, 1, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_hour_acoustic_file, 1, 1, 1, 1)
self.label_temperature.show()
self.gridLayout_goupbox_info.addWidget(self.label_temperature, 2, 0, 1, 1)
self.spinbox_temperature.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_temperature, 2, 1, 1, 1)
self.label_speed_of_sound.show()
self.gridLayout_goupbox_info.addWidget(self.label_speed_of_sound, 3, 0, 1, 1)
self.spinbox_speed_of_sound.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_speed_of_sound, 3, 1, 1, 1)
self.label_sound_attenuation.show()
self.gridLayout_goupbox_info.addWidget(self.label_sound_attenuation, 4, 0, 1, 1)
self.spinbox_sound_attenuation.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_sound_attenuation, 4, 1, 1, 1)
self.label_freq.show() self.label_freq.show()
self.gridLayout_goupbox_info.addWidget(self.label_freq, 5, 0, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_freq, 2, 0, 1, 1)
self.combobox_frequency_information.show() self.combobox_frequency_information.show()
self.gridLayout_goupbox_info.addWidget(self.combobox_frequency_information, 5, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.combobox_frequency_information, 2, 1, 1, 1)
self.label_profiles.show()
self.gridLayout_goupbox_info.addWidget(self.label_profiles, 6, 0, 1, 1)
self.label_profiles_per_sec.show()
self.gridLayout_goupbox_info.addWidget(self.label_profiles_per_sec, 7, 0, 1, 1)
self.label_cells.show()
self.gridLayout_goupbox_info.addWidget(self.label_cells, 8, 0, 1, 1)
self.label_cell_size.show()
self.gridLayout_goupbox_info.addWidget(self.label_cell_size, 9, 0, 1, 1)
self.label_pulse_length.show()
self.gridLayout_goupbox_info.addWidget(self.label_pulse_length, 10, 0, 1, 1)
self.label_pings_per_sec.show()
self.gridLayout_goupbox_info.addWidget(self.label_pings_per_sec, 11, 0, 1, 1)
self.label_pings_per_profile.show()
self.gridLayout_goupbox_info.addWidget(self.label_pings_per_profile, 12, 0, 1, 1)
self.label_kt.show() self.label_kt.show()
self.gridLayout_goupbox_info.addWidget(self.label_kt, 13, 0, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_kt, 3, 0, 1, 1)
self.spinbox_kt.show() self.spinbox_kt.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_kt, 13, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.spinbox_kt, 3, 1, 1, 1)
self.checkbox_kt.show() self.checkbox_kt.show()
self.gridLayout_goupbox_info.addWidget(self.checkbox_kt, 13, 2, 1, 1) self.gridLayout_goupbox_info.addWidget(self.checkbox_kt, 3, 2, 1, 1)
self.label_temperature.show()
self.gridLayout_goupbox_info.addWidget(self.label_temperature, 4, 0, 1, 1)
self.spinbox_temperature.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_temperature, 4, 1, 1, 1)
self.label_speed_of_sound.show()
self.gridLayout_goupbox_info.addWidget(self.label_speed_of_sound, 5, 0, 1, 1)
self.spinbox_speed_of_sound.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_speed_of_sound, 5, 1, 1, 1)
self.label_sound_attenuation.show()
self.gridLayout_goupbox_info.addWidget(self.label_sound_attenuation, 6, 0, 1, 1)
self.spinbox_sound_attenuation.show()
self.gridLayout_goupbox_info.addWidget(self.spinbox_sound_attenuation, 6, 1, 1, 1)
self.label_profiles.show()
self.gridLayout_goupbox_info.addWidget(self.label_profiles, 7, 0, 1, 1)
self.label_profiles_per_sec.show()
self.gridLayout_goupbox_info.addWidget(self.label_profiles_per_sec, 8, 0, 1, 1)
self.label_cells.show()
self.gridLayout_goupbox_info.addWidget(self.label_cells, 9, 0, 1, 1)
self.label_cell_size.show()
self.gridLayout_goupbox_info.addWidget(self.label_cell_size, 10, 0, 1, 1)
self.label_pulse_length.show()
self.gridLayout_goupbox_info.addWidget(self.label_pulse_length, 11, 0, 1, 1)
self.label_pings_per_sec.show()
self.gridLayout_goupbox_info.addWidget(self.label_pings_per_sec, 12, 0, 1, 1)
self.label_pings_per_profile.show()
self.gridLayout_goupbox_info.addWidget(self.label_pings_per_profile, 13, 0, 1, 1)
self.label_rx.show() self.label_rx.show()
self.gridLayout_goupbox_info.addWidget(self.label_rx, 14, 0, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_rx, 14, 0, 1, 1)
@ -2187,31 +2187,31 @@ class AcousticDataTab(QWidget):
self.label_profiles_value.setText(str(stg.nb_profiles[self.fileListWidget.currentRow()] self.label_profiles_value.setText(str(stg.nb_profiles[self.fileListWidget.currentRow()]
[self.combobox_frequency_information.currentIndex()])) [self.combobox_frequency_information.currentIndex()]))
self.gridLayout_goupbox_info.addWidget(self.label_profiles_value, 6, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_profiles_value, 7, 1, 1, 1)
self.label_profiles_per_sec_value.setText(str(stg.nb_profiles_per_sec[self.fileListWidget.currentRow()] self.label_profiles_per_sec_value.setText(str(stg.nb_profiles_per_sec[self.fileListWidget.currentRow()]
[self.combobox_frequency_information.currentIndex()]) + " Hz") [self.combobox_frequency_information.currentIndex()]) + " Hz")
self.gridLayout_goupbox_info.addWidget(self.label_profiles_per_sec_value, 7, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_profiles_per_sec_value, 8, 1, 1, 1)
self.label_cells_value.setText(str(stg.nb_cells[self.fileListWidget.currentRow()] self.label_cells_value.setText(str(stg.nb_cells[self.fileListWidget.currentRow()]
[self.combobox_frequency_information.currentIndex()])) [self.combobox_frequency_information.currentIndex()]))
self.gridLayout_goupbox_info.addWidget(self.label_cells_value, 8, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_cells_value, 9, 1, 1, 1)
self.label_cell_size_value.setText(str(100*round(stg.cell_size[self.fileListWidget.currentRow()] self.label_cell_size_value.setText(str(100*round(stg.cell_size[self.fileListWidget.currentRow()]
[self.combobox_frequency_information.currentIndex()], 3)) + " cm") [self.combobox_frequency_information.currentIndex()], 3)) + " cm")
self.gridLayout_goupbox_info.addWidget(self.label_cell_size_value, 9, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_cell_size_value, 10, 1, 1, 1)
self.label_pulse_length_value.setText(str(round(stg.pulse_length[self.fileListWidget.currentRow()] self.label_pulse_length_value.setText(str(round(stg.pulse_length[self.fileListWidget.currentRow()]
[self.combobox_frequency_information.currentIndex()], 6)) + " sec") [self.combobox_frequency_information.currentIndex()], 6)) + " sec")
self.gridLayout_goupbox_info.addWidget(self.label_pulse_length_value, 10, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_pulse_length_value, 11, 1, 1, 1)
self.label_pings_per_sec_value.setText(str(stg.nb_pings_per_sec[self.fileListWidget.currentRow()] self.label_pings_per_sec_value.setText(str(stg.nb_pings_per_sec[self.fileListWidget.currentRow()]
[self.combobox_frequency_information.currentIndex()]) + " Hz") [self.combobox_frequency_information.currentIndex()]) + " Hz")
self.gridLayout_goupbox_info.addWidget(self.label_pings_per_sec_value, 11, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_pings_per_sec_value, 12, 1, 1, 1)
self.label_pings_per_profile_value.setText(str(stg.nb_pings_averaged_per_profile[self.fileListWidget.currentRow()] self.label_pings_per_profile_value.setText(str(stg.nb_pings_averaged_per_profile[self.fileListWidget.currentRow()]
[self.combobox_frequency_information.currentIndex()])) [self.combobox_frequency_information.currentIndex()]))
self.gridLayout_goupbox_info.addWidget(self.label_pings_per_profile_value, 12, 1, 1, 1) self.gridLayout_goupbox_info.addWidget(self.label_pings_per_profile_value, 13, 1, 1, 1)
stg.kt_corrected = deepcopy(stg.kt_read) stg.kt_corrected = deepcopy(stg.kt_read)
# if self.checkbox_kt.isChecked(): # if self.checkbox_kt.isChecked():