wolfhece 2.1.13__py3-none-any.whl → 2.1.15__py3-none-any.whl

wolfhece/picc.py

@@ -33,6 +33,9 @@ class Picc_data(Element_To_Draw):
         self.cloud = None
         self._colors = {'Habitation': [255, 0, 0], 'Annexe': [0, 255, 0], 'Culture, sport ou loisir': [0, 0, 255], 'Autre': [10, 10, 10]}
 
+        self.active_vector = None
+        self.active_zone = None
+
         return None
 
     def read_data(self, data_dir:Path = None, bbox:Union[Polygon, list[float]] = None, colorize:bool = True) -> None:
@@ -74,8 +77,9 @@ class Picc_data(Element_To_Draw):
 
                         try:
                             self.data_dir = Path(pathname).parent
+                            data_dir = self.data_dir
                             self._filename_vector = Path(pathname).name
-                            self.zones = Zones(pathname, bbox = bbox, mapviewer=self.mapviewer)
+                            self.zones = Zones(pathname, bbox = bbox, mapviewer=self.mapviewer, parent=self)
                             self.zones.prep_listogl()
                         except:
                             logging.error(_('File not found : {}').format(pathname))
@@ -88,9 +92,10 @@ class Picc_data(Element_To_Draw):
                         pathname = dirDialog.GetPath()
 
                         try:
-                            self.data_dir = Path(pathname)
+                            self.data_dir = Path(pathname).parent
+                            data_dir = self.data_dir
                             self._filename_vector = ''
-                            self.zones = Zones(self.data_dir, bbox = bbox, mapviewer=self.mapviewer)
+                            self.zones = Zones(pathname, bbox = bbox, mapviewer=self.mapviewer, parent=self)
                             self.zones.prep_listogl()
 
                         except:
@@ -100,7 +105,7 @@ class Picc_data(Element_To_Draw):
             pointfile = data_dir / self._filename_points
 
             if pointfile.exists():
-                self.cloud = cloud_vertices(data_dir / self._filename_points, bbox = bbox)
+                self.cloud = cloud_vertices(data_dir / self._filename_points, bbox = bbox, mapviewer=self.mapviewer)
                 self.cloud.myprop.width = 3
                 self.cloud.myprop.color = getIfromRGB([0, 0, 255])
             else:
@@ -168,6 +173,32 @@ class Picc_data(Element_To_Draw):
         else:
             logging.warning(_('No cloud properties to show !'))
 
+    def Active_vector(self, vector_to_activate:vector):
+        """ Activate a vector """
+
+        self.active_vector = vector_to_activate
+        self.active_zone = vector_to_activate.parentzone
+
+        if self.mapviewer is not None:
+            self.mapviewer.Active_vector(vector_to_activate)
+        
+        else:
+            logging.warning(_('No mapviewer to activate vector !'))
+
+    def Active_zone(self, zone_to_activate:zone):
+        """ Activate a zone """
+
+        self.active_zone = zone_to_activate
+        
+        if len(zone_to_activate.myvectors) > 0:
+            self.active_vector = zone_to_activate.myvectors[0]
+
+        if self.mapviewer is not None:
+            self.mapviewer.Active_vector(self.active_vector)
+        
+        else:
+            logging.warning(_('No mapviewer to activate zone !'))
+
 class Cadaster_data(Picc_data):
     """ Read and show cadaster data """
 

wolfhece/wolf_array.py

@@ -348,11 +348,13 @@ class header_wolf():
         """
         Get indices from coordinates
 
-        :param xy = numpy array containing (x, y, [z]) coordinates
+        :param xy = numpy array containing (x, y, [z]) coordinates - shape (n, 2) or (n, 3)
         :param scale = scaling of the spatial resolution (dx,dy,[dz])
         :param aswolf = if True, return if one-based (as Wolf VB6 or Fortran), otherwise 0-based (default Python standard)
         :param abs = if True, remove translation from (x, y, [z]) (coordinate from global space)
         :param forcedims2 = if True, force to return only 2 indices even if z is supplied
+
+        :return : numpy array containing (i, j, [k]) indices - shape (n, 2) or (n, 3)
         """
 
         locxy = xy.copy()
