added add_station_times function to echogramviewer

Author: peter-urban

python/themachinethatgoesping/pingprocessing/split_pings/__init__.py

@@ -2,7 +2,7 @@
 from .by_time import by_time_difference
 from .by_distance import by_distance_difference
 from .by_channel_id import by_channel_id
-from .by_file import by_file_nr, by_file_path
+from .by_file import by_file_nr, by_file_path, by_folder_path
 from .by_function_return import by_function_return
 from .by_time_blocks import by_time_blocks
 from .into_time_blocks import into_time_blocks

python/themachinethatgoesping/pingprocessing/split_pings/by_file.py

@@ -2,6 +2,7 @@
 from collections import defaultdict
 import numpy as np
 import math
+import os
 from typing import Dict, List
 from themachinethatgoesping.pingprocessing.core.progress import get_progress_iterator
 import themachinethatgoesping.navigation as nav
@@ -49,3 +50,25 @@ def by_file_path(pings: List[I_Ping], progress: bool = True) -> Dict[str, List[I
 
     return split_pings
 
+
+def by_folder_path(pings: List[I_Ping], progress: bool = True) -> Dict[str, List[I_Ping]]:
+    """
+    Splits a list of pings by the folder path where the primary file is located.
+
+    Args:
+        pings (List[I_Ping]): A list of pings to be split.
+        progress (bool, optional): Whether to show a progress bar. Defaults to True.
+
+    Returns:
+        Dict[str, List[I_Ping]]: A dictionary where the keys are folder paths and the values are lists of pings.
+    """
+    it = get_progress_iterator(pings, progress, desc="Split pings by folder path")
+
+    split_pings = defaultdict(list)
+
+    for ping in it:
+        folder_path = os.path.dirname(ping.file_data.get_primary_file_path())
+        split_pings[folder_path].append(ping)
+
+    return split_pings
+

python/themachinethatgoesping/pingprocessing/watercolumn/image/make_wci.py

@@ -206,12 +206,28 @@ def from_pings_and_limits(
             vmax = _vmax + (_vmax - vmin) * 0.01
 
         # build array with backtraced positions (beam angle, range from transducer)
-        y_coordinates = np.linspace(hmin, hmax, horizontal_pixels)
-        res = y_coordinates[1] - y_coordinates[0]
-        z_coordinates = np.arange(vmin, vmax + res, res)
+        # Apply horizontal_pixels to the longer axis to maintain aspect ratio
+        # and prevent grid explosion when one dimension is much smaller than the other
+        h_range = hmax - hmin
+        v_range = vmax - vmin
+        
+        if h_range >= v_range:
+            # Horizontal is longer: apply max pixels to horizontal
+            y_pixels = horizontal_pixels
+            z_pixels = max(1, int(np.ceil(horizontal_pixels * v_range / h_range)))
+        else:
+            # Vertical is longer: apply max pixels to vertical
+            z_pixels = horizontal_pixels
+            y_pixels = max(1, int(np.ceil(horizontal_pixels * h_range / v_range)))
+        
+        y_coordinates = np.linspace(hmin, hmax, y_pixels)
+        z_coordinates = np.linspace(vmin, vmax, z_pixels)
+        
+        y_res = y_coordinates[1] - y_coordinates[0] if len(y_coordinates) > 1 else h_range
+        z_res = z_coordinates[1] - z_coordinates[0] if len(z_coordinates) > 1 else v_range
 
         # compute the extent
-        extent = [hmin - res * 0.5, hmax + res * 0.5, vmax + res * 0.5, vmin - res * 0.5]
+        extent = [hmin - y_res * 0.5, hmax + y_res * 0.5, vmax + z_res * 0.5, vmin - z_res * 0.5]
 
         # single ping case
         if not is_iterable(pings):