pingmapper 5.0.6__py3-none-any.whl → 5.0.7__py3-none-any.whl

pingmapper/funcs_common.py

@@ -244,82 +244,122 @@ def downloadSegmentationModelsv1_0(modelDir):
     return
 
 
-# =========================================================
-def saveDefaultParams(values):
-
-    try:
-        projDir = os.path.join(values['proj'], values['projName'])
-    except:
-        projDir = os.path.join(values['proj'], values['prefix'])
-
-    try:
-        inDir = values['inDir']
-    except:
-        inDir = ''
+# # =========================================================
+# def saveDefaultParams(values):
+
+#     try:
+#         projDir = os.path.join(values['proj'], values['projName'])
+#     except:
+#         projDir = os.path.join(values['proj'], values['prefix'])
+
+#     try:
+#         inDir = values['inDir']
+#     except:
+#         inDir = ''
+
+#     try:
+#         inFile = values['inFile']
+#     except:
+#         inFile = ''
+    
+#     params = {
+#         'inDir':inDir,
+#         'inFile':inFile,
+#         'projDir':projDir,
+#         'project_mode':int(values['project_mode']),
+#         'tempC':float(values['tempC']),
+#         'nchunk':int(values['nchunk']),
+#         'cropRange':float(values['cropRange']),
+#         'exportUnknown':values['exportUnknown'],
+#         'fixNoDat':values['fixNoDat'],
+#         'threadCnt':float(values['threadCnt']),
+#         'max_heading_deviation':float(values['max_heading_deviation']),
+#         'max_heading_distance':float(values['max_heading_distance']),
+#         'min_speed':float(values['min_speed']),
+#         'max_speed':float(values['max_speed']),
+#         'filter_table':bool(values['filter_table']),
+#         'aoi':values['aoi'],
+#         'pix_res_son':float(values['pix_res_son']),
+#         'pix_res_map':float(values['pix_res_map']),
+#         'x_offset':float(values['x_offset']),
+#         'y_offset':float(values['y_offset']),
+#         'egn':values['egn'],
+#         'egn_stretch':values['egn_stretch'],
+#         'egn_stretch_factor':float(values['egn_stretch_factor']),
+#         'wcp':values['wcp'],
+#         'wcr':values['wcr'],
+#         'wco':values['wco'],
+#         'wcm':values['wcm'],
+#         'sonogram_colorMap':values['sonogram_colorMap'],
+#         'tileFile':values['tileFile'],
+#         'spdCor':bool(values['spdCor']),
+#         'maxCrop':values['maxCrop'],
+#         'mask_shdw':bool(values['mask_shdw']),
+#         'remShadow':values['remShadow'],
+#         'detectDep':values['detectDep'],
+#         'smthDep':values['smthDep'],
+#         'adjDep':float(values['adjDep']),
+#         'pltBedPick':values['pltBedPick'],
+#         'rect_wcp':values['rect_wcp'],
+#         'rect_wcr':values['rect_wcr'],
+#         'rubberSheeting':values['rubberSheeting'],
+#         'rectMethod':values['rectMethod'],
+#         'rectInterpDist':int(values['rectInterpDist']),
+#         'son_colorMap':values['son_colorMap'],
+#         'pltSubClass':values['pltSubClass'],
+#         'map_sub':values['map_sub'],
+#         'export_poly':values['export_poly'],
+#         'mosaic':values['mosaic'],
+#         'map_mosaic':values['map_mosaic'],
+#         'banklines':values['banklines'],
+#         'coverage':values['coverage'],
+#     }
+
+#     json_object = json.dumps(params, indent=4)
+
+#     user_params = os.path.join(SCRIPT_DIR, 'user_params.json')
+#     with open(user_params, "w") as f:
+#         f.write(json_object)
+
+def saveDefaultParams(values, user_params=None):
+    """
+    Save provided values to user_params.json.
+    Merge with any existing file and convert common numpy types to plain Python.
+    """
+    if user_params is None:
+        user_params = os.path.join(SCRIPT_DIR, 'user_params.json')
 
+    # load existing params if present
     try:
