wolfhece 2.1.77__py3-none-any.whl → 2.1.79__py3-none-any.whl

wolfhece/apps/hydrometry.py

@@ -0,0 +1,28 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
+import wx
+from ..PyTranslate import _
+
+from ..hydrometry.kiwis_gui import hydrometry_gui
+
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
+def main():
+
+    app = wx.App()
+    frame = hydrometry_gui()
+    app.MainLoop()
+
+
+if __name__=='__main__':
+    main()

wolfhece/apps/version.py

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

wolfhece/cli.py

@@ -46,6 +46,11 @@ def wolf2d():
     from .apps.wolf2D import main
     main()
 
+def hydrometry():
+    """ Application for 2D simuations """
+    from .apps.hydrometry import main
+    main()
+
 def digitizer():
     """ Application for digitizing curves """
     from .apps.curvedigitizer import main

wolfhece/hydrometry/kiwis.py

@@ -209,22 +209,61 @@ class kiwis_site_fields(Enum):
     site_id = 'site_id'
 
 KIWIS_GROUP_TS = {'rain': \
-                    {'5min': {'name': 'DGH-TS-Export-Pluie5min', 'id': 1332286 }, \
+                    {'highres': {'name': 'DGH-TS-Export-Pluie5min', 'id': 1332286 }, \
+                    '5min': {'name': 'DGH-TS-Export-Pluie5min', 'id': 1332286 }, \
                     '1h': {'name': 'DGH-TS-Export-PluieHoraire', 'id': 5716546 }, \
                     '1d': {'name': 'DGH-TS-Export-PluieJourn', 'id': 5728245 }, \
                     '1m': {'name': 'DGH-TS-Export-PluieMensuelle', 'id': 7254396 }}, \
                'flowrate': \
-                    {'5or10min': {'name': 'SPW-WS-DebitHR', 'id': 7256917 }, \
+                    {'highres': {'name': 'SPW-WS-DebitHR', 'id': 7256917 }, \
+                    '5or10min': {'name': 'SPW-WS-DebitHR', 'id': 7256917 }, \
                     '1h': {'name': 'SPW-WS-DebitHoraire', 'id': 7256918 }, \
                     '1d': {'name': 'SPW-WS-DebitJourn', 'id': 7256919 }, \
                     '1m': {'name': 'SPW-WS-DebitMensuel', 'id': 7256920 }}, \
                'waterdepth': \
-                    {'5or10min': {'name': 'SPW-WS-HauteurHR', 'id': 7255523 }, \
+                    {'highres': {'name': 'SPW-WS-HauteurHR', 'id': 7255523 }, \
+                    '5or10min': {'name': 'SPW-WS-HauteurHR', 'id': 7255523 }, \
                     '1h': {'name': 'SPW-WS-HauteurHoraire', 'id': 7255522 }, \
                     '1d': {'name': 'SPW-WS-HauteurJourn', 'id': 7255151 }, \
                     '1m': {'name': 'SPW-WS-HauteurMensuelle', 'id': 7255524 }} \
                 }
 
+KIWIS_GROUP_TS_WATERINFO = {'rain': \
+                    {'highres': {'name': WaterInfo_GroupdID.Rain_1m.name, 'id': WaterInfo_GroupdID.Rain_1m.value[1] }, \
+                    '1min': {'name': WaterInfo_GroupdID.Rain_1m.name, 'id': WaterInfo_GroupdID.Rain_1m.value[1] }, \
+                    '15min': {'name': WaterInfo_GroupdID.Rain_15m.name, 'id': WaterInfo_GroupdID.Rain_15m.value[1] }, \
+                    '1h': {'name': WaterInfo_GroupdID.Rain_hourly.name, 'id': WaterInfo_GroupdID.Rain_hourly.value[1] }, \
+                    '1d': {'name': WaterInfo_GroupdID.Rain_daily.name, 'id': WaterInfo_GroupdID.Rain_daily.value[1] }, \
+                    '1m': {'name': WaterInfo_GroupdID.Rain_monthly.name, 'id': WaterInfo_GroupdID.Rain_monthly.value[1] }}, \
+               'flowrate': \
+                    {'highres': {'name': WaterInfo_GroupdID.Flowrate_15m.name, 'id': WaterInfo_GroupdID.Flowrate_15m.value[1] }, \
+                    '15min': {'name': WaterInfo_GroupdID.Flowrate_15m.name, 'id': WaterInfo_GroupdID.Flowrate_15m.value[1] }, \
+                    '1h': {'name': WaterInfo_GroupdID.Flowrate_hourly.name, 'id': WaterInfo_GroupdID.Flowrate_hourly.value[1] }, \
+                    '1d': {'name': WaterInfo_GroupdID.Flowrate_daily.name, 'id': WaterInfo_GroupdID.Flowrate_daily.value[1] }, \
+                    '1m': {'name': WaterInfo_GroupdID.Flowrate_monthly.name, 'id': WaterInfo_GroupdID.Flowrate_monthly.value[1] }}, \
+               'waterdepth': \
+                    {'highres': {'name': WaterInfo_GroupdID.Water_Level_15m.name, 'id': WaterInfo_GroupdID.Water_Level_15m.value[1] }, \
+                    '15min': {'name': WaterInfo_GroupdID.Water_Level_15m.name, 'id': WaterInfo_GroupdID.Water_Level_15m.value[1] }, \
+                    '1h': {'name': WaterInfo_GroupdID.Water_Level_hourly.name, 'id': WaterInfo_GroupdID.Water_Level_hourly.value[1] }, \
+                    '1d': {'name': WaterInfo_GroupdID.Water_Level_daily.name, 'id': WaterInfo_GroupdID.Water_Level_daily.value[1] }, \
+                    '1m': {'name': WaterInfo_GroupdID.Water_Level_monthly.name, 'id': WaterInfo_GroupdID.Water_Level_monthly.value[1] }} \
+                }
+
+KIWIS_GROUP_TS_HIC = {'rain': \
+                    {'highres': {'name': HICWS_GroupID.Precipitation_high_res.name, 'id': HICWS_GroupID.Precipitation_high_res.value[1] }, \
+                    '1h': {'name': HICWS_GroupID.Precipitation_hourly.name, 'id': HICWS_GroupID.Precipitation_hourly.value[1] }, \
+                    '1m': {'name': HICWS_GroupID.Precipitation_monthly.name, 'id': HICWS_GroupID.Precipitation_monthly.value[1] }}, \
+               'flowrate': \
+                    {'highres': {'name': HICWS_GroupID.FlowRate_hig_res.name, 'id': HICWS_GroupID.FlowRate_hig_res.value[1] }, \
+                    '1h': {'name': HICWS_GroupID.FlowRate_hourly.name, 'id': HICWS_GroupID.FlowRate_hourly.value[1] }, \
+                    '1d': {'name': HICWS_GroupID.FlowRate_daily.name, 'id': HICWS_GroupID.FlowRate_daily.value[1] }}, \
+               'waterdepth': \
+                    {'highres': {'name': HICWS_GroupID.Water_Level_high_res.name, 'id': HICWS_GroupID.Water_Level_high_res.value[1] }, \
+                    '1h': {'name': HICWS_GroupID.Water_Level_hourly.name, 'id': HICWS_GroupID.Water_Level_hourly.value[1] }, \
+                    '1d': {'name': HICWS_GroupID.Water_Level_daily.name, 'id': HICWS_GroupID.Water_Level_daily.value[1] }} \
+                }
+
+
 class kiwis_keywords_horq(Enum):
     V5_10MIN    = 'complet'
     V1H         = '1h.moyen'
@@ -248,12 +287,51 @@ class kiwis_default_q(Enum):
     Q_1H        = '10-Debit.1h.Moyen'
     Q_1H_Ultra  = '10-Debit ultrason.1h.Moyen'
 
+    def __str__(self):
+        return self.value
+
 class kiwis_default_h(Enum):
     H_FULL      = '05-Hauteur.Complet'
     H_1H        = '10-Hauteur.1h.Moyen'
     H_1J        = '20-Hauteur.Jour.Moyen'
     Z_1H        = '10-Hauteur_absolue.1h.Moyen'
 
+    def __str__(self):
+        return self.value
+
+class kiwis_default_rain(Enum):
+    R_FULL      = '05-Precipitation.Complete'
+    R_PROD      = '02b-Precipitation.5min.Production'
+    R_1H        = '10-Precipitation.1h.Total'
+    R_1J        = '20-Precipitation.Jour.Total'
+    R_1M        = '40-Precipitation.Mois.Total'
+
+    def __str__(self):
+        return self.value
+
+class kiwis_default_rain_Waterinfo(Enum):
+    R_FULL      = 'P.1'
+    R_10        = 'P.10'
+    R_5         = 'P.5'
+    R_15        = 'P.15'
+    R_1H        = 'P.60'
+    R_1J        = 'DagTotaal'
+    R_1M        = 'MaandTotaal'
+
+    def __str__(self):
+        return self.value
+
+class kiwis_default_rain_HIC(Enum):
+    R_FULL      = 'Base'
+    R_15        = '15Tot'
+    R_1H        = '60Tot'
+    R_1J        = 'DagTot'
+    R_1M        = 'MaandTot'
+
+    def __str__(self):
+        return self.value
+
+
 """
 Code qualité    Validation  Qualité
 40              Oui         Mesure ou calcul de qualité standard
@@ -690,7 +768,7 @@ class hydrometry():
         else:
             return self.realstations.iloc[index[0]]
 
-    def get_timeseries_group(self, rfw:Literal['rain','waterdepth','flowrate'], time:Literal['5min','5or10min','1h','1d','1m']):
+    def get_timeseries_group(self, rfw:Literal['rain','waterdepth','flowrate'], time:Literal['highres','5min','5or10min','15min','1h','1d','1m']):
         """Obtention des stations pour le groupe souhaité.
 
         Temps retourné en UTC
@@ -701,11 +779,28 @@ class hydrometry():
 
         if self.url!='':
             stations=None
-            if rfw in KIWIS_GROUP_TS.keys():
-                if time in KIWIS_GROUP_TS[rfw].keys():
-                    group_id = KIWIS_GROUP_TS[rfw][time]['id']
-                    json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesList) +'&timeseriesgroup_id='+str(group_id)+'&orderby=station_no', verify=True, headers=self._header).json()
+
+            if self.url == URL_SPW:
+                locdict = KIWIS_GROUP_TS
+                returnFields = ''
+            elif self.url == URL_WATERINFO:
+                locdict = KIWIS_GROUP_TS_WATERINFO
+                returnFields = '&metadata=true&custattr_returnfields=dataprovider,dataowner&md_returnfields=custom_attributes,station_id,station_no,station_name,ts_id,ts_name,stationparameter_name,ts_unitsymbol,parametertype_name'
+            elif self.url == URL_HICWS:
+                locdict = KIWIS_GROUP_TS_HIC
+                returnFields = '&metadata=true&custattr_returnfields=dataprovider,dataowner&md_returnfields=custom_attributes,station_id,station_no,station_name,ts_id,ts_name,stationparameter_name,ts_unitsymbol,parametertype_name'
+
+            if rfw in locdict.keys():
+                if time in locdict[rfw].keys():
+                    group_id = locdict[rfw][time]['id']
+                    json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesList) +
+                                             '&timeseriesgroup_id='+str(group_id)+
+                                             '&orderby=station_no'+
+                                             returnFields,
+                                             verify=True, headers=self._header).json()
                     stations = pd.DataFrame(json_data[1:], columns = json_data[0])
