wolfhece 2.1.17__py3-none-any.whl → 2.1.19__py3-none-any.whl

wolfhece/PyDraw.py

@@ -882,7 +882,12 @@ class WolfMapViewer(wx.Frame):
 
 
     def get_canvas_bounds(self, gridsize:float = None):
-        """ Retourne les limites de la zone d'affichage """
+        """ 
+        Retourne les limites de la zone d'affichage 
+        
+        :return: [xmin, ymin, xmax, ymax]
+
+        """
 
         if gridsize is None:
 
@@ -1261,7 +1266,7 @@ class WolfMapViewer(wx.Frame):
                 
                 outdir = dlg.GetPath()
 
-            names = ['danger_h.tif', 'danger_u.tif', 'danger_q.tif']
+            names = ['danger_h.tif', 'danger_u.tif', 'danger_q.tif', 'danger_Z.tif']
             for name, danger_map in zip(names, danger_maps):
                 danger_map.write_all(Path(outdir) / name)
 
@@ -2772,13 +2777,26 @@ class WolfMapViewer(wx.Frame):
                                '2015': 'ORTHO_2015', '2016': 'ORTHO_2016', '2017': 'ORTHO_2017',
                                '2018': 'ORTHO_2018', '2019': 'ORTHO_2019', '2020': 'ORTHO_2020',
                                '2021': 'ORTHO_2021', '2022 printemps': 'ORTHO_2022_PRINTEMPS', '2022 été': 'ORTHO_2022_ETE',
-                               '2023 été': 'ORTHO_2023_ETE'}}
+                               '2023 été': 'ORTHO_2023_ETE',
+                               }}
+        data_2021 = {'EAU': {'IDW': 'ZONES_INONDEES_IDW', 
+                             'Emprise': 'ZONES_INONDEES', 
+                             'Emprise wo Alea': 'ZONES_INONDEES_wo_alea'}}
+        
         for idx, (k, item) in enumerate(orthos.items()):
             for kdx, (m, subitem) in enumerate(item.items()):
                 self.add_object(which='wmsback',
                                 newobj=imagetexture('PPNC', m, k, subitem,
                                                     self, xmin, xmax, ymin, ymax, -99999, 1024),
                                 ToCheck=False, id='PPNC ' + m)
