wolfhece 2.2.15__py3-none-any.whl → 2.2.17__py3-none-any.whl

wolfhece/Model1D.py

@@ -1860,7 +1860,7 @@ class Creator_1D:
                                 format ='zones',
                                 save_as: str='',
                                 return_list = True) -> list[crosssections]: # FIXME list of cross sections
-        """
+        r"""
         Save each `Zone` in `Zones` as a cross sections file and,
         return a list of cross sections.
 
@@ -2530,7 +2530,7 @@ class Creator_1D:
         return file_path
 
     def count_lists_in_list(self, lst: list[list], nodes_1D = False) -> int:
-        """
+        r"""
         Return the sum of lengths of lists in a list.
             - /!\ Attention for 1D nodes (nodes_1D),
             the number of nodes is the number
@@ -2602,7 +2602,7 @@ class Creator_1D:
     def _write_relations_profiles(self,
                                  crosses:list[list[profile]],
                                  save_as:str) -> None:
-        """
+        r"""
         /!\ Has been deprecated.
 
         - Write the HSPW (Heigh, wetted Section, wetted Perimeter, top Width)relations
@@ -2680,7 +2680,7 @@ class Creator_1D:
     def __write_relations_profiles(self,
                                  crosses:list[list[profile]],
                                  save_as:str) -> None:
-        """
+        r"""
         /!\ Has been deprecated.
 
         - Write the HSPW (Height, wetted Section, wetted Perimeter, top Width)relations
@@ -3285,7 +3285,7 @@ class Creator_1D:
             raise Exception('Define a writing a method!')
 
     def read_hydrograph_from_textfile(self, file:str)-> list[list[list,list]]: # FIXME nameread discharges from
-        """
+        r"""
         Return a hydrograph from a text file.
         /!\ The file should be on the wolf hydrograph format.
 
@@ -3401,7 +3401,7 @@ class Creator_1D:
                              save_as: str,
                              writing_method: Literal['continuous', 'stepwise'] = 'continuous',
                              epsilon:float = 0.01):
-        """
+        r"""
         - Write the infiltration files (.inf, .infil, .tv) and,
         - Apply the preprocessing mode to the hydrographs before writing them.
 
@@ -4201,7 +4201,7 @@ class Creator_1D:
                         raise Exception(_('Bad type of boundary condition.'))
 
     def write_width_file(self, crosses:list[list[profile]], width:float , save_as:str):
-        '''
+        r'''
         Write the width file (.width file).
         - The width is constant for all the profiles
 
@@ -4597,7 +4597,7 @@ class Creator_1D:
         logging.info(f'{directory} removed.')
 
     def find_1D_binary_results(self, directory:str) -> tuple[str]:  #FIXME find why self is not working
-        """
+        r"""
         /!\ This method has been deprecated.
         Return a tuple containing the paths to the model:
 
@@ -4627,7 +4627,7 @@ class Creator_1D:
         return (head_file,results_depths, results_discharges, results_wetted_sections)
 
     def read_1D_binary_results(self, results: list[str]) -> tuple[np.ndarray]:
-        '''
+        r'''
         /!\ This method has been deprecated. Check the the class` Wolfresults_1D` for the new implementation.
         Return a tuple containing the simulated results as numpy arrays in this order:
             - 0. Nodes coordinates (np.ndarray),
@@ -4701,7 +4701,7 @@ class Creator_1D:
                         landmark:Zones = None,
                         banks: Zones = None,
                         dpi: float = Constants.DPI.value ) -> None:
-        """
+        r"""
         /!\ This method has been deprecated. Check the the class` Wolfresults_1D` for the new implementation.
         Plot the results of 1D model either:
             - as a gif  (evolution of all parameters)
@@ -5040,7 +5040,7 @@ class Creator_1D:
                               which_nodes:list[int] = [0,-1],
                               save_as:str ='',
                               figure_size = (20,10)):
-        """
+        r"""
         /!\ This method has been deprecated. Check the the class` Wolfresults_1D` for the new implementation.
 
         Plot the hydrographs of the nodes.
@@ -8907,7 +8907,7 @@ class Wolfresults_1D:
                             figsize:tuple = (20,10),
                             alpha:float = 0.3,
                             save_as:str=''):
-        """
+        r"""
         /!\ Deprecating
         Animate the selected variables in figures, save them as a file and
         return  the information associated with their axes.

wolfhece/PyDraw.py

@@ -797,7 +797,12 @@ class DragdropFileTarget(wx.FileDropTarget):
                     id = id + '_1'
 
                 try:
