pingmapper 4.2.3__tar.gz → 4.2.4__tar.gz

{pingmapper-4.2.3 → pingmapper-4.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 4.2.3
+Version: 4.2.4
 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.3 → pingmapper-4.2.4}/pingmapper/class_portstarObj.py

@@ -1026,8 +1026,6 @@ class portstarObj(object):
         self._getPortStarScanChunk(i)
         mergeSon = self.mergeSon
 
-        print(mergeSon)
-
         ###################
         # Make 3-band array
         b1 = mergeSon.copy() # Band 1: no change
@@ -1640,11 +1638,6 @@ class portstarObj(object):
         self.star._loadSonMeta()
         starDF = self.star.sonMetaDF
 
-        # Add instrument depth if not present
-        if 'inst_dep_m' not in portDF.columns:
-            portDF['inst_dep_m'] = portDF['dep_m']
-            starDF['inst_dep_m'] = starDF['dep_m']
-
         portDF = portDF.loc[portDF['chunk_id'] == i, ['inst_dep_m', 'dep_m']]
         starDF = starDF.loc[starDF['chunk_id'] == i, ['inst_dep_m', 'dep_m']]
 

{pingmapper-4.2.3 → pingmapper-4.2.4}/pingmapper/class_sonObj.py

@@ -749,19 +749,13 @@ class sonObj(object):
                 file.seek(pingIdx) # Move to that location
 
                 # Get the ping
-                if self.son8bit:
-                    buffer = file.read(ping_len)
-                else:
-                    buffer = file.read(ping_len*2)
+                buffer = file.read(ping_len)
 
                 if self.flip_port:
                     buffer = buffer[::-1]
 
                 # Read the data
-                if self.son8bit:
-                    dat = np.frombuffer(buffer, dtype='>u1')
-                else:
-                    dat = np.frombuffer(buffer, dtype='>u2')
+                dat = np.frombuffer(buffer, dtype='>u1')
 
                 try:
                     sonDat[:ping_len, i] = dat
@@ -770,7 +764,7 @@ class sonObj(object):
                     sonDat[:ping_len, i] = dat
         
         file.close()
-        self.sonDat = sonDat.astype('uint8')
+        self.sonDat = sonDat
         return
 
     # ======================================================================

{pingmapper-4.2.3 → pingmapper-4.2.4}/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 *.svlog") ), initial_folder=os.path.dirname(default_params['inFile']))
+        browse_input = sg.FileBrowse(file_types=(("Sonar File", "*.DAT *.sl2 *.sl3") ), initial_folder=os.path.dirname(default_params['inFile']))
 
     # Add to layout
     layout.append([text_io])

{pingmapper-4.2.3 → pingmapper-4.2.4}/pingmapper/main_readFiles.py

@@ -44,9 +44,9 @@ from doodleverse_utils.imports import *
 
 from scipy.signal import savgol_filter
 
-sys.path.insert(0, r'Z:\UDEL\PythonRepos\PINGVerter')
+# sys.path.insert(0, r'C:\Users\cbodine\PythonRepos\PINGVerter')
 
-from pingverter import hum2pingmapper, low2pingmapper, cerul2pingmapper
+from pingverter import hum2pingmapper, low2pingmapper
 
 import cv2
 
@@ -313,11 +313,6 @@ 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
-
     ####################
     # Create son objects
     ####################
@@ -347,7 +342,6 @@ def read_master_func(logfilename='',
         son.isOnix = sonar_obj.isOnix
         son.trans = sonar_obj.trans
         son.humDat = sonar_obj.humDat
-        son.son8bit = sonar_obj.son8bit
 
         if pix_res_son == 0:
             son.pix_res_son = 0
@@ -696,7 +690,6 @@ def read_master_func(logfilename='',
             print("{:<20s} | {:<15s} | {:<15s} | {:<15s} | {:<5s}".format("Attribute", "Minimum", "Maximum", "Average", "Valid"))
             print("______________________________________________________________________________")
             for att in df.columns:
-                print(att)
 
                 # Find min/max/avg of each column
                 if (att == 'date') or (att == 'time'):
@@ -1257,9 +1250,9 @@ def read_master_func(logfilename='',
     # Export un-rectified sonar tiles                                          #
     ############################################################################
 
-    moving_window = False
+    moving_window = True
     window_stride = 0.1
-    # tileFile = '.mp4'
+    tileFile = '.mp4'
     frameRate = 5
     if tileFile == '.mp4':
         imgType = '.png'

pingmapper-4.2.4/pingmapper/version.py

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

{pingmapper-4.2.3 → pingmapper-4.2.4}/pingmapper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 4.2.3
+Version: 4.2.4
 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.3/pingmapper/version.py

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