pingmapper 4.2.6__tar.gz → 4.2.8__tar.gz

{pingmapper-4.2.6 → pingmapper-4.2.8}/PKG-INFO

@@ -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 → pingmapper-4.2.8}/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-4.2.6 → pingmapper-4.2.8}/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-4.2.6 → pingmapper-4.2.8}/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-4.2.8/pingmapper/version.py

@@ -0,0 +1 @@
+__version__ = '4.2.8'

{pingmapper-4.2.6 → pingmapper-4.2.8}/pingmapper.egg-info/PKG-INFO

@@ -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 → pingmapper-4.2.8}/pingmapper.egg-info/SOURCES.txt

@@ -15,7 +15,6 @@ pingmapper/gui_main.py
 pingmapper/main_mapSubstrate.py
 pingmapper/main_readFiles.py
 pingmapper/main_rectify.py
-pingmapper/mosaic_substrate.py
 pingmapper/test_PINGMapper.py
 pingmapper/test_time.py
 pingmapper/version.py

pingmapper-4.2.6/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)])

pingmapper-4.2.6/pingmapper/version.py

@@ -1 +0,0 @@
-__version__ = '4.2.6'