wolfhece 2.1.44__py3-none-any.whl → 2.1.45__py3-none-any.whl

wolfhece/PyDraw.py

@@ -5520,8 +5520,8 @@ class WolfMapViewer(wx.Frame):
             del wait
 
     def export_shape(self, outdir='', fn = '', myarrays=[], descr=[], mask:WolfArray=None):
-        """ Export multiple arrays to shapefile 
-        
+        """ Export multiple arrays to shapefile
+
         :param outdir: output directory
         :param fn: filename -- .shp will be added if not present
         :param myarrays: list of Wolfarrays to export
@@ -5598,12 +5598,12 @@ class WolfMapViewer(wx.Frame):
 
     def export_geotif(self, outdir='', fn = '', myarrays=[], descr=[]):
         """ Export multiple arrays to geotiff
-        
+
         :param outdir: output directory
         :param fn: filename -- .tif will be added if not present
         :param myarrays: list of Wolfarrays to export
-        :param descr: list of descriptions -- Bands names 
-        
+        :param descr: list of descriptions -- Bands names
+
         """
 
         if len(myarrays)==0:
@@ -6832,7 +6832,7 @@ class WolfMapViewer(wx.Frame):
                 self.add_object('array', newobj=mb, id=self.selected_object.idx + '_mb')
             else:
                 logging.warning(_('Convert to multi-blocks not yet implemented for this type of object'))
-        
+
         elif _('Export to Shape file') in text:
 
             if isinstance(self.selected_object, Zones):
@@ -6845,9 +6845,9 @@ class WolfMapViewer(wx.Frame):
                 fdlg.Destroy()
 
         elif _('Export active zone to Shape file') in text:
-                
+
             if isinstance(self.selected_object, Zones):
-            
+
                 filterArray = "Shapefile (*.shp)|*.shp"
                 fdlg = wx.FileDialog(self, "Choose file name for Vector :" + self.selected_object.idx, wildcard=filterArray,
                                         style=wx.FD_SAVE)
@@ -7876,7 +7876,7 @@ class WolfMapViewer(wx.Frame):
             if self.action == 'dynamic parallel':
                 self.active_zone.parallel_active(self.dynapar_dist)
 
-            self.Refresh()
+            self.Paint()
 
         self._last_mouse_pos = (x,y,pos)
         self._update_mytooltip()

wolfhece/PyGui.py

@@ -7,38 +7,70 @@ Copyright (c) 2024 University of Liege. All rights reserved.
 This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
