Calculate mean speed when populating the database tab

hydroffice · Jan 22, 2025 · 1cd677d · 1cd677d
1 parent 85e7809
commit 1cd677d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/hyo2/ssm2/app/gui/soundspeedmanager/widgets/database.py b/hyo2/ssm2/app/gui/soundspeedmanager/widgets/database.py
@@ -797,10 +797,10 @@ def __lt__(self, other):
         # prepare the table
         self.ssp_list.setSortingEnabled(False)
         self.ssp_list.clear()
-        self.ssp_list.setColumnCount(24)
+        self.ssp_list.setColumnCount(25)
         self.ssp_list.setHorizontalHeaderLabels(['id', 'time', 'location',
-                                                 'sensor', 'probe',
-                                                 'ss@min depth', 'min depth', 'max depth', 'max depth[no ext]',
+                                                 'sensor', 'probe', 'ss@min depth', 'mean speed',
+                                                 'min depth', 'max depth', 'max depth[no ext]',
                                                  'original path', 'institution',
                                                  'survey', 'vessel', 'sn',
                                                  'processing time', 'processing info', 'surveylines', 'comments',
@@ -817,7 +817,7 @@ def __lt__(self, other):
             processed = True
             tokens = ssp_[11].split(";")
             # Re-arrange index to match the new items and labels
-            ssp = ssp_[0:5] + ssp_[20:24] + ssp_[5:20]
+            ssp = ssp_[0:5] + ssp_[20:25] + ssp_[5:20]
             if Dicts.proc_user_infos['PLOTTED'] not in tokens:
                 processed = False
 

diff --git a/hyo2/ssm2/lib/db/db.py b/hyo2/ssm2/lib/db/db.py
@@ -664,7 +664,7 @@ def list_profiles(self):
                     if probe_type not in Dicts.probe_types.values():
                         probe_type = Dicts.probe_types['Future']
 
-                    # special handling for surface sound speed, min depth, max depth
+                    # special handling for surface sound speed, mean sound speed, min depth, max depth
                     try:
                         min_depth = str()
                         for row_min in sql_min:
@@ -679,6 +679,14 @@ def list_profiles(self):
                         logger.warning("profile %s: %s -> skipping" % (e, row['pk']))
                         continue
 
+                    try:
+                        mean_ss = str()
+                        ssp = self.profile_by_pk(row['pk'])
+                        mean_ss = '%0.2f' % ssp.cur.proc_speed_mean
+                    except Exception as e:
+                        logger.warning("profile %s: %s -> skipping" % (e, row['pk']))
+                        continue
+
                     try:
                         max_depth = str()
                         for row_max in sql_max:
@@ -726,9 +734,10 @@ def list_profiles(self):
                                      row['conductivity_uom'],  # 18
                                      row['salinity_uom'],  # 19
                                      ss_at_min_depth,  # 20
-                                     min_depth,  # 21
-                                     max_depth,  # 22
-                                     max_raw_depth,  # 23
+                                     mean_ss,  # 21
+                                     min_depth,  # 22
+                                     max_depth,  # 23
+                                     max_raw_depth,  # 24
                                      ))
             return ssp_list