wolfhece 2.0.23__py3-none-any.whl → 2.0.25__py3-none-any.whl

wolfhece/wolfresults_2D.py

@@ -352,17 +352,28 @@ class Props_Res_2D(wx.Frame):
 
         Toolssizer = wx.BoxSizer(wx.VERTICAL)
         hbox = wx.BoxSizer(wx.HORIZONTAL)
-        self._label_nullvalue = wx.StaticText(self._tools,label=_('Epsilon'))
-        self._txt_nullvalue = wx.TextCtrl(self._tools,value=str(self._parent.epsilon), style=wx.TE_CENTER)
-        self._txt_nullvalue.SetToolTip(_('Epsilon value under which the value is not plotted'))
-        hbox.Add(self._label_nullvalue, 0, wx.EXPAND|wx.ALL)
-        hbox.Add(self._txt_nullvalue, 1, wx.EXPAND|wx.ALL)
+        hbox2 = wx.BoxSizer(wx.HORIZONTAL)
+
+        self._label_epsilon = wx.StaticText(self._tools,label=_('Epsilon'))
+        self._txt_epsilon = wx.TextCtrl(self._tools,value=str(self._parent.epsilon), style=wx.TE_CENTER)
+        self._txt_epsilon.SetToolTip(_('Epsilon value under which the value is not plotted'))
+
+        self._label_nullvalue = wx.StaticText(self._tools,label=_('Null value'))
+        self._txt_nullvalue = wx.TextCtrl(self._tools,value=str(self._parent.nullvalue), style=wx.TE_CENTER)
+        self._txt_nullvalue.SetToolTip(_('Null value -- All node with this value will be masked (not plotted)'))
+
+        hbox.Add(self._label_epsilon, 0, wx.EXPAND|wx.ALL)
+        hbox.Add(self._txt_epsilon, 1, wx.EXPAND|wx.ALL)
+
+        hbox2.Add(self._label_nullvalue, 0, wx.EXPAND|wx.ALL)
+        hbox2.Add(self._txt_nullvalue, 1, wx.EXPAND|wx.ALL)
 
         self._Apply_Tools = wx.Button(self._tools, wx.ID_ANY, _("Apply modifications"), wx.DefaultPosition,
                                  wx.DefaultSize, 0)
         self._Apply_Tools.SetToolTip(_("Save modifications into memmory/object"))
 
         Toolssizer.Add(hbox, 0, wx.EXPAND)
+        Toolssizer.Add(hbox2, 0, wx.EXPAND)
         Toolssizer.Add(self._Apply_Tools, 1, wx.EXPAND)
 
         self._tools.SetSizer(Toolssizer)
@@ -628,14 +639,29 @@ class Props_Res_2D(wx.Frame):
     def OnApplyTools(self, event:wx.MouseEvent):
         """ Apply modifications in the textctrl """
 
+        neweps:str  = self._txt_epsilon.Value
         newnull:str = self._txt_nullvalue.Value
+
+        if neweps.lower() == 'nan':
+            neweps = np.nan
+        else:
+            neweps = float(neweps)
+
         if newnull.lower() == 'nan':
             newnull = np.nan
         else:
             newnull = float(newnull)
 
-        if self._parent.epsilon != newnull:
-            self._parent.epsilon = newnull
+        to_update = False
+        if self._parent.epsilon != neweps:
+            self._parent.epsilon = neweps
+            to_update = True
+
+        if self._parent.nullvalue != newnull:
+            self._parent.nullvalue = newnull
+            to_update = True
+
+        if to_update:
             self._parent.read_oneresult(self._parent.current_result)
             self._parent.set_currentview()
 
@@ -1379,10 +1405,14 @@ class OneWolfResult:
 
     @property
     def sediment_diameter(self):
+        """ Diamètre des particules de sédiment [m] """
+
         return self._sedimentdiam
 
     @sediment_diameter.setter
     def sediment_diameter(self, value:float):
+        """ Diamètre des particules de sédiment [m] """
+
         self._force_update_shields = self._sedimentdiam != value
         self._sedimentdiam = value
         # forcer la MAJ si nécessaire
@@ -1391,10 +1421,14 @@ class OneWolfResult:
 
     @property
     def sediment_density(self):
+        """ Densité des particules de sédiment [-] """
+
         return self._sedimentdensity
 
     @sediment_density.setter
     def sediment_density(self, value:float):
+        """ Densité des particules de sédiment [-] """
+
         self._force_update_shields = self._sedimentdensity != value
         self._sedimentdensity = value
         # forcer la MAJ si nécessaire
@@ -1403,12 +1437,23 @@ class OneWolfResult:
 
     @property
     def current(self):
+        """ Vue courante """
+
         return self._current
 
