wolfhece 2.1.34__py3-none-any.whl → 2.1.36__py3-none-any.whl

wolfhece/GraphProfile.py

@@ -15,8 +15,8 @@ import wx
 import wx.lib.agw.aui as aui
 import copy
 from shapely.geometry import LineString,Point
-from matplotlib import figure as mplfig
-from matplotlib import axes as mplax
+from matplotlib.figure import Figure
+from matplotlib.axis import Axis
 import matplotlib.pyplot as plt
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas, NavigationToolbar2WxAgg as NavigationToolbar
 from wx.grid import Grid
@@ -37,7 +37,7 @@ class ProfilePanel(wx.Panel):
     """
     A wx.panel on which the matplolib figure is displayed.
     """
-    figure: mplfig.Figure
+    figure: Figure
 
     def __init__(self, parent, id =-1, dpi= None, toolbar = True, **kwargs):
 
@@ -47,7 +47,7 @@ class ProfilePanel(wx.Panel):
 
         #Figure
         if self.wx_exists:
-            self.figure = mplfig.Figure(dpi = dpi, figsize=(8,4))
+            self.figure = Figure(dpi = dpi, figsize=(8,4))
         else:
             self.figure = plt.figure(dpi = dpi, figsize=(15,10)) # FIXME not exactly the same than mplfig.Figure, probably rendering machine
 
@@ -97,7 +97,7 @@ class ProfilePanel(wx.Panel):
 
         return self.ax_cs_real, self.ax_img, self.ax_dis, self.ax_hsw
 
-    def get_fig_ax(self) -> list((mplfig.Figure, mplax, mplax, mplax, mplax, mplax)):
+    def get_fig_ax(self) -> tuple[Figure, Axis, Axis, Axis, Axis, Axis]:
         """
         This method returns the active axes of the matplotlib figure.
         """
@@ -969,7 +969,7 @@ class PlotCSAll(ProfilePanel):
         self.plot_hspw()
         self.plot_cs()
 
-    def plot_profile(self, figax:tuple([mplfig.Figure, mplax.Axes]) = None):
+    def plot_profile(self, figax:tuple[Figure, Axis] = None):
         """
         This method plots the geometric profiles on the first and third graph.
         The third graph is anamorphosed to allow comparisons with other graphs using the same scale.
@@ -1039,7 +1039,7 @@ class PlotCSAll(ProfilePanel):
         if self.wx_exists:
             leg4.set_draggable(True)
 
-    def plot_discharge(self, figax:tuple([mplfig.Figure, mplax.Axes]) = None):
+    def plot_discharge(self, figax:tuple[Figure, Axis] = None):
         """
         This method plots the discharge relationships of the active profile on the 5th axis of the matplotlib figure.
         """
@@ -1069,7 +1069,7 @@ class PlotCSAll(ProfilePanel):
         if self.wx_exists:
             leg5.set_draggable(True)
 
-    def plot_hspw(self, figax:tuple([mplfig.Figure, mplax.Axes]) = None):
+    def plot_hspw(self, figax:tuple[Figure, Axis] = None):
         """
         The methods plots the hydraulic radius - H, the wetted area - S, the wetted perimeter - P and top width - W on sixth axis and last graph of the figure.
         """

wolfhece/apps/version.py

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

wolfhece/cli.py

@@ -13,6 +13,24 @@ def check():
     from .apps.check_install import main
     main()
 
+def license():
+    """ Main wolf application : License """
+    from .libs.wolfogl import request_license
+    from pathlib import Path
+
+    if Path(__file__).parent / 'license' / 'wolf.lic':
+        print('License file found -- Regenerate !')
+
+    email = ''
+    while not '@' in email:
+        email = input('Enter your email and press enter : ')
+
+    request_license(email)
+    if Path(__file__).parent / 'license' / 'wolf.lic':
+        print('Done !')
+    else:
+        print('Error ! - Please retry. If the error persists, contact the support.')
+
 def accept():
     """ Main wolf application : Accept """
     from .acceptability.cli import main

wolfhece/hydrology/Comparison.py

@@ -419,10 +419,10 @@ class Comparison:
             tzPlot = plotDict["General Parameters"]["Time Zone Plot"]
             tzDelta = datetime.timedelta(hours=tzPlot)
 
-        # if(envelop and not("Ref Name" in plotDict["General Parameters"])):
-        #     refName = "Catchment 1"
-        # else:
-        #     refName = plotDict["General Parameters"]["Ref Name"]
+        if(envelop and not("Ref Name" in plotDict["General Parameters"])):
+            refName = "Catchment 1"
+        else:
+            refName = plotDict["General Parameters"]["Ref Name"]
 
         if(not("Add Table" in plotDict["General Parameters"])):
             addTable = False
@@ -1076,10 +1076,13 @@ class Comparison:
             tzPlot = plotDict["General Parameters"]["Time Zone Plot"]
             tzDelta = datetime.timedelta(hours=tzPlot)
 
-        # if(envelop and not("Ref Name" in plotDict["General Parameters"])):
-        #     refName = "Catchment 1"
-        # else:
-        #     refName = plotDict["General Parameters"]["Ref Name"]
+        #******************************************************
+        #FIXME : is it correct ??
+        if(envelop and not("Ref Name" in plotDict["General Parameters"])):
+            refName = "Catchment 1"
+        else:
+            refName = plotDict["General Parameters"]["Ref Name"]
+        #******************************************************
 
         if(not("Add Table" in plotDict["General Parameters"])):
             addTable = False

wolfhece/hydrometry/kiwispie.py

@@ -25,10 +25,7 @@ from tabulate import tabulate
 import logging
 logger = logging.getLogger(__name__)
 
-try:
-    basestring
-except NameError:
-    basestring = str
+basestring = str
 
 class KIWISError(Exception):
     """

