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

Compare commits

base: parouby:0e657106ce8d86c8f30cd14c25bff14765bc8a41
Branches Tags
parouby:dev-bjvincent-fix-UBSediFlow
parouby:dev-bjvincent
parouby:dev
parouby:fix-save-load
parouby:main
parouby:dev-parouby
parouby:dev-brahim
parouby:v2.2
parouby:v2.1
...
compare: parouby:965b222e65f446ddb0532a58244e0949d8e52ca8
Branches Tags
parouby:dev-bjvincent-fix-UBSediFlow
parouby:dev-bjvincent
parouby:dev
parouby:fix-save-load
parouby:main
parouby:dev-parouby
parouby:dev-brahim
parouby:v2.2
parouby:v2.1

2 Commits
0e657106ce ... 965b222e65

Author SHA1 Message Date
Pierre-Antoine 965b222e65 Acoustic data: Fix distance to free surface computation (without reload input file). 2025-04-24 17:18:25 +02:00
Pierre-Antoine 967540d7f7 SQL: Minor change. 2025-04-24 16:18:39 +02:00
2 changed files with 18 additions and 36 deletions
Show Stats Expand all files Collapse all files

2
Model/create_table_for_save_as.py
View File

@ -213,7 +213,7 @@ class CreateTableForSaveAs:
def save(self): def save(self):
start = time.time() start = time.time()
self.create_table() self.create_table()
print(f"end : {time.time() - start} sec") logger.info(f"end : {time.time() - start} sec")
def open_file_dialog(self): def open_file_dialog(self):
name, _ = QFileDialog.getSaveFileName( name, _ = QFileDialog.getSaveFileName(

52
View/acoustic_data_tab.py
View File

@ -1202,50 +1202,32 @@ class AcousticDataTab(QWidget):
msgBox.exec() msgBox.exec()
self.lineEdit_distance_from_ABS_to_free_surface.setText("0.00") self.lineEdit_distance_from_ABS_to_free_surface.setText("0.00")
else: return
stg.distance_from_ABS_to_free_surface[
self.fileListWidget.currentRow()
] = (
float(
self.lineEdit_distance_from_ABS_to_free_surface\
.text().replace(",", ".")
)
)
self.lineEdit_distance_from_ABS_to_free_surface.setText(
str(
"%4s" % stg.distance_from_ABS_to_free_surface[
self.fileListWidget.currentRow()
]
)
)
def refresh_distance_from_ABS_to_free_surface(self): def refresh_distance_from_ABS_to_free_surface(self):
self.pushbutton_distance_from_ABS_to_free_surface.blockSignals(True) self.pushbutton_distance_from_ABS_to_free_surface.blockSignals(True)
if self.combobox_ABS_system_choice.currentIndex() == 1: data_id = self.fileListWidget.currentRow()
acoustic_data = AcousticDataLoader(
stg.path_BS_raw_data[self.fileListWidget.currentRow()] + "/" + previous = stg.distance_from_ABS_to_free_surface[data_id]
stg.filename_BS_raw_data[self.fileListWidget.currentRow()] new = (
) float(
elif self.combobox_ABS_system_choice.currentIndex() == 2: self.lineEdit_distance_from_ABS_to_free_surface\
acoustic_data = AcousticDataLoaderUBSediFlow( .text().replace(",", ".")
stg.path_BS_raw_data[self.fileListWidget.currentRow()] + "/" +
stg.filename_BS_raw_data[self.fileListWidget.currentRow()]
) )
)
self.lineEdit_distance_from_ABS_to_free_surface.setText(f"{new}")
stg.depth[self.fileListWidget.currentRow()] = acoustic_data._r logger.debug(f"prev: {previous}, new: {new}")
stg.depth_reshape[self.fileListWidget.currentRow()] = acoustic_data.reshape_r()
stg.depth[self.fileListWidget.currentRow()] = ( stg.depth[data_id] = stg.depth[data_id] - previous
stg.depth[self.fileListWidget.currentRow()] + stg.depth_reshape[data_id] = stg.depth_reshape[data_id] - previous
stg.distance_from_ABS_to_free_surface[self.fileListWidget.currentRow()])
stg.depth_reshape[self.fileListWidget.currentRow()] = ( stg.depth[data_id] = stg.depth[data_id] + new
stg.depth_reshape[self.fileListWidget.currentRow()] + stg.depth_reshape[data_id] = stg.depth_reshape[data_id] + new
stg.distance_from_ABS_to_free_surface[self.fileListWidget.currentRow()])
stg.depth_cross_section[self.fileListWidget.currentRow()] = stg.depth[self.fileListWidget.currentRow()] stg.depth_cross_section[data_id] = stg.depth[data_id]
stg.distance_from_ABS_to_free_surface[data_id] = new
self.fill_table() self.fill_table()