pingmapper 4.2.9__tar.gz → 4.2.11__tar.gz

{pingmapper-4.2.9 → pingmapper-4.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 4.2.9
+Version: 4.2.11
 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.9 → pingmapper-4.2.11}/pingmapper/gui_main.py

@@ -73,7 +73,7 @@ def gui(batch: bool):
         text_input = sg.Text('Recording to Process')
         # in_input = sg.In(key='inFile', size=(80,1))
         in_input = sg.In(key='inFile', size=(80,1), default_text=default_params['inFile'])
-        browse_input = sg.FileBrowse(file_types=(("Sonar File", "*.DAT *.sl2 *.sl3") ), initial_folder=os.path.dirname(default_params['inFile']))
+        browse_input = sg.FileBrowse(file_types=(("Sonar File", "*.DAT *.sl2 *.sl3 *.svlog") ), initial_folder=os.path.dirname(default_params['inFile']))
 
     # Add to layout
     layout.append([text_io])

{pingmapper-4.2.9 → pingmapper-4.2.11}/pingmapper/main_readFiles.py

@@ -36,6 +36,11 @@ 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
+
 from pingmapper.funcs_common import *
 from pingmapper.class_sonObj import sonObj
 from pingmapper.class_portstarObj import portstarObj
@@ -46,7 +51,7 @@ from scipy.signal import savgol_filter
 
 # sys.path.insert(0, r'C:\Users\cbodine\PythonRepos\PINGVerter')
 
-from pingverter import hum2pingmapper, low2pingmapper
+from pingverter import hum2pingmapper, low2pingmapper, cerul2pingmapper
 
 import cv2
 
@@ -246,6 +251,11 @@ def read_master_func(logfilename='',
     |     |          water column present (wcp)
     '''
 
+    #####################################
+    # Show version
+    from pingmapper.version import __version__
+    print("\nPING-Mapper v{}".format(__version__))
+
 
     #####################################
     # Download models if they don't exist
@@ -315,6 +325,11 @@ def read_master_func(logfilename='',
     elif file_type == '.sl2' or file_type == '.sl3':
         sonar_obj = low2pingmapper(inFile, projDir, nchunk, tempC, exportUnknown)
 
+    # Prepare Cerulean file for PINGMapper
+    elif file_type == '.svlog':
+        sonar_obj = cerul2pingmapper(inFile, projDir, nchunk, tempC, exportUnknown)
+        detectDep = 1 # No depth in cerulean files, so set to Zheng et al. 2021
+
     ####################
     # Create son objects
     ####################

{pingmapper-4.2.9 → pingmapper-4.2.11}/pingmapper/main_rectify.py

@@ -262,6 +262,10 @@ def rectify_master_func(logfilename='',
     # Smooth Trackline                                                         #
     ############################################################################
 
+    # Must use COG for rubber sheeting
+    if rubberSheeting:
+        rectMethod = 'COG'
+
     cog=True
     if rectMethod != 'COG':
         cog=False

{pingmapper-4.2.9 → pingmapper-4.2.11}/pingmapper/test_PINGMapper.py

@@ -38,6 +38,12 @@ 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
+
 from pingmapper.funcs_common import *
 from pingmapper.main_readFiles import read_master_func
 from pingmapper.main_rectify import rectify_master_func
@@ -177,7 +183,7 @@ def test(ds):
     ## 2==Auto detect depth w/ Thresholding
 
     smthDep = True #Smooth depth before water column removal
-    adjDep = 10 #Aditional depth adjustment (in pixels) for water column removaL
+    adjDep = 0 #Aditional depth adjustment (in meters) for water column removaL
     pltBedPick = True #Plot bedpick on sonogram
 
 

pingmapper-4.2.11/pingmapper/version.py

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

{pingmapper-4.2.9 → pingmapper-4.2.11}/pingmapper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 4.2.9
+Version: 4.2.11
 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.9/pingmapper/version.py

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