wolfhece/lagrangian/advection.py

@@ -12,6 +12,7 @@ from wolfhece.lagrangian.velocity_field import Velocity_Field, Velocity_Field_nu
 
 import numpy as np
 from numba import jit
+from typing import Union, Literal
 
 @jit(nopython=True)
 def advection_xy(start_x:np.ndarray,
@@ -20,7 +21,7 @@ def advection_xy(start_x:np.ndarray,
                  end_y:np.ndarray,
                  uv_field:Velocity_Field_numba,
                  dt:float,
-                 scheme:['Euler_expl', 'RK22', 'RK4', 'RK45']) -> float:
+                 scheme:Literal['Euler_expl', 'RK22', 'RK4', 'RK45']) -> float:
     """
     Update the position of the particles.
     """
@@ -122,7 +123,7 @@ def advection_xy_2fields(start_x:np.ndarray,
                          uv_fields:Velocity_2Fields_numba,
                          current_time:float,
                          dt:float,
-                         scheme:['Euler_expl', 'RK22', 'RK4', 'RK45']) -> float:
+                         scheme:Literal['Euler_expl', 'RK22', 'RK4', 'RK45']) -> float:
     """
     Update the position of the particles.
     """

{wolfhece-2.1.34.dist-info → wolfhece-2.1.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.34
+Version: 2.1.36
 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: scikit-learn
 Requires-Dist: cryptography
 Requires-Dist: jax
 Requires-Dist: triangle

{wolfhece-2.1.34.dist-info → wolfhece-2.1.36.dist-info}/RECORD

@@ -1,6 +1,6 @@
 wolfhece/CpGrid.py,sha256=ke4n1khTUoed2asJl1GR25PsEkI4TpiBDCo4u0aSo9M,10658
 wolfhece/GraphNotebook.py,sha256=V1_Ak4F_hoIpKm2GAakuyKOALhujjIXB5FwzFHtM5-8,28021
-wolfhece/GraphProfile.py,sha256=aGceovpE2NkMzcn4eGUVPt5SqX__BqMuXaWo2LGhoII,69735
+wolfhece/GraphProfile.py,sha256=OCgJo0YFFBI6H1z-5egJsOOoWF_iziiza0-bbPejNMc,69656
 wolfhece/Lidar2002.py,sha256=bX-nIzdpjD7rOfEgJpTeaW6rIdAXwDp_z4YTM9CgANY,6068
 wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=uL1DJVmDI2xVSE7H6n3icn3QbsPtTHeg8E-6wkDloKw,476914
@@ -24,7 +24,7 @@ wolfhece/ReadDataDCENN.py,sha256=vm-I4YMryvRldjXTvRYEUCxZsjb_tM7U9yj6OaPyD0k,153
 wolfhece/Results2DGPU.py,sha256=P42XCqKQVFMkUt6ZTbNeIT7CV6aRqAIcBQLmRbsj4Cs,23336
 wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
-wolfhece/cli.py,sha256=LyALn5YDSzg6m2d9GEd3X1HSEQ7htEVNsNh0HGC8t-U,2347
+wolfhece/cli.py,sha256=3S1Hbp2tOl51LwLcloAm1DqV9QuUWJx_Ui_vdKNtGxo,2915
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
 wolfhece/drawing_obj.py,sha256=znIQY8dkYhnmoq3mEsVkVzd-hSKDbFY6i8TV-Tf37jM,4040
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
@@ -71,7 +71,7 @@ wolfhece/apps/check_install.py,sha256=icFpkjfwNGDX-0NZVa-ijrCrqmGHEKDiFphjN8uTyh
 wolfhece/apps/curvedigitizer.py,sha256=_hRR2PWow7PU7rTHIbc6ykZ08tCXcK9uy7RFrb4EKkE,5196
 wolfhece/apps/isocurrent.py,sha256=MuwTodHxdc6PrqNpphR2ntYf1NLL2n9klTPndGrOHDQ,4109
 wolfhece/apps/splashscreen.py,sha256=2o1NRxs48BC8m0XCbDgWmWxWDddDXaCtZ-lSnU-cSkM,2922
-wolfhece/apps/version.py,sha256=mbAbt8tRPNax-w_wdVAZ2qWb08NGlMwMEIrZ62J4IRw,388
+wolfhece/apps/version.py,sha256=b4QUjeosMLU1tdLlu7uvGlp3GeubVH8VFCVliut20o0,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
@@ -104,7 +104,7 @@ wolfhece/fonts/sanserif.ttf,sha256=Nvv5eMgTl5-bWgV37B7E1-vZpAZPNJwjtJSzMNDrl9A,4
 wolfhece/ftp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ftp/downloader.py,sha256=NANzxSzdcp25dFMYin5QA9UnFexNe6-W2AqqTzUE4f4,5223
 wolfhece/hydrology/Catchment.py,sha256=uBNzw2Um3_2TZTo2nlMeKmq50IVTf5GPt-SLwRaEOpA,139369
-wolfhece/hydrology/Comparison.py,sha256=vz6JwzQyJUGePXDYYNReOMmnmfivlsm4x_FcveXFgIE,84128
+wolfhece/hydrology/Comparison.py,sha256=_2YU9P-AHKnP67sVJWCc6HpnZw9cYBHKjuUGULggICo,84277
 wolfhece/hydrology/Dumping.py,sha256=SHGYXr30nMOGPSLArMvAzVxGyLywLf4i267166oUHhQ,2403
 wolfhece/hydrology/Optimisation.py,sha256=GJj0VfG_AVNmyrzyML-FadQg8GAiCh3Mnm9UQMZI-Mg,142538
 wolfhece/hydrology/Outlet.py,sha256=jdjYN2gIolQJ5prf1wVfxm7cp_YguwQ0JMRsC9ks-Tg,10519
@@ -125,7 +125,7 @@ wolfhece/hydrometry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 wolfhece/hydrometry/kiwis.py,sha256=KHRfYrtd5hwxKxdChbkTXYH-cDSDcaQJFTEgjrnVMg4,34929
 wolfhece/hydrometry/kiwis_gui.py,sha256=lApsSeBMJNAR1yocggdoHwz_xe6M_oaZ_E13CfHAlQA,23124
 wolfhece/hydrometry/kiwis_wolfgui.py,sha256=GPa5YNp2V2ZlxYQjPiCXERgPuWB_zij4ec2yHpRvoFA,4027
-wolfhece/hydrometry/kiwispie.py,sha256=Fr63d56ApTjhv2F0_pOHLZjw5jO9jG1iEd3uls2oxzw,13543
+wolfhece/hydrometry/kiwispie.py,sha256=akOaV46WwzISVlCcPz_phjsBrI_rDACUzdELtjx-xNg,13498
 wolfhece/icons/folder_open.png,sha256=ykBlU2FtGcpjAu1YO4_eGlDg2svgs_IAs-4d5O2e3AM,2329
 wolfhece/icons/folder_plus.png,sha256=Z1Jcs87Z6pNcudxGDTNhC_hgolSSaXe6_fmQE_n-ero,1963
 wolfhece/icons/image.png,sha256=jomOPNO4HBArBZe8Ya189Iar5nzhO8c0S9JW-6iaErk,2684
@@ -133,7 +133,7 @@ wolfhece/icons/multiple_files.png,sha256=qQEZ5740dyYrMGWGop5h0e2Np_bjq3eqg6VC1-7
 wolfhece/icons/python.png,sha256=nQiK5h92QC85148vFBx58lUmaSzEvwTCgDr-cumju_4,2573
 wolfhece/icons/simulation.png,sha256=I48r_TOPqtUA4bsDGlji--9gJjiDaSl2NcVCMf8h9Gk,2094
 wolfhece/lagrangian/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/lagrangian/advection.py,sha256=DMJ7BAaVuCVdNz2EM_B-9TrGG3-wzuRMdNKKRAhI_gQ,9194
+wolfhece/lagrangian/advection.py,sha256=_fuDx8AcOVWxY1dYq3no3lSCmLwrw49AAAEr6icE-6c,9243
 wolfhece/lagrangian/emitter.py,sha256=D-94Joy_bJmhwDIomEDVo1q0LsuzrwaSpzSLjCWXSmo,11862
 wolfhece/lagrangian/example_domain.py,sha256=-xDTmo1vZWG3yZt3VdhEiOjvtbm77b_AuGb90Rgq2Rk,4787
 wolfhece/lagrangian/particle_system.py,sha256=ZwlgwH8JuBh3KBzxBZzSZi6ya3ftvk-4P3Lk4s_zh4A,23999
@@ -171,12 +171,11 @@ 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/WolfOGL.c,sha256=Dm_4cI9NHFAMhs4cskjcQStpeIYjedOrHPqlcHeQVAk,1753700
-wolfhece/libs/WolfOGL.pyx,sha256=YmA3NPLt9zPo-UarGnz33dFdSmAc2Vaul5I1_0EWYKo,80278
 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
 wolfhece/libs/fribidi-0.dll,sha256=MCLSH_tGJXcJdcnUXilGNTVMH6KU8OumYyJX8yN08bQ,111616
+wolfhece/libs/get_infos.cp310-win_amd64.pyd,sha256=45b6uo0r2zPD4KbpHR8QZC0TwQHDb9S0It7-kv0GWTA,77824
 wolfhece/libs/glu32.dll,sha256=gLubeeL9b_RDYTQ2JL0iHzpRMg8uapKCOEpZ15k1SUQ,164352
 wolfhece/libs/hdf5.dll,sha256=quTNP4GZtVNJ6Ptx__ltuGTN0gQ96rvkGL5yBLuUcF4,3129856
 wolfhece/libs/hdf5_hl.dll,sha256=alZLhLXbReBtwbwsariWWRPAlrwzrePr-Mbdgiy922Y,112128
@@ -199,8 +198,8 @@ wolfhece/libs/svml_dispmd.dll,sha256=GdwVZSC_XYiNpVVUqTqxAcYAf4zP6tr-E1N-3skVS7s
 wolfhece/libs/vcomp100.dll,sha256=NKvXc8hc4MrFa9k8ErALA6OmldGfR3zidaZPCZhMVJI,57168
 wolfhece/libs/vcruntime140.dll,sha256=YYMpkONk3KW_osYdkw8ArKrm0aqjEwOSQDRVrpoRJaU,89880
 wolfhece/libs/vcruntime140_1.dll,sha256=FVS1gClo_bJwWmfLthWF6VYLnkKdBDpap0LvPJu_tr8,37240
-wolfhece/libs/verify_license.cp310-win_amd64.pyd,sha256=-lobNXvqiN7vNl7zzrZWOBPsGW13qT77JWiSy2D3FCk,92672
-wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=K6HTq5bFSRv9y-k6wbdO4qMPJcZQKvozCYThsltx6Yk,286720
+wolfhece/libs/verify_wolf.cp310-win_amd64.pyd,sha256=ceWkovmTDfQcIzlxOBjUUDoHu6ZglOlUFADaRuAe3WM,127488
+wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=1nQE30ZDXTmnjnaJisDDlP5zvt5Chu2Lxz1a-bZTY1A,294912
 wolfhece/libs/wolfpy.cp310-win_amd64.pyd,sha256=6omqEaxmQll-Gg24e90wVomAB9rO_tyyOES2FewXn58,36457472
 wolfhece/libs/zlib1.dll,sha256=E9a0e62VgmG1A8ohZzhVCmmfGtbyXxXu4aFeADTNJ30,77824
 wolfhece/libs/GL/gl.h,sha256=IhsS_fOLa8GW9MpiLZebe9QYRy6uIB_qK_uQMWMOoeg,46345
@@ -279,8 +278,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.34.dist-info/METADATA,sha256=YzbzAnUePWRacNKgk_2tWGEChEt1Ai5J6mv7EqhadKs,2401
-wolfhece-2.1.34.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-wolfhece-2.1.34.dist-info/entry_points.txt,sha256=MAG6NrF64fcxiVNb2g1JPYPGcn9C0HWtqqNurB83oX0,330
-wolfhece-2.1.34.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.34.dist-info/RECORD,,
+wolfhece-2.1.36.dist-info/METADATA,sha256=Tlb74Iqx7ORkpGXPfl2fQwEAhBiBhYuIAn9tDwQRPTY,2430
+wolfhece-2.1.36.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+wolfhece-2.1.36.dist-info/entry_points.txt,sha256=yggeO1Fa80pi2BrOd9k5dTkiFlefGPwG6HztZhY0-qw,366
+wolfhece-2.1.36.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.36.dist-info/RECORD,,

{wolfhece-2.1.34.dist-info → wolfhece-2.1.36.dist-info}/entry_points.txt

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