Resolving confilct

View/sediment_calibration_tab.py

@@ -1802,13 +1802,7 @@ class SedimentCalibrationTab(QWidget):
 
         else:
             # --- Read calibration file ---
-            data = pd.read_csv(
-                os.path.join(
-                    stg.path_calibration_file,
-                    stg.filename_calibration_file
-                ),
-                header=0, index_col=0
-            )
+            data = pd.read_csv(os.path.join(stg.path_calibration_file, stg.filename_calibration_file), header=0, index_col=0)
 
             # --- Fill spinboxes of calibration parameter ---
             self.label_temperature.clear()
@@ -2142,6 +2136,7 @@ class SedimentCalibrationTab(QWidget):
         ]
 
         for i in range(self.combobox_acoustic_data_choice.count()):
+
             J_cross_section_freq1 = np.array([])
             J_cross_section_freq2 = np.array([])
 
@@ -2225,25 +2220,19 @@ class SedimentCalibrationTab(QWidget):
         self.lineEdit_alphas_freq2.setText(str("%.5f" % alpha_s_freq2))
 
         if (alpha_s_freq1 < 0) or (alpha_s_freq2 < 0):
+
             msgBox = QMessageBox()
             msgBox.setWindowTitle("Alpha computation error")
-            msgBox.setIconPixmap(
-                QPixmap(
-                    self._path_icon("no_approved.png")
-                ).scaledToHeight(32, Qt.SmoothTransformation)
-            )
+            msgBox.setIconPixmap(QPixmap(self._path_icon("no_approved.png")).scaledToHeight(32, Qt.SmoothTransformation))
             msgBox.setText("Sediment sound attenuation is negative !")
             msgBox.setStandardButtons(QMessageBox.Ok)
             msgBox.exec()
 
         else:
+
             msgBox = QMessageBox()
             msgBox.setWindowTitle("Alpha computation validation")
-            msgBox.setIconPixmap(
-                QPixmap(
-                    self._path_icon("approved.png")
-                ).scaledToHeight(32, Qt.SmoothTransformation)
-            )
+            msgBox.setIconPixmap(QPixmap(self._path_icon("approved.png")).scaledToHeight(32, Qt.SmoothTransformation))
             msgBox.setText("Sediment sound attenuation is positive.")
             msgBox.setStandardButtons(QMessageBox.Ok)
             msgBox.exec()
@@ -2744,3 +2733,4 @@ class SedimentCalibrationTab(QWidget):
             self.lineEdit_slider_FCB.setText(
                 str(stg.time[self.combobox_acoustic_data_choice.currentIndex()][
                         self.combobox_frequency_FCB.currentIndex(), self.slider_FCB.value()-1]))
+