pingmapper 4.2.9__py3-none-any.whl → 4.2.11__py3-none-any.whl

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/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/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/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/version.py

@@ -1 +1 @@
-__version__ = '4.2.9'
+__version__ = '4.2.11'

{pingmapper-4.2.9.dist-info → pingmapper-4.2.11.dist-info}/METADATA

@@ -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.11.dist-info/RECORD

@@ -0,0 +1,22 @@
+pingmapper/__init__.py,sha256=8zLGg-DfQhnDl2Ky0n-zXpN-8e-g7iR0AcaI4l4Vvpk,32
+pingmapper/__main__.py,sha256=6qBbTK3eg_Er2SlUgBUaR0CBrJCKB9P2dpJaq2y5y3g,1421
+pingmapper/class_mapSubstrateObj.py,sha256=FXw61jZ2Fnpk74vZl4PT0ijlN9gz1S-kIf8RyyrrI1Y,36785
+pingmapper/class_portstarObj.py,sha256=1jFyKUXVL_0rzCA0sQREiCS9qp0ZQqPshOIk0XHcknM,105527
+pingmapper/class_rectObj.py,sha256=GV14tTFHc_2XCLTZ-niVDMU3ohH9puHVqWgtjndMW4M,90897
+pingmapper/class_sonObj.py,sha256=jxo_QBtYJmM9oJlxPfcKutc_8HkEj1hBdP5F6-61Mz8,74242
+pingmapper/funcs_common.py,sha256=pCOIy83srtYKtKUnF4oXkd83_kimZI0NiSrO0TE0O4g,13414
+pingmapper/funcs_model.py,sha256=dO9J4-0s1COggHkSUqHFC1qKTs20A6PSvkDqXWMUT6A,7916
+pingmapper/funcs_rectify.py,sha256=Goh5Yon_qP93dLjq8Vv_qezPxw1H0Yb7Rw4MCTt9Z8U,12114
+pingmapper/gui_main.py,sha256=91HAQP-o1EWxvTdW3Sv4eYJcDiSGYp_U7pQ9f_ZJ7Z8,34316
+pingmapper/main_mapSubstrate.py,sha256=obzB_uM0N8z7C0DJFsk1HGaFWd7g_U5Ejghdxey86u0,21073
+pingmapper/main_readFiles.py,sha256=G435bPsfTMt-YC3PKYiu6dW5773C6qhjDBuXRzb764c,53859
+pingmapper/main_rectify.py,sha256=df6cRODvLRVYWsWHE-g6Kk5JBihtWj5NHHcc6w0jkHM,19681
+pingmapper/test_PINGMapper.py,sha256=-SYMsdK-tTodXp5dCFSWPn-KRN7-OjX6OwjQ2-8hQg0,14176
+pingmapper/test_time.py,sha256=uHT0mtLDP1J6w-snoELyk4UzZ2LrDeF6jGgJJVloalg,750
+pingmapper/version.py,sha256=wVA9FQiVBAtgizy42u87ZKjWF0ms1HV6fR3Wfq-_58o,22
+pingmapper-4.2.11.data/data/pingmapper_config/default_params.json,sha256=YA9Rx1PSdUy4cTq-vtKORo3nNLisCYNOeUBxClldmHs,1285
+pingmapper-4.2.11.dist-info/licenses/LICENSE,sha256=lowDp_th1CGR0Z224a-jYRi-oNFe_0fdldL3USXhX-k,1095
+pingmapper-4.2.11.dist-info/METADATA,sha256=GE0vG0B6xkn45kPVVqgAviVr8dbyzCHV8eCPa1MTYMY,9174
+pingmapper-4.2.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pingmapper-4.2.11.dist-info/top_level.txt,sha256=RlV4sDoE3uIIDzNMOjN2t012Ia_jsblNVojJvg4q84w,11
+pingmapper-4.2.11.dist-info/RECORD,,

{pingmapper-4.2.9.dist-info → pingmapper-4.2.11.dist-info}/WHEEL

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

pingmapper-4.2.9.dist-info/RECORD

@@ -1,22 +0,0 @@
-pingmapper/__init__.py,sha256=8zLGg-DfQhnDl2Ky0n-zXpN-8e-g7iR0AcaI4l4Vvpk,32
-pingmapper/__main__.py,sha256=6qBbTK3eg_Er2SlUgBUaR0CBrJCKB9P2dpJaq2y5y3g,1421
-pingmapper/class_mapSubstrateObj.py,sha256=FXw61jZ2Fnpk74vZl4PT0ijlN9gz1S-kIf8RyyrrI1Y,36785
-pingmapper/class_portstarObj.py,sha256=1jFyKUXVL_0rzCA0sQREiCS9qp0ZQqPshOIk0XHcknM,105527
-pingmapper/class_rectObj.py,sha256=GV14tTFHc_2XCLTZ-niVDMU3ohH9puHVqWgtjndMW4M,90897
-pingmapper/class_sonObj.py,sha256=jxo_QBtYJmM9oJlxPfcKutc_8HkEj1hBdP5F6-61Mz8,74242
-pingmapper/funcs_common.py,sha256=pCOIy83srtYKtKUnF4oXkd83_kimZI0NiSrO0TE0O4g,13414
-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=obzB_uM0N8z7C0DJFsk1HGaFWd7g_U5Ejghdxey86u0,21073
-pingmapper/main_readFiles.py,sha256=MexJce9Ztsrgyd_3Z26dCTCY58KKLuRf3hIV9U2EGy0,53304
-pingmapper/main_rectify.py,sha256=2XsEOqog5HOFjeeiUcY9Sq_Y74F04uEkUxbkEbGnCb8,19587
-pingmapper/test_PINGMapper.py,sha256=ZdVPHTlJFAR_JMnY-kzJe3WeIY6Dukb7Apy4InBFpUI,13986
-pingmapper/test_time.py,sha256=uHT0mtLDP1J6w-snoELyk4UzZ2LrDeF6jGgJJVloalg,750
-pingmapper/version.py,sha256=yvHjVLLVx-JPb9M_ofUHXpjA6rtcCDGAGn6ykTlRppw,21
-pingmapper-4.2.9.data/data/pingmapper_config/default_params.json,sha256=YA9Rx1PSdUy4cTq-vtKORo3nNLisCYNOeUBxClldmHs,1285
-pingmapper-4.2.9.dist-info/licenses/LICENSE,sha256=lowDp_th1CGR0Z224a-jYRi-oNFe_0fdldL3USXhX-k,1095
-pingmapper-4.2.9.dist-info/METADATA,sha256=I8l4_cnALCJZdzDHreS2BJf4kDo4JVVW-BO9n5OMjQQ,9173
-pingmapper-4.2.9.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-pingmapper-4.2.9.dist-info/top_level.txt,sha256=RlV4sDoE3uIIDzNMOjN2t012Ia_jsblNVojJvg4q84w,11
-pingmapper-4.2.9.dist-info/RECORD,,