-    def set_linkedvec(self,link):
+    def set_linkedvec(self, link:vector):
+        """ Set the linked vecteor -- used for masking outside the vector """
         self.linkedvec = link
 
-    def set_epsilon(self,eps):
+    def set_epsilon(self, eps:float):
+        """
+        Définit la valeur de l'epsilon pour le masquage des données.
+
+        Toute valeur de waterdepth inférieure à eps sera masquée. see "filter_inundation"
+
+        :param eps: valeur de l'epsilon
+        """
+
         self.epsilon = eps
 
     def filter_inundation(self):
@@ -1420,7 +1465,13 @@ class OneWolfResult:
         mask = self.waterdepth.array < self.epsilon
         self._current.filter_inundation(mask = mask)
 
-    def set_current(self,which):
+    def set_current(self, which:views_2D):
+        """
+        Définition de la vue courante
+
+        :param which: vue courante (voir enum views_2D)
+        """
+
         self._which_current = which
 
         if which==views_2D.WATERDEPTH:
@@ -1667,6 +1718,14 @@ class OneWolfResult:
             self._vec_field.arrow_pixel_size = max(1,self._vec_field.arrow_pixel_size)
 
     def update_pal(self, curpal:wolfpalette, graypal=None, bluepal=None):
+        """
+        Mise à jour de la palette
+
+        :param curpal: palette courante
+        :param graypal: palette grise
+        :param bluepal: palette bleue
+        """
+
         which = self._which_current
 
         self._current.mypal = curpal
@@ -1683,12 +1742,13 @@ class OneWolfResult:
         elif which =='t_wd_u':
             self._view.pals = [graypal,bluepal,None]
 
-    def get_critdiam(self,which) -> WolfArray:
+    def get_critdiam(self, which:int) -> WolfArray:
         """
         Calcul du dimètre critique
 
-        !param which : 0 == Shields ; 1 == Izbach
+        :param which : 0 = Shields ; 1 = Izbach
         """
+
         def compute(which) -> WolfArray:
             ij = np.argwhere(self.waterdepth.array>0.)
 
@@ -1705,16 +1765,11 @@ class OneWolfResult:
 
             return diamcrit
 
-        if self.wx_exists:
-
-            with wx.lib.busy.BusyInfo(_('Computing critical diameters')):
-                wait = wx.BusyCursor()
+        logging.info(_('Computing critical diameters'))
 
-                diamcrit = compute(which)
+        diamcrit = compute(which)
 
-                del wait
-        else:
-            diamcrit = compute(which)
+        logging.info(_('End of computing critical diameters'))
 
         return diamcrit
 
@@ -1741,36 +1796,28 @@ class OneWolfResult:
 
             return shields
 
-        if self.wx_exists:
-            with wx.lib.busy.BusyInfo(_('Computing critical diameters')):
-                wait = wx.BusyCursor()
-
-                shields = compute()
-
-                del wait
-        else:
-            shields = compute()
+        logging.info(_('Computing critical diameters'))
+        shields = compute()
+        logging.info(_('End of computing critical diameters'))
 
         return shields
 
-    def get_critsusp(self,which=50):
+    def get_critsusp(self, which:int = 50):
 
-        with wx.lib.busy.BusyInfo(_('Computing critical diameters')):
-            wait = wx.BusyCursor()
-            ij = np.argwhere(self.waterdepth.array>0.)
+        logging.info(_('Computing critical diameters'))
+        ij = np.argwhere(self.waterdepth.array>0.)
 
-            diamcrit = WolfArray(mold=self.waterdepth)
-            qnorm = (self.qx**2.+self.qy**2.)**.5
-            qnorm.array.mask=self.waterdepth.array.mask
+        diamcrit = WolfArray(mold=self.waterdepth)
+        qnorm = (self.qx**2.+self.qy**2.)**.5
+        qnorm.array.mask=self.waterdepth.array.mask
 
-            diam = np.asarray([get_d_cr_susp(qnorm.array[i,j],self.waterdepth.array[i,j],1./self.rough_n.array[i,j],which=which) for i,j in ij])
+        diam = np.asarray([get_d_cr_susp(qnorm.array[i,j],self.waterdepth.array[i,j],1./self.rough_n.array[i,j],which=which) for i,j in ij])
 
-            diamcrit.array[ij[:,0],ij[:,1]] = diam
-
-            del wait
-            return diamcrit
+        diamcrit.array[ij[:,0],ij[:,1]] = diam
 
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None):
+        """ Affichage des résultats """
+
         if self._which_current in VIEWS_VECTOR_FIELD:
             self._vec_field.plot(sx, sy,xmin,ymin,xmax,ymax)
         elif self._which_current in VIEWS_COMPLEX:
@@ -1778,7 +1825,9 @@ class OneWolfResult:
         else:
             self._current.plot(sx, sy,xmin,ymin,xmax,ymax)
 
-    def get_values_labels(self, i, j):
+    def get_values_labels(self, i:int, j:int):
+        """ Récupération des valeurs et labels pour affichage """
+
         which = self._which_current
 
         mylab = [which.value]
@@ -1872,6 +1921,7 @@ class Wolfresults_2D(Element_To_Draw):
      - la classe se comporte donc un peu comme une généralisation d'une matrice 'WolfArrayMB' mais il ne s'agit pas d'une extension par polymorphisme
      - on retrouve cependant plusieurs routines similaires afin de faciliter l'intégration dans un viewer WX
     """
+
     myblocks:dict[str, OneWolfResult]
     head_blocks:dict[str, header_wolf]
 
@@ -1888,19 +1938,26 @@ class Wolfresults_2D(Element_To_Draw):
                  need_for_wx: bool = False,
                  loader=None) -> None:
         """
-        gpu_loader: if True then we'll load GPU results.
-        This param was introduced because one cannot guess if one's loading GPU results
-        by just looking at the filename (GPU results come in directories).
+        Initialisation
+
+        :param fname : nom du fichier de résultats
+        :param mold : objet 'WolfArray' servant de moule pour les résultats
+        :param eps : valeur de l'epsilon pour le masquage des données
+        :param idx : identifiant de l'objet
+        :param plotted : si True alors l'objet est prêt à être affiché
+        :param mapviewer : objet 'WolfMapViewer' pour l'affichage
+        :param need_for_wx : si True alors l'objet abesoin d'une app WX. Si elle n'existe pas, génération d'une erreur !
+        :param loader : if True then we'll use this function rather than classic one.
+                        This param was introduced because one cannot guess if one's loading GPU results
+                        by just looking at the filename (GPU results come in directories).
         """
         super().__init__(idx, plotted, mapviewer, need_for_wx)
 
-        """
-        Initialisation
-        """
         self.filename=""
         self.filenamegen=self.filename
 
         self.linkedvec = None # vecteur d'exclusion de données
+
         self.epsilon = eps
         self._epsilon_default = self.epsilon
 
@@ -2063,6 +2120,7 @@ class Wolfresults_2D(Element_To_Draw):
         :param abs = if True, add translation to (x, y) (coordinate to global space)
         :return : tuple of two lists of two floats - ([xmin, xmax],[ymin, ymax])
         """
+
         if abs:
             return ([self.origx + self.translx, self.origx + self.translx + float(self.nbx) * self.dx],
                     [self.origy + self.transly, self.origy + self.transly + float(self.nby) * self.dy])
@@ -2072,6 +2130,7 @@ class Wolfresults_2D(Element_To_Draw):
 
     def check_bounds_ij(self, i:int, j:int):
         """Check if i and j are inside the array bounds"""
+
         x,y = self.get_xy_from_ij(i,j)
         return self.check_bounds_xy(x,y)
 
@@ -2082,14 +2141,18 @@ class Wolfresults_2D(Element_To_Draw):
 
         return x>=xmin and x<=xmax and y>=ymin and y<=ymax
 
-    # @property
-    # def nullvalue(self):
-    #     return self.epsilon
+    @property
+    def nullvalue(self):
+        """ Get nullvalue from the first block """
+
+        return self[0].nullvalue
 
-    # @nullvalue.setter
-    # def nullvalue(self, value):
-    #     self._epsilon_default = value
-    #     self.epsilon = self._epsilon_default
+    @nullvalue.setter
+    def nullvalue(self, value):
+        """ Set nullvalue for all blocks """
+
+        for i in range(self.nb_blocks):
+            self[i].nullvalue = value
 
     @property
     def alpha(self):
@@ -2133,6 +2196,7 @@ class Wolfresults_2D(Element_To_Draw):
 
     def show_properties(self):
         """ Affichage des propriétés de la matrice """
+
         if self.wx_exists and self.properties is not None:
             self.properties.SetTitle(_('Properties : ') + self.idx)
             self.properties.Show()
@@ -2142,6 +2206,7 @@ class Wolfresults_2D(Element_To_Draw):
         Create :
            - Props_Res_2D (GUI) if mapviewer is not None
         """
+
         if self.wx_exists and self.mapviewer is not None:
             self.properties = Props_Res_2D(self, self.mapviewer)
             self.properties.Hide()
@@ -2149,6 +2214,8 @@ class Wolfresults_2D(Element_To_Draw):
             self.properties = None
 
     def get_header(self, abs=True) -> header_wolf:
+        """ Récupération de l'entête de la matrice """
+
         curhead = header_wolf()
 
         curhead.origx = self.origx