-
-from os import scandir, getcwd, makedirs
-from os.path import exists, join, isdir, isfile, dirname, normpath, splitext
-from pathlib import Path
-import numpy.ma as ma
-import wx
-import wx.adv
-from wx.lib.busy import BusyInfo
-import logging
-from pathlib import Path
-
-from .apps.splashscreen import WolfLauncher
-from .wolf_array import WOLF_ARRAY_FULL_LOGICAL, WOLF_ARRAY_MB_SINGLE, WolfArray, getkeyblock, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_MB_INTEGER
-from .PyTranslate import _
-from .PyDraw import WolfMapViewer,imagetexture, draw_type
-
-from .hydrometry.kiwis_wolfgui import hydrometry_wolfgui
-
-from .PyConfig import WolfConfiguration, ConfigurationKeys
-from .pylogging import create_wxlogwindow
-
-from .RatingCurve import SPWMIGaugingStations,SPWDCENNGaugingStations
-from .mesh2d.wolf2dprev import *
-from .Results2DGPU import wolfres2DGPU
-from .PyGuiHydrology import GuiHydrology
-from .RatingCurve import SPWMIGaugingStations,SPWDCENNGaugingStations
-from .hydrology.Catchment import Catchment
-from .hydrology.forcedexchanges import forced_exchanges
-from .PyParams import Wolf_Param
-from .picc import Picc_data, Cadaster_data
-from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier
-from .CpGrid import CpGrid
+try:
+    from os import scandir, getcwd, makedirs
+    from os.path import exists, join, isdir, isfile, dirname, normpath, splitext
+    from pathlib import Path
+    import numpy.ma as ma
+    import wx
+    import wx.adv
+    from wx.lib.busy import BusyInfo
+    import logging
+    from pathlib import Path
+except ImportError as e:
+    print(f"Import Error: {e} - extern modules")
+    print("Please install the required modules using 'pip install -r requirements.txt'")
+
+try:
+    from .apps.splashscreen import WolfLauncher
+except ImportError as e:
+    print(f"Import Error: {e} - Splashscreen")
+    print("Please install the required modules using 'pip install -r requirements.txt'")
+
+try:
+    from .wolf_array import WOLF_ARRAY_FULL_LOGICAL, WOLF_ARRAY_MB_SINGLE, WolfArray, getkeyblock, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_MB_INTEGER
+except ImportError as e:
+    print(f"Import Error: {e} - WolfArray")
+    print("Please install the required modules using 'pip install -r requirements.txt'")
+try:
+    from .PyTranslate import _
+except ImportError as e:
+    print(f"Import Error: {e} - PyTranslate")
+    print("Please install the required modules using 'pip install -r requirements.txt'")
+try:
+    from .PyDraw import WolfMapViewer,imagetexture, draw_type
+except ImportError as e:
+    print(f"Import Error: {e} - PyDraw")
+    print("Please install the required modules using 'pip install -r requirements.txt'")
+
+try:
+    from .hydrometry.kiwis_wolfgui import hydrometry_wolfgui
+except ImportError as e:
+    print(f"Import Error: {e} - hydrometry_wolfgui")
+    print("Please install the required modules using 'pip install -r requirements.txt'")
+
+try:
+    from .PyConfig import WolfConfiguration, ConfigurationKeys
+    from .pylogging import create_wxlogwindow
+except ImportError as e:
+    print(f"Import Error: {e} - PyConfig, pylogging")
+    print("Please install the required modules using 'pip install -r requirements.txt'")
+
+try:
+    from .RatingCurve import SPWMIGaugingStations,SPWDCENNGaugingStations
+    from .mesh2d.wolf2dprev import *
+    from .Results2DGPU import wolfres2DGPU
+    from .PyGuiHydrology import GuiHydrology
+    from .RatingCurve import SPWMIGaugingStations,SPWDCENNGaugingStations
+    from .hydrology.Catchment import Catchment
+    from .hydrology.forcedexchanges import forced_exchanges
+    from .PyParams import Wolf_Param
+    from .picc import Picc_data, Cadaster_data
+    from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier
+    from .CpGrid import CpGrid
+except ImportError as e:
+    print(f"Import Error: {e} - RatingCurve, mesh2d, Results2DGPU, PyGuiHydrology, RatingCurve, hydrology, PyParams, picc, wolf_zi_db, CpGrid")
+    print("Please install the required modules using 'pip install -r requirements.txt'")
 
 
 GEOM_GROUP_NAME = _('Block geometry')

wolfhece/apps/check_install.py

@@ -15,14 +15,23 @@ def main():
     try:
         from osgeo import ogr, gdal
         ret += 'GDAL/OGR installed\n\n'
-    except:
+    except ImportError as e:
         ret += 'GDAL/OGR not installed\n Please install GDAL from https://github.com/cgohlke/geospatial-wheels/releases\n\n'
+        ret += 'Error : ' + str(e) + '\n\n'
 
+    try:
+        from ..libs import wolfpy
+        ret += 'Wolfpy accessible\n\n'
+    except ImportError as e:
+        ret += 'Wolfpy not accessible\n\n'
+        ret += 'Error : ' + str(e) + '\n\n'
+    
     try:
         from ..PyGui import MapManager
         ret += 'Wolfhece installed\n\n'
-    except:
-        ret += 'Wolfhece not installed\n Retry installation : pip install wolfhece or pip install wolfhece --upgrade\n\n'
+    except ImportError as e:
+        ret += 'Wolfhece not installed properly\n Retry installation : pip install wolfhece or pip install wolfhece --upgrade\n\n'
+        ret += 'Error : ' + str(e) + '\n\n'
 
     print(ret)
 

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 1
-        self.patch = 44
+        self.patch = 45
 
     def __str__(self):
 

wolfhece/libs/__init__.py

