Compare commits

...

2 Commits

2 changed files with 18 additions and 36 deletions

View File

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

View File

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