pingmapper 5.3.3__tar.gz → 5.3.5__tar.gz

{pingmapper-5.3.3 → pingmapper-5.3.5}/PKG-INFO

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

{pingmapper-5.3.3 → pingmapper-5.3.5}/pingmapper/class_portstarObj.py

@@ -2305,7 +2305,7 @@ class portstarObj(object):
                 dd = float(depth * depth)
                 row_arr = np.arange(depth, H_pred)
                 src_idx = np.round(
-                    np.sqrt(row_arr.astype(np.float64) ** 2 - dd)
+                    np.sqrt(row_arr.astype(np.float32) ** 2 - dd)
                 ).astype(int)
                 valid = src_idx < H_pred
                 rows_v = row_arr[valid]

{pingmapper-5.3.3 → pingmapper-5.3.5}/pingmapper/class_sonObj.py

@@ -1328,7 +1328,7 @@ class sonObj(object):
             row_arr = np.arange(depth, H)
             # Horizontal range index via Pythagorean theorem (vectorised)
             src_idx = np.round(
-                np.sqrt(row_arr.astype(np.float64) ** 2 - dd)
+                np.sqrt(row_arr.astype(np.float32) ** 2 - dd)
             ).astype(int)
 
             # Discard out-of-bounds indices
@@ -2919,7 +2919,7 @@ class sonObj(object):
         '''
 
         # Get sonDat
-        sonDat = self.sonDat.astype('float64')
+        sonDat = self.sonDat.astype('float32')
 
         # Create mask from zero values
         mask = np.where(sonDat == 0, 0, 1)

{pingmapper-5.3.3 → pingmapper-5.3.5}/pingmapper/class_sonObj_nadirgaptest.py

@@ -957,7 +957,7 @@ class sonObj(object):
             row_arr = np.arange(depth, H)
             # Horizontal range via Pythagorean theorem, plus nadir gap offset
             src_idx = np.round(
-                np.sqrt(row_arr.astype(np.float64) ** 2 - dd)
+                np.sqrt(row_arr.astype(np.float32) ** 2 - dd)
             ).astype(int) + nadirGap
 
             # Discard out-of-bounds indices
@@ -2356,7 +2356,7 @@ class sonObj(object):
         '''
 
         # Get sonDat
-        sonDat = self.sonDat.astype('float64')
+        sonDat = self.sonDat.astype('float32')
 
         # Create mask from zero values
         mask = np.where(sonDat == 0, 0, 1)

{pingmapper-5.3.3 → pingmapper-5.3.5}/pingmapper/funcs_common.py

@@ -443,7 +443,7 @@ def saveDefaultParams(values, user_params=None):
             return {k: _sanitize(val) for k, val in v.items()}
         if isinstance(v, (np.integer, np.int_, np.int64)):
             return int(v)
-        if isinstance(v, (np.floating, np.float64, np.float64)):
+        if isinstance(v, (np.floating, np.float32, np.float32)):
             return float(v)
         if isinstance(v, (np.ndarray, list, tuple)):
             return [_sanitize(x) for x in v]
@@ -516,7 +516,7 @@ class FastPiecewiseAffineTransform(PiecewiseAffineTransform):
             [self.affines[i].params for i in range(len(self._tesselation.simplices))]
         )
 
-        result = np.empty((n, 3), dtype=np.float64)
+        result = np.empty((n, 3), dtype=np.float32)
 
         # Process in batches to avoid large allocations in find_simplex and the
         # affine einsum, both of which scale with n_coords and can exceed several GiB.

{pingmapper-5.3.3 → pingmapper-5.3.5}/pingmapper/gui_main.py

@@ -2,11 +2,8 @@
 import sys, os
 import webbrowser
 