@@ -2177,7 +2244,7 @@ class Wolfresults_2D(Element_To_Draw):
         return curhead
 
     def __getitem__(self, block_key:Union[int,str]) -> WolfArray:
-        """Access a block's Numpy array of this multi-blocks Result"""
+        """Access a block's array of this multi-blocks Result"""
 
         if isinstance(block_key,int):
             _key = getkeyblock(block_key)
@@ -2189,6 +2256,7 @@ class Wolfresults_2D(Element_To_Draw):
         else:
             return None
 
+    """ Iterator """
     def __iter__(self):
         self._iter = 0
         return self[self._iter]
@@ -2196,9 +2264,11 @@ class Wolfresults_2D(Element_To_Draw):
     def __next__(self):
         self._iter += 1
         return self[self._iter]
+    """ End Iterator """
 
     def as_WolfArray(self, copyarray:bool=True) -> Union[WolfArray, WolfArrayMB]:
         """Récupération d'une matrice MB ou Mono sur base du résultat courant"""
+
         if self.nb_blocks>1:
 
             retarray = WolfArrayMB()
@@ -2215,6 +2285,8 @@ class Wolfresults_2D(Element_To_Draw):
 
     @property
     def nb_blocks(self):
+        """ Nombre de blocs """
+
         return len(self.myblocks)
 
     @property
@@ -2250,6 +2322,7 @@ class Wolfresults_2D(Element_To_Draw):
             self.set_currentview()
 
     def _gpu_loader(self, fname:str):
+
         # 2D GPU
         nb_blocks = 1
         self.myblocks = {}
@@ -2328,6 +2401,7 @@ class Wolfresults_2D(Element_To_Draw):
         """
         Lecture d'une palette disponible dans le répertoire "models"
         """
+
         dir  = join(dirname(__file__), 'models')
 
         if exists(join(dir, which + '.pal')):
@@ -2440,11 +2514,12 @@ class Wolfresults_2D(Element_To_Draw):
         """Return the current view"""
         return self._which_current_view
 
-    def filter_inundation(self, eps=None, linkedvec = None):
+    def filter_inundation(self, eps:float=None, linkedvec:vector = None):
         """
-        Apply filter on array :
-            - mask data below eps
-            - mask data outisde linkedvec
+        Apply filtering on array
+
+        :param eps : mask data below eps
+        :param linkedvec : mask data outside linkedvec
         """
 
         if eps is not None:
@@ -2457,8 +2532,12 @@ class Wolfresults_2D(Element_To_Draw):
         for curblock in self.myblocks.values():
             curblock.filter_inundation()
 
-    def set_currentview(self, which=None, force_wx=False):
-        """Set the current view --> see 'views_2D' for supported values"""
+    def set_currentview(self, which=None, force_wx=False, force_updatepal:bool=False):
+        """
+        Set the current view --> see 'views_2D' for supported values
+
+        """
+
         if which is None:
             which = self._which_current_view
 
@@ -2503,8 +2582,11 @@ class Wolfresults_2D(Element_To_Draw):
             if which in VIEWS_VECTOR_FIELD or which in VIEWS_COMPLEX:
                 self.update_zoom_factor()
 
-            # self.mypal.automatic = True
-            # self.reset_plot()
+            if force_updatepal:
+                self.mypal.automatic = True
+                self.updatepalette()
+            else:
+                self.link_palette()
 
             self.plotting=False
             self.mimic_plotdata()
@@ -3474,8 +3556,12 @@ class Wolfresults_2D(Element_To_Draw):
         """
         Applique la même palette de couleur/colormap à tous les blocs
         """
-        for curblock in self.myblocks.values():
-            curblock.update_pal(self.mypal,self.palgray,self.palblue)
+        if (self.palgray is not None) and (self.palblue is not None):
+            for curblock in self.myblocks.values():
+                curblock.update_pal(self.mypal, self.palgray, self.palblue)
+        else:
+            for curblock in self.myblocks.values():
+                curblock.update_pal(self.mypal)
 
     def get_min_max(self, which:Literal[views_2D.TOPOGRAPHY, views_2D.WATERDEPTH, 'current']):
         """
@@ -3524,13 +3610,16 @@ class Wolfresults_2D(Element_To_Draw):
 
         return allarrays
 
-    def updatepalette(self,which=0,onzoom=[]):
+    def updatepalette(self, which=0, onzoom=[]):
         """
         Mise à jour des palettes de couleur/colormaps
 
         palgray : niveaux de gris
         palblue : niveaux de bleu
         mypal   : coloration paramétrique
