pingmapper 5.0.8__py3-none-any.whl → 5.0.9__py3-none-any.whl

pingmapper/class_sonObj.py

@@ -1301,7 +1301,10 @@ class sonObj(object):
 
                 # Distance (in meters)
                 d = sonMeta['trk_dist'].to_numpy()
-                d = np.max(d) - np.min(d)
+                # d = np.max(d) - np.min(d)
+                d = d[-1] - d[0]
+
+                
 
                 pixM = sonMeta['pixM']
                 # Find most common pixel size
@@ -1313,11 +1316,36 @@ class sonObj(object):
                 # Distance in pix
                 d = round(d / pixM, 0).astype(int)
 
-                sonDat = resize(sonDat,
-                                (sonDat.shape[0], d),
-                                mode='reflect',
-                                clip=True,
-                                preserve_range=True)
+                # to avoid oom errors
+                rows = sonDat.shape[0]
+                new_cols = d  # your target width
+                item_size = sonDat.itemsize  # bytes per element
+
+                estimated_bytes = rows * new_cols * item_size
+                estimated_MB = estimated_bytes / 1e6
+
+                available_bytes = psutil.virtual_memory().available
+                available_MB = available_bytes / 1e6
+
+
+                mem_margin = 0.9
+                safe_limit_MB = available_MB * (1 - mem_margin)
+
+                if d > 0 and estimated_MB < safe_limit_MB and new_cols<65500:
+                    sonDat = resize(
+                        sonDat,
+                        (rows, new_cols),
+                        mode='reflect',
+                        clip=True,
+                        preserve_range=True
+                    )
+                if estimated_MB > safe_limit_MB:
+                    print(f"Resize skipped for chunk {chunk}: estimated {estimated_MB:.2f} MB exceeds safe limit of {safe_limit_MB:.2f} MB.")
+                    # Optionally: fallback to chunked resize or downsampling
+                elif new_cols>65500:
+                    print(f"Resize skipped for chunk {chunk}: Maximum supported image dimension is 65500 pixels.")
+                else:
+                    print(f"Resize skipped for chunk {chunk}: Vessel did not move.")
 
             else:
                 sonDat = resize(sonDat,

pingmapper/gui_main.py

@@ -10,16 +10,16 @@ SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 PACKAGE_DIR = os.path.dirname(SCRIPT_DIR)
 sys.path.append(PACKAGE_DIR)
 
-# # For Debug
-# from funcs_common import *
-# from main_readFiles import read_master_func
-# from main_rectify import rectify_master_func
-# from main_mapSubstrate import map_master_func
+# For Debug
+from funcs_common import *
+from main_readFiles import read_master_func
+from main_rectify import rectify_master_func
+from main_mapSubstrate import map_master_func
 
-from pingmapper.funcs_common import *
-from pingmapper.main_readFiles import read_master_func
-from pingmapper.main_rectify import rectify_master_func
-from pingmapper.main_mapSubstrate import map_master_func
+# from pingmapper.funcs_common import *
+# from pingmapper.main_readFiles import read_master_func
+# from pingmapper.main_rectify import rectify_master_func
+# from pingmapper.main_mapSubstrate import map_master_func
 
 import json
 import pandas as pd
@@ -763,24 +763,26 @@ def gui(batch: bool):
                 print('\n===========================================')
                 print('===========================================')
                 print('***** READING *****')
-                read_master_func(**params)
+                ss_chan_avail  = read_master_func(**params)
                 # read_master_func(sonFiles, humFile, projDir, t, nchunk, exportUnknown, wcp, wcr, detectDepth, smthDep, adjDep, pltBedPick, threadCnt)
 
-                if rect_wcp or rect_wcr or banklines or coverage or pred_sub or map_sub or export_poly:
-                    print('\n===========================================')
-                    print('===========================================')
-                    print('***** RECTIFYING *****')
-                    rectify_master_func(**params)
-                    # rectify_master_func(sonFiles, humFile, projDir, nchunk, rect_wcp, rect_wcr, mosaic, threadCnt)
-
-                #==================================================
-                #==================================================
-                if pred_sub or map_sub or export_poly or pltSubClass:
-                    print('\n===========================================')
-                    print('===========================================')
-                    print('***** MAPPING SUBSTRATE *****')
-                    print("working on "+projDir)
-                    map_master_func(**params)
+                if ss_chan_avail:
+
+                    if rect_wcp or rect_wcr or banklines or coverage or pred_sub or map_sub or export_poly:
+                        print('\n===========================================')
+                        print('===========================================')
+                        print('***** RECTIFYING *****')
+                        rectify_master_func(**params)
+                        # rectify_master_func(sonFiles, humFile, projDir, nchunk, rect_wcp, rect_wcr, mosaic, threadCnt)
+
+                    #==================================================
+                    #==================================================
+                    if pred_sub or map_sub or export_poly or pltSubClass:
+                        print('\n===========================================')
+                        print('===========================================')
+                        print('***** MAPPING SUBSTRATE *****')
+                        print("working on "+projDir)
+                        map_master_func(**params)
 
                 gc.collect()
                 print("\n\nTotal Processing Time: ",datetime.timedelta(seconds = round(time.time() - start_time, ndigits=0)))

pingmapper/main_readFiles.py

@@ -36,14 +36,14 @@ SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 PACKAGE_DIR = os.path.dirname(SCRIPT_DIR)
 sys.path.append(PACKAGE_DIR)
 
-# # For debug
-# from funcs_common import *
-# from class_sonObj import sonObj
-# from class_portstarObj import portstarObj
+# For debug
+from funcs_common import *
+from class_sonObj import sonObj
+from class_portstarObj import portstarObj
 
-from pingmapper.funcs_common import *
-from pingmapper.class_sonObj import sonObj
-from pingmapper.class_portstarObj import portstarObj
+# from pingmapper.funcs_common import *
+# from pingmapper.class_sonObj import sonObj
+# from pingmapper.class_portstarObj import portstarObj
 
 import shutil
 
@@ -419,8 +419,34 @@ def read_master_func(logfilename='',
         if son.beamName == 'ss_port' or son.beamName == 'ss_star':
             ss_chan_avail.append(son)
     if len(ss_chan_avail) == 0:
-        print('\n\nNo side-scan channels available. Aborting!')
-        sys.exit()
+        # print('\n\nNo side-scan channels available. Aborting!')
+        # sys.exit()
+
+        print('\n\nNo side-scan channels available!\nUpdating processing parameters as necessary...')
+        print('\nFiltering not avaialable...')
+        max_heading_deviation = 0
+        min_speed = 0
+        max_speed = 0
+        aoi = ''
+        time_table = ''
+
+        print('\nAuto depth picking not available...')
+        detectDep = 0
+        pltBedPick = False
+
+        print('\nShadow removal not available')
+        remShadow = 0
+        pred_sub = False
+
+        print('\nEGN not available...')
+        egn = False
+
+        print('\nWCO and WCM not available...')
+        wco = False
+        wcm = False
+
+
+
     elif len(ss_chan_avail) == 1:
         print('\n\nMaking copy of {} to ensure PINGMapper compatibility'.format(son.beamName))
         origBeam = son.beamName
@@ -1021,8 +1047,12 @@ def read_master_func(logfilename='',
         saveDepth = False
 
     if saveDepth:
-        # Save detected depth to csv
-        depDF = psObj._saveDepth(chunks, detectDep, smthDep, adjDep, instDepAvail)
+
+        if ss_chan_avail:
+            # Save detected depth to csv
+            depDF = psObj._saveDepth(chunks, detectDep, smthDep, adjDep, instDepAvail)
+        else:
+            depDF = []
 
         # Store depths in downlooking sonar files also
         for son in sonObjs:
@@ -1501,3 +1531,9 @@ def read_master_func(logfilename='',
         son._pickleSon()
     gc.collect()
     printUsage()
+
+    if len(ss_chan_avail) == 0:
+        return False
+    else:
+        return True
+

pingmapper/version.py

@@ -1 +1 @@
-__version__ = '5.0.8'
+__version__ = '5.0.9'

{pingmapper-5.0.8.dist-info → pingmapper-5.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 5.0.8
+Version: 5.0.9
 Summary: Open-source interface for processing recreation-grade side scan sonar datasets and reproducibly mapping benthic habitat
 Author: Cameron Bodine, Daniel Buscombe
 Author-email: bodine.cs@gmail.email

{pingmapper-5.0.8.dist-info → pingmapper-5.0.9.dist-info}/RECORD

@@ -3,21 +3,21 @@ pingmapper/__main__.py,sha256=AFopb_XqSU4ZWnmmNICLmtEP7XI_7D-9ng5mnvWNePc,1431
 pingmapper/class_mapSubstrateObj.py,sha256=txB9YqXfVgDFi628jo2F1RtEw1lCNR8wYpkhy94bn0U,37036
 pingmapper/class_portstarObj.py,sha256=vrk7zVdg0apQEashg2cxcG2EfUgNu01f6SSwyCadwiA,106951
 pingmapper/class_rectObj.py,sha256=aJbM-q3UNBhvWutOJwnweGkWTrx6avslX2DCWdofW4Q,96182
-pingmapper/class_sonObj.py,sha256=7HVeCTDSUTwerkdB-hrRTITvh9q7kCfbL98QCTFp85Q,75683
+pingmapper/class_sonObj.py,sha256=wt4M086rucGuZpEMSYf4JegugyG69QrzG3YWMr5M_00,76913
 pingmapper/class_sonObj_nadirgaptest.py,sha256=DSFgjEgpwPgDZslw0vXGGBNFYlcoUa2Ufbr8i_Uqdhc,76915
 pingmapper/funcs_common.py,sha256=0uZErbrWZ_jhOLOc-CT--8OX4eHF9qE_E5Wwy60aSvQ,15300
 pingmapper/funcs_model.py,sha256=tvAISiYLOD9vO10xitrUq8qKmtIQVvN1NC4FQqbrqv8,8661
 pingmapper/funcs_rectify.py,sha256=bAFWbNr4dyOuQzF1j4Je-K4zxfJZUjISc0nYrOot8Ng,12418
-pingmapper/gui_main.py,sha256=5JsOYqRu146T1xhRgYC9ag3vnpRWqa2PDuJky595YA0,34780
+pingmapper/gui_main.py,sha256=DSDQSvFhh6IzvJE0Gb7tShFLw5amqCHuazwHiklGVl8,34888
 pingmapper/main_mapSubstrate.py,sha256=E7jYmKHATXSk5XWhPR-pWH0288wurhX5ph94Gp_v0eg,21217
-pingmapper/main_readFiles.py,sha256=v-LCC6Yl7htttOkAme9rZ6AhpP4aaZSD_sHq30vsygc,56964
+pingmapper/main_readFiles.py,sha256=q2sKPZAubn27yfMW-gS_gHi8ESta0_oGjbCjJo9nwW0,57782
 pingmapper/main_rectify.py,sha256=uOKHHYrjVa3PVtU26G_fL9hTV7sZkvIzEgk3VJd3tVA,20217
 pingmapper/test_PINGMapper.py,sha256=-SYMsdK-tTodXp5dCFSWPn-KRN7-OjX6OwjQ2-8hQg0,14176
 pingmapper/test_time.py,sha256=uHT0mtLDP1J6w-snoELyk4UzZ2LrDeF6jGgJJVloalg,750
-pingmapper/version.py,sha256=09G9VFaz1clAk9W4CwD7jaXBusQQgwfuHkZn5i8Ccbw,21
-pingmapper-5.0.8.data/data/pingmapper_config/default_params.json,sha256=YA9Rx1PSdUy4cTq-vtKORo3nNLisCYNOeUBxClldmHs,1285
-pingmapper-5.0.8.dist-info/licenses/LICENSE,sha256=lowDp_th1CGR0Z224a-jYRi-oNFe_0fdldL3USXhX-k,1095
-pingmapper-5.0.8.dist-info/METADATA,sha256=7-w-w1UY_PmbbhbrucA0v4CFL6BRX9rz2CItHR-Fp3o,9202
-pingmapper-5.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pingmapper-5.0.8.dist-info/top_level.txt,sha256=RlV4sDoE3uIIDzNMOjN2t012Ia_jsblNVojJvg4q84w,11
-pingmapper-5.0.8.dist-info/RECORD,,
+pingmapper/version.py,sha256=HqMS0rnpSiDFIEcOWQ7kY54HvJuEhkV7etIZUx39NGw,21
+pingmapper-5.0.9.data/data/pingmapper_config/default_params.json,sha256=YA9Rx1PSdUy4cTq-vtKORo3nNLisCYNOeUBxClldmHs,1285
+pingmapper-5.0.9.dist-info/licenses/LICENSE,sha256=lowDp_th1CGR0Z224a-jYRi-oNFe_0fdldL3USXhX-k,1095
+pingmapper-5.0.9.dist-info/METADATA,sha256=OLd899S9oygHLmgkwSLTy0Lr-alDD7Cq0iNom4_WeMg,9202
+pingmapper-5.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pingmapper-5.0.9.dist-info/top_level.txt,sha256=RlV4sDoE3uIIDzNMOjN2t012Ia_jsblNVojJvg4q84w,11
+pingmapper-5.0.9.dist-info/RECORD,,