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

pingmapper/class_rectObj.py

@@ -617,7 +617,7 @@ class rectObj(sonObj):
         if cog:
             self._interpRangeCoords(filt)
         else:
-            sDF = sDF[['record_num', 'chunk_id', 'ping_cnt', 'time_s', 'lons', 'lats', 'utm_es', 'utm_ns', 'instr_heading', 'cog', 'dep_m', 'range', 'range_lon', 'range_lat', 'range_e', 'range_n', ping_bearing]].copy()
+            sDF = sDF[['record_num', 'chunk_id', 'ping_cnt', 'time_s', 'lons', 'lats', 'utm_es', 'utm_ns', 'instr_heading', 'cog', 'dep_m', 'range', 'range_lon', 'range_lat', 'range_e', 'range_n', ping_bearing, 'transect']].copy()
             sDF.rename(columns={'lons': 'trk_lons', 'lats': 'trk_lats', 'utm_es': 'trk_utm_es', 'utm_ns': 'trk_utm_ns', 'cog': 'trk_cog', 'range_lat':'range_lats', 'range_lon':'range_lons', 'range_e':'range_es', 'range_n':'range_ns'}, inplace=True)
             sDF['chunk_id_2'] = sDF.index.astype(int)
 

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

@@ -46,7 +46,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
 
@@ -315,6 +315,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
     ####################
@@ -357,7 +362,7 @@ def read_master_func(logfilename='',
         son.sonMetaFile = meta['metaCSV']
 
         if sonFiles:
-            if son.beamName in sonFiles:
+            if any(son.beam in s for s in sonFiles):
                 sonObjs.append(son)
             else:
                 pass

pingmapper/main_rectify.py

@@ -262,8 +262,12 @@ def rectify_master_func(logfilename='',
     # Smooth Trackline                                                         #
     ############################################################################
 
+    # Must use COG for rubber sheeting
+    if rubberSheeting:
+        rectMethod = 'COG'
+
     cog=True
-    if 'rectMethod' != 'COG':
+    if rectMethod != 'COG':
         cog=False
 
     smthTrkFilenames = smoothTrackline(projDir=projDir, x_offset=x_offset, y_offset=y_offset, nchunk=nchunk, cog=cog, threadCnt=threadCnt)

pingmapper/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 4.2.8
+Version: 4.2.10
 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.10.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=rsu9S1UDyVpHQl1frWAa6B8ka05zmRqWmAQbKQzjUOw,53567
+pingmapper/main_rectify.py,sha256=df6cRODvLRVYWsWHE-g6Kk5JBihtWj5NHHcc6w0jkHM,19681
+pingmapper/test_PINGMapper.py,sha256=ZdVPHTlJFAR_JMnY-kzJe3WeIY6Dukb7Apy4InBFpUI,13986
+pingmapper/test_time.py,sha256=uHT0mtLDP1J6w-snoELyk4UzZ2LrDeF6jGgJJVloalg,750
+pingmapper/version.py,sha256=v3f4Iuo4qROiPylZKniXkSoF0x5vI58duORwnHGs0n4,22
+pingmapper-4.2.10.data/data/pingmapper_config/default_params.json,sha256=YA9Rx1PSdUy4cTq-vtKORo3nNLisCYNOeUBxClldmHs,1285
+pingmapper-4.2.10.dist-info/licenses/LICENSE,sha256=lowDp_th1CGR0Z224a-jYRi-oNFe_0fdldL3USXhX-k,1095
+pingmapper-4.2.10.dist-info/METADATA,sha256=c4HICHLroMW4dkAsbB5SgMNoeld7tS_OCurbvIk-g7k,9174
+pingmapper-4.2.10.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+pingmapper-4.2.10.dist-info/top_level.txt,sha256=RlV4sDoE3uIIDzNMOjN2t012Ia_jsblNVojJvg4q84w,11
+pingmapper-4.2.10.dist-info/RECORD,,

pingmapper-4.2.8.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=2HCmaZ_8PG92305tJmkB0V8oSYCCJxOE58iz1GUpiPc,90885
-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=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=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,,