+
+        :param which: 0
+        :param onzoom: Liste Python de type [xmin, xmax, ymin, ymax]
         """
         self.palgray = wolfpalette()
         self.palblue = wolfpalette()
@@ -3547,6 +3636,14 @@ class Wolfresults_2D(Element_To_Draw):
 
         self.link_palette()
 
+        if self.properties is not None:
+            # update GUI properties
+            self.properties.update_palette()
+            if self.mypal.automatic:
+                self.properties._cm_auto.SetValue(1)
+            else:
+                self.properties._cm_auto.SetValue(0)
+
     def delete_lists(self):
         """
         Reset des listes OpenGL de la matrice courante

{wolfhece-2.0.23.dist-info → wolfhece-2.0.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.0.23
+Version: 2.0.25
 Author-email: Stéphane Champailler <stephane.champailler@uliege.be>, Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.0.23.dist-info → wolfhece-2.0.25.dist-info}/RECORD

@@ -4,28 +4,28 @@ wolfhece/GraphProfile.py,sha256=nP8xnwUBw2EIxfI7YysuWbwA7-sTZeONUMPkIVimOyg,6890
 wolfhece/Lidar2002.py,sha256=sXZ6p8_EKI5l8fJswIMAABT6dqHKVexU52Tjl1uuisU,5770
 wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
-wolfhece/PyCrosssections.py,sha256=wdq-KYaLDBAa-gu3plWFBJN0Stx-oZX2dxs-iKjGBHo,111109
-wolfhece/PyDraw.py,sha256=C501ZkqfL42RBw0ytO7u3amB3bFiz5W4bobqratdt4A,322796
-wolfhece/PyGui.py,sha256=TLhXjfEZhMRucPmtu1ntz-wlvX4phntPHG6jYhGPMUk,52687
-wolfhece/PyGuiHydrology.py,sha256=t7EqOMyA1mkVg_aATMaduR-aqs04V-uRCifyHVmPqRs,7133
-wolfhece/PyHydrographs.py,sha256=h2OfgmRkKc5XZn0iPFOVy60pGTSa5EFoUOEya0SeG7o,3411
+wolfhece/PyCrosssections.py,sha256=yye3WLW3dUaiXIpFXnQyTau5GfRzK2E7LxLVH-hNjAI,111113
+wolfhece/PyDraw.py,sha256=CWlJvRLXtYoAUAzfGzZYjbgN0GgbT8l8-IemJlwVYMc,317074
+wolfhece/PyGui.py,sha256=1NEHwZAx7T2EHBhr-Z8K3CfaBwPbhuQvsy71QsIqph8,53054
+wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
+wolfhece/PyHydrographs.py,sha256=dA7uH-whC7SGZomEpxZz1QtIEqJG73sgPa7hftJ4clg,3403
 wolfhece/PyPalette.py,sha256=nb9oPLZF-xx-yvOWvw2XVVmis6XTmYT2i7hvH3qPwAg,21932
-wolfhece/PyParams.py,sha256=TN7xDdhBGwq9dypVXuIfOUZ9Y6OxwcemfMhrJr1Y89U,81691
+wolfhece/PyParams.py,sha256=znG35yKe2k_NKl7P58E9tWFjCOemSAIXVsNZVSoqdPI,82161
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
-wolfhece/PyVertex.py,sha256=slmNcecB54jmqGHC4bozemLRUASSW6uJzypxWZ9kh7g,35071
+wolfhece/PyVertex.py,sha256=_06ugznBpagA3akh11_4srP0zuTFstCW_0T2XnxD_Ss,35010
 wolfhece/PyVertexvectors.py,sha256=n5Xfb-AlJfwV-RVOrV15Uo3STR-PYdxDY1Tb_MJkeV0,190119
 wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
-wolfhece/RatingCurve.py,sha256=Psw4OknvqVXOjIomJxCW4hGd_q2HZ4DmcwV-wJXehds,21420
+wolfhece/RatingCurve.py,sha256=YSQvSvdMHE6hSlWVBF5Oe0-Fh3waNMpOdmcymaCCTis,21706
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
-wolfhece/RatingCurve_xml.py,sha256=iP6hanwG6EzddcWF2zvsuU9JLfrPtq7-AOFwcz2HO8k,24469
+wolfhece/RatingCurve_xml.py,sha256=ViGeMgKYbxorDqd2GPyC0qyWTYhTSOVIjNNPPw0Z-FE,24467
 wolfhece/ReadDataDCENN.py,sha256=4OMDBgkZ_v7OWmVhyQ-reab7MPxGhFEDY2qS8yThhdM,1240