-                    newobj = WolfArray(fname=name, mapviewer= self.window)
+                    h = header_wolf.read_header(name)
+
+                    if h.nb_blocks>0:
+                        newobj = WolfArrayMB(fname=name, mapviewer= self.window)
+                    else:
+                        newobj = WolfArray(fname=name, mapviewer= self.window)
                     self.window.add_object('array', newobj = newobj, id  = id)
                 except:
                     logging.error(_('Error while loading array : ') + name)
@@ -998,7 +1003,7 @@ class Sim_Explorer(wx.Frame):
             secax.tick_params(axis='x', rotation=30)
 
             ax[1].plot(main_x, self.active_res2d.all_dt, 'o-')
-            ax[1].set_ylabel(_('$\Delta t$ [s]'), fontsize=8)
+            ax[1].set_ylabel(_(r'$\Delta t$ [s]'), fontsize=8)
             ax[1].grid(which='both')
             ax[1].set_xticks(main_x)
             ax[1].set_xticklabels([])
@@ -2887,7 +2892,7 @@ class WolfMapViewer(wx.Frame):
             self.menuwolf2d.AppendSeparator()
 
             self.menu2d_dangermap = self.menuwolf2d.Append(wx.ID_ANY, _("Danger map"), _("Compute the danger map"))
-            # self.menu2d_dangermap_mp = self.menuwolf2d.Append(wx.ID_ANY, _("Danger map (multiprocess)"), _("Compute the danger map using multiprocessing -- Need to duplicate the model, the memory usage can be very high for large model"))
+            self.menu2d_dangermap_mp = self.menuwolf2d.Append(wx.ID_ANY, _("Danger map (multiprocess)"), _("Compute the danger map using multiprocessing -- Need to duplicate the model, the memory usage can be very high for large model"))
             self.menu2d_dangermaph = self.menuwolf2d.Append(wx.ID_ANY, _("Danger map - only h"), _("Compute the danger map - only waterdepth"))
 
             self.menuwolf2d.AppendSeparator()
@@ -3519,16 +3524,21 @@ class WolfMapViewer(wx.Frame):
                 every = dlg.GetValue()
 
             if itemlabel == _("Danger map"):
+                logging.info(_('Danger map -- Be patient !'))
                 pgbar = wx.ProgressDialog(_('Danger map'), _('Danger map'), maximum = end_step-1, parent=self, style = wx.PD_APP_MODAL | wx.PD_AUTO_HIDE)
                 def _callback(id, msg):
                     pgbar.Update(id+1-start_step, msg)
 
-                danger_maps = self.active_res2d.danger_map_multiprocess(start_step-1, end_step-1, every, _callback)
+                danger_maps = self.active_res2d.danger_map(start_step-1, end_step-1, every, _callback)
 
                 pgbar.Hide()
                 pgbar.Destroy()
+                logging.info(_('Danger map done !'))
             else:
+
+                logging.info(_('Multiprocess danger map -- Be patient !'))
                 danger_maps = self.active_res2d.danger_map_multiprocess(start_step-1, end_step-1, every)
+                logging.info(_('Multiprocess danger map done !'))
 
             with wx.DirDialog(None, _('Choose a directory to store results'), style=wx.DD_DEFAULT_STYLE) as dlg:
 
@@ -3537,9 +3547,24 @@ class WolfMapViewer(wx.Frame):
 
                 outdir = dlg.GetPath()
 
-            names = ['danger_h.tif', 'danger_u.tif', 'danger_q.tif', 'danger_Z.tif', 'danger_head.tif']
+            names = ['danger_h', 'danger_u',
+                     'danger_q', 'danger_Z',
+                     'danger_head',
+                     'danger_toal', 'danger_tom']
+
             for name, danger_map in zip(names, danger_maps):
-                danger_map.write_all(Path(outdir) / name)
+
+                if isinstance(danger_map, WolfArrayMB):
+                    name = name + '.bin'
+                    logging.info(_('Saving danger map {}').format(name))
+                    danger_map.write_all(Path(outdir) / name)
+                elif isinstance(danger_map, WolfArray):
+                    name = name + '.tif'
+                    logging.info(_('Saving danger map {}').format(name))
+                    danger_map.write_all(Path(outdir) / name)
+                else:
+                    logging.error(_('Bad type for danger map {} -- not saved !').format(name))
+                    continue
 
         elif itemlabel == _("Setup cache..."):
 

wolfhece/PyGui.py

