wolfhece 2.1.22__py3-none-any.whl → 2.1.23__py3-none-any.whl

wolfhece/PyDraw.py

@@ -414,6 +414,7 @@ class WolfMapViewer(wx.Frame):
         createbcmanager2D = self.menucreateobj.Append(wx.ID_ANY, _('Create BC manager Wolf2D...'), _('New BC manager 2D'))
         createpartsystem = self.menucreateobj.Append(wx.ID_ANY, _('Create particle system...'), _('Create a particle system - Lagrangian view'))
         create1Dmodel = self.menucreateobj.Append(wx.ID_ANY, _('Create Wolf1D...'),('Create a 1D model using crossections, vectors and arrays...'))
+        create_acceptability = self.menucreateobj.Append(wx.ID_ANY, _('Create acceptability manager...'), _('Create acceptability manager'))
 
         self.filemenu.AppendSeparator()
 
@@ -5049,6 +5050,13 @@ class WolfMapViewer(wx.Frame):
             from .scenario.config_manager import Config_Manager_2D_GPU
             newmanager = Config_Manager_2D_GPU(mapviewer=self)
 
+        elif itemlabel == _('Create acceptability manager...'):
+
+            from .acceptability.acceptability_gui import AcceptabilityGui
+            newmanager = AcceptabilityGui()
+            newmanager.mapviewer = self
+            newmanager.Show()
+
         elif itemlabel==_('Create BC manager Wolf2D...'):
 
             if self.active_array is not None:

wolfhece/PyParams.py

@@ -927,7 +927,7 @@ class Wolf_Param(wx.Frame):
             # priority to default parameters
             if key_Param.ADDED_JSON in param_def.keys():
                 param[key_Param.ADDED_JSON] = param_def[key_Param.ADDED_JSON]
-                
+
             param[key_Param.COMMENT] = param_def[key_Param.COMMENT]
             param[key_Param.TYPE] = param_def[key_Param.TYPE]
 
@@ -1032,7 +1032,7 @@ class Wolf_Param(wx.Frame):
         else:
             if locvalue is None:
                 locvalue = ""
-                
+
             page.Append(pg.StringProperty(label = param_name, name = locname, value = locvalue))
 
     def _add_elem_to_page(self, page:pg.PropertyGridPage, group:str, param:dict, param_def:dict = None, prefix:str=''):
@@ -1373,6 +1373,7 @@ class Wolf_Param(wx.Frame):
         self.myIncParam.clear()
         if self.prop is not None:
             self.prop.Clear()
+            self.prop.SetDescription("","")
 
     # Object access
     # -------------

wolfhece/apps/version.py

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

wolfhece/irm_qdf.py

@@ -102,6 +102,8 @@ class MontanaIRM():
         return rain*dur/60. #to obtains [mm.h^-1] as dur is in [min]
 
     def get_hyeto(self,durmax,T,r=0.5):
+        """ :param r: Decentration coefficient
+        """
         x = np.arange(10,durmax,1,dtype=np.float64)
         # y = [self.get_instantrain(curx,T) for curx in x]
 
@@ -234,7 +236,17 @@ class Qdf_IRM():
 
 
     def importfromwebsite(self,store_path='irm',verbose=False,waitingtime=.01):
-        """ Import des fichiers Excel pour toutes les communes depuis le site de l'IRM """
+        """ Import Excel files for all municipalities from the IRM website
+
+            :param store_path: Where to store the downloaded data. Directory
+                will be created if it doesn't exists.
+            :param verbose: If `True`, will print some progress information. If
+                `False`, will do nothing. If a callable, then will call it with a
+                float in [0, 1]. 0 means nothing downloaded, 1 means everything
+                downloaded.
+            :param waitingtime: How long to wait (in seconds) betwenn the download
+                of each station (will make sure we don't overwhelm IRM's website).
+        """
         import requests
 
         if not path.exists(store_path):
@@ -251,7 +263,10 @@ class Qdf_IRM():
                 file.write(response.content)
                 file.close()
                 if verbose:
-                    print(myins)
+                    if callable(verbose):
+                        verbose(key/len(self.myloc.inscode2name))
+                    else:
+                        print(myins)
 
             sleep(waitingtime)
 
@@ -439,6 +454,8 @@ class Qdf_IRM():
         fig,ax = self.montana.plot_hyeto(durmax,T,r)
         ax.set_title(self.name + ' - code : ' + str(self.code))
 
+        return fig
+
     def plot_hyetos(self,durmax,r=.5):
 
         fig,ax = self.montana.plot_hyetos(durmax,r)

{wolfhece-2.1.22.dist-info → wolfhece-2.1.23.dist-info}/METADATA

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

{wolfhece-2.1.22.dist-info → wolfhece-2.1.23.dist-info}/RECORD

@@ -6,12 +6,12 @@ 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=xGMogLlksiVz6o6p9URnkQD9a6w3e92cJN8RgS47aRo,389804
+wolfhece/PyDraw.py,sha256=WMu6lRmC9JJkcRFoj-pkDpRrkaEWRyOMHer3zwZ42Qs,390207
 wolfhece/PyGui.py,sha256=8UWyaYwiHD9juDbPs__pmCXIDoM8r9_bGKLf29xVGZI,103140
 wolfhece/PyGuiHydrology.py,sha256=r8kcY2eGAQzSwVtLpyMUiBL5xBpMBsi7ovs0PgStGWw,14648
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=Vl5RrBIC_a5-mZKUtBd5kG0mif946B7OtS3fnehkmOc,25012
-wolfhece/PyParams.py,sha256=Aj8kcT044abwBYU_OiEcJWcyNVqxYithNfbzdHyI-QA,97072
+wolfhece/PyParams.py,sha256=R3AWcb7Mhixwnw4iONSN4gk1DOXKcJR2lj7jaIml4B8,97085
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=dHTjyYYTn0F_NWerlAOBKHV79RUzEEtMJMldQtVc1Cs,40092
@@ -32,7 +32,7 @@ wolfhece/friction_law.py,sha256=vMr6BgVVV2JqhPDjBtZBtosDIZcbykZxw-fKxiJzd4M,5200
 wolfhece/gpuview.py,sha256=Lq17jV2ytQShUuvi1UE_A1-6Q0IojsKxrKhkYHRf_8w,23437
 wolfhece/import_ascfiles.py,sha256=jg4urcLdSgFS1Knvh7AVGJqM44qc_uYDNrR568tMh-A,4167
 wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
-wolfhece/irm_qdf.py,sha256=749SlAXiN1oXp5tfBJoPNJWxydQlY55K0qvIM5YexlM,15436
+wolfhece/irm_qdf.py,sha256=7XeyPxy7fYbR5T4si6huCyBx1_AwoIogzNEOpu9U-xg,16234
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/multiprojects.py,sha256=K40kM09xNkQSjiwANTsA4CpaW7KEkawpBkpoiehk9yo,21251
 wolfhece/picc.py,sha256=UCWX1Y6Xb-iviI4qF-MgBSDZDWQn_tlKNfKRBUY75ow,8504
@@ -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=zxkGhL5-N1mwERa9B0LJ3RZUGCtqNlavCXcY1H1TFx0,388
+wolfhece/apps/version.py,sha256=0SgGx6ma4vpnfiXmyC_QcZXNoArMJdZUfpGhFt_y1y4,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
@@ -274,8 +274,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.22.dist-info/METADATA,sha256=JUhQi9mzKdTMu9aWvC1QPRi78EWvlHpyKguRgwKccI4,2307
-wolfhece-2.1.22.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-wolfhece-2.1.22.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.22.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.22.dist-info/RECORD,,
+wolfhece-2.1.23.dist-info/METADATA,sha256=U_Lk5vtUoLriGYNkAHjpnEBEH6lFGzSMBrJ8D-PjIyM,2307
+wolfhece-2.1.23.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+wolfhece-2.1.23.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.23.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.23.dist-info/RECORD,,