-wolfhece/Results2DGPU.py,sha256=IyBOwA_S72rABMARCJp3xLSv9s8lQgDjWHsvCYwqohM,16579
+wolfhece/Results2DGPU.py,sha256=c7q0ETGY76SxHH1bg9hNXk8KD1slM62tZBIlqw_94_A,14752
 wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/cli.py,sha256=rHxZGgs_R776VCWhs36pYFoiuiQycwgGTVOLK-JNzjE,1937
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
-wolfhece/drawing_obj.py,sha256=rHMGdiihIv68WZnWFNdgiA51QhSm8EX-pykdyTSOdoo,3136
+wolfhece/drawing_obj.py,sha256=NJ8looAaaVlgxX0QNYx3kBbP7QFJ7_PitcL7RtOc9jY,3502
 wolfhece/flow_SPWMI.py,sha256=mdiupyOem6_FZ0OSKn8Vq5Nmr9Av-j83d2YyRPLZFlQ,20658
 wolfhece/friction_law.py,sha256=vMr6BgVVV2JqhPDjBtZBtosDIZcbykZxw-fKxiJzd4M,5200
 wolfhece/gpuview.py,sha256=Lq17jV2ytQShUuvi1UE_A1-6Q0IojsKxrKhkYHRf_8w,23437
@@ -34,7 +34,7 @@ wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
 wolfhece/irm_qdf.py,sha256=0nOU_usEZuWMwYOPV9qtZoWsQTn2x2DxOuk7VlYMkbo,15419
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/multiprojects.py,sha256=fnv19sDntJFt3fNMre18-Io14MsRazbFIML4MIxuDgU,13895
-wolfhece/pybridges.py,sha256=BVUESKoTdL1i_rdoe_jEsItgjKS0oqLohwrHj8snjxQ,57190
+wolfhece/pybridges.py,sha256=HJ1BL1HC7UrgpQ-3jKXkqPFmc-TzToL28Uex2hjHk6c,57166
 wolfhece/pydike.py,sha256=G4jfSZaAHHr4VWEJqnXSvEswXvlOz1yhbhQ6uu3AqyM,1943
 wolfhece/pylogging.py,sha256=i9Zugx3t9dPc7nBwcP20L_R4_k_WawpAQsvbZU8l9Hg,4230
 wolfhece/pypolygons_scen.py,sha256=lrUty990vT1iiILiIuTY8pNStiaZOi2dXWJuL9C-4Ps,26211
@@ -49,17 +49,17 @@ wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=quflEvi32lWSvOPa0aDCDl-8Jv-jGtLHbR2rdx67LsI,14883
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
 wolfhece/wolf_vrt.py,sha256=wuMPAXNYTByNGNtvWhwW1fQelPstAPTQZECgXHZ0oTM,5180
-wolfhece/wolfresults_2D.py,sha256=gGXTg1nKS3lPd8eYUsyUtMuzTcgNy8GpUBw5pbKUKTA,145714
+wolfhece/wolfresults_2D.py,sha256=DsXd1BSUHPfDP23opypCkEi2wltmlUmNezci41PBVyI,148889
 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
 wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,104622
-wolfhece/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
 wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9o,630
 wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
 wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
 wolfhece/apps/splashscreen.py,sha256=9BNArfcoRcyWglzFDQdLv2Dlvqz8w5qYKdE5zA66-Kw,2117
-wolfhece/apps/version.py,sha256=AR5VuDo0rvldetfOPlc0jtls3HgiewRprm7x_oDnjKM,388
+wolfhece/apps/version.py,sha256=QTrZW8KwpQpvu9p2n5YhLCMDE5dnarPBZuFtNV0R4T0,388
 wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
 wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
 wolfhece/apps/wolfcompare2Darrays.py,sha256=MucG5h4sU4jicDVCKohiCDUVUqx_RQ1qKrZKokpnxhQ,3743
@@ -82,15 +82,15 @@ wolfhece/fonts/helvetica.ttf,sha256=X4Zd3zdUmuRGMLE6UB-BMIbirpdK3Ia5czfNnuSx5P8,
 wolfhece/fonts/sanserif.ttf,sha256=Nvv5eMgTl5-bWgV37B7E1-vZpAZPNJwjtJSzMNDrl9A,42696
 wolfhece/ftp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ftp/downloader.py,sha256=NANzxSzdcp25dFMYin5QA9UnFexNe6-W2AqqTzUE4f4,5223
-wolfhece/hydrology/Catchment.py,sha256=x_9Z4dCg08f1SyRi2pFlaYKgT9kAXQC-2PiG7VnRl_8,120545
+wolfhece/hydrology/Catchment.py,sha256=xpV-pE6sCnrIWtaNruN2FUTyGap9JgzeLexnoOv5a80,120399
 wolfhece/hydrology/Comparison.py,sha256=fWmuR3YlpOEMTnjb6uIyXppCp_iWA0A5hRIPO-WXhYs,81534