+                else:
+                    logging.error(f'{time} not found in Enum')
 
             return stations
 
@@ -726,7 +821,8 @@ class hydrometry():
             stations=None
             group_id = group.value[1]
             returnFields = '&metadata=true&custattr_returnfields=dataprovider,dataowner&md_returnfields=custom_attributes,station_id,station_no,station_name,ts_id,ts_name,stationparameter_name,ts_unitsymbol,parametertype_name'
-            json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesValueLayer) +
+            # json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesValueLayer) +
+            json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesList) +
                                      '&timeseriesgroup_id='+str(group_id)+
                                      '&orderby=station_no'+
                                      returnFields,
@@ -814,7 +910,14 @@ class hydrometry():
                                  +'&format=json'
                                  ,verify=True, headers=self._header).json()
 
-        return id,pd.DataFrame(json_data[1:], columns = json_data[0])
+        try:
+            if json_data[0] == 'No matches.':
+                return id, None
+
+            return id, pd.DataFrame(json_data[1:], columns = json_data[0])
+        except Exception as e:
+            logging.error('Error in timeseries_list :', e)
+            return id, None
 
     def save_all_lists(self, dir:str):
         """Sauveragde des listes pour toutes les stations
@@ -841,7 +944,7 @@ class hydrometry():
         return stationname.replace('/','-') + '_' + stationcode + '_' + str(id) + '.csv'
 
     def _get_filename_series(self,stationname:str='',stationcode:str='',
-                             which:kiwis_default_q | kiwis_default_h | kiwis_keywords_horq | kiwis_keywords_rain = kiwis_default_q.Q_FULL):
+                             which:kiwis_default_q | kiwis_default_h | kiwis_keywords_horq | kiwis_default_rain = kiwis_default_q.Q_FULL):
         """retourne un nom de fichier avec la station et le code et le type de données
 
         Utile car dans certains noms de la BDD KIWIS il y a un caractère '/' qui ne peut être utilisé comme nom de fichier
