wolfhece 2.2.1__py3-none-any.whl → 2.2.3__py3-none-any.whl

wolfhece/lifewatch.py

@@ -0,0 +1,88 @@
+from enum import Enum
+from PIL import Image
+
+class LifeWatch_Legend(Enum):
+    """
+    https://www.mdpi.com/2306-5729/8/1/13
+
+    Map Class	Map Code	Related EAGLE Code	Percentage of Land Area [%] Based on 2018 Product
+    Water	10	LCC-3	0.73
+    Natural Material Surfaces with less than 10% vegetation	15	LCC-1_2	0.32
+    Artificially sealed ground surface	20	LCC-1_1_1_3	5.75
+    Building, specific structures and facilities	21	LCC-1_1_1_1 ||     LCC-1_1_1_2	1.99
+    Herbaceous in rotation during the year (e.g., crops)	30	LCC-2_2	23.94
+    Grassland with intensive management	35	LCC-2_2	27.57
+    Grassland and scrub of biological interest	40	LCC-2_2	1.82
+    Inundated grassland and scrub of biological interest	45	LCC-2_2 &     LCH-4_4_2	0.22
+    Vegetation of recently disturbed area (e.g., clear cut)	48	LCC-2_2 &     LCH-3_8	2.64
+    Coniferous trees (≥3 m)	50	LCC-2_1_1 &     LCH-3_1_1	11.24
+    Small coniferous trees (<3 m)	51	LCC-2_1_2 &    LCH-3_1_1	0.40
+    Broadleaved trees (≥3 m)	55	LCC-2_1_1 &    LCH-3_1_2	21.63
+    Small broadleaved trees (<3 m) and shrubs	56	LCC-2_1_2 &    LCH-3_1_2	1.75
+
+    Color Table (RGB with 256 entries) from tiff file
+    10: 10,10,210,255
+    11: 254,254,254,255
+    15: 215,215,215,255
+    20: 20,20,20,255
+    21: 210,0,0,255
+    30: 230,230,130,255
+    35: 235,170,0,255
+    40: 240,40,240,255
+    45: 145,245,245,255
+    46: 246,146,246,255
+    48: 148,112,0,255
+    50: 50,150,50,255
+    51: 0,151,151,255
+    55: 55,255,0,255
+    56: 156,255,156,255
+    """
+    WATER = (10, (10, 210, 255))
+    NATURAL_MATERIAL_SURFACES = (15, (215, 215, 215, 255))
+    ARTIFICIALLY_SEALED_GROUND_SURFACE = (20, (20, 20, 20, 255))
+    BUILDING = (21, (210, 0, 0, 255))
+    HERBACEOUS_ROTATION = (30, (230, 230, 130, 255))
+    GRASSLAND_INTENSIVE_MANAGEMENT = (35, (235, 170, 0, 255))
+    GRASSLAND_SCRUB_BIOLOGICAL_INTEREST = (40, (240, 40, 240, 255))
+    INUNDATED_GRASSLAND_SCRUB_BIOLOGICAL_INTEREST = (45, (145, 245, 245, 255))
+    VEGETATION_RECENTLY_DISTURBED_AREA = (48, (148, 112, 0, 255))
+    CONIFEROUS_TREES = (50, (50, 150, 50, 255))
+    SMALL_CONIFEROUS_TREES = (51, (0, 151, 151, 255))
+    BROADLEAVED_TREES = (55, (55, 255, 0, 255))
+    SMALL_BROADLEAVED_TREES_SHRUBS = (56, (156, 255, 156, 255))
+
+    NODATA11 = (11, (254,254,254,255)) # Not used
+    NODATA46 = (46, (246,146,246,255)) # Not used
+    NODATA100 = (100, (0, 0, 0, 255)) # Outside Belgium/Wallonia
+
+if __name__ == "__main__":
+    import numpy as np
+    n = 4
+
+    DIR = r'E:\MODREC-Vesdre\vesdre-data\LifeWatch'
+
+    # Tif file is very large, so we need to use PIL to open it
+    Image.MAX_IMAGE_PIXELS = 15885900000
+    img = Image.open(DIR + r'\lifewatch_LC2018_vx19_2mLB08cog.tif',)
+    img = np.asarray(img)
+
+    ij11 = np.where(img == 11)
+    ij46 = np.where(img == 46)
+
+    print(ij11[0].shape) # must be 0
+    print(ij11[1].shape) # must be 0
+
+    img = img[::n,:-img.shape[1]//2:n]
+    print(np.unique(img))
+
+    img = Image.open(DIR +r'\lifewatch_LC2022_vx20_2mLB08cog.tif',)
+    img = np.asarray(img)
+
+    ij11 = np.where(img == 11) # must be 0
+    ij46 = np.where(img == 46) # must be 0
+
+    print(ij11[0].shape)
+    print(ij11[1].shape)
+
+    img = img[::n,:-img.shape[1]//2:n]
+    print(np.unique(img))

wolfhece/scenario/config_manager.py

@@ -2341,8 +2341,8 @@ class UI_Manager_2D_GPU():
                         cursim._save_json()
                 except Exception as e:
                     self._wp[cursim] = None
-                    logging.debug(_('Error while saving parameters for simulation {}'.format(cursim.path.name)))
-                    logging.debug(str(e))
+                    logging.error(_('Error while saving parameters for simulation {}'.format(cursim.path.name)))
+                    logging.error(str(e))
 
     def _callbackwp_destroy(self):
         """ Callback for wolfparam """
@@ -2355,8 +2355,8 @@ class UI_Manager_2D_GPU():
                         cursim._save_json()
                 except Exception as e:
                     self._wp[cursim] = None
-                    logging.debug(_('Error while saving parameters for simulation {}'.format(cursim.path.name)))
-                    logging.debug(str(e))
+                    logging.error(_('Error while saving parameters for simulation {}'.format(cursim.path.name)))
+                    logging.error(str(e))
 
     def OnActivateTreeElem(self, e):
         """

wolfhece/wolf_array.py

@@ -10,13 +10,15 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 
 import os
 import sys
+
+import numpy as np
+import numpy.ma as ma
+
 from typing import Union, Literal
 from matplotlib.axis import Axis
 from matplotlib.figure import Figure
 import matplotlib.pyplot as plt
 from matplotlib.colors import Colormap
-import numpy as np
-import numpy.ma as ma
 import math as m
 import logging
 import json
@@ -40,7 +42,6 @@ import re
 import wx
 from scipy.interpolate import interp2d, griddata
 from scipy.ndimage import laplace, label, sum_labels
-import pygltflib
 from shapely.geometry import Point, LineString, MultiLineString, Polygon, MultiPolygon, MultiPoint
 from shapely.ops import linemerge, substring, polygonize_full
 from shapely import contains, contains_properly, contains_xy, touches, prepare, destroy_prepared, is_prepared
@@ -56,12 +57,6 @@ except ImportError as e:
     print(e)
     raise Exception(_('Error importing modules'))
 
-try:
-    from osgeo import gdal
-except ImportError as e:
-    print(e)
-    raise Exception(_('Error importing GDAL library'))
-
 try:
     from .Coordinates_operations import reproject_and_resample_raster
 except ImportError as e:
@@ -132,6 +127,13 @@ VERSION_RGB = 3
 
 from numba import jit
 
+try:
+    from osgeo import gdal, osr
+    gdal.UseExceptions()
+except ImportError as e:
+    print(e)
+    raise Exception(_('Error importing GDAL library'))
+
 @jit(nopython=True)
 def custom_gradient(array: np.ndarray):
     """ Calculate the gradient manually """
@@ -878,7 +880,7 @@ class header_wolf():
         locpath = Path(filename)
 
         if filename.endswith('.tif') or filename.endswith('.tiff') :
-            from osgeo import gdal
+            # from osgeo import gdal
 
             raster:gdal.Dataset
             raster = gdal.Open(filename)
@@ -932,7 +934,7 @@ class header_wolf():
 
         elif filename.endswith('.vrt'):
             # Virtual raster
-            from osgeo import gdal
+            # from osgeo import gdal
 
             raster:gdal.Dataset
             raster = gdal.Open(filename)
@@ -4059,7 +4061,7 @@ class SelectionData():
                 selunique, counts = np.unique(self.myselection, return_counts=True, axis=0)
 
                 # les éléments énumérés plus d'une fois doivent être enlevés
-                #  on trie par ordre décroissant
+                # on trie par ordre décroissant
                 locsort = sorted(zip(counts.tolist(), selunique.tolist()), reverse=True)
                 counts = [x[0] for x in locsort]
                 sel = [tuple(x[1]) for x in locsort]
@@ -5492,6 +5494,11 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         return self.alpha
 
+    # def find_minmax(self, update=False):
+        
+    #     if update:
+    #         [self.xmin, self.xmax], [self.ymin, self.ymax] = self.get_bounds()
+    
     @property
     def memory_usage(self):
         """
@@ -6099,7 +6106,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         :param extent: suffix to add to the filename before the extension '.tif' (only if outdir is provided)
         :param EPSG: EPSG code, by default 31370 (Lambert 72)
         """
-        from osgeo import gdal, osr, gdalconst
+        # from osgeo import gdal, osr, gdalconst
 
         outdir = str(outdir)
         extent = str(extent)
@@ -6378,7 +6385,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         :param which: band to import
         :param crop: crop the data - [xmin, xmax, ymin, ymax]
         """
-        from osgeo import gdal, osr, gdalconst
+        # from osgeo import gdal, osr, gdalconst
 
         if fn !='':
             pass
@@ -7831,9 +7838,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array + other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array + other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(self.array + other.array, self.array.mask)
+            newArray.array = np.ma.masked_array(self.array + other.array, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7860,9 +7867,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array * other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array * other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(self.array * other.array, self.array.mask)
+            newArray.array = np.ma.masked_array(self.array * other.array, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7889,9 +7896,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array - other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array - other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(self.array - other.array, self.array.mask)
+            newArray.array = np.ma.masked_array(self.array - other.array, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7916,7 +7923,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             newArray.origz = self.origz
             newArray.translz = self.translz
 
-        newArray.array = np.ma.masked_array(self.array ** other, self.array.mask)
+        newArray.array = np.ma.masked_array(self.array ** other, self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -7943,9 +7950,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if type(other) == float:
             if other != 0.:
-                newArray.array = np.ma.masked_array(self.array / other, self.array.mask)
+                newArray.array = np.ma.masked_array(self.array / other, self.array.mask, dtype=self.array.dtype)
         else:
-            newArray.array = np.ma.masked_array(np.where(other == 0., 0., self.array / other.array), self.array.mask)
+            newArray.array = np.ma.masked_array(np.where(other == 0., 0., self.array / other.array), self.array.mask, dtype=self.array.dtype)
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -9287,9 +9294,20 @@ class WolfArray(Element_To_Draw, header_wolf):
                 elif self.wolftype in [WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2]:
                     value=np.int16(value)
                 elif self.wolftype in [WOLF_ARRAY_FULL_INTEGER8]:
-                    value=np.int8(value)
+                    try:
+                        value = np.int8(value)
+                    except:
+                        value = 0
+                        logging.warning(_('Value too high for int8 conversion'))
+                        logging.warning(_('Value set to 0'))
+
                 elif self.wolftype in [WOLF_ARRAY_FULL_UINTEGER8]:
-                    value=np.uint8(value)
+                    try:
+                        value = np.uint8(value)
+                    except:
+                        value = 0
+                        logging.warning(_('Value too high for int8 conversion'))
+                        logging.warning(_('Value set to 0'))
         except:
             logging.error(_('Type not supported : {} - {}'.format(value, type(value))))
             logging.warning(_('Masking operation compromised'))
@@ -9688,6 +9706,13 @@ class WolfArray(Element_To_Draw, header_wolf):
             for cur in self.viewers3d:
                 cur.update_palette(self.idx, self.mypal.get_colors_f32().flatten(), self.mypal.values.astype(np.float32))
 
+    def find_minmax(self, update=False):
+        """ Find the min and max values of the array
+
+        ATTENTION : Just to conform to the interface of the Element_To_Draw class
+        """
+        if update:
+            [self.xmin, self.xmax], [self.ymin, self.ymax] = self.get_bounds()
 
     def plot(self, sx:float=None, sy:float=None, xmin:float=None, ymin:float=None, xmax:float=None, ymax:float=None, size:float=None):
         """
@@ -9709,17 +9734,17 @@ class WolfArray(Element_To_Draw, header_wolf):
         if self.plotted and sx is None:
             sx = self.sx
             sy = self.sy
-            xmin = self.xmin
-            xmax = self.xmax
-            ymin = self.ymin
-            ymax = self.ymax
+            xmin = self._xmin_plot
+            xmax = self._xmax_plot
+            ymin = self._ymin_plot
+            ymax = self._ymax_plot
         else:
             self.sx = sx
             self.sy = sy
-            self.xmin = xmin
-            self.xmax = xmax
-            self.ymin = ymin
-            self.ymax = ymax
+            self._xmin_plot = xmin
+            self._xmax_plot = xmax
+            self._ymin_plot = ymin
+            self._ymax_plot = ymax
 
         nbpix = min(sx * self.dx, sy * self.dy)
         if nbpix >= 1.:

wolfhece/wolf_texture.py

@@ -26,7 +26,7 @@ import math
 import numpy as np
 
 from .PyTranslate import _
-from .PyWMS import getIGNFrance, getWalonmap, getVlaanderen
+from .PyWMS import getIGNFrance, getWalonmap, getVlaanderen, getLifeWatch
 from .textpillow import Font_Priority, Text_Image,Text_Infos
 from .drawing_obj import Element_To_Draw
 
@@ -253,7 +253,8 @@ class imagetexture(Element_To_Draw):
     def __init__(self, which: str, label: str, cat: str, subc: str, mapviewer,
                  xmin:float, xmax:float, ymin:float, ymax:float,
                  width:int = 1000, height:int = 1000,
-                 France:bool = False, epsg='31370', Vlaanderen:bool = False) -> None:
+                 France:bool = False, epsg='31370', Vlaanderen:bool = False,
+                 LifeWatch:bool = False) -> None:
 
         super().__init__(label+cat+subc, plotted=False, mapviewer=mapviewer, need_for_wx=False)
 
@@ -264,6 +265,7 @@ class imagetexture(Element_To_Draw):
 
         self.France = France
         self.Vlaanderen = Vlaanderen
+        self.LifeWatch = LifeWatch
 
         self.epsg = epsg
 
@@ -306,6 +308,11 @@ class imagetexture(Element_To_Draw):
                 mybytes = getVlaanderen(self.category,
                                        self.xmin, self.ymin, self.xmax, self.ymax,
                                        self.width, self.height, False)
+
+            elif self.LifeWatch:
+                mybytes = getLifeWatch(self.category + '_' + self.subcategory,
+                                       self.xmin, self.ymin, self.xmax, self.ymax,
+                                       self.width, self.height, False)
             else:
                 mybytes = getWalonmap(self.category + '/' + self.subcategory,
                                       self.xmin, self.ymin, self.xmax, self.ymax,

{wolfhece-2.2.1.dist-info → wolfhece-2.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.1
+Version: 2.2.3
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
@@ -69,6 +69,8 @@ Requires-Dist: plyfile
 Requires-Dist: tabulate
 Requires-Dist: ipympl
 Requires-Dist: contextily
+Requires-Dist: pefile
+Requires-Dist: wolfpydike
 
 Ce paquet contient l'interface graphique Python du logiciel WOLF (HECE - ULiège) de même que plusieurs outils de traitements topographique, hydraulique et hydrologique.
 

{wolfhece-2.2.1.dist-info → wolfhece-2.2.3.dist-info}/RECORD

@@ -5,19 +5,20 @@ wolfhece/GraphProfile.py,sha256=OCgJo0YFFBI6H1z-5egJsOOoWF_iziiza0-bbPejNMc,6965
 wolfhece/Lidar2002.py,sha256=bX-nIzdpjD7rOfEgJpTeaW6rIdAXwDp_z4YTM9CgANY,6068
 wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
+wolfhece/PandasGrid.py,sha256=YIleVkUkoP2MjtQBZ9Xgwk61zbgMj4Pmjj-clVTfPRs,2353
 wolfhece/PyConfig.py,sha256=Y0wtSIFpAMYa7IByh7hbW-WEOVjNsQEduq7vhIYdZQw,16716
 wolfhece/PyCrosssections.py,sha256=igU_ELrg5VrHU6RNbF5tHxPyVImpR3xdpfopJYc7haw,114711
-wolfhece/PyDraw.py,sha256=sSCWZhBSakxp34ifrSyB_Oz57xCm6b-x6_J1Jd87jtY,603334
-wolfhece/PyGui.py,sha256=B7-pAQ0tOkXVIb_3BSjNVROFF9s23lGCSBaQD5NxvOQ,145093
+wolfhece/PyDraw.py,sha256=GVwGT4mG0XnIq9fV5Vvg1jeMMSv6609TAi_OkSj4gGo,629784
+wolfhece/PyGui.py,sha256=IU97wVlmer3Q2MpWbJv4MQWH7nYbc5uN4pRzhr4jdlM,145197
 wolfhece/PyGuiHydrology.py,sha256=sKafpOopBg50L5llZCI_fZtbebVTDtxvoRI6-osUwhg,14745
-wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
-wolfhece/PyPalette.py,sha256=mTknZlfioRGX7iJVoKG1Yc0pQooZA_KYyFsAzvLY4Rk,34344
-wolfhece/PyParams.py,sha256=wVgzJC5Bs8rfx6NdUdcFDtnsaPBYJgRn3A-rROk49MQ,99525
+wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
+wolfhece/PyPalette.py,sha256=SnzMfzpVblbvq1kItLp52jufk6-R1b0QX3fF6RUKKT4,34842
+wolfhece/PyParams.py,sha256=Dh9C_WYICMjo3m9roRySsu8ZgFzzYhSr6RpbaXZni0M,99423
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
-wolfhece/PyVertex.py,sha256=qFf8UPvkbwumRRfjpBcgZmqpHtcEtIEoUh30rWFF-lQ,45205
-wolfhece/PyVertexvectors.py,sha256=2kjtKwdYiGif-NVok8rS9T7Ok8jYMGN4tzy6zXoTxh8,325764
-wolfhece/PyWMS.py,sha256=WmOzHP02wVcB5RGJAlENL_NzF9rYfvLxslRFyxaEt1Q,6615
+wolfhece/PyVertex.py,sha256=PDKpLFPqE1ORzfi36xKIjuKsxR8DR0iNMsLhAGw11rY,45205
+wolfhece/PyVertexvectors.py,sha256=0lt0YyHIz_IxgXqdqPlTDruDwjeP6L1Dw6B2Q35a8kQ,325801
+wolfhece/PyWMS.py,sha256=_HwJh3WVc0eHNCOPlQx40TVCdfXQF86Lb-_qpbzTC2M,8829
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=cUjReVMHFKtakA2wVey5zz6lCgHlSr72y7ZfswZDvTM,33891
@@ -28,6 +29,7 @@ wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/analyze_vect.py,sha256=3lkMwaQ4KRddBVRvlP9PcM66wZwwC0eCmypP91AW-os,6015
 wolfhece/cli.py,sha256=U8D7e_OezfrRfgMsa4TyQ7rI4voLKSY3RK-c8fb6rrw,3156
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
+wolfhece/dike.py,sha256=eG9EDCRk46Nlzpg5OycUeOag_T8joyJ2wzTkQgAT5F0,30710
 wolfhece/drawing_obj.py,sha256=7vY04B6r08nurTTFmBXHyR5tVIF1YzAEw_uz4pqTDIw,4233
 wolfhece/eikonal.py,sha256=iDeDs571sVXGe4IsPSJ1Sa4hX8Ri2jWE7u83xzvA2K8,23189
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
@@ -39,6 +41,7 @@ wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
 wolfhece/irm_qdf.py,sha256=DMdDEAYbgYxApObm6w-dZbBmA8ec6PghBLXR2lUEZLc,27457
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/lagrange_multiplier.py,sha256=0G-M7b2tGzLx9v0oNYYq4_tLAiHcs_39B4o4W3TUVWM,6567
+wolfhece/lifewatch.py,sha256=TOqmbD_fuxXLvrnx401z5OxMqOBBSn-7Yg6flndWXFE,3324
 wolfhece/matplotlib_fig.py,sha256=vnFI6sghw9N9jKhR8X1Z4aWli_5fPNylZQtFuujFJDY,84075
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
@@ -55,21 +58,21 @@ wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools2d_dll.py,sha256=oU0m9XYAf4CZsMoB68IuKeE6SQh-AqY7O5NVED8r9uw,13125
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=RcyJHpoTBudR-dkG5NjS4-X0CgyfHVflZACJAXPBOts,485378
+wolfhece/wolf_array.py,sha256=t6-gLy1Op3Lx6Nmxv-Yo7cQIW62BinFDRP7x6Qpb5u8,486606
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
-wolfhece/wolf_texture.py,sha256=ecoXXmmcLuyG1oPqU2dB_k03qMTCLTVQoSq1xi1EalU,17359
+wolfhece/wolf_texture.py,sha256=IvFtekT5iLU2sivZOOlJXpE4CevjTQYSxHaOp4cH_wI,17723
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
 wolfhece/wolf_vrt.py,sha256=wbxXVN7TL9zgdyF79S-4e3pje6wJEAgBEfF_Y8kkzxs,14271
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
 wolfhece/wolfresults_2D.py,sha256=5Ser0lcfoGbsHLASx_1UtxmanYDGSuOCMgaadSNTHzs,218154
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
-wolfhece/acceptability/Parallels.py,sha256=njrJFH_tTdQUg2px-QqQR6VdhImP1TEujLhpM3JEKNo,4001
+wolfhece/acceptability/Parallels.py,sha256=2wVkfJYor4yl7VYiAZiGGTFwtAab2z66ZfRtBliVweE,4088
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
 wolfhece/acceptability/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/acceptability/acceptability.py,sha256=dLsYVwPiYH33M7y2vVzlLVd9q8dLgDIeTuJ8f20L4ig,28006
-wolfhece/acceptability/acceptability_gui.py,sha256=EWM-WfLWKTzMguZHWgRfRQARxb1xINwx0G9VOzmOn5k,74493
+wolfhece/acceptability/acceptability_gui.py,sha256=OR02JhbBzhqtJAhP1tXudP3Tbi6qkhbu1Kfn6oY-Zds,72307
 wolfhece/acceptability/cli.py,sha256=ul_GmDnSgKSgA7z5ZIzeA_MlS2uqo-Xi48bqmWUS-Qk,19141
-wolfhece/acceptability/func.py,sha256=Aj85M01b09ENb9vN3q6isnJO5a2wNlNfiwhHbguhg_w,68263
+wolfhece/acceptability/func.py,sha256=OP9Gd3l3BQ4_93Zl0rQjGqKf-we_Ncpmu-YkwrZFAkQ,72545
 wolfhece/apps/ManageParams.py,sha256=9okXHGHKEayA9iKTnv8jsVYCP2up5kr6hDaKO_fMCaQ,748
 wolfhece/apps/Optimisation_hydro.py,sha256=ySIaVsFNEx4PaHFLlT2QW9BiwChVcTNd2TBnW1aICsI,810
 wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,104622
@@ -77,13 +80,13 @@ wolfhece/apps/WolfPython2.png,sha256=VMPV-M-3BCOg8zOJss8bXwPmzRYZy8Fo-XtnVYNgbaw
 wolfhece/apps/WolfPython3.png,sha256=3G84zx14HnlB9YXMY4VUAO7IB3eu7JFvi4Kpmc_4zBE,403298
 wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
 wolfhece/apps/acceptability.py,sha256=hMIxTRNQARTTWJJaakb6kEK9udNh-w64VDgxxezVk3k,790
-wolfhece/apps/check_install.py,sha256=vrrkPu0ay5Ru25JKrYqzdVnyfnlzY3rDLYFGDJOptko,3989
+wolfhece/apps/check_install.py,sha256=ULUN2frWsMK2a-aKu5an6qx7JBJ9JJWGK9sWWTqYpYA,4001
 wolfhece/apps/check_version.py,sha256=Zze7ltzcM2ZzIGMwkcASIjapCG8CEzzW9kwNscA3NhM,1768
 wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVzzA,9106
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
-wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=E_lGl4BWE12swHHPwJTWvzfUAgEj2g4eoDA_PFNSTYA,387
+wolfhece/apps/splashscreen.py,sha256=eCPAUYscZPWDYKBHDBWum_VIcE7WXOCBe1GLHL3KUmU,3088
+wolfhece/apps/version.py,sha256=lVoU-2zAdKqdc2HowaZyYIpzDeY0BVhAVNi5RcXr7ig,387
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -92,6 +95,8 @@ wolfhece/apps/wolf_logo3.bmp,sha256=AxRvS_uc2MJn_ksMExPhFEDJ0_PmlR3xU13gzfc28xk,
 wolfhece/apps/wolf_logo4.bmp,sha256=N6d_NZ3V2M-qtSdTM0LP3PhU2TtltB_UNW6Z2WiLrvM,5830
 wolfhece/apps/wolfcompare2Darrays.py,sha256=AfEJjku_oSWWqyCIDOqId0quZrS_NpTIFN4fHcVDWb4,4179
 wolfhece/apps/wolfhydro.py,sha256=EsXTtXhnsQV1j-tiFYcyfMrJpjFv1MrWiftwODdi_8I,817
+wolfhece/assets/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
+wolfhece/assets/speedometer.py,sha256=Oqttbw-AB9niaQRNDd0bmyu-ozyOHoYRQd1dApywwdU,5877
 wolfhece/bernoulli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/bernoulli/chamber.py,sha256=ZWNjTAmTaH8u8J00n8uEib7dy84mUfHWN43805W_Qsw,2354
 wolfhece/bernoulli/fluids.py,sha256=-mPv3EtCcIEfvTI7oSELtOjUFiKhKANu8w96NnUnrvU,464
@@ -107,6 +112,9 @@ wolfhece/clientserver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 wolfhece/clientserver/clientserver.py,sha256=sNJ8STw0kqUjCB4AerqZNbzCtl5WRe_JRvhe7whNoSE,2798
 wolfhece/coupling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/coupling/hydrology_2d.py,sha256=QBIcgujfOX1xX3ARF2PQz6Uqwu3j6EaRw0QlGjG_H7k,53090
+wolfhece/drowning_victims/Class.py,sha256=W7oliBnGE_4i2NwkLgOqdq4eo0EuDdR1qMDF1fGfYUo,94132
+wolfhece/drowning_victims/Functions.py,sha256=hlAOyzt15GYe0urDPYquJaV6i0LyDj7X5BAUGE6ppso,47535
+wolfhece/drowning_victims/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/eva/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/eva/bootstrap.py,sha256=Ys4xTDIvG_QtxCKWLYzb3_XAZU441jGX7fHIbd9Mvr0,840
 wolfhece/eva/hydrogramme_mono.py,sha256=uZFIgJJ-JogMFzt7D7OnyVaHvgxCQJPZz9W9FgnuthA,8138
@@ -276,7 +284,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=d-LWa_FxmPxTSc_H1lDHwqLB6TCqj1IUrRJhatfPMMA,5623
-wolfhece/scenario/config_manager.py,sha256=uJvMry-ApxSDnrlDANkF_8a67VH5tOCbRIQQCtPu9SI,113836
+wolfhece/scenario/config_manager.py,sha256=5_USTuhaAYDNQaqDt2VA0wssv2f53rgjGnMt1vkoc48,113836
 wolfhece/scenario/imposebc_void.py,sha256=PqA_99hKcaqK5zsK6IRIc5Exgg3WVpgWU8xpwNL49zQ,5571
 wolfhece/scenario/update_void.py,sha256=Yb7TMIUx9Gzm9_6qRMJnF39Uqi17dIkMmscSXo2WaTs,10033
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -305,8 +313,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.2.1.dist-info/METADATA,sha256=YHBhMrSW-_ghRKpHukFs1j-NKs4iHqfDKgIcjsBhJkA,2694
-wolfhece-2.2.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-wolfhece-2.2.1.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.2.1.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.1.dist-info/RECORD,,
+wolfhece-2.2.3.dist-info/METADATA,sha256=7nhPe_QhpAi0TfGLOiKVOAdqSKC1Niqz3xWKfBIEqqM,2744
+wolfhece-2.2.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+wolfhece-2.2.3.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.2.3.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.3.dist-info/RECORD,,