pingmapper 5.0.15__tar.gz → 5.0.17__tar.gz

{pingmapper-5.0.15 → pingmapper-5.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 5.0.15
+Version: 5.0.17
 Summary: Open-source interface for processing recreation-grade side scan sonar datasets and reproducibly mapping benthic habitat
 Author: Cameron Bodine, Daniel Buscombe
 Author-email: bodine.cs@gmail.email

{pingmapper-5.0.15 → pingmapper-5.0.17}/pingmapper/class_sonObj.py

@@ -1453,104 +1453,6 @@ class sonObj(object):
 
         return
 
-    # ======================================================================
-    def _exportMovWin(self,
-                      i : int,
-                      stride : int,
-                      tileType: list,
-                      pingMax: int,
-                      depMax: int):
-        
-        '''
-        '''
-
-        # Set chunk index
-        a_idx = i-1
-        b_idx = i
-
-        # Iterate each tile type
-        for t in tileType:
-            if t == 'wco':
-                cropMax = depMax
-            else:
-                cropMax = pingMax
-            inDir = os.path.join(self.outDir, t)
-            outDir = os.path.join(self.outDir, t+'_mw')
-
-            if not os.path.exists(outDir):
-                try:
-                    os.mkdir(outDir)
-                except:
-                    pass
-
-            # Find the images
-            images = os.listdir(inDir)
-            images.sort()
-
-            # Get each image
-            a_img = images[a_idx]
-            b_img = images[b_idx]
-
-            # Get image name
-            img_name = a_img.split('.')[0]
-
-            # Open each image
-            a_img = imread(os.path.join(inDir, a_img))
-            b_img = imread(os.path.join(inDir, b_img))
-
-            def resize_to_pingMax(img, cropMax):
-                ndims = img.ndim
-                current_size = img.shape[0]
-                if current_size < cropMax:
-                    # Pad with zeros 
-                    if ndims == 2:
-                        padding = ((0, cropMax - current_size), (0, 0))
-                    else:
-                        padding = ((0, cropMax - current_size), (0, 0), (0,0))
-                    resized_img = np.pad(img, padding, mode='constant', constant_values=0)
-                elif current_size > cropMax:
-                    # Truncate the array
-                    resized_img = img[:cropMax, :]
-                else:
-                    # No change needed
-                    resized_img = img
-                return resized_img
-
-            # Resize a_img and b_img
-            a_img = resize_to_pingMax(a_img, cropMax)
-            b_img = resize_to_pingMax(b_img, cropMax)
-
-            # Set stride based on first image
-            # stride = int(round(a_img.shape[1] * stride, 0))
-            if stride == 0:
-                to_stride = 1
-            else:
-                to_stride = int(round(self.nchunk * stride, 0))
-
-            # Set window size based on first image
-            # winSize = a_img.shape[1]
-            winSize = self.nchunk
-
-            # Concatenate images
-            movWin = np.concatenate((a_img, b_img), axis=1)
-
-            # Last window idx
-            lastWinIDX = self.nchunk
-
-            win = 0
-            # Iterate each window
-            while win < lastWinIDX:
-                window = movWin[:, win:win+winSize]
-
-                zero = self._addZero(win)
-
-                # Save window
-                imsave(os.path.join(outDir, img_name+'_'+zero+str(win)+'.jpg'), window)
-
-                win += to_stride
-
-        return
-
 
     
     ############################################################################

{pingmapper-5.0.15 → pingmapper-5.0.17}/pingmapper/main_mapSubstrate.py

@@ -79,8 +79,6 @@ def map_master_func(logfilename='',
                     mask_wc=False,
                     spdCor=False,
                     maxCrop=False,
-                    moving_window=False,
-                    window_stride=0.1,
                     USE_GPU=False,
                     remShadow=0,
                     detectDep=0,

{pingmapper-5.0.15 → pingmapper-5.0.17}/pingmapper/main_readFiles.py

@@ -116,8 +116,6 @@ def read_master_func(logfilename='',
                      mask_wc=False,
                      spdCor=False,
                      maxCrop=False,
-                     moving_window=False,
-                     window_stride=0.1,
                      USE_GPU=False,
                      remShadow=0,
                      detectDep=0,
@@ -551,14 +549,14 @@ def read_master_func(logfilename='',
         del son
 
 
-        # If Onix, need to store self._trans in object
-        if sonObjs[0].isOnix:
-            for son in sonObjs:
-                son._loadSonMeta()
-                utm_e=son.sonMetaDF.iloc[0]['utm_e']
-                utm_n=son.sonMetaDF.iloc[0]['utm_n']
-                son._getEPSG(utm_e, utm_n)
-            del son
+        # # If Onix, need to store self._trans in object
+        # if sonObjs[0].isOnix:
+        #     for son in sonObjs:
+        #         son._loadSonMeta()
+        #         utm_e=son.sonMetaDF.iloc[0]['utm_e']
+        #         utm_n=son.sonMetaDF.iloc[0]['utm_n']
+        #         son._getEPSG(utm_e, utm_n)
+        #     del son
 
 
     else:
@@ -1469,83 +1467,6 @@ def read_master_func(logfilename='',
                 #     son._exportTilesSpd(i, tileFile=imgType, spdCor=spdCor, mask_shdw=mask_shdw, maxCrop=maxCrop)
                 #     sys.exit()
 
-                if moving_window and not spdCor:
-
-                    # Crop all images to most common range
-                    son._loadSonMeta()
-                    sDF = son.sonMetaDF
-                    
-                    rangeCnt = np.unique(sDF['ping_cnt'], return_counts=True)
-                    pingMaxi = np.argmax(rangeCnt[1])
-                    pingMax = int(rangeCnt[0][pingMaxi])
-
-                    depCnt = np.unique(sDF['dep_m'], return_counts=True)
-                    depMaxi = np.argmax(depCnt[1])
-                    depMax = int(depCnt[0][depMaxi]/sDF['pixM'][0])
-                    depMax += 50
-
-
-                    # Remove first chunk
-                    chunks.sort()
-                    chunks = chunks[1:]
-
-                    # Get types of files exported
-                    tileType = []
-                    if son.wcp:
-                        tileType.append('wcp')
-                    if son.wcm:
-                        tileType.append('wcm')
-                    if son.wcr_src:
-                        tileType.append('src')
-                    if son.wco:
-                        tileType.append('wco')
-
-                    Parallel(n_jobs= np.min([len(chunks), threadCnt]))(delayed(son._exportMovWin)(i, stride=window_stride, tileType=tileType, pingMax=pingMax, depMax=depMax) for i in tqdm(chunks))
-
-                    # son._exportMovWin(chunks, 
-                    #                   stride=window_stride, 
-                    #                   tileType=tileType)
-
-                    for t in tileType:
-                        shutil.rmtree(os.path.join(son.outDir, t))
-
-                    # Create a movie
-                    if tileFile == '.mp4' and moving_window and not spdCor:
-                        for t in tileType:
-                            inDir = os.path.join(son.outDir, t+'_mw')
-
-                            imgs = os.listdir(inDir)
-                            imgs.sort()
-
-                            frame = cv2.imread(os.path.join(inDir, imgs[0]))
-                            height, width, layers = frame.shape
-
-                            outName = '_'.join(imgs[0].split('_')[:-2])
-                            vidPath = os.path.join(inDir, outName+tileFile)
-
-                            video = cv2.VideoWriter(vidPath, cv2.VideoWriter_fourcc(*'mp4v'), 3, (width, height))
-                            for image in imgs:
-                                frame = cv2.imread(os.path.join(inDir, image))
-
-                                # Pad end
-                                if frame.shape[1] < nchunk:
-                                    n_dims = frame.ndim
-                                    if n_dims == 2:
-                                        padding = ((0,0), (0, nchunk-frame.shape[1]))
-                                    else:
-                                        padding = ((0,0), (0, nchunk-frame.shape[1]), (0,0))
-                                    frame = np.pad(frame, padding, mode='constant', constant_values=0)
-
-                                video.write(frame)
-
-                            video.release()
-
-                            # Removs
-                            for image in imgs:
-                                os.remove(os.path.join(inDir, image))
-
-                            # shutil.rmtree(os.path.join(son.outDir, t))
-
                 son._pickleSon()
 
 

{pingmapper-5.0.15 → pingmapper-5.0.17}/pingmapper/main_rectify.py

@@ -84,8 +84,6 @@ def rectify_master_func(logfilename='',
                         mask_wc=False,
                         spdCor=False,
                         maxCrop=False,
-                        moving_window=False,
-                        window_stride=0.1,
                         USE_GPU=False,
                         remShadow=0,
                         detectDep=0,

pingmapper-5.0.17/pingmapper/version.py

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

{pingmapper-5.0.15 → pingmapper-5.0.17}/pingmapper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingmapper
-Version: 5.0.15
+Version: 5.0.17
 Summary: Open-source interface for processing recreation-grade side scan sonar datasets and reproducibly mapping benthic habitat
 Author: Cameron Bodine, Daniel Buscombe
 Author-email: bodine.cs@gmail.email

pingmapper-5.0.15/pingmapper/version.py

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