@@ -895,6 +998,8 @@ class hydrometry():
 
         """
 
+        ts_name = str(ts_name)
+
         if timezone=='Europe/Brussels' or timezone=='local':
             timezone=''
 
@@ -921,28 +1026,38 @@ class hydrometry():
                 if len(json_data)==1:
                     return None
 
+                elif len(json_data)>2:
+                    logging.warning('More than one timeseries found for station {0} with name {1}'.format(stationname,ts_name))
+                    logging.warning('We are using the first one - Please check if it is the right one')
+
                 ts_id = str(int(pd.DataFrame(json_data[1:], columns = json_data[0])[timeseries_fields.TS_ID.value].iloc[0]))
             else:
                 filename = self._get_filename_list(stationname,stationcode)
                 curlist=pd.read_csv(join(dir,filename),index_col=0)
                 ts_id = str(int(curlist.loc(curlist[timeseries_fields.TS_NAME.value==ts_name])[timeseries_fields.TS_ID.value]))
 
-            if "1h" in ts_name:
+            if "1h" in ts_name or "60" in ts_name:
                 nb = (todate - fromdate).days*24
                 cursec = 3600
             elif "5min" in ts_name:
                 nb = (todate - fromdate).days*24*12
                 cursec = 300
+            elif "15" in ts_name:
+                nb = (todate - fromdate).days*24*4
+                cursec = 300
             elif "10min" in ts_name:
                 nb = (todate - fromdate).days*24*6
                 cursec = 600
             elif "2min" in ts_name:
                 nb = (todate - fromdate).days*24*30
                 cursec = 120
-            elif "jour" in ts_name:
+            elif "1min" in ts_name:
+                nb = (todate - fromdate).days*24*60
+                cursec = 120
+            elif "jour" in ts_name or "day in ts_name":
                 nb = (todate - fromdate).days*24
                 cursec = 24*3600
-            elif "mois" in ts_name:
+            elif "mois" in ts_name or "month" in ts_name:
                 nb = (todate - fromdate).days/30
                 cursec = 24*30*3600
 
@@ -1078,7 +1193,7 @@ class hydrometry():
         return df.squeeze()
 
     def fromcsv(self, dir:str='spw', stationname:str='', stationcode:str='',
-                which:kiwis_default_q | kiwis_default_h | kiwis_keywords_horq | kiwis_keywords_rain = kiwis_default_q.Q_FULL,
+                which:kiwis_default_q | kiwis_default_h | kiwis_keywords_horq | kiwis_default_rain = kiwis_default_q.Q_FULL,
                 fromdate:datetime=None, todate:datetime=None):
         """
         Lecture depuis un fichier csv créé depuis un import précédent.