@@ -155,6 +155,8 @@ class GenMapManager(wx.Frame):
 class MapManager(GenMapManager):
 
     def __init__(self,*args, **kw):
+
+        logging.info("MapManager")
         super().__init__(*args, **kw)
 
         icon = wx.Icon()
@@ -181,7 +183,7 @@ class MapManager(GenMapManager):
             except:
                 logging.error("No icon for the log window")
 
-
+        logging.info("MapManager - MapViewer created")
         # Set directory for hydrometry data, relative to the current file
         dir_data = Path(__file__).parent / "data"
         dir_hydro = dir_data / "hydrometry"
@@ -196,11 +198,16 @@ class MapManager(GenMapManager):
         if not dir_picc.exists():
             dir_picc.mkdir(parents=True, exist_ok=True)
 
+        logging.info("MapManager - Data directories created")
         try:
             self.SPWhydrometry = hydrometry_wolfgui(dir=dir_hydro, idx = 'SPW hydrometry', mapviewer=self.mapviewer, parent = self, plotted=False)
+            logging.info("MapManager - hydrometry_wolfgui created")
             self.picc          = Picc_data(data_dir=dir_picc, mapviewer=self.mapviewer)
+            logging.info("MapManager - Picc_data created")
             self.cadaster      = Cadaster_data(data_dir=dir_cadaster, mapviewer=self.mapviewer)
+            logging.info("MapManager - Cadaster_data created")
             self.landmaps      = PlansTerrier(mapviewer=self.mapviewer, parent = self, idx='LandMaps', plotted=True)
+            logging.info("MapManager - PlansTerrier created")
 
             self.mapviewer.add_object(which='other',
                                     newobj=self.SPWhydrometry,
@@ -225,6 +232,7 @@ class MapManager(GenMapManager):
             logging.warning("Can't load some data (hydrometry, picc, cadaster, landmaps) -- Please check the data directories and/or report the issue")
 
         self.mapviewer.menu_walous()
+        logging.info("MapManager - Menu Walous created")
 
 # class GPU2DModel(GenMapManager):
 

wolfhece/PyParams.py

@@ -333,6 +333,35 @@ class Wolf_Param(wx.Frame):
                           toShow,
                           toolbar=toolbar)
 
+    def __getstate__(self):
+        state =  self.__dict__.copy()
+        # Remove the wxPython GUI from the state to avoid pickling issues
+        state.pop('prop', None)
+        state.pop('sizer', None)
+        state.pop('callback', None)
+        state.pop('callbackdestroy', None)
+        state.pop('DestroyAtClosing', None)
+        state.pop('show_in_active_if_default', None)
+        state.pop('sizerbut', None)
+        state.pop('myIncGroup', None)
+        state.pop('myIncParam', None)
+        state.pop('update_incr_at_every_change', None)
+        state.pop('wxparent', None)
+        state.pop('gui_hydrometry', None)
+        state.pop('cloud_stations_real', None)
+        state.pop('cloud_stations', None)
+        state.pop('gui_hydrometry', None)
+
+        return state
+
+    def __setstate__(self, state):
+
+        self.__dict__.update(state)
+
+        # Reinitialize the wxPython GUI if it was not initialized before pickling
+        if self.wx_exists:
+            self._set_gui()
+
     @property
     def has_prop(self) -> bool:
         """ Return True if the property grid is available """

wolfhece/Results2DGPU.py

@@ -193,11 +193,17 @@ class wolfres2DGPU(Wolfresults_2D):
             if key in dct:
                 dct.pop(key)
 
+        dct['isGPU'] = True
+
         return dct
 
     def __setstate__(self, dct):
+
         super().__setstate__(dct)
 
+        self._loader(self.filename)
+        self._post_loader()
+
         self._result_store = None
         self._cache = None
         self.setup_store(self._result_store)

wolfhece/__init__.py

@@ -7,7 +7,7 @@ try:
     ogr.UseExceptions()
     osr.UseExceptions()
 except ImportError as e:
-    print(e)
+    # print(e)
     raise Exception(_('Error importing GDAL library\nPlease ensure GDAL is installed and the Python bindings are available\n\ngdal wheels can be found at https://github.com/cgohlke/geospatial-wheels'))
 
 from .apps.version import WolfVersion

wolfhece/apps/version.py

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

wolfhece/apps/wolf.py

@@ -8,10 +8,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
 import wx
 from ..PyTranslate import _
 
-import ctypes
 myappid = 'wolf_hece_uliege' # arbitrary string
 ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
 

wolfhece/assets/__init__.py

@@ -1 +0,0 @@
-from . import _add_path