@@ -494,24 +496,47 @@ class header_wolf():
         """ alias for get_xy_from_ij """
         return self.get_xy_from_ij(i, j, k, scale, aswolf, abs)
 
-    def ij2xy(self, ij:np.ndarray, scale:float=1., aswolf:bool=False, abs:bool=True) -> np.ndarray:
-        """ alias for get_xy_from_ij_array """
+    def ij2xy_np(self, ij:np.ndarray, scale:float=1., aswolf:bool=False, abs:bool=True) -> np.ndarray:
+        """ alias for get_xy_from_ij_array
+
+        :param ij = numpy array containing (i, j, [k]) indices
+        :param scale = scaling of the spatial resolution (dx,dy,[dz])
+        :param aswolf = if True, input is one-based (as Wolf VB6 or Fortran), otherwise 0-based (default Python standard)
+        :param abs = if True, add translation to results (x, y, [z]) (coordinate to global space)
+
+        ..warning: 'ij' is not the result of np.where() but if you want to use np.where() you can use the following code:
+        ```
+        np.vstack((ij[0], ij[1])).T
+        ```
+
+        :return : numpy array containing (x, y, [z]) coordinates - shape (n, 2) or (n, 3)
+        """
         return self.get_xy_from_ij_array(ij, scale, aswolf, abs)
 
     def xy2ij(self, x:float, y:float, z:float=0., scale:float=1., aswolf:bool=False, abs:bool=True, forcedims2:bool=False) -> Union[tuple[np.int32,np.int32], tuple[np.int32,np.int32,np.int32]]:
         """ alias for get_ij_from_xy """
         return self.get_ij_from_xy(x, y, z, scale, aswolf, abs, forcedims2)
 
-    def xy2ij(self, xy:np.ndarray, scale:float=1., aswolf:bool=False, abs:bool=True) -> np.ndarray:
-        """ alias for get_xy_from_ij_array """
+    def xy2ij_np(self, xy:np.ndarray, scale:float=1., aswolf:bool=False, abs:bool=True) -> np.ndarray:
+        """
+        alias for get_ij_from_xy_array
+
+        :param xy = numpy array containing (x, y, [z]) coordinates - shape (n, 2) or (n, 3)
+        :param scale = scaling of the spatial resolution (dx,dy,[dz])
+        :param aswolf = if True, return if one-based (as Wolf VB6 or Fortran), otherwise 0-based (default Python standard)
+        :param abs = if True, remove translation from (x, y, [z]) (coordinate from global space)
+        :param forcedims2 = if True, force to return only 2 indices even if z is supplied
+
+        :return : numpy array containing (i, j, [k]) indices - shape (n, 2) or (n, 3)
+        """
         return self.get_xy_from_ij_array(xy, scale, aswolf, abs)
 
-    def xyz2ijk(self, xyz:np.ndarray, scale:float=1., aswolf:bool=False, abs:bool=True) -> np.ndarray:
+    def xyz2ijk_np(self, xyz:np.ndarray, scale:float=1., aswolf:bool=False, abs:bool=True) -> np.ndarray:
         """ alias for get_xy_from_ij_array """
         assert xyz.shape[1] == 3, _('xyz must be a 2D array with 3 columns')
         return self.get_xy_from_ij_array(xyz, scale, aswolf, abs)
 
-    def ijk2xyz(self, ijk:np.ndarray, scale:float=1., aswolf:bool=False, abs:bool=True) -> np.ndarray:
+    def ijk2xyz_np(self, ijk:np.ndarray, scale:float=1., aswolf:bool=False, abs:bool=True) -> np.ndarray:
         """ alias for get_xy_from_ij_array """
         assert ijk.shape[1] == 3, _('ijk must be a 2D array with 3 columns')
         return self.get_xy_from_ij_array(ijk, scale, aswolf, abs)