@@ -1112,7 +1227,7 @@ class hydrometry():
             return mydata[fromdate:todate]
 
     def saveas(self, flow:pd.Series, dir:str, stationname='', stationcode='',
-               which:kiwis_default_q | kiwis_default_h | kiwis_keywords_horq | kiwis_keywords_rain = kiwis_default_q.Q_FULL):
+               which:kiwis_default_q | kiwis_default_h | kiwis_keywords_horq | kiwis_default_rain = kiwis_default_q.Q_FULL):
         """Sauvegarde d'une series pandas dans un fichier .csv
 
         :param flow: série pandas

wolfhece/hydrometry/kiwis_gui.py

@@ -33,7 +33,7 @@ import gettext
 
 _=gettext.gettext
 
-from .kiwis import hydrometry, kiwis_keywords_horq, kiwis_keywords_rain, quality_code
+from .kiwis import hydrometry, kiwis_keywords_horq, kiwis_keywords_rain, quality_code, kiwis_default_rain, kiwis_default_rain_HIC, kiwis_default_rain_Waterinfo
 
 class hydrometry_gui(wx.Frame):
     """
@@ -279,12 +279,16 @@ class hydrometry_gui(wx.Frame):
 
         id,self.timeseries = self.hydro.timeseries_list(stationcode=stationcode)
 