-        inFile = values['inFile']
-    except:
-        inFile = ''
-    
-    params = {
-        'inDir':inDir,
-        'inFile':inFile,
-        'projDir':projDir,
-        'project_mode':int(values['project_mode']),
-        'tempC':float(values['tempC']),
-        'nchunk':int(values['nchunk']),
-        'cropRange':float(values['cropRange']),
-        'exportUnknown':values['exportUnknown'],
-        'fixNoDat':values['fixNoDat'],
-        'threadCnt':float(values['threadCnt']),
-        'max_heading_deviation':float(values['max_heading_deviation']),
-        'max_heading_distance':float(values['max_heading_distance']),
-        'min_speed':float(values['min_speed']),
-        'max_speed':float(values['max_speed']),
-        'filter_table':bool(values['filter_table']),
-        'aoi':values['aoi'],
-        'pix_res_son':float(values['pix_res_son']),
-        'pix_res_map':float(values['pix_res_map']),
-        'x_offset':float(values['x_offset']),
-        'y_offset':float(values['y_offset']),
-        'egn':values['egn'],
-        'egn_stretch':values['egn_stretch'],
-        'egn_stretch_factor':float(values['egn_stretch_factor']),
-        'wcp':values['wcp'],
-        'wcr':values['wcr'],
-        'wco':values['wco'],
-        'wcm':values['wcm'],
-        'sonogram_colorMap':values['sonogram_colorMap'],
-        'tileFile':values['tileFile'],
-        'spdCor':bool(values['spdCor']),
-        'maxCrop':values['maxCrop'],
-        'mask_shdw':bool(values['mask_shdw']),
-        'remShadow':values['remShadow'],
-        'detectDep':values['detectDep'],
-        'smthDep':values['smthDep'],
-        'adjDep':float(values['adjDep']),
-        'pltBedPick':values['pltBedPick'],
-        'rect_wcp':values['rect_wcp'],
-        'rect_wcr':values['rect_wcr'],
-        'rubberSheeting':values['rubberSheeting'],
-        'rectMethod':values['rectMethod'],
-        'rectInterpDist':int(values['rectInterpDist']),
-        'son_colorMap':values['son_colorMap'],
-        'pltSubClass':values['pltSubClass'],
-        'map_sub':values['map_sub'],
-        'export_poly':values['export_poly'],
-        'mosaic':values['mosaic'],
-        'map_mosaic':values['map_mosaic'],
-        'banklines':values['banklines'],
-        'coverage':values['coverage'],
-    }
-
-    json_object = json.dumps(params, indent=4)
-
-    user_params = os.path.join(SCRIPT_DIR, 'user_params.json')
-    with open(user_params, "w") as f:
-        f.write(json_object)
+        if os.path.exists(user_params):
+            with open(user_params, 'r', encoding='utf8') as f:
+                existing = json.load(f)
+        else:
+            existing = {}
+    except Exception:
+        existing = {}
+
+    def _sanitize(v):
+        if isinstance(v, dict):
+            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)):
+            return float(v)
+        if isinstance(v, (np.ndarray, list, tuple)):
+            return [_sanitize(x) for x in v]
+        try:
+            json.dumps(v)
+            return v
+        except Exception:
+            return str(v)
+
+    sanitized = _sanitize(values)
+    merged = existing.copy()
+    merged.update(sanitized)
+
+    with open(user_params, 'w', encoding='utf8') as f:
+        json.dump(merged, f, indent=4, ensure_ascii=False)
 
 def clip_table(csv):    
 
@@ -332,7 +372,16 @@ def clip_table(csv):
     elif sys.platform == "darwin":
         subprocess.run(['open', "{}".format(csv)], check=True)
     else:
-        subprocess.run(['xdg-open', "{}".format(csv)], check=True)
+        try:
+            subprocess.run(['xdg-open', "{}".format(csv)], check=True)
+        except:
+            "WSL"
+            # Convert the WSL path to a Windows-style path
+            # Use -a for absolute path or -w for Windows path (can handle network shares)
+            windows_path = subprocess.check_output(["wslpath", "-w", csv]).decode().strip()
+
+            # Launch the file using the default Windows application
+            subprocess.run(["explorer.exe", windows_path])
 
     df = pd.read_csv(csv)
 

pingmapper/version.py

@@ -1 +1 @@
-__version__ = '5.0.6'
+__version__ = '5.0.7'