@@ -653,7 +678,7 @@ class header_wolf():
 
         else:
             if not os.path.exists(filename + '.txt'):
-                logging.info(_('File {} does not exist -- Retry!'.format(filename + '.txt')))
+                logging.info(_('File {} does not exist -- Maybe be a parameter.json exists or retry !'.format(filename + '.txt')))
                 return
 
             with open(filename + '.txt', 'r') as f:
@@ -2961,6 +2986,89 @@ class SelectionData():
 
         self.update_nb_nodes_selection()
 
+    def dilate_selection(self, nb_iterations:int, use_mask:bool = True, structure:np.ndarray = None):
+        """ Extend the selection """
+
+        if self.myselection == 'all':
+            logging.info(_('Cannot extend selection when all nodes are selected'))
+            return
+
+        if len(self.myselection) == 0:
+            logging.info(_('No nodes selected'))
+            return
+
+        if nb_iterations < 1:
+            logging.info(_('Number of iterations must be greater than 0'))
+            return
+
+        if self.parent.array is None:
+            logging.info(_('No array to select from'))
+            return
+
+        from scipy import ndimage
+
+        xy = self.myselection
+        ij = [self.parent.get_ij_from_xy(x, y) for x, y in xy]
+
+        selected = np.zeros(self.parent.array.shape, dtype=bool)
+        for i, j in ij:
+            selected[i, j] = True
+
+        selected = ndimage.binary_dilation(selected,
+                                           iterations=nb_iterations,
+                                           mask=~self.parent.array.mask if use_mask else None,
+                                           structure=structure)
+
+        ij = np.argwhere(selected)
+        ij = np.vstack([ij[:, 0], ij[:, 1]]).T
+        xy = self.parent.ij2xy_np(ij)
+
+        self.myselection = xy.tolist()
+
+        self.update_nb_nodes_selection()
+
+    def erode_selection(self, nb_iterations:int, use_mask:bool = True, structure:np.ndarray = None):
+        """ Reduce the selection """
+
+        if self.myselection == 'all':
+            logging.info(_('Cannot reduce selection when all nodes are selected'))
+            return
+
+        if len(self.myselection) == 0:
+            logging.info(_('No nodes selected'))
+            return
+
+        if nb_iterations < 1:
+            logging.info(_('Number of iterations must be greater than 0'))
+            return
+
+        if self.parent.array is None:
+            logging.info(_('No array to select from'))
+            return
+
+        from scipy import ndimage
+
+        xy = self.myselection
+        ij = [self.parent.get_ij_from_xy(x, y) for x, y in xy]
+
+        selected = np.zeros(self.parent.array.shape, dtype=bool)
+
+        for i, j in ij:
+            selected[i, j] = True
+
+        selected = ndimage.binary_erosion(selected,
+                                            iterations=nb_iterations,
+                                            mask=~self.parent.array.mask if use_mask else None,
+                                            structure=structure)
+
+        ij = np.argwhere(selected)
+        ij = np.vstack([ij[:, 0], ij[:, 1]]).T
+        xy = self.parent.ij2xy_np(ij)
+
+        self.myselection = xy.tolist()
+
+        self.update_nb_nodes_selection()
+
     def update_nb_nodes_selection(self):
         """ Update the number of selected nodes """
 
@@ -2969,21 +3077,23 @@ class SelectionData():
         else:
             nb = len(self.myselection)
 