+        if self.timeseries is None:
+            logging.warning(_('No timeseries for this station'))
+            return
+
         self.timeseries.sort_values('ts_name', inplace=True)
 
         self.listbox3.Clear()
 
         for curkey in kiwis_keywords_horq:
-            eltoadd = self.timeseries[self.timeseries['ts_name'].str.lower().str.contains(curkey.value)]['ts_name'].to_list()
+            eltoadd = self.timeseries[self.timeseries['ts_name'].str.lower().str.contains(curkey.value.lower())]['ts_name'].to_list()
             if len(eltoadd)>0:
                 for i, curel in reversed(list(enumerate(eltoadd))):
                     for curexc in to_exclude:
@@ -294,7 +298,17 @@ class hydrometry_gui(wx.Frame):
                 self.listbox3.Append(eltoadd)
 
         for curkey in kiwis_keywords_rain:
-            eltoadd = self.timeseries[self.timeseries['ts_name'].str.lower().str.contains(curkey.value)]['ts_name'].to_list()
+            eltoadd = self.timeseries[self.timeseries['ts_name'].str.lower().str.contains(curkey.value.lower())]['ts_name'].to_list()
+            if len(eltoadd)>0:
+                for i, curel in reversed(list(enumerate(eltoadd))):
+                    for curexc in to_exclude:
+                        if curexc in curel.lower():
+                            eltoadd.pop(i)
+                            break
+                self.listbox3.Append(eltoadd)
+
+        for curkey in kiwis_default_rain:
+            eltoadd = self.timeseries[self.timeseries['ts_name'].str.lower().str.contains(curkey.value.lower())]['ts_name'].to_list()
             if len(eltoadd)>0:
                 for i, curel in reversed(list(enumerate(eltoadd))):
                     for curexc in to_exclude:
@@ -303,6 +317,27 @@ class hydrometry_gui(wx.Frame):
                             break
                 self.listbox3.Append(eltoadd)
 
+        for curkey in kiwis_default_rain_Waterinfo:
+            eltoadd = self.timeseries[self.timeseries['ts_name'].str.lower().str.contains(curkey.value.lower())]['ts_name'].to_list()
+            if len(eltoadd)>0:
+                for i, curel in reversed(list(enumerate(eltoadd))):
+                    for curexc in to_exclude:
+                        if curexc in curel.lower():
+                            eltoadd.pop(i)
+                            break
+                self.listbox3.Append(eltoadd)
+
+        for curkey in kiwis_default_rain_HIC:
+            eltoadd = self.timeseries[self.timeseries['ts_name'].str.lower().str.contains(curkey.value.lower())]['ts_name'].to_list()
+            if len(eltoadd)>0:
+                for i, curel in reversed(list(enumerate(eltoadd))):
+                    for curexc in to_exclude:
+                        if curexc in curel.lower():
+                            eltoadd.pop(i)
+                            break
+                self.listbox3.Append(eltoadd)
+
+
         self.listbox3.Append('--')
 
         self.listbox3.Append(self.timeseries['ts_name'].tolist())