-wolfhece/hydrology/Dumping.py,sha256=Vt5WwGW-5rv9j7kg6z-JdI3olO2LY019cAEYyrfey_k,2011
-wolfhece/hydrology/Optimisation.py,sha256=GeIrezh7YxVmP9zqHcZIrSmbp-azmSKFmpp_oEJZZ_A,91096
-wolfhece/hydrology/Outlet.py,sha256=MDcrrRzpoCmReQxaPKjhkXnN01Bqmnm0Kmjf8fdkTFo,9992
+wolfhece/hydrology/Dumping.py,sha256=GKYvkKgCfJQT1XEF1ceh7evdhlpZRPcuf6VlBdH-TaM,2085
+wolfhece/hydrology/Optimisation.py,sha256=RBMjjobXka4uXs86rkmualZuxIuH0JMWRuITyLyJv9s,91988
+wolfhece/hydrology/Outlet.py,sha256=fpetH2ZKnTKIBNuVclxrncc5OAxWUGI5_ed9gXh6fD4,10201
 wolfhece/hydrology/PostProcessHydrology.py,sha256=SiW5FIf8FeQL9ItWG8ODt612k5m59aogSLgpsXinr8I,6944
 wolfhece/hydrology/PyWatershed.py,sha256=K6yz8UquJi51v2nGqWmeo8qs82-QHoa2LYaxwoUBTxM,73914
-wolfhece/hydrology/RetentionBasin.py,sha256=jw8xI5i5OmktJKGD9BLfQp_XV2s74j4s-SuehnvPkKE,64164
-wolfhece/hydrology/SubBasin.py,sha256=OPdhwBnwU-kFtHRNvUAxiCzPSZlC3XpiEMlEa5UgRRI,142004
+wolfhece/hydrology/RetentionBasin.py,sha256=y8sVEIlkZHHeF5HdwClEc-5evcoPUn7zDWgSh6eWpYg,64339
+wolfhece/hydrology/SubBasin.py,sha256=IvuyiSJdLO2Z3_wXYUU9Tn6UNgaVk25EgWO_fMqbNFI,141955
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/hydrology/constant.py,sha256=W04wikEJHDQaY0bR8ddU1b_OAuwX1VjNTnXRROwZzug,1231
 wolfhece/hydrology/cst_exchanges.py,sha256=Bzpebw47Q0o2-UUzKZ3fndFLOv-PfLUQM7jgQkYTJf4,14851
@@ -135,21 +135,19 @@ wolfhece/lazviewer/libs/tbb.dll,sha256=HnW3LKBZHrnbeItnMY2rVJln8XduJ014CMq-PfkPj
 wolfhece/lazviewer/libs/tbbmalloc.dll,sha256=jFI6RvB88vkF0S8Q-YVjxdvIdIzfxOMkjOHrppG4QYs,208624
 wolfhece/lazviewer/libs/vcomp120.dll,sha256=rnENZnDZIvu_Cty-x0P-deVyzyHPdXn69fNHpgbDfLs,137376
 wolfhece/lazviewer/points/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/lazviewer/points/expr.py,sha256=wGXQXW0lkN5RqXGeBrwzZjH4kKNF00tQOutQnb2GDIc,14697
+wolfhece/lazviewer/points/expr.py,sha256=L8-mJWnHYfgjHI-4kj7yoC58IYvQYguV-wLqaO3Xp1Q,14700
 wolfhece/lazviewer/points/points.py,sha256=9qzCZvHMDL7ZdMc2P0UvljGHcB-L9_BlyR6MLMUsY84,9016
 wolfhece/lazviewer/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/lazviewer/processing/estimate_normals/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/lazviewer/processing/estimate_normals/estimate_normals.cp310-win_amd64.pyd,sha256=HzgLI4WnTEVdjBf2rsd89-lRUqPyzO79GKrsf2Y0zDI,124416
 wolfhece/lazviewer/processing/estimate_normals/estimate_normals.cp39-win_amd64.pyd,sha256=NBUTqdyyfQQXf3cBldV349yKJ6Rb7LlZKKg6UXSg2Gk,123392
-wolfhece/lazviewer/vfuncs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/lazviewer/vfuncs/vfuncs.cp310-win_amd64.pyd,sha256=4mvnfY9Wd-oE7rJR1Yy7TNTsrJy95_OV9VPb5yVNbqU,135680
-wolfhece/lazviewer/vfuncs/vfuncs.cp39-win_amd64.pyd,sha256=MzAEyrgnqja-FjHGtL-jbWg9o0f2SWUDVimXBN-8kCA,135168
 wolfhece/lazviewer/viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqaJntumJc,202240
 wolfhece/lazviewer/viewer/viewer.py,sha256=8_MQCaQOS0Z_oRPiGoRy1lq-aCirReX3hWEBjQID0ig,24665
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
 wolfhece/libs/WolfDll.dll,sha256=s-Fwboq8EethHHmipZZjdniEQtyqZv6vS-bQRKNTVgs,132915712
 wolfhece/libs/WolfDll_CD.dll,sha256=kC1svCwD1qSmppsiVfHwDkIvoJO_1l6TG1GfIxgiqQQ,131415040
