pingmapper 4.2.8__tar.gz → 4.2.10__tar.gz

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

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

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

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

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

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