pingmapper 4.2.12__py3-none-any.whl → 4.2.13__py3-none-any.whl

pingmapper/class_rectObj.py

@@ -36,8 +36,13 @@ SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 PACKAGE_DIR = os.path.dirname(SCRIPT_DIR)
 sys.path.append(PACKAGE_DIR)
 
+# # For depug
+# from funcs_common import *
+# from class_sonObj import sonObj
+
 from pingmapper.funcs_common import *
 from pingmapper.class_sonObj import sonObj
+
 from osgeo import gdal, ogr, osr
 from osgeo_utils.gdal_sieve import gdal_sieve
 from scipy.interpolate import splprep, splev
@@ -1366,11 +1371,11 @@ class rectObj(sonObj):
 
         pix_m = self.pixM # Get pixel size
 
-        xPixMax, yPixMax = df[xPix].max().astype(int), df[yPix].max().astype(int)
+        xPixMax, yPixMax = int(df[xPix].max()), int(df[yPix].max())
 
         # Get extent of chunk
-        xMin, xMax = df[xCoord].min().astype(int), df[xCoord].max().astype(int)
-        yMin, yMax = df[yCoord].min().astype(int), df[yCoord].max().astype(int)
+        xMin, xMax = int(df[xCoord].min()), int(df[xCoord].max())
+        yMin, yMax = int(df[yCoord].min()), int(df[yCoord].max())
 
         # Setup outupt array
         # Determine output shape dimensions

pingmapper/class_sonObj.py

@@ -741,6 +741,14 @@ class sonObj(object):
         for i in range(len(self.headIdx)):
             if ~np.isnan(self.headIdx[i]):
                 ping_len = min(self.pingCnt[i].astype(int), self.pingMax)
+
+
+                # #### Do not commit!!!!
+                # # if self.beamName == 'ss_star' or self.beamName == 'ss_port':
+                # #     ping_len *= 2
+                if not self.son8bit:
+                    ping_len *= 2
+
                 headIDX = self.headIdx[i].astype(int)
                 son_offset = self.son_offset[i].astype(int)
                 # pingIdx = headIDX + self.headBytes # Determine byte offset to sonar returns
@@ -755,7 +763,13 @@ class sonObj(object):
                     buffer = buffer[::-1]
 
                 # Read the data
-                dat = np.frombuffer(buffer, dtype='>u1')
+                if self.son8bit:# and self.beamName != 'ss_star' and self.beamName != 'ss_port':
+                    dat = np.frombuffer(buffer, dtype='>u1')
+                else:
+                    try:
+                        dat = np.frombuffer(buffer, dtype='>u2')
+                    except:
+                        dat = np.frombuffer(buffer[:-1], dtype='>u2')
 
                 try:
                     sonDat[:ping_len, i] = dat
@@ -764,7 +778,7 @@ class sonObj(object):
                     sonDat[:ping_len, i] = dat
         
         file.close()
-        self.sonDat = sonDat
+        self.sonDat = sonDat.astype(np.uint8)
         return
 
     # ======================================================================

pingmapper/gui_main.py

@@ -80,6 +80,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 *.RSD *.svlog") ), 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

pingmapper/main_readFiles.py

@@ -50,9 +50,9 @@ from doodleverse_utils.imports import *
 
 from scipy.signal import savgol_filter
 
-# sys.path.insert(0, r'C:\Users\cbodine\PythonRepos\PINGVerter')
+# sys.path.insert(0, r'Z:\UDEL\PythonRepos\PINGVerter')
 
-from pingverter import hum2pingmapper, low2pingmapper, cerul2pingmapper
+from pingverter import hum2pingmapper, low2pingmapper, cerul2pingmapper#, gar2pingmapper
 
 import cv2
 