+wolfhece/libs/WolfDll_debug.dll,sha256=q-MkJtHkkFs4Q5RyQSU1nnx7CsB_vI1gBYplbf8stKg,74510848
 wolfhece/libs/WolfOGL.c,sha256=tBWGfpFFe8gfRjImUUlqdxhcRpQ6ytEWU7Z6PC0v9as,1085242
 wolfhece/libs/WolfOGL.pyx,sha256=kc1uxbO2wQx0Qoe7BVQnqTJgUWYx_Vtf1wzXMxzf8bI,65911
 wolfhece/libs/api-ms-win-crt-heap-l1-1-0.dll,sha256=r0euvgZa8vBFoZ8g7H5Upuc8DD6aUQimMJWnIyt1OBo,19720
@@ -199,9 +197,9 @@ wolfhece/mar/interface_MAR_WOLF.py,sha256=MWeXaHLDT4Eo9jZOAvz013lmpgGYT1v9VUYGAg
 wolfhece/mesh2d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mesh2d/bc_manager.py,sha256=vSVogXy1x3A6fZKWA6mPZSGX2e3EAUVmEjD9Bgww_hU,51173
 wolfhece/mesh2d/cell_tracker.py,sha256=AR-Bty-QnrY1ni8Lwak2kU2UWMAJSBCF2ugl2YpfsB4,8660
-wolfhece/mesh2d/config_manager.py,sha256=5im8G1efNXH-7km6JR__lTIKp93L4SlfXbAZwuVzfqs,14407
+wolfhece/mesh2d/config_manager.py,sha256=vrxLku4isZJTxbHOACEEIEEjQB9pkLpaVPteJz9GhnE,14417
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=BaJeKHyJiKEFWBkTQeYsDBW86703ooj65MFVpPMgjLg,2810
-wolfhece/mesh2d/wolf2dprev.py,sha256=TAgIRb8X0-Ktoa5PtZQ8Z_ev99MlDw-VmeJgq8IeRZo,136108
+wolfhece/mesh2d/wolf2dprev.py,sha256=DEoWWHjBdAMQQWMwTSk88QMgjnN-X4ZZCmOV5p0XNOM,136438
 wolfhece/models/HECE_169.pptx,sha256=OWJtsWz504A-REFaaxw8lwStHyQU2l7KEeiE7IZvtbk,3396930
 wolfhece/models/blue.pal,sha256=NnjJnjnYVdQkG54RyPXvo4Tl9ytB0cN7zpiHtj1N6bw,33
 wolfhece/models/diff16.pal,sha256=Pkp9kQ1GvmAKz3lgwohsw8eQySjVVKHbjhoWw-gZ6Nc,303
@@ -225,7 +223,7 @@ wolfhece/rem/RasterViz.py,sha256=TDhWyMppcYBL71HfhpZuMgYKhz7faZg-MEOQJo_3Ivo,291
 wolfhece/rem/__init__.py,sha256=S2-J5uEGK_VaMFjRUYFIdSScJjZyuXH4RmMmnG3OG7I,19
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/scenario/check_scenario.py,sha256=Q0_jA3PYapcbCT881YojTwKoRi_RjZpevHXhtP9VoqE,4619
-wolfhece/scenario/config_manager.py,sha256=0S4GzeTi96zSOy0g59LlR7x6-uT8mqHH5xxhhnSuNhE,55244
+wolfhece/scenario/config_manager.py,sha256=hZpddcOyMfDb3ulNM229Pv-B32Ty73NtTn7i_cd7guA,55233
 wolfhece/scenario/imposebc_void.py,sha256=pl7c99HQQMQT7i15fDlOOFYCdOtR5c_XIBOveOTOaLc,5273
 wolfhece/scenario/update_void.py,sha256=MmiDiwWHvuk0mpXOlMeB2ImY-d1Wi3Wfmg9hrDTAraE,7176
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -246,8 +244,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.0.23.dist-info/METADATA,sha256=ILTWNh7V6XuNr1w9QKnT4QnoEI10GW-NAZgHg06UJAg,2239
-wolfhece-2.0.23.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wolfhece-2.0.23.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.0.23.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.0.23.dist-info/RECORD,,
+wolfhece-2.0.25.dist-info/METADATA,sha256=vB782q0jVlZOidz2A7_jObdmcgydzD9BFUbUt0pcAlc,2239
+wolfhece-2.0.25.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wolfhece-2.0.25.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.0.25.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.25.dist-info/RECORD,,