@@ -0,0 +1,79 @@
+from pathlib import Path
+import sys
+import os
+import shutil
+
+MKL_DLLS = ['libiomp5md.dll',
+            'mkl_core.2.dll',
+            'mkl_intel_thread.2.dll',
+            'mkl_rt.2.dll']
+FORTRAN_DLLS = ['libifcoremd.dll',
+                'libifcoremdd.dll',
+                'libmmd.dll',
+                'libifportmd.dll',
+                'libmmdd.dll',
+                'svml_dispmd.dll',
+                'libiomp5md.dll']
+# VC_RUNTIME_DLLS = ['vcruntime140.dll',
+#                    'vcruntime140_1.dll']
+# HDF5_DLLS = ['hdf5.dll',
+#              'hdf5_hl.dll']
+
+interpreter_path = Path(sys.executable).parent
+library_bin_path = interpreter_path / 'Library' / 'bin'
+if not library_bin_path.exists():
+    if 'Scripts' in interpreter_path.parts:
+        library_bin_path = interpreter_path.parent / 'Library' / 'bin'
+
+h5py_path = interpreter_path / 'Lib' / 'site-packages' / 'h5py'
+mydir = Path(__file__).parent
+
+
+error = False
+if library_bin_path.exists():
+    for dll in MKL_DLLS:
+        dll_path = library_bin_path / dll
+        if not dll_path.exists():
+            error = True
+            print(f"Missing DLL: {dll}")
+        else:
+            if not (mydir / dll).exists():
+                shutil.copy(dll_path, mydir / dll)
+
+    # for dll in VC_RUNTIME_DLLS:
+    #     dll_path = interpreter_path / dll
+    #     if not dll_path.exists():
+    #         error = True
+    #         print(f"Missing DLL: {dll}")
+    #     else:
+    #         if not (mydir / dll).exists():
+    #             shutil.copy(dll_path, mydir / dll)
+
+    for dll in FORTRAN_DLLS:
+        dll_path = library_bin_path / dll
+        if not dll_path.exists():
+            error = True
+            print(f"Missing DLL: {dll}")
+        else:
+            if not (mydir / dll).exists():
+                shutil.copy(dll_path, mydir / dll)
+
+else:
+    error = True
+    print("Library/bin directory not found -- Impossible to copy DLLs.")
+
+# if h5py_path.exists():
+#     for dll in HDF5_DLLS:
+#         dll_path = h5py_path / dll
+#         if not dll_path.exists():
+#             error = True
+#             print(f"Missing DLL: {dll}")
+#         else:
+#             if not (mydir / dll).exists():
+#                 shutil.copy(dll_path, mydir / dll)
+# else:
+#     error = True
+#     print("h5py directory not found.")
+
+if error:
+    raise FileNotFoundError("Missing DLLs. Please check the output above.")

wolfhece/scenario/config_manager.py

@@ -1616,6 +1616,7 @@ class UI_Manager_2D_GPU():
         destroy_if_exists = ret == wx.ID_YES
         dlg.Destroy()
 
+        preserve_ic = False
         if not destroy_if_exists:
             dlg = wx.MessageDialog(None, _('Do you want to preserve initial conditions ?'), _('Warning'), wx.YES_NO)
             ret = dlg.ShowModal()