{wolfhece-2.1.77.dist-info → wolfhece-2.1.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.77
+Version: 2.1.79
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.77.dist-info → wolfhece-2.1.79.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=fvTs3NyeMjMr6AHbYwqJ7uSoD3uSMzddWQmMUjvc9zA,422185
+wolfhece/PyDraw.py,sha256=ta1-9DW_wYzE32DxTg-uHCV0PHCR3mRZkkGwB7Lg4Jo,422523
 wolfhece/PyGui.py,sha256=oBIBpgBQRR_XXucKE5-RFrtqKj0DRg9VlUCRo8Mzalc,105009
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -25,7 +25,7 @@ wolfhece/ReadDataDCENN.py,sha256=vm-I4YMryvRldjXTvRYEUCxZsjb_tM7U9yj6OaPyD0k,153
 wolfhece/Results2DGPU.py,sha256=P42XCqKQVFMkUt6ZTbNeIT7CV6aRqAIcBQLmRbsj4Cs,23336
 wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
-wolfhece/cli.py,sha256=3S1Hbp2tOl51LwLcloAm1DqV9QuUWJx_Ui_vdKNtGxo,2915
+wolfhece/cli.py,sha256=rTZj0vJehKA6Ej0fn_jFpeXuKBiDqqGFK3xrhHJyEz0,3030
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
 wolfhece/drawing_obj.py,sha256=7vY04B6r08nurTTFmBXHyR5tVIF1YzAEw_uz4pqTDIw,4233
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
@@ -58,10 +58,10 @@ wolfhece/wolfresults_2D.py,sha256=1rzkcZtS6Y8bn8izX-kTePpstrPi9TiOkw9XBueG1fk,16
 wolfhece/xyz_file.py,sha256=Se4nCPwYAYLSA5i0zsbnZUKoAMAD0mK1FJea5WSZUkk,5755
 wolfhece/acceptability/Parallels.py,sha256=h4tu3SpC_hR5Hqa68aruxhtAyhs8u666YuZ40_fR5zg,3979
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
-wolfhece/acceptability/acceptability.py,sha256=rk2NMGNx5uZADMZKA-CsGm612vtcse1DNBb-8iLIz3g,24429
-wolfhece/acceptability/acceptability_gui.py,sha256=xyZt0u1DH2afsg04f50tk3QZkXNOgkGE99ZwaM_BaFI,12298
+wolfhece/acceptability/acceptability.py,sha256=9hKkzHG6_eB_IQz4aT5mfd2E0manvpH5LBScaL_3NzA,24038
+wolfhece/acceptability/acceptability_gui.py,sha256=OvJIovypnvWTewESvVxBxskDNNat6kvUiD_UwKSvk4s,12106
 wolfhece/acceptability/cli.py,sha256=WVyEtse0vh6PSCBNhT7x6wwdJI9D5iy5H-AkWov-vxs,7386
-wolfhece/acceptability/func.py,sha256=ZtBtxGGvWddrw0s4SU0y7DcU9K4kWxjQv1dB5zPki4s,61476
+wolfhece/acceptability/func.py,sha256=XxBDs1Gs61ijxVzP-etYU0YFi2rhpWI3_UJdyZp2imU,57984
 wolfhece/apps/ManageParams.py,sha256=9okXHGHKEayA9iKTnv8jsVYCP2up5kr6hDaKO_fMCaQ,748
 wolfhece/apps/Optimisation_hydro.py,sha256=ySIaVsFNEx4PaHFLlT2QW9BiwChVcTNd2TBnW1aICsI,810
 wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,104622
@@ -70,9 +70,10 @@ wolfhece/apps/WolfPython3.png,sha256=3G84zx14HnlB9YXMY4VUAO7IB3eu7JFvi4Kpmc_4zBE
 wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
 wolfhece/apps/check_install.py,sha256=Xoi_d8MzKzNAy2xqEpERdsqgRPu0hbBWukI0WkIYzD0,1701
 wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefgmk,5334
+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=klzSAX95Q2bylp5-HILfWTktL1FcaIOCdg-3qeadBo8,388
+wolfhece/apps/version.py,sha256=20SNkZLII_Z9vtEHLrNJvzuFQsXBm86gVjh6SHLAiSc,388
 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
@@ -126,10 +127,9 @@ wolfhece/hydrology/read.py,sha256=itMat6MMn4Y14C3SMU_9JMBtpXFjG4mLNMfXXd5U6Ns,93
 wolfhece/hydrology/slope_manager.py,sha256=vlek0z8qcqB61eleiksyOe3QR1vpbtwfeowy6ms7_Fg,5580
 wolfhece/hydrology/wolfMap_treatment.py,sha256=eAxr24zJGwmDof1aZpcxewVvv_bWDvoO8t9Wwf99Mlo,10606
 wolfhece/hydrometry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/hydrometry/kiwis.py,sha256=br80IMFvg2xfTjaUaYT9QS7q1LBzQ8kvPBxJDcSujrA,55991
-wolfhece/hydrometry/kiwis_gui.py,sha256=SdO8EmyFzhzjHlEjZtNJ68HXBOLkK9l40c0750F39V4,23146
+wolfhece/hydrometry/kiwis.py,sha256=Y_rAEgnBFwGL7VY2nEAZ2_buoO4gDplMprRaB27-7RE,62665
+wolfhece/hydrometry/kiwis_gui.py,sha256=xubayI3ijq87l47pcVtP-D9mOGurOSu9rKz511oa7n0,24898
 wolfhece/hydrometry/kiwis_wolfgui.py,sha256=GPa5YNp2V2ZlxYQjPiCXERgPuWB_zij4ec2yHpRvoFA,4027
-wolfhece/hydrometry/kiwispie.py,sha256=akOaV46WwzISVlCcPz_phjsBrI_rDACUzdELtjx-xNg,13498
 wolfhece/icons/folder_open.png,sha256=ykBlU2FtGcpjAu1YO4_eGlDg2svgs_IAs-4d5O2e3AM,2329
 wolfhece/icons/folder_plus.png,sha256=Z1Jcs87Z6pNcudxGDTNhC_hgolSSaXe6_fmQE_n-ero,1963
 wolfhece/icons/image.png,sha256=jomOPNO4HBArBZe8Ya189Iar5nzhO8c0S9JW-6iaErk,2684
@@ -283,8 +283,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.77.dist-info/METADATA,sha256=glI0wL4UaFiyCz0Yu9jjXkCcKoGl4jHP0wiwXHX0Vls,2570
-wolfhece-2.1.77.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-wolfhece-2.1.77.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.77.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.77.dist-info/RECORD,,
+wolfhece-2.1.79.dist-info/METADATA,sha256=wFUA0yYPFc_-u_3WBOoxlxS6LQLo3zYZDUCPtZFwzlI,2570
+wolfhece-2.1.79.dist-info/WHEEL,sha256=nCVcAvsfA9TDtwGwhYaRrlPhTLV9m-Ga6mdyDtuwK18,91
+wolfhece-2.1.79.dist-info/entry_points.txt,sha256=JzPffdR7HHEMbYNX9QIBUeBPvG7b8Ag20QaIsF5JiuI,478
+wolfhece-2.1.79.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.79.dist-info/RECORD,,

{wolfhece-2.1.77.dist-info → wolfhece-2.1.79.dist-info}/WHEEL

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

{wolfhece-2.1.77.dist-info → wolfhece-2.1.79.dist-info}/entry_points.txt

@@ -2,6 +2,7 @@
 wolf_accept = wolfhece.cli:accept
 wolf_check = wolfhece.cli:check
 wolf_gui = wolfhece.cli:wolf
+wolf_hydrometry = wolfhece.cli:hydrometry
 wolf_license = wolfhece.cli:license
 
 [gui_scripts]
@@ -10,5 +11,6 @@ wolf2d = wolfhece.cli:wolf2d
 wolfcompare = wolfhece.cli:compare
 wolfdigitizer = wolfhece.cli:digitizer
 wolfhydro = wolfhece.cli:hydro
+wolfhydrometry = wolfhece.cli:hydrometry
 wolfoptimhydro = wolfhece.cli:optihydro
 wolfparam = wolfhece.cli:params