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

Resolve merge conflict by incorporating both suggestions

dev-brahim
brahim 2025-03-13 12:05:27 +01:00
parent 571ac20d37 2715d225af
commit 0df253d70f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
View/sediment_calibration_tab.py
View File

@ -1795,6 +1795,11 @@ class SedimentCalibrationTab(QWidget):
msgBox.setText("Update data before importing calibration") msgBox.setText("Update data before importing calibration")
msgBox.setStandardButtons(QMessageBox.Ok) msgBox.setStandardButtons(QMessageBox.Ok)
msgBox.exec() msgBox.exec()
elif stg.filename_calibration_file == "":
pass
else: else:
# --- Read calibration file --- # --- Read calibration file ---
data = pd.read_csv( data = pd.read_csv(