pingmapper 4.2.6__py3-none-any.whl → 4.2.8__py3-none-any.whl

pingmapper/main_mapSubstrate.py

@@ -80,6 +80,8 @@ def map_master_func(logfilename='',
                     mask_wc=False,
                     spdCor=False,
                     maxCrop=False,
+                    moving_window=False,
+                    window_stride=0.1,
                     USE_GPU=False,
                     remShadow=0,
                     detectDep=0,

pingmapper/main_readFiles.py

@@ -75,7 +75,7 @@ def read_master_func(logfilename='',
                      pix_res_map=0,
                      x_offset=0,
                      y_offset=0,
-                     tileFile=False,
+                     tileFile='.png',
                      egn=False,
                      egn_stretch=0,
                      egn_stretch_factor=1,
@@ -83,11 +83,13 @@ def read_master_func(logfilename='',
                      wcm=False,
                      wcr=False,
                      wco=False,
-                     sonogram_colorMap='Greys',
+                     sonogram_colorMap='Greys_r',
                      mask_shdw=False,
                      mask_wc=False,
                      spdCor=False,
                      maxCrop=False,
+                     moving_window=False,
+                     window_stride=0.1,
                      USE_GPU=False,
                      remShadow=0,
                      detectDep=0,
@@ -354,7 +356,13 @@ def read_master_func(logfilename='',
 
         son.sonMetaFile = meta['metaCSV']
 
-        sonObjs.append(son)
+        if sonFiles:
+            if son.beamName in sonFiles:
+                sonObjs.append(son)
+            else:
+                pass
+        else:
+            sonObjs.append(son)
 
     ####
     # OLD    
@@ -1250,10 +1258,10 @@ def read_master_func(logfilename='',
     # Export un-rectified sonar tiles                                          #
     ############################################################################
 
-    moving_window = True
-    window_stride = 0.1
-    tileFile = '.mp4'
-    frameRate = 5
+    # moving_window = True
+    # window_stride = 0.1
+    # tileFile = '.mp4'
+    # frameRate = 5
     if tileFile == '.mp4':
         imgType = '.png'
     else:

pingmapper/main_rectify.py

@@ -84,13 +84,14 @@ def rectify_master_func(logfilename='',
                         mask_wc=False,
                         spdCor=False,
                         maxCrop=False,
+                        moving_window=False,
+                        window_stride=0.1,
                         USE_GPU=False,
                         remShadow=0,
                         detectDep=0,
                         smthDep=0,
                         adjDep=0,
                         pltBedPick=False,
-                        cog=True,
                         rect_wcp=False,
                         rect_wcr=False,
                         rubberSheeting=True,
@@ -261,6 +262,10 @@ def rectify_master_func(logfilename='',
     # Smooth Trackline                                                         #
     ############################################################################
 
+    cog=True
+    if 'rectMethod' != 'COG':
+        cog=False
+
     smthTrkFilenames = smoothTrackline(projDir=projDir, x_offset=x_offset, y_offset=y_offset, nchunk=nchunk, cog=cog, threadCnt=threadCnt)
     for son in portstar:
         beam = son.beamName

pingmapper/version.py

@@ -1 +1 @@
-__version__ = '4.2.6'
+__version__ = '4.2.8'

{pingmapper-4.2.6.dist-info → pingmapper-4.2.8.dist-info}/METADATA

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

{pingmapper-4.2.6.dist-info → pingmapper-4.2.8.dist-info}/RECORD

@@ -8,16 +8,15 @@ pingmapper/funcs_common.py,sha256=pCOIy83srtYKtKUnF4oXkd83_kimZI0NiSrO0TE0O4g,13
 pingmapper/funcs_model.py,sha256=dO9J4-0s1COggHkSUqHFC1qKTs20A6PSvkDqXWMUT6A,7916
 pingmapper/funcs_rectify.py,sha256=Goh5Yon_qP93dLjq8Vv_qezPxw1H0Yb7Rw4MCTt9Z8U,12114
 pingmapper/gui_main.py,sha256=4mWQDt0qJ-VaQnUQkbYlBiHTIdaVRMh1n5ULkEpRXbQ,34308
-pingmapper/main_mapSubstrate.py,sha256=XfjWeI77JeSc0Z64ktwAe4_Bo9yx6FnjANyDnzp1dZI,20991
-pingmapper/main_readFiles.py,sha256=FScvLChVQIjlicX1yzr263rad71ECojS1hz9MiEAKaA,53036
-pingmapper/main_rectify.py,sha256=k3XA3DEsUp_WZ9J7ugguXqmQjVCCTBhZvm73_UBuJiI,19468
-pingmapper/mosaic_substrate.py,sha256=KEIu4Os8ax9fYYqejphO1suhrZwZ6Cd9i4H5t9Bk9NA,966
+pingmapper/main_mapSubstrate.py,sha256=obzB_uM0N8z7C0DJFsk1HGaFWd7g_U5Ejghdxey86u0,21073
+pingmapper/main_readFiles.py,sha256=R2xzNIoAQOmXAnGiGkiq8h7MxNDAIX6hnKs9YB86EAg,53292
+pingmapper/main_rectify.py,sha256=fQMd09RbvkTOQ3l_fKYg1mZn7egMtuPJkG8-rN0iT4A,19589
 pingmapper/test_PINGMapper.py,sha256=ZdVPHTlJFAR_JMnY-kzJe3WeIY6Dukb7Apy4InBFpUI,13986
 pingmapper/test_time.py,sha256=uHT0mtLDP1J6w-snoELyk4UzZ2LrDeF6jGgJJVloalg,750
-pingmapper/version.py,sha256=5qNn46yLWlQWULkaH44HvigjOMJ2sqekprJW6UxbbCg,21
-pingmapper-4.2.6.data/data/pingmapper_config/default_params.json,sha256=YA9Rx1PSdUy4cTq-vtKORo3nNLisCYNOeUBxClldmHs,1285
-pingmapper-4.2.6.dist-info/licenses/LICENSE,sha256=lowDp_th1CGR0Z224a-jYRi-oNFe_0fdldL3USXhX-k,1095
-pingmapper-4.2.6.dist-info/METADATA,sha256=9NxxFRheLBRDFgPanF02e7D-rhijnsGh7cc0_RJl2EU,9173
-pingmapper-4.2.6.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-pingmapper-4.2.6.dist-info/top_level.txt,sha256=RlV4sDoE3uIIDzNMOjN2t012Ia_jsblNVojJvg4q84w,11
-pingmapper-4.2.6.dist-info/RECORD,,
+pingmapper/version.py,sha256=ltynC5U5URkV3Hq3VGLUkBudnSS6yOSDZUICYCTmB0U,21
+pingmapper-4.2.8.data/data/pingmapper_config/default_params.json,sha256=YA9Rx1PSdUy4cTq-vtKORo3nNLisCYNOeUBxClldmHs,1285
+pingmapper-4.2.8.dist-info/licenses/LICENSE,sha256=lowDp_th1CGR0Z224a-jYRi-oNFe_0fdldL3USXhX-k,1095
+pingmapper-4.2.8.dist-info/METADATA,sha256=Gw7rghv0FyidtHm4SRh9s1dB0wbsJRT0DV-CS7ayJIU,9173
+pingmapper-4.2.8.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+pingmapper-4.2.8.dist-info/top_level.txt,sha256=RlV4sDoE3uIIDzNMOjN2t012Ia_jsblNVojJvg4q84w,11
+pingmapper-4.2.8.dist-info/RECORD,,

{pingmapper-4.2.6.dist-info → pingmapper-4.2.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.1.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pingmapper/mosaic_substrate.py

@@ -1,27 +0,0 @@
-
-
-
-from osgeo import gdal
-
-
-
-resampleAlg = 'nearest'
-overview = False
-inVrt = r'D:\redbo_science\projects\GulfSturgeonProject_2025\ProcessedData\Raw\PRL_438_395_20210304_FWSB1_Rec00008_2025\substrate\map_substrate_mosaic\PRL_438_395_20210304_FWSB1_Rec00008_2025_map_substrate_raster_mosaic_0_copy.vrt'
-outRast = r'D:\redbo_science\projects\GulfSturgeonProject_2025\ProcessedData\Raw\PRL_438_395_20210304_FWSB1_Rec00008_2025\substrate\map_substrate_mosaic\PRL_438_395_20210304_FWSB1_Rec00008_2025_map_substrate.tif'
-
- # Create GeoTiff from vrt
-ds = gdal.Open(inVrt)
-
-kwargs = {'format': 'GTiff',
-            'creationOptions': ['NUM_THREADS=ALL_CPUS', 'COMPRESS=LZW', 'TILED=YES']
-            }
-
-# Create geotiff
-gdal.Translate(outRast, ds, **kwargs)
-
-# Generate overviews
-if overview:
-    dest = gdal.Open(outRast, 1)
-    gdal.SetConfigOption('COMPRESS_OVERVIEW', 'DEFLATE')
-    dest.BuildOverviews('nearest', [2 ** j for j in range(1,10)])