-        if nb > 10000:
-            if not self.hideselection:
-                self.update_plot_selection = False  # on met par défaut à False car OpenGL va demander une MAJ de l'affichage le temps que l'utilisateur réponde
-                dlg = wx.MessageDialog(None,
-                                       'Large selection !!' + str(nb) + '\n Do you want plot the selected cells?',
-                                       style=wx.YES_NO)
-                ret = dlg.ShowModal()
-                if ret == wx.ID_YES:
-                    self.update_plot_selection = True
-                else:
-                    self.update_plot_selection = False
-                    self.hideselection = True
-                dlg.Destroy()
-        else:
-            self.update_plot_selection = True
+        self.update_plot_selection = True
+        if self.wx_exists:
+            if nb > 10000:
+                if not self.hideselection:
+                    self.update_plot_selection = False  # on met par défaut à False car OpenGL va demander une MAJ de l'affichage le temps que l'utilisateur réponde
+                    dlg = wx.MessageDialog(None,
+                                        'Large selection !!' + str(nb) + '\n Do you want plot the selected cells?',
+                                        style=wx.YES_NO)
+                    ret = dlg.ShowModal()
+                    if ret == wx.ID_YES:
+                        self.update_plot_selection = True
+                    else:
+                        self.update_plot_selection = False
+                        self.hideselection = True
+                    dlg.Destroy()
+            else:
+                self.update_plot_selection = True
 
         if nb>0:
             if self.myselection=='all':
@@ -4458,10 +4568,13 @@ class WolfArray(Element_To_Draw, header_wolf):
         arr=self.array
         if arr.dtype == np.float32:
             arr_type = gdal.GDT_Float32
+            nullvalue = self.nullvalue
         elif arr.dtype == np.float64:
             arr_type = gdal.GDT_Float64
+            nullvalue = self.nullvalue
         else:
             arr_type = gdal.GDT_Int32
+            nullvalue = int(self.nullvalue)
 
         driver: gdal.Driver
         out_ds: gdal.Dataset
@@ -4481,7 +4594,7 @@ class WolfArray(Element_To_Draw, header_wolf):
                                 -self.dy])
 
         band = out_ds.GetRasterBand(1)
-        band.SetNoDataValue(self.nullvalue)
+        band.SetNoDataValue(nullvalue)
         band.WriteArray(np.flipud(arr.data.transpose()))
         band.FlushCache()
         band.ComputeStatistics(True)
@@ -4587,6 +4700,9 @@ class WolfArray(Element_To_Draw, header_wolf):
                 self.wolftype = WOLF_ARRAY_FULL_SINGLE
             elif self.array.dtype == np.int32:
                 self.wolftype = WOLF_ARRAY_FULL_INTEGER
+            elif self.array.dtype == np.uint8:
+                self.array = self.array.astype(np.int32)
+                self.wolftype = WOLF_ARRAY_FULL_INTEGER8
 
             self.mask_data(self.nullvalue)
 
@@ -5372,6 +5488,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         """
 
         sel = np.asarray(xy)
+        z   = np.asarray(z)
 
         if len(sel) == 1:
             ijall = np.asarray(self.get_ij_from_xy(sel[0, 0], sel[0, 1])).transpose()
@@ -6089,9 +6206,9 @@ class WolfArray(Element_To_Draw, header_wolf):
                 logging.warning(_('No data file : ')+self.filename)
             return
 
-        if self.filename.endswith('.tif'):
+        if self.filename.endswith('.tif') or self.filename.endswith('.tiff'):
             self.import_geotif(which= which_band, crop = self.cropini)
-            self.mask_data(self.nullvalue)
+            # self.mask_data(self.nullvalue)
             self.loaded = True
         elif self.filename.endswith('.npy'):
             # Numpy format
@@ -6207,7 +6324,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             self.write_txt_header()
             self.write_array()
 
-    def rebin(self, factor:float, operation:Literal['mean', 'sum']='mean') -> None:
+    def rebin(self, factor:float, operation:Literal['mean', 'sum', 'min']='mean') -> None:
         """
         Change resolution - in place
 
@@ -6216,7 +6333,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         If you want to keep current data, copy the WolfArray into a new variable -> newWA = Wolfarray(mold=curWA)
         """
         operation = operation.lower()
-        if not operation in ['sum', 'mean']:
+        if not operation in ['sum', 'mean', 'min']:
             raise ValueError("Operator not supported.")
 
         if np.mod(self.nbx,factor) != 0 or np.mod(self.nby,factor) != 0 :
@@ -6692,8 +6809,11 @@ class WolfArray(Element_To_Draw, header_wolf):
         return newWolfArray
 
     def extend(self, x_ext:int, y_ext:int):
+        """
+        Extend the array
 