@@ -326,15 +326,26 @@ def read_master_func(logfilename='',
     elif file_type == '.sl2' or file_type == '.sl3':
         sonar_obj = low2pingmapper(inFile, projDir, nchunk, tempC, exportUnknown)
 
+    # # Prepare Garmin file for PINGMapper
+    # elif file_type == '.RSD':
+    #     sonar_obj = gar2pingmapper(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
 
+    # Unknown
+    else:
+        print('\n\nERROR!\n\nFile type {} not supported at this time.'.format(file_type))
+        sys.exit()
+
     ####################
     # Create son objects
     ####################
 
+    # print(sonar_obj)
+
     # Get available beams and metadata
     beamMeta = sonar_obj.beamMeta
 
@@ -360,6 +371,13 @@ def read_master_func(logfilename='',
         son.isOnix = sonar_obj.isOnix
         son.trans = sonar_obj.trans
         son.humDat = sonar_obj.humDat
+        # if son.beamName == 'ss_port' or son.beamName == 'ss_star':
+        #     son.son8bit = sonar_obj.son8bit
+        # else:
+        son.son8bit = sonar_obj.son8bit
+
+        # print(son.beamName, son.son8bit)
+
 
         if pix_res_son == 0:
             son.pix_res_son = 0

pingmapper/main_rectify.py

@@ -44,10 +44,10 @@ sys.path.append(PACKAGE_DIR)
 # from class_portstarObj import portstarObj
 # from funcs_rectify import smoothTrackline
 
-# from pingmapper.funcs_common import *
-# from pingmapper.class_rectObj import rectObj
-# from pingmapper.class_portstarObj import portstarObj
-# from pingmapper.funcs_rectify import smoothTrackline
+from pingmapper.funcs_common import *
+from pingmapper.class_rectObj import rectObj
+from pingmapper.class_portstarObj import portstarObj
+from pingmapper.funcs_rectify import smoothTrackline
 
 import inspect
 
@@ -418,7 +418,7 @@ def rectify_master_func(logfilename='',
             print('\n\tExporting', len(chunks), 'GeoTiffs for', son.beamName)
             # for i in chunks:
             #     son._rectSonRubber(i, filter, cog, wgs=False)
-            #     sys.exit()
+            #     # sys.exit()
             Parallel(n_jobs= np.min([len(chunks), threadCnt]))(delayed(son._rectSonRubber)(i, filter, cog, wgs=False) for i in tqdm(range(len(chunks))))
             son._cleanup()
             gc.collect()

pingmapper/version.py

@@ -1 +1 @@
-__version__ = '4.2.12'
+__version__ = '4.2.13'

{pingmapper-4.2.12.dist-info → pingmapper-4.2.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 4.2.12
+Version: 4.2.13
 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.12.dist-info → pingmapper-4.2.13.dist-info}/RECORD

@@ -2,21 +2,21 @@ 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/class_rectObj.py,sha256=6i0w5S13NDWZmI9gT0EY_j5noQYZKFvN3biupISzfEM,90939
+pingmapper/class_sonObj.py,sha256=sanRxSTeluW6zTdtn1lsUsjbRvKwNMkNJwXvJl7A1t8,74818
 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=w9E9pHjXLTzeu8rt1iohcMxGxR1ot8O_G6prHRW13bc,34509
+pingmapper/gui_main.py,sha256=hGe8mhANkWMdwLkRmutEW7M209mKyU5GemsIVJ3Do_4,34672
 pingmapper/main_mapSubstrate.py,sha256=obzB_uM0N8z7C0DJFsk1HGaFWd7g_U5Ejghdxey86u0,21073
-pingmapper/main_readFiles.py,sha256=vUKP44xnuza0sRcsyfkB2jOtYwR2tlkgYMnSdThgHuI,53861
-pingmapper/main_rectify.py,sha256=npSnzyNtGgVaeHN7IAzuufjzkttFA46buEm_g-I-QRY,19877
+pingmapper/main_readFiles.py,sha256=1XsV63LG2F164P9k5Ys4pr_DLDMlmc29p5d74lCIXZw,54421
+pingmapper/main_rectify.py,sha256=ctYi5rhwCT71_LAIBgSXb9xE55_Pepi6HKX79KksVRg,19871
 pingmapper/test_PINGMapper.py,sha256=-SYMsdK-tTodXp5dCFSWPn-KRN7-OjX6OwjQ2-8hQg0,14176
 pingmapper/test_time.py,sha256=ZdlaA9ODWgFYi63Jjz0byP6aLV7E9QTQYf0BGfa7SaY,859
-pingmapper/version.py,sha256=-FYI3q0s14GXAZBzWvNE0NIBQuGXxXwo7zf0FXvGBuU,22
-pingmapper-4.2.12.data/data/pingmapper_config/default_params.json,sha256=YA9Rx1PSdUy4cTq-vtKORo3nNLisCYNOeUBxClldmHs,1285
-pingmapper-4.2.12.dist-info/licenses/LICENSE,sha256=lowDp_th1CGR0Z224a-jYRi-oNFe_0fdldL3USXhX-k,1095
-pingmapper-4.2.12.dist-info/METADATA,sha256=FlnDfiiB1K0WNOIbxdckLmSCv6rsHV5BmtJcma9jCR8,9174
-pingmapper-4.2.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pingmapper-4.2.12.dist-info/top_level.txt,sha256=RlV4sDoE3uIIDzNMOjN2t012Ia_jsblNVojJvg4q84w,11
-pingmapper-4.2.12.dist-info/RECORD,,
+pingmapper/version.py,sha256=VpzLn7R_Sqxrg6oLvamIsCR5fARsZEwfGw6LNip5bmU,22
+pingmapper-4.2.13.data/data/pingmapper_config/default_params.json,sha256=YA9Rx1PSdUy4cTq-vtKORo3nNLisCYNOeUBxClldmHs,1285
+pingmapper-4.2.13.dist-info/licenses/LICENSE,sha256=lowDp_th1CGR0Z224a-jYRi-oNFe_0fdldL3USXhX-k,1095
+pingmapper-4.2.13.dist-info/METADATA,sha256=zKNEHXoKQCfDFiBQHE-vDqMMBmCupOkaVTZ-Q-vdg5w,9174
+pingmapper-4.2.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pingmapper-4.2.13.dist-info/top_level.txt,sha256=RlV4sDoE3uIIDzNMOjN2t012Ia_jsblNVojJvg4q84w,11
+pingmapper-4.2.13.dist-info/RECORD,,