{wolfhece-2.1.44.dist-info → wolfhece-2.1.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.44
+Version: 2.1.45
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece
@@ -13,6 +13,7 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Python: <3.11,>=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: wxpython
+Requires-Dist: colorlog
 Requires-Dist: intel-fortran-rt
 Requires-Dist: scikit-learn
 Requires-Dist: cryptography

{wolfhece-2.1.44.dist-info → wolfhece-2.1.45.dist-info}/RECORD

@@ -6,8 +6,8 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=uL1DJVmDI2xVSE7H6n3icn3QbsPtTHeg8E-6wkDloKw,476914
 wolfhece/PyConfig.py,sha256=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=MQO149Cp8QtxWceXpKWLsDbE6JBrVbqEWoAOXWfHl2w,390751
-wolfhece/PyGui.py,sha256=_1LKelusQ-FS0AtgpwFiXKMZ2glky7K1WINTI93H0k0,103438
+wolfhece/PyDraw.py,sha256=mMPowIkidxWrEqQwvsFG__HADLjIu-nVRX0ChllpAUA,390687
+wolfhece/PyGui.py,sha256=aRWv9tBpRl7sKEd2gHWj8Bss0ZOKbGlUYIehWHFm8WY,105008
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
 wolfhece/PyPalette.py,sha256=5TvXF5wWDxP4e70zO9B0UMgVP9c0oAzerM28aoJ1CTg,27982
@@ -67,11 +67,11 @@ wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,
 wolfhece/apps/WolfPython2.png,sha256=VMPV-M-3BCOg8zOJss8bXwPmzRYZy8Fo-XtnVYNgbaw,618073
 wolfhece/apps/WolfPython3.png,sha256=3G84zx14HnlB9YXMY4VUAO7IB3eu7JFvi4Kpmc_4zBE,403298
 wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
-wolfhece/apps/check_install.py,sha256=icFpkjfwNGDX-0NZVa-ijrCrqmGHEKDiFphjN8uTyh8,928
+wolfhece/apps/check_install.py,sha256=SG024u18G7VRLKynbp7DKD1jImtHwuWwN4bJWHm-YHE,1271
 wolfhece/apps/curvedigitizer.py,sha256=_hRR2PWow7PU7rTHIbc6ykZ08tCXcK9uy7RFrb4EKkE,5196
 wolfhece/apps/isocurrent.py,sha256=MuwTodHxdc6PrqNpphR2ntYf1NLL2n9klTPndGrOHDQ,4109
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=42X8KC4MhMsyZkkbTyYj1S26AzOp9fQtCIqVNikPw5o,388
+wolfhece/apps/version.py,sha256=ls80i8D7bLwHlLa8Q9f7hPR0HGZE2sGy0sqH0i67EBs,388
 wolfhece/apps/wolf.py,sha256=mM6Tyi4DlKQILmO49cDUCip9fYVy-hLXkY3YhZgIeUQ,591
 wolfhece/apps/wolf2D.py,sha256=yPQGee7fsegoQ8GfWKrWEjX1Az_ApL-UWlBiqPvaIyY,565
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -171,6 +171,7 @@ wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqa
 wolfhece/lazviewer/viewer/viewer.py,sha256=8_MQCaQOS0Z_oRPiGoRy1lq-aCirReX3hWEBjQID0ig,24665
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
 wolfhece/libs/WolfDll.dll,sha256=E8SeV0AHVXW5ikAQuVtijqIvaYx7UIMeqvnnsmTMCT8,132934144
+wolfhece/libs/__init__.py,sha256=KHR7OIX5YURmKmbx5LkORqUIhF1dz6e1Pf60yLuj0jw,2452
 wolfhece/libs/api-ms-win-crt-heap-l1-1-0.dll,sha256=r0euvgZa8vBFoZ8g7H5Upuc8DD6aUQimMJWnIyt1OBo,19720
 wolfhece/libs/api-ms-win-crt-math-l1-1-0.dll,sha256=ol0GVN6wzqGu8Ym6IXTQ8TvfUvCY06nsNtFeS_swxJk,27912
 wolfhece/libs/api-ms-win-crt-runtime-l1-1-0.dll,sha256=NxpEq5FhSowm0Vm-uHKntD9WnLX6yK2pms6Y8mSjtQM,23304
@@ -253,7 +254,7 @@ wolfhece/report/reporting.py,sha256=JUEXovx_S4jpYkJEBU0AC-1Qw2OkkWyV3VAp6iOfSHc,
 wolfhece/report/wolf_report.png,sha256=NoSV58LSwb-oxCcZScRiJno-kxDwRdm_bK-fiMsKJdA,592485
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/scenario/check_scenario.py,sha256=w7_SST4n_uec-MUBK36gbJzz2KC8qT_bVJ_VNyp7cMo,4917
-wolfhece/scenario/config_manager.py,sha256=hw9NfD75sttg-BJfyclXqZUsJwzlqUwE0bQUnzX7IiM,85258
+wolfhece/scenario/config_manager.py,sha256=k5wPR58AQk_xSN1uzKR0DjGume26NrbBFZvAbgMIhlc,85287
 wolfhece/scenario/imposebc_void.py,sha256=PqA_99hKcaqK5zsK6IRIc5Exgg3WVpgWU8xpwNL49zQ,5571
 wolfhece/scenario/update_void.py,sha256=ay8C_FxfXN627Hx46waaAO6F3ovYmOCTxseUumKAY7c,7474
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -276,8 +277,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.44.dist-info/METADATA,sha256=z3vYq9zp0CQf9Rg8X1x3H2PER-At8R863VPkddKCfYo,2463
-wolfhece-2.1.44.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.44.dist-info/entry_points.txt,sha256=yggeO1Fa80pi2BrOd9k5dTkiFlefGPwG6HztZhY0-qw,366
-wolfhece-2.1.44.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.44.dist-info/RECORD,,
+wolfhece-2.1.45.dist-info/METADATA,sha256=y63i_CDK02w9EiVXGhd2JlyrM_GCuI0iP7BTQfkmbAw,2488
+wolfhece-2.1.45.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.45.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.45.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.45.dist-info/RECORD,,

{wolfhece-2.1.44.dist-info → wolfhece-2.1.45.dist-info}/entry_points.txt

@@ -1,6 +1,7 @@
 [console_scripts]
 wolf_accept = wolfhece.cli:accept
 wolf_check = wolfhece.cli:check
+wolf_gui = wolfhece.cli:wolf
 wolf_license = wolfhece.cli:license
 
 [gui_scripts]