-        # crop is the opposite
+        Crop is the opposite
+        """
 
         assert x_ext >= 0 and y_ext >= 0
         assert self.nbdims == 2, "Only 2D arrays are supported"
@@ -6851,6 +6971,11 @@ class WolfArray(Element_To_Draw, header_wolf):
         if self.array is None:
             return
 
+        if self.wolftype != WOLF_ARRAY_FULL_SINGLE:
+            self._tmp_float32 = self.array.astype(dtype=np.float32)
+        else:
+            self._tmp_float32 = None
+
         if self.mypal.automatic:
             if onzoom != []:
                 self.mypal.isopop(self.get_working_array(onzoom), self.nbnotnullzoom)
@@ -7062,10 +7187,10 @@ class WolfArray(Element_To_Draw, header_wolf):
                     if self.wolftype != WOLF_ARRAY_FULL_SINGLE:
                         if self.nbnotnull != self.nbx * self.nby:
                             if self.nbnotnull > 0:
-                                wolfogl.addme(self.array.astype(dtype=np.float32), self.rgb, ox, oy, dx, dy, jstart,
+                                wolfogl.addme(self._tmp_float32, self.rgb, ox, oy, dx, dy, jstart,
                                               jend, istart, iend, cursize, self.nullvalue, self.alpha)
                         elif self.nbnotnull > 0:
-                            wolfogl.addmeall(self.array.astype(dtype=np.float32), self.rgb, ox, oy, dx, dy, jstart,
+                            wolfogl.addmeall(self._tmp_float32, self.rgb, ox, oy, dx, dy, jstart,
                                              jend, istart, iend, cursize, self.nullvalue, self.alpha)
                     else:
                         if self.nbnotnull != self.nbx * self.nby:

{wolfhece-2.1.13.dist-info → wolfhece-2.1.15.dist-info}/METADATA

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

{wolfhece-2.1.13.dist-info → wolfhece-2.1.15.dist-info}/RECORD

@@ -6,16 +6,16 @@ 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=JA_tGLF5LbhAK3565bKR32pI-Nvg3nLbxRoQhRGuf1Y,379054
-wolfhece/PyGui.py,sha256=7p4ecrrODTggH8Oz4GTg4rWk6Z3vhYH4GNAE4TL3VY8,102058
+wolfhece/PyDraw.py,sha256=Kfu3uoxwP6ZK9LqE5Br-GBex_bSS6k4F3tfsK-qIZvU,379565
+wolfhece/PyGui.py,sha256=fqy8f3tLt7myJskVvspTQ_ZO7kaiSNKmcfFLrfr4w7M,103174
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=Vl5RrBIC_a5-mZKUtBd5kG0mif946B7OtS3fnehkmOc,25012
-wolfhece/PyParams.py,sha256=xUmtwna4rhTCqa3-fpq7bG5pxMpoa4PFRi5hEjxOxPw,96868
+wolfhece/PyParams.py,sha256=V1Pe4rsBpWBA5kI5rRG7B5ijPHAdpM1i2uyxhnrwX94,96896
 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=fp5iCndmybEJij-n_SUrv-Q_Zm3RYn2BwYvPiZuCUwk,223514
+wolfhece/PyVertexvectors.py,sha256=C0uB7MTUeNB3XNxf1R98epvcqoLJIlExvI1zwom48jA,223945
 wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
 wolfhece/RatingCurve.py,sha256=YSQvSvdMHE6hSlWVBF5Oe0-Fh3waNMpOdmcymaCCTis,21706
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -35,7 +35,7 @@ wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
 wolfhece/irm_qdf.py,sha256=749SlAXiN1oXp5tfBJoPNJWxydQlY55K0qvIM5YexlM,15436
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/multiprojects.py,sha256=K40kM09xNkQSjiwANTsA4CpaW7KEkawpBkpoiehk9yo,21251
-wolfhece/picc.py,sha256=KKPNk1BEe7QBzo2icIsdsxUopJ1LXYTomfdfeG2gCeA,7419
+wolfhece/picc.py,sha256=UCWX1Y6Xb-iviI4qF-MgBSDZDWQn_tlKNfKRBUY75ow,8504
 wolfhece/pyGui1D.py,sha256=pzLWXQ_w3Y_yI846w1GklFO9h5lWZOqiUzg1BUPkuRI,121616
 wolfhece/pybridges.py,sha256=4PRSsWngDmQnlVuN2tJj0C_HT1h47ExH9QTUPs_Wxlg,57215
 wolfhece/pydike.py,sha256=G4jfSZaAHHr4VWEJqnXSvEswXvlOz1yhbhQ6uu3AqyM,1943
@@ -48,7 +48,7 @@ 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=003bWiCVDjfkCGEDp1ZRZd4xVtufYuGiAK7sC9VJycY,330960
+wolfhece/wolf_array.py,sha256=vf3S7vIdN0ziYtpHSyQRCjwneQCKlGOdCYpZE3xQcLk,335853
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
@@ -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=a9eiwDNszu93f8vdAjTr999YFaeZRJGnUP8ygnLdzJg,388
+wolfhece/apps/version.py,sha256=X3iLT7rB3ADIv1WPZzMTWmvsIohdaLhJ_J-11OkQy6U,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
@@ -91,26 +91,26 @@ wolfhece/eva/joint_models.py,sha256=KTal-jVJmeEWXPQ5mKyT032q186Drz3IFdc60daz-t0,
 wolfhece/eva/mixture_models.py,sha256=WRzGxE2rQ-RkQUskL6IlSeUqEWlAeezJrNhkr0QpeOI,15923
 wolfhece/eva/pyseries.py,sha256=Oz2QCPGrbebAwQL1Vl-kc4t1OkzS-pCuj5rZwDGEJ-I,118536
 wolfhece/fonts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/fonts/arial.ttf,sha256=uwYWwXEZKaG6axcVPiDDM0MXLgf40xAQmMwR8BSShSY,37496
+wolfhece/fonts/arial.ttf,sha256=lXZrWPfYabD6LPbm_rJsGyHN8mMfHFhj_JvSBtXG6O4,915212
 wolfhece/fonts/helvetica.ttf,sha256=X4Zd3zdUmuRGMLE6UB-BMIbirpdK3Ia5czfNnuSx5P8,317968
 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=j4ggD0FQn04s9thXYHB-HiOx3tkvTmwt8R5QSgwNDlE,135112
-wolfhece/hydrology/Comparison.py,sha256=vO9ogoZA8qzG57pg1AdHNL9HWgCCY8-5wqPyCgj1ucg,82209
+wolfhece/hydrology/Catchment.py,sha256=QGTgdt6HQ9ZVzsROdebzZaabZGlgdCh9sQI_soDAL2I,139051
+wolfhece/hydrology/Comparison.py,sha256=FC7syHzczIWERM7AxZWKlak2vbzKuXt2x5XiPYyzUY8,83810
 wolfhece/hydrology/Dumping.py,sha256=GKYvkKgCfJQT1XEF1ceh7evdhlpZRPcuf6VlBdH-TaM,2085
-wolfhece/hydrology/Optimisation.py,sha256=kpfR-krMRzANU96Mn4H2kroIuEmMWns8quEnLSFGB8E,138736
+wolfhece/hydrology/Optimisation.py,sha256=JD72GXAWL6fwagCrCVb0qMEFuYvUlO1vDigteV4EIuA,142220
 wolfhece/hydrology/Outlet.py,sha256=fpetH2ZKnTKIBNuVclxrncc5OAxWUGI5_ed9gXh6fD4,10201
 wolfhece/hydrology/PostProcessHydrology.py,sha256=SiW5FIf8FeQL9ItWG8ODt612k5m59aogSLgpsXinr8I,6944
-wolfhece/hydrology/PyWatershed.py,sha256=gSCEz7W38fnTNyjBYgiepUbZbluCDSGIpzTMNDVzXPc,74277
-wolfhece/hydrology/RetentionBasin.py,sha256=UZiHvygNEMfNdaK49CX3y8jzqwkThwwniS9ob1BTECs,71505
-wolfhece/hydrology/SubBasin.py,sha256=4qpvPi41R9gmKDzyJA_S77k953w2FknnsP2ZSRZQstE,169754
+wolfhece/hydrology/PyWatershed.py,sha256=NO2f4XVA8JxW06ysUhlAN4VYVlv3oCqhhyQ8BeTC7d4,92823
+wolfhece/hydrology/RetentionBasin.py,sha256=cV-Rn-Ya7vWHnkl6pHcQ8GFx5HX-wM7uHI4_Zry-kks,82605
+wolfhece/hydrology/SubBasin.py,sha256=b5RawgPmfVWUJhkv-nEVSbdN3ytIxpov7kjBSvMrd1c,171159
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/hydrology/constant.py,sha256=nRn4IuQ1FZakQtS6z9IpVHeudMfU_7KQ66LCxY6NX4k,1227
 wolfhece/hydrology/cst_exchanges.py,sha256=u0Bs4SBOjgp6n6xuKusHvUCI0abeiEIUpBZRr11RExg,17569
 wolfhece/hydrology/data_treatment.py,sha256=oCoG1xhUra0GtKnCCJ5s9E0DXoZ3MuUOn2Y0Lq5cEH8,34649
 wolfhece/hydrology/forcedexchanges.py,sha256=WPIhAHBfnPLornxbImrvdqMI0tKO7ERHrLrHWJ6YRUY,1941
-wolfhece/hydrology/plot_hydrology.py,sha256=A3fvICvnNW24uuWfPI5-zV8iMjGTbDh6H6dZtTOUFWQ,32592
+wolfhece/hydrology/plot_hydrology.py,sha256=3Qn_on3ca0IdCSclcZhVPNowQMI0DjRcn8wSDE2loyA,34604
 wolfhece/hydrology/read.py,sha256=tTU-zCDJ9aI859XTc99R0WhOSZS2q7IZXhRNCpeRqqo,9010
 wolfhece/hydrology/slope_manager.py,sha256=uZzq7Ba3RMbZL5LPaxdCpkgTVNBAUJs1X_d2sQqHkUs,5262
 wolfhece/hydrology/wolfMap_treatment.py,sha256=5LO49yj1M-s9sGaK0hVgMtuT3t1yPJq9wd6LDh-GXaA,10288
@@ -163,7 +163,7 @@ wolfhece/lazviewer/viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 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=3--r0CVWTsb_st6oMf0AyP6OyTNPj9b4kl0g_-cAwi0,132934144
+wolfhece/libs/WolfDll.dll,sha256=E8SeV0AHVXW5ikAQuVtijqIvaYx7UIMeqvnnsmTMCT8,132934144
 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
@@ -267,8 +267,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.13.dist-info/METADATA,sha256=DghX1BAmzBJLe8etnO3FCeT-LTKyab8jTTcZ5PUWhlw,2282
-wolfhece-2.1.13.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-wolfhece-2.1.13.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.13.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.13.dist-info/RECORD,,
+wolfhece-2.1.15.dist-info/METADATA,sha256=1jd4LkINbWxRjLu3_KsyhqidpBEGHf9x-MjtBReHkME,2282
+wolfhece-2.1.15.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+wolfhece-2.1.15.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.15.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.15.dist-info/RECORD,,

{wolfhece-2.1.13.dist-info → wolfhece-2.1.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: setuptools (70.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any