{pingmapper-5.0.6.dist-info → pingmapper-5.0.7.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ pingmapper/class_portstarObj.py,sha256=eufSlCsjBLyMr_2_a_B0_OzG2O6qyMX4o_pfSGwH0
 pingmapper/class_rectObj.py,sha256=aJbM-q3UNBhvWutOJwnweGkWTrx6avslX2DCWdofW4Q,96182
 pingmapper/class_sonObj.py,sha256=7HVeCTDSUTwerkdB-hrRTITvh9q7kCfbL98QCTFp85Q,75683
 pingmapper/class_sonObj_nadirgaptest.py,sha256=DSFgjEgpwPgDZslw0vXGGBNFYlcoUa2Ufbr8i_Uqdhc,76915
-pingmapper/funcs_common.py,sha256=pCOIy83srtYKtKUnF4oXkd83_kimZI0NiSrO0TE0O4g,13414
+pingmapper/funcs_common.py,sha256=0uZErbrWZ_jhOLOc-CT--8OX4eHF9qE_E5Wwy60aSvQ,15300
 pingmapper/funcs_model.py,sha256=dO9J4-0s1COggHkSUqHFC1qKTs20A6PSvkDqXWMUT6A,7916
 pingmapper/funcs_rectify.py,sha256=bAFWbNr4dyOuQzF1j4Je-K4zxfJZUjISc0nYrOot8Ng,12418
 pingmapper/gui_main.py,sha256=5JsOYqRu146T1xhRgYC9ag3vnpRWqa2PDuJky595YA0,34780
@@ -14,10 +14,10 @@ pingmapper/main_readFiles.py,sha256=lhL41W4UisY8ZgdRBgk5G47SeaLHMmB0Myk47Fhxtrc,
 pingmapper/main_rectify.py,sha256=uOKHHYrjVa3PVtU26G_fL9hTV7sZkvIzEgk3VJd3tVA,20217
 pingmapper/test_PINGMapper.py,sha256=-SYMsdK-tTodXp5dCFSWPn-KRN7-OjX6OwjQ2-8hQg0,14176
 pingmapper/test_time.py,sha256=uHT0mtLDP1J6w-snoELyk4UzZ2LrDeF6jGgJJVloalg,750
-pingmapper/version.py,sha256=Kp7sR4cODRPi7lBgDu-q0bdVhI9y2SJ5O0SyDpUJuXE,21
-pingmapper-5.0.6.data/data/pingmapper_config/default_params.json,sha256=YA9Rx1PSdUy4cTq-vtKORo3nNLisCYNOeUBxClldmHs,1285
-pingmapper-5.0.6.dist-info/licenses/LICENSE,sha256=lowDp_th1CGR0Z224a-jYRi-oNFe_0fdldL3USXhX-k,1095
-pingmapper-5.0.6.dist-info/METADATA,sha256=jgLZ_1zUPe7MrFOSBTYeF9HxSpuhXlfOuE3jygZCFow,9202
-pingmapper-5.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pingmapper-5.0.6.dist-info/top_level.txt,sha256=RlV4sDoE3uIIDzNMOjN2t012Ia_jsblNVojJvg4q84w,11
-pingmapper-5.0.6.dist-info/RECORD,,
+pingmapper/version.py,sha256=oWnQcEE23SEA_ioIuiT7OYVZH5tddP4EGG6dO2yVfuU,21
+pingmapper-5.0.7.data/data/pingmapper_config/default_params.json,sha256=YA9Rx1PSdUy4cTq-vtKORo3nNLisCYNOeUBxClldmHs,1285
+pingmapper-5.0.7.dist-info/licenses/LICENSE,sha256=lowDp_th1CGR0Z224a-jYRi-oNFe_0fdldL3USXhX-k,1095
+pingmapper-5.0.7.dist-info/METADATA,sha256=n4Ar8EKcgz0VgHI0bIV6Sz_qrWK1KE0ijtRcgXCMOTM,9202
+pingmapper-5.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pingmapper-5.0.7.dist-info/top_level.txt,sha256=RlV4sDoE3uIIDzNMOjN2t012Ia_jsblNVojJvg4q84w,11
+pingmapper-5.0.7.dist-info/RECORD,,