The acoustic data tab has been updated, and the variables in the settings python file have been modified: all are python lists, allowing you to work with multiple acoustic data. Each list are filled with object with as many object as there are acoutic data. 1/ File list widget is added to add/clear/delete buttons. Measurement information is displayed in a scrolling text box. Table of backscatter values is added. Limits of dataset in display option box are displayed with double slider. Limits of dataset are displayed in Display options box with double sliders. Double sliders are also used for river bottom detection.

Model/AquascatDataLoader.py

@@ -687,7 +687,7 @@ class RawAquascatData:
         # ---------------------------------------------------------------------
 
         #  Allocate Memory for the Data
-        AuxData = np.zeros((AuxNumSamples, NumAuxChans))
+        AuxData = np.zeros((int(AuxNumSamples), NumAuxChans))
         AbsData = np.zeros((int(AbsNumBins[0]), int(AbsNumProfiles[0]),
                             int(NumAbsTimeSlots)), dtype=float, order='C')
         PressTempData = np.zeros((NumSerialSamples, 2))

Model/TableModel.py

@@ -13,14 +13,19 @@ class TableModel(QAbstractTableModel):
             #     value = self._data.iloc[index.row(), index.column()]
             #     if isinstance(value, int) or isinstance(value, float):
             #         return Qt.AlignVCenter + Qt.AlignRight
-            return str(value)
-            # if isinstance(value, float):
-            #     # Render float to 2 dp
-            #     return "%.2f" % value
+
+            if isinstance(value, float):
+                # Render float to 2 dp
+                if len(str(value).split(".")[1]) <= 3:
+                    return "%.2f" % value
+                else:
+                    return "%.2e" % value
             # if isinstance(value, str):
             #     # Render strings with quotes
             #     return '"%s"' % value
 
+            return value
+
     def rowCount(self, index):
         # The length of the outer list.
         return self._data.shape[0]
@@ -36,4 +41,4 @@ class TableModel(QAbstractTableModel):
             if orientation == Qt.Horizontal:
                 return str(self._data.columns[section])
             if orientation == Qt.Vertical:
-                return str(self._data.index[section])
+                return str(self._data.index[section])

Model/acoustic_data_loader.py

@@ -90,7 +90,7 @@ class AcousticDataLoader:
         # self.reshape_t()
         # self.compute_r_2D()
 
-    def reshape_BS_raw_cross_section(self):
+    def reshape_BS_raw_data(self):
         BS_raw_cross_section = np.reshape(self._BS_raw_data,
                                           (self._r.shape[1] * self._time.shape[1], self._freq.shape[0]),
                                           order="F")
@@ -114,7 +114,7 @@ class AcousticDataLoader:
         print(r2D.shape)
         return r2D
 
-    def reshape_t(self):
+    def reshape_time(self):
         # t = np.reshape(np.repeat(self._time, self._r.shape[0]), (self._time.shape[0]*self._r.shape[0], 1))
         t = np.zeros((self._r.shape[1] * self._time.shape[1], self._freq.shape[0]))
         for i, _ in enumerate(self._freq):