-PySimpleGUI_License = 'e3yAJ9MVaOWANplCbmndNNl2VwHvlCwpZTSjIl6DIjkiRGpYc53aRty8aBWpJF1qdwGLlzv9bUiHILs3Inkyxpp5Yq2OVku8cg2ZVrJ7RNCQI66bMcTLcnyKMbTRMK57OCTPMGxGNtS8whirTBGTlLjxZEWg5DzWZdUXRUlLcDGfxnv7eiWB1jlOb6nqR8WTZ2XsJVzbabW19ouWI6j0oXiKN0Si4AwtI7iFw8iGTBmtFftjZEUxZMpYcLncNk0rIJj4oyisQq2uFCtqZnXWJvvqbEiCICsSIbkC5jhKbvWTVqM2YtX6Ni0XIJjloji1QEmU9Ak5ayWp5nlnIwi3wiiOQK279ytqcKGwFGuvepS6IH6iIOiYIGs7I4kYNQ13cY33RkvIbqWkVyypSKUOQoiZO2ijIFzaMNTEAp0bNxyWI1sLIwkRRjhZdNGBVoJkcZ3MNN1yZMWTQtihOiieIYyXMDDIIF0ILaTyAt36LKTREj5JI1iYwcixRgGuFk0BZGU5VZ4dciGUl3ykZ3XtMbilOMiBIhy1M5DtId1mL6T1A935LYTLEN5iI3iJwoirR8Wa12h5a0WtxkBNZdGiRJyYZXX9N5zZI2jSoZizYpmp9YkHaIWz5YluLTmcNXzNQmGZd0twYGW6l3sALZmTNWvubcSEItsPITk6lFQgQUWZRrkfcEmAVxz0c9y7IG6sILjZEYyzO8Cf4c0WLDj3QCwSLwjPEt2BMMi0J69p854e39898f71ea82d3a530f7a6ed8a02a4eea9ffd2c7b1279074b491c71b411f392e6d726a2d2f9dbf63388356cf4e083e358fe428852d676073e128607b9ad194c15e34a4feb463a749fd3295606caa293b823d102e854cd845b79b5ec5eaec0b2ef7f9cf0c87b2dfcad3f14cd0d66a2da97e6b38a535eb8707b4486c9802a4bfeb09703382e157449096f0e3551af9f444197cacb3f3d42187cea97ab61978985ddeecd086b9cb86c4ec1c08082d47b3ed0ae9c044d9aa65e5c9bf6e00238f78ed858cfdaf0021fb95d636e0cce84d84d2c2da7ac57f2e54fe793fce44a8b8abf96ce7c381f4b7eeb55dc4b68768e8172a4dffc1b683e62a108b2dfc2ef340dab058e6ee5c1f525f93e89d39258862f099987a8ec7022db5aecb5a58e81d02370d5717d18498ae58749aa5e463cf757ab7fa84efe49c1b770da397eef22423696ad433e7232646e279906bef084b21714ac5fc2af564a03ebc789123aed44531765b3e72c6165131feab68e35e0276a64760ee9abf043bece1e3cd148bcec97ab835395391387ff9d2b74a835a15ea5bac9c7e1218c217481a3999a91e037a138aaf5dddadb2247141242140b130e273aab5e1e6855fae8b7ee80d64be2d09a46f3d49555f53a7a849138fc3b9d2323658ea7e86a0039c40f3c15fd3647f99ec98232d9734a5933177c48c6575a1415e2808640cfb27773e728fe128b99757'
-try:
-    import FreeSimpleGUI as sg
-except ImportError:
-    import PySimpleGUI as sg
+
+import FreeSimpleGUI as sg
 import matplotlib.pyplot as plt
 
 # Add 'pingmapper' to the path, may not need after pypi package...

{pingmapper-5.3.3 → pingmapper-5.3.5}/pingmapper/main_mapSubstrate.py

@@ -110,7 +110,8 @@ def map_master_func(logfilename='',
                     banklines=False,
                     export_16bit=False,
                     export_16bit_colormap=False,
-                    export_colormap_uint8=True):
+                    export_colormap_uint8=True,
+                    **kwargs):
 
     '''
     Main script to map substrates from side scan sonar imagery.

{pingmapper-5.3.3 → pingmapper-5.3.5}/pingmapper/main_readFiles.py

@@ -158,7 +158,8 @@ def read_master_func(logfilename='',
                      mosaic=False,
                      map_mosaic=0,
                      banklines=False,
-                     return_context=False):
+                     return_context=False,
+                     **kwargs):
 
     '''
     Main script to read data from Humminbird sonar recordings. Scripts have been

{pingmapper-5.3.3 → pingmapper-5.3.5}/pingmapper/main_rectify.py

@@ -156,7 +156,8 @@ def rectify_master_func(logfilename='',
                         mosaic_nchunk=50,
                         mosaic=False,
                         map_mosaic=0,
-                        banklines=False):
+                        banklines=False,
+                        **kwargs):
     '''
     Main script to rectify side scan sonar imagery from a Humminbird.
 

pingmapper-5.3.5/pingmapper/version.py

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

{pingmapper-5.3.3 → pingmapper-5.3.5}/pingmapper.egg-info/PKG-INFO

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

pingmapper-5.3.3/pingmapper/version.py

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