+
+        for idx, (k, item) in enumerate(data_2021.items()):
+            for kdx, (m, subitem) in enumerate(item.items()):
+                self.add_object(which='wmsback',
+                                newobj=imagetexture('PPNC', m, k, subitem,
+                                                    self, xmin, xmax, ymin, ymax, -99999, 1024),
+                                ToCheck=False, id='Data 2021 ' + m)
+
         self.add_object(which='wmsback',
                         newobj=imagetexture('PPNC', 'Orthos France', 'OI.OrthoimageCoverage.HR', '',
                                             self, xmin, xmax, ymin, ymax, -99999, 1024, France=True, epsg='EPSG:27563'),
@@ -5594,7 +5612,7 @@ class WolfMapViewer(wx.Frame):
         Add object to current Frame/Drawing area
         """
 
-        filterArray = "bin (*.bin)|*.bin|Elevation WOLF2D (*.top)|*.top|Geotif (*.tif)|*.tif|Float ESRI (*.flt)|*.flt|Numpy (*.npy)|*.npy|Numpy named arrays(*.npz)|*.npz|all (*.*)|*.*"
+        filterArray = "All supported formats|*.bin;*.tif;*.tiff;*.top;*.flt;*.npy;*.npz|bin (*.bin)|*.bin|Elevation WOLF2D (*.top)|*.top|Geotif (*.tif)|*.tif|Float ESRI (*.flt)|*.flt|Numpy (*.npy)|*.npy|Numpy named arrays(*.npz)|*.npz|all (*.*)|*.*"
         filterjson = "json (*.json)|*.json|all (*.*)|*.*"
         filterall = "all (*.*)|*.*"
         filterres2d = "all (*.*)|*.*"
@@ -5662,6 +5680,7 @@ class WolfMapViewer(wx.Frame):
 
         curtree = None
         if which.lower() == 'array' or which.lower() == 'array_crop':
+
             curdict = self.myarrays
             curtree = self.myitemsarray
 
@@ -5860,7 +5879,7 @@ class WolfMapViewer(wx.Frame):
 
                 with wx.lib.busy.BusyInfo(_('Importing files')):
                     wait = wx.BusyCursor()
-                    newobj = Tiles(filename, parent=self, linked_data_dir=dirname)
+                    newobj = Tiles(filename, parent=self, linked_data_dir=dirname, mapviewer=self)
                     del wait
 
                     if which.lower() == 'tilescomp':
@@ -5947,6 +5966,7 @@ class WolfMapViewer(wx.Frame):
             self._set_active_bc()
 
         elif which.lower() == 'array_lidar_first' or which.lower() == 'array_lidar_second':
+
             curdict = self.myarrays
             curtree = self.myitemsarray
 
@@ -6001,6 +6021,7 @@ class WolfMapViewer(wx.Frame):
                 id = 'lidar2002_secondecho'
 
         elif which.lower() == 'res2d':
+
             curdict = self.myres2D
             curtree = self.myitemsres2d
 
@@ -6016,6 +6037,7 @@ class WolfMapViewer(wx.Frame):
             self.active_res2d = newobj
 
         elif which.lower() == 'res2d_gpu':
+
             curdict = self.myres2D
             curtree = self.myitemsres2d
 
@@ -6042,6 +6064,7 @@ class WolfMapViewer(wx.Frame):
             self.myvectors.append(newobj)
 
         elif which.lower() == 'cross_sections':
+
             curdict = self.myvectors
             curtree = self.myitemsvector
 
@@ -6107,7 +6130,7 @@ class WolfMapViewer(wx.Frame):
 
                 with wx.lib.busy.BusyInfo(_('Importing cloud points')):
                     wait = wx.BusyCursor()
-                    newobj = cloud_vertices(filename, header=loadhead)
+                    newobj = cloud_vertices(filename, header=loadhead, mapviewer=self)
                     del wait
 
             self.myclouds.append(newobj)
@@ -6116,12 +6139,13 @@ class WolfMapViewer(wx.Frame):
             self.create_cloud_menu()
 
         elif which.lower() == 'triangulation':
+
             curdict = self.mytri
             curtree = self.myitemstri
             if newobj is None:
                 with wx.lib.busy.BusyInfo(_('Importing triangulation')):
                     wait = wx.BusyCursor()
-                    newobj = Triangulation(filename,mapviewer=self)
+                    newobj = Triangulation(filename, mapviewer=self)
                     del wait
 
             self.mytri.append(newobj)
@@ -6134,8 +6158,11 @@ class WolfMapViewer(wx.Frame):
                 curtree = self.myitemsothers
                 self.myothers.append(newobj)
                 newobj.mapviewer = self
+            else:
+                logging.warning('No object to add in "Other" category -- Please provide an object to add or check your code')
 
         elif which.lower() == 'views':
+
             if newobj is None:
                 newobj = WolfViews(plotted=ToCheck, mapviewer=self)
                 newobj.read_from_file(filename)
@@ -6145,22 +6172,29 @@ class WolfMapViewer(wx.Frame):
             self.myviews.append(newobj)
 
         elif which.lower() == 'wmsback':
+
             if not newobj is None:
                 curdict = self.mywmsback
                 curtree = self.myitemswmsback
                 self.mywmsback.append(newobj)
+            else:
+                logging.warning('No object to add in "WMS background" category -- Please provide an object to add or check your code')
 
         elif which.lower() == 'wmsfore':
+
             if not newobj is None:
                 curdict = self.mywmsfore
                 curtree = self.myitemswmsfore
                 self.mywmsfore.append(newobj)
+            else:
+                logging.warning('No object to add in "WMS foreground" category -- Please provide an object to add or check your code')
 
         elif which.lower() == 'particlesystem':
+            
             curdict = self.mypartsystems
             curtree = self.myitemsps
             if newobj is None:
-                    newobj = Particle_system()
+                    newobj = Particle_system(mapviewer=self)
                     newobj.load(filename)
 
             self.mypartsystems.append(newobj)
@@ -6546,6 +6580,7 @@ class WolfMapViewer(wx.Frame):
         elif text == _('Down'):
             self.downobj()
         elif text == _('Rename'):
+
             #Modification du nom de l'objet sélectionné
             if self.selected_object is not None:
                 #récupération de l'id courant
@@ -7341,8 +7376,9 @@ class WolfMapViewer(wx.Frame):
 
             #Print info in the status bar
             txt  = 'Dx : {:4f} ; Dy : {:4f}'.format(self.active_array.dx, self.active_array.dy)
-            txt += ' ; Xmin : {:4f} ; Ymin : {:4f}'.format(self.active_array.xmin, self.active_array.ymin)
-            txt += ' ; Xmax : {:4f} ; Ymax : {:4f}'.format(self.active_array.xmax, self.active_array.ymax)
+            txt += ' ; Xmin : {:4f} ; Ymin : {:4f}'.format(self.active_array.origx, self.active_array.origy)
+            txt += ' ; Xmax : {:4f} ; Ymax : {:4f}'.format(self.active_array.origx + self.active_array.dx * float(self.active_array.nbx), 
+                                                           self.active_array.origy + self.active_array.dy * float(self.active_array.nby))
             txt += ' ; Nx : {:d} ; Ny : {:d}'.format(self.active_array.nbx, self.active_array.nby)
 
             if self.active_array.nb_blocks > 0:

wolfhece/PyWMS.py

@@ -12,7 +12,7 @@ from .PyTranslate import _
 def to_image(mybytes:BytesIO) -> Image:
     return Image.open(mybytes)
 
-def getWalonmap(cat:Literal['IMAGERIE/ORTHO_2021', 'ALEA', 'CADMAP', 'LIDAXES', '$IDW', 'ZONES_INONDEES'],
+def getWalonmap(cat:Literal['IMAGERIE/ORTHO_2021', 'ALEA', 'CADMAP', 'LIDAXES', '$IDW', 'EAU/ZONES_INONDEES'],
                 xl:float,
                 yl:float,
                 xr:float,
@@ -23,6 +23,8 @@ def getWalonmap(cat:Literal['IMAGERIE/ORTHO_2021', 'ALEA', 'CADMAP', 'LIDAXES',
 
     if cat.find('$')>0:
         catloc=cat[:cat.find('$')]
+    elif cat.find('_wo_alea')>0:
+        catloc=cat[:cat.find('_wo_alea')]
     else:
         catloc=cat
 
@@ -78,18 +80,17 @@ def getWalonmap(cat:Literal['IMAGERIE/ORTHO_2021', 'ALEA', 'CADMAP', 'LIDAXES',
         elif cat.find('LIDAXES')>0:
             curcont=['4,5,6,7,8,9,11,13']
             curstyles=['default,default,default,default,default,default,default,default']
-        elif cat.find('$IDW')>0:
-            curcont=[ul.quote('Zones inondées - Modélisation IDW')]
+        elif cat.find('IDW')>0:
+            curcont=['0']
             curstyles=['default']
         elif cat.find('ZONES_INONDEES')>0:
-            layers=[
-                ul.quote('Zones inondables'),
-                ul.quote('Zones inondées - Satellites'),
-                ul.quote('Zones indondées - Verviers'),
-                ul.quote('Zones inondées - Enquêtes SPW'),
-                ul.quote('Zones inondées - Digitalisations')]
-            curcont=['{},{},{},{},{},{}'.format(layers[0],layers[1],layers[2],layers[3],layers[4])]
-            curstyles=['default,default,default,default,default']
+
+            if 'wo_alea' in cat:
+                curcont = list(wms.contents)[1:]
+                curstyles=['default']*len(curcont)
+            else:
+                curcont = list(wms.contents)
+                curstyles=['default']*len(curcont)
 
         try:
             img=wms.getmap(layers=curcont,styles=curstyles,srs='EPSG:31370',bbox=(xl,yl,xr,yr),size=(w,h),format='image/png',transparent=True)

wolfhece/apps/version.py

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

wolfhece/models/white_black.pal

@@ -0,0 +1,9 @@
+2
+0.0
+255
+255
+255
+420.6319885253906
+0
+0
+0

wolfhece/wolf_array.py

@@ -477,7 +477,7 @@ class header_wolf():
                         logging.warning(_('get_xy_from_ij_array - ij is a tuple of 2 arrays, it is converted to a 2D array'))
             else:
                 ij = np.array(ij)
-        
+
         elif isinstance(ij,list):
             if len(ij) == 2:
                 if (isinstance(ij[0],np.ndarray)) and (isinstance(ij[1],np.ndarray)):
@@ -486,7 +486,7 @@ class header_wolf():
                         logging.warning(_('get_xy_from_ij_array - ij is a list of 2 arrays, it is converted to a 2D array'))
             else:
                 ij = np.array(ij)
-            
+
         if abs:
             tr_x = self.translx
             tr_y = self.transly
@@ -649,6 +649,49 @@ class header_wolf():
             filename = str(filename)
 
         if filename.endswith('.tif'):
+            from osgeo import gdal
+
+            raster:gdal.Dataset
+            raster = gdal.Open(filename)
+            geotr = raster.GetGeoTransform()
+            self.dx = geotr[1]
+            self.dy = abs(geotr[5])
+            self.origx = geotr[0]
+            self.origy = geotr[3]
+            self.nbx = raster.RasterXSize
+            self.nby = raster.RasterYSize
+
+            """
+            https://docs.qgis.org/3.34/en/docs/user_manual/processing_algs/gdal/rasterconversion.html
+
+            0 — Use Input Layer Data Type
+            1 — Byte (Eight bit unsigned integer (quint8))
+            2 — Int16 (Sixteen bit signed integer (qint16))
+            3 — UInt16 (Sixteen bit unsigned integer (quint16))
+            4 — UInt32 (Thirty two bit unsigned integer (quint32))
+            5 — Int32 (Thirty two bit signed integer (qint32))
+            6 — Float32 (Thirty two bit floating point (float))
+            7 — Float64 (Sixty four bit floating point (double))
+            8 — CInt16 (Complex Int16)
+            9 — CInt32 (Complex Int32)
+            10 — CFloat32 (Complex Float32)
+            11 — CFloat64 (Complex Float64)
+            12 — Int8 (Eight bit signed integer (qint8))
+            """
+
+            dtype = raster.GetRasterBand(1).DataType
+
+            if dtype in [1, 4]:
+                self.wolftype = WOLF_ARRAY_FULL_INTEGER
+            elif dtype ==6:
+                self.wolftype = WOLF_ARRAY_FULL_SINGLE
+            elif dtype == 7:
+                self.wolftype = WOLF_ARRAY_FULL_DOUBLE
+            else:
+                logging.error(_('The datatype of the raster is not supported -- {}'.format(dtype)))
+                logging.error(_('Please convert the raster to a supported datatype - or upgrade the code to support this datatype'))
+                logging.error(_('See : read_txt_header and import_geotif in wolf_array.py'))
+                return
             return
 
         if filename.endswith('.flt'):
@@ -2162,7 +2205,7 @@ class Ops_Array(wx.Frame):
                         self.myzones.showstructure()
                     return
 
-        self.myzones.showstructure()   
+        self.myzones.showstructure()
 
     def OnLoadvec(self, event:wx.MouseEvent):
         """ Load vector file """
@@ -4666,9 +4709,76 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if crop is not None :
             if os.path.exists(fn):
+
+                tmpdx = self.dx
+
+                fn_crop = fn + '_crop.tif'
+                if type(crop) is np.ndarray:
+                    pass
+                elif type(crop) is list:
+                    pass
+                else:
+                    if not self.wx_exists:
+                        logging.error(_('Crop must be a list or a numpy array with 4 values - xmin, xmax, ymin, ymax'))
+                        return
+
+                    raster:gdal.Dataset
+                    raster = gdal.Open(fn)
+                    geotr = raster.GetGeoTransform()
+                    self.dx = geotr[1]
+                    self.dy = abs(geotr[5])
+
+
+                    newcrop = CropDialog(None)
+
+                    if self.wx_exists:
+                        bounds = self.mapviewer.get_canvas_bounds()
+
+                        newcrop.dx.Value = str(self.dx)
+                        newcrop.dy.Value = str(self.dy)
+
+                        newcrop.dx.Enable(False)
+                        newcrop.dy.Enable(False)
+
+                        newcrop.ox.Value = str(float((bounds[0] // 50.) * 50.))
+                        newcrop.ex.Value = str(float((bounds[2] // 50.) * 50.))
+                        newcrop.oy.Value = str(float((bounds[1] // 50.) * 50.))
+                        newcrop.ey.Value = str(float((bounds[3] // 50.) * 50.))
+
+                    badvalues = True
+                    while badvalues:
+                        badvalues = False
+
+                        ret = newcrop.ShowModal()
+                        if ret == wx.ID_CANCEL:
+                            newcrop.Destroy()
+                            return
+                        else:
+                            crop = [float(newcrop.ox.Value), float(newcrop.ex.Value),
+                                    float(newcrop.oy.Value), float(newcrop.ey.Value)]
+
+                            tmpdx = float(newcrop.dx.Value)
+                            tmpdy = float(newcrop.dy.Value)
+
+                        if self.dx != tmpdx or self.dy != tmpdy:
+                            if tmpdx / self.dx != tmpdy / self.dy:
+                                badvalues = True
+
+                    newcrop.Destroy()
+
                 xmin, xmax, ymin, ymax = crop
-                gdal.Translate(fn+'_crop.tif', fn, projWin=[xmin, ymax, xmax, ymin])
-                fn +='_crop.tif'
+
+                with wx.FileDialog(None, _('Save the cropped file for later'), wildcard="Tiff files (*.tif)|*.tif",
+                                    style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT) as fileDialog:
+
+                    if fileDialog.ShowModal() == wx.ID_CANCEL:
+                        return
+
+                    fn_crop = fileDialog.GetPath()
+
+
+                gdal.Translate(fn_crop, fn, projWin=[xmin, ymax, xmax, ymin])
+                fn  = fn_crop
 
         raster:gdal.Dataset
         raster = gdal.Open(fn)
@@ -6452,6 +6562,20 @@ class WolfArray(Element_To_Draw, header_wolf):
             else:
                 newcrop = CropDialog(None)
 
+                if self.mapviewer is not None:
+                    bounds = self.mapviewer.get_canvas_bounds()
+
+                    newcrop.dx.Value = str(self.dx)
+                    newcrop.dy.Value = str(self.dy)
+
+                    # newcrop.dx.Enable(False)
+                    # newcrop.dy.Enable(False)
+
+                    newcrop.ox.Value = str(float((bounds[0] // 50.) * 50.))
+                    newcrop.ex.Value = str(float((bounds[2] // 50.) * 50.))
+                    newcrop.oy.Value = str(float((bounds[1] // 50.) * 50.))
+                    newcrop.ey.Value = str(float((bounds[3] // 50.) * 50.))
+
                 badvalues = True
                 while badvalues:
                     badvalues = False

wolfhece/wolfresults_2D.py

@@ -3098,6 +3098,17 @@ class Wolfresults_2D(Element_To_Draw):
         else:
             return self.myblocks[getkeyblock(block,False)].waterdepth
 
+    def get_top_for_block(self, block: Union[int, str]) -> WolfArray:
+        """
+        Retourne la matrice de topographie pour un bloc spécifique
+
+        block : numéro du bloc; 1-based;
+        """
+        if isinstance(block,str):
+            return self.myblocks[block].top
+        else:
+            return self.myblocks[getkeyblock(block,False)].top
+
     def get_qx_for_block(self, block: Union[int, str]) -> WolfArray:
         """
         Retourne la matrice de débit selon X pour un bloc spécifique
@@ -4116,7 +4127,7 @@ class Wolfresults_2D(Element_To_Draw):
         self.get_working_array()
         self.updatepalette(whichpal)
 
-    def danger_map(self, start:int=0, end:int=-1, every:int=1) -> Union[tuple[WolfArray, WolfArray, WolfArray], tuple[WolfArrayMB, WolfArrayMB, WolfArrayMB]]:
+    def danger_map(self, start:int=0, end:int=-1, every:int=1) -> Union[tuple[WolfArray, WolfArray, WolfArray, WolfArray], tuple[WolfArrayMB, WolfArrayMB, WolfArrayMB, WolfArrayMB]]:
         """
         Create Danger Maps
 
@@ -4124,7 +4135,7 @@ class Wolfresults_2D(Element_To_Draw):
         :param end: end time step - 0-based
         :param every: step interval
 
-        :return : tuple of WolfArray or WolfArrayMB - H, U_norm, Q_norm
+        :return : tuple of WolfArray or WolfArrayMB - H, U_norm, Q_norm, Z
         """
 
         # Number of  time steps
@@ -4135,11 +4146,12 @@ class Wolfresults_2D(Element_To_Draw):
         # Init Danger Maps basde on results type
         #    If only one block --> WolfArray
         #    If only multiple blocks --> WolfArrayMB
-        danger_map_matrix_h = self.as_WolfArray(copyarray=True)
-        danger_map_matrix_v = self.as_WolfArray(copyarray=True)
+        danger_map_matrix_h   = self.as_WolfArray(copyarray=True)
+        danger_map_matrix_v   = self.as_WolfArray(copyarray=True)
         danger_map_matrix_mom = self.as_WolfArray(copyarray=True)
+        danger_map_matrix_z   = self.as_WolfArray(copyarray=True)
 
-        danger = [danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom]
+        danger = [danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom, danger_map_matrix_z]
 
         for curdanger in danger:
             curdanger.nullvalue = 0.
@@ -4157,17 +4169,21 @@ class Wolfresults_2D(Element_To_Draw):
                     wd = self.get_h_for_block(curblock)
                     qx = self.get_qx_for_block(curblock)
                     qy = self.get_qy_for_block(curblock)
+                    top = self.get_top_for_block(curblock)
 
                     ij = np.where(~wd.array.mask)
 
                     # 
                     mom = np.zeros_like(wd.array)
                     v   = np.zeros_like(wd.array)
+                    z   = np.zeros_like(wd.array)
+
                     mom[ij] = (qx.array[ij]**2.+qy.array[ij]**2.)**.5
                     v[ij]   = mom[ij]/wd.array[ij]
+                    z[ij]   = wd.array[ij] + top.array[ij]
 
                     # Comparison
-                    for curdanger, curcomp in zip(danger, [wd.array, v, mom]):
+                    for curdanger, curcomp in zip(danger, [wd.array, v, mom, z]):
                         ij = np.where((curdanger.array < curcomp) & (~wd.array.mask))
                         curdanger.array.data[ij] = curcomp[ij]
                         curdanger.array.mask[ij] = False
@@ -4177,17 +4193,21 @@ class Wolfresults_2D(Element_To_Draw):
                 wd = self.get_h_for_block(curblock)
                 qx = self.get_qx_for_block(curblock)
                 qy = self.get_qy_for_block(curblock)
+                top = self.get_top_for_block(curblock)
 
                 ij = np.where(~wd.array.mask)
 
                 # 
                 mom = np.zeros_like(wd.array)
                 v   = np.zeros_like(wd.array)
+                z   = np.zeros_like(wd.array)
+
                 mom[ij] = (qx.array[ij]**2.+qy.array[ij]**2.)**.5
                 v[ij]   = mom[ij]/wd.array[ij]
+                z[ij]   = wd.array[ij] + top.array[ij]
 
                 # Comparison
-                for curdanger, curcomp in zip(danger, [wd.array, v, mom]):
+                for curdanger, curcomp in zip(danger, [wd.array, v, mom, z]):
                     ij = np.where((curdanger.array < curcomp) & (~wd.array.mask))
                     curdanger.array.data[ij] = curcomp[ij]
                     curdanger.array.mask[ij] = False
@@ -4196,14 +4216,15 @@ class Wolfresults_2D(Element_To_Draw):
 
         if self.nb_blocks>1:
             for i in range(self.nb_blocks):
-                danger_map_matrix_v[i].array.mask[:,:] = danger_map_matrix_h[i].array.mask[:,:]
+                danger_map_matrix_v[i].array.mask[:,:]   = danger_map_matrix_h[i].array.mask[:,:]
                 danger_map_matrix_mom[i].array.mask[:,:] = danger_map_matrix_h[i].array.mask[:,:]
+                danger_map_matrix_z[i].array.mask[:,:]   = danger_map_matrix_h[i].array.mask[:,:]
         else:
-            danger_map_matrix_v.array.mask[:,:] = danger_map_matrix_h.array.mask[:,:]
+            danger_map_matrix_v.array.mask[:,:]   = danger_map_matrix_h.array.mask[:,:]
             danger_map_matrix_mom.array.mask[:,:] = danger_map_matrix_h.array.mask[:,:]
+            danger_map_matrix_z.array.mask[:,:]   = danger_map_matrix_h.array.mask[:,:]
 
-
-        return (danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom)
+        return (danger_map_matrix_h, danger_map_matrix_v, danger_map_matrix_mom, danger_map_matrix_z)
 
     def danger_map_only_h(self, start:int=0, end:int=-1, every:int=1) -> WolfArray:
         """

{wolfhece-2.1.17.dist-info → wolfhece-2.1.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.17
+Version: 2.1.19
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: AGPL-v3 License
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.17.dist-info → wolfhece-2.1.19.dist-info}/RECORD

@@ -6,7 +6,7 @@ wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/Model1D.py,sha256=-cMz-ePSYzrKVVDidiDOz6cojEZ3y6u9gIb7RPwT6Y8,476593
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
 wolfhece/PyCrosssections.py,sha256=f4dNYRUGZKePruaaBiTcn5vlrw8TFTj9XwTDrdiF_uU,112450
-wolfhece/PyDraw.py,sha256=ayK8YWZGOj79auURpkHaDCUreOlaAtMVq2ZpuzL3s_Q,383008
+wolfhece/PyDraw.py,sha256=YlgDQm0xiJP0uWLCpLVFhjH9YPl3O7JyO-2tLYlqxqw,384535
 wolfhece/PyGui.py,sha256=fqy8f3tLt7myJskVvspTQ_ZO7kaiSNKmcfFLrfr4w7M,103174
 wolfhece/PyGuiHydrology.py,sha256=r8kcY2eGAQzSwVtLpyMUiBL5xBpMBsi7ovs0PgStGWw,14648
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
@@ -16,7 +16,7 @@ wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=dHTjyYYTn0F_NWerlAOBKHV79RUzEEtMJMldQtVc1Cs,40092
 wolfhece/PyVertexvectors.py,sha256=4K0T74MUH-ycX79hFa2618vKVTu9qOSh49hlbKrydMg,224123
-wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
+wolfhece/PyWMS.py,sha256=pV7JdzbreQGXCg3E6PwllchEUYu2YiPZEIua2ppJorA,4304
 wolfhece/RatingCurve.py,sha256=f6IGLS5aJBJD_t_k903m_yRZ60MzKNKanzD6njXZxa8,22200
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=vbLxSWwHPsCAsR13KaG5WVmVn_cha7-6cF4zj7Diiz8,33593
@@ -48,13 +48,13 @@ wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
 wolfhece/test_Results2DGPU.py,sha256=NOJ_hFXrcLSQXS1dtsqXRQltqIZtDSHMz_EgAJ2_FHU,307
 wolfhece/textpillow.py,sha256=zEfLrKhfCDyMaVuQOUjHqz6MGKeQ4aewMxOsWi5-wKI,13832
 wolfhece/tools_mpl.py,sha256=q8Yc4aukPPiUcEzREvZRM_em67XqXaahdoaNt0DETfE,266
-wolfhece/wolf_array.py,sha256=tYzkVd4Zrvr6FotO571IfW6Kkvx9Kli9QnzbiXVwZEo,337760
+wolfhece/wolf_array.py,sha256=8cYHIwul4VVkSXwGqPMLaEv8n3c5cC0Ozp5xdfupUsI,342928
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
 wolfhece/wolf_vrt.py,sha256=un5CKzAUmzSsjLXK7YLnQEWz8FLoafXJs8oqUvS_-h0,10271
 wolfhece/wolf_zi_db.py,sha256=Ok0MxQYZMMLRJN1QY-HSplLhUzzb6gkXgBQ3ihhLQHk,12669
-wolfhece/wolfresults_2D.py,sha256=6CkXD_X4pOBFce0nFZjR6VjKzLKSYqqY4UhXKzzrKuM,164515
+wolfhece/wolfresults_2D.py,sha256=U42Rz8fWQ6Zb2nvzPGvj6eHz_i_RNkmK056AuLDSYgs,165557
 wolfhece/xyz_file.py,sha256=aQOcTHkHRhXHxL_WxTHwzygp6e47San7SHSpxKQU0dw,5457
 wolfhece/apps/ManageParams.py,sha256=heg5L4fMn0ettR7Bad_Q680o_JWnTbe3WFkL_9IziAk,312
 wolfhece/apps/Optimisation_hydro.py,sha256=mHazBazTUGyxPbHPXhaQim8vqIeOOuKPjH0B48VWduA,374
@@ -66,7 +66,7 @@ wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9
 wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
 wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
 wolfhece/apps/splashscreen.py,sha256=LkEVMK0eCc84NeCWD3CGja7fuQ_k1PrZdyqD3GQk_8c,2118
-wolfhece/apps/version.py,sha256=YX9tmGcv0oDZgHzLyJ-fs3F4ENyIBZMuarvn4elQtAo,388
+wolfhece/apps/version.py,sha256=pxI-blXjVWz8Af7dvteh6caxvhN-mCRsq-_4uSmye8s,388
 wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
 wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -228,6 +228,7 @@ wolfhece/models/shields_cst.pal,sha256=zUGFI6HiL0bsHeOzcWNih3F9cxXKXLLZYA5rtqRbz
 wolfhece/models/walous_niv1.pal,sha256=mHMjCB-ja47mV3ZsvDOhS2CEK8YN6ewOkf1W7l7JQ8k,138
 wolfhece/models/walous_niv2.pal,sha256=B5wt5-O88dpaiA6yR4uriOy0tfDVU_cms0Xr6Dw9ZGg,377
 wolfhece/models/waterdepths.pal,sha256=8rcQfuZOeLKzYv5sARPkhpvZYc1OToj3ZukcbuRUgIY,136
+wolfhece/models/white_black.pal,sha256=BKjVN1kuk1OtJB9S3uM5fxteWbggI3Pb8p9WdDptT4c,51
 wolfhece/opengl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/opengl/gl_utils.py,sha256=-eH2WAWdLFr6mzEwN8XdfJfM8U2rgvRryCAqjH-zeys,66136
 wolfhece/opengl/py3d.py,sha256=Ws2VM8TNHR4Tx_Ud14c38FEco3LZWevH7UvtSUt6osw,66451
@@ -267,8 +268,8 @@ wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,11
 wolfhece/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
-wolfhece-2.1.17.dist-info/METADATA,sha256=jWnXOeve-xUr_A3ZHX9uCTDFNr8GVLlUTepoSZN0HD0,2282
-wolfhece-2.1.17.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-wolfhece-2.1.17.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.17.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.17.dist-info/RECORD,,
+wolfhece-2.1.19.dist-info/METADATA,sha256=nBRFLNjydXPkETNSMpS4ccjkMxDi8kgcghfRBWX9Vmg,2282
+wolfhece-2.1.19.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+wolfhece-2.1.19.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.19.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.19.dist-info/RECORD,,