wolfhece 2.2.16__py3-none-any.whl → 2.2.18__py3-none-any.whl

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)
@@ -2072,7 +2077,7 @@ class WolfMapViewer(wx.Frame):
         self.popupmenu = wx.Menu()
         self.popupmenu.Bind(wx.EVT_MENU, self.OnPopupItemSelected)
 
-        for text in [_('Save'), _('Save as'), _('Rename'), _('Duplicate'), _('Delete'), _('Up'), _('Down'), _('Check/Uncheck'), _('Properties')]:
+        for text in [_('Save'), _('Save as'), _('Rename'), _('Duplicate'), _('Delete'), _('Up'), _('Down'), _('Check/Uncheck'), _('Properties'), _('Reload')]:
             item = self.popupmenu.Append(-1, text)
 
         self.menubar = wx.MenuBar()
@@ -2290,9 +2295,9 @@ class WolfMapViewer(wx.Frame):
 
         self.analyzeplot.AppendSeparator()
 
-        self.analyzemenu.Append(wx.ID_ANY,_('Plot...'),self.analyzeplot)
-        self.analyzemenu.Append(wx.ID_ANY,_('Export...'),self.analyzeexport)
-        self.analyzemenu.Append(wx.ID_ANY,_('Inpaint...'),self.analyzeinpaint)
+        self.analyzemenu.Append(wx.ID_ANY,_('Plot...'), self.analyzeplot)
+        self.analyzemenu.Append(wx.ID_ANY,_('Export...'), self.analyzeexport)
+        self.analyzemenu.Append(wx.ID_ANY,_('Inpaint...'), self.analyzeinpaint)
 
 
         self.analyzeinpaint.Append(wx.ID_ANY, _("Inpaint active array..."), _("Inpaint active array"))
@@ -2695,12 +2700,19 @@ class WolfMapViewer(wx.Frame):
             self.trianglesmenu = wx.Menu()
             self.menubar.Append(self.trianglesmenu, _('&Triangulations'))
 
-            self._menuinteractptri = self.trianglesmenu.Append(wx.ID_ANY, _("Interpolate on active triangulation..."), _("InterpolateTri"))
+            self._menuinteractptri = self.trianglesmenu.Append(wx.ID_ANY, _("Interpolate on active triangulation..."),
+                                                               _('Interpolate active array on active triangulation'))
+
+            self._menuinteractptri_above = self.trianglesmenu.Append(wx.ID_ANY, _("Interpolate on active triangulation (keep only above)..."),
+                                                                     _('Interpolate active array on active triangulation but keep only values above the array'))
+
+            self._menuinteractptri_below = self.trianglesmenu.Append(wx.ID_ANY, _("Interpolate on active triangulation (keep only below)..."),
+                                                                     _('Interpolate active array on active triangulation but keep only values below the array'))
+
             self._menucomparetri = self.trianglesmenu.Append(wx.ID_ANY, _("Compare triangles to array..."), _("Comparison"))
             self._menumovetri = self.trianglesmenu.Append(wx.ID_ANY, _("Move triangles..."), _("Move triangles"))
             self._menurotatetri = self.trianglesmenu.Append(wx.ID_ANY, _("Rotate triangles..."), _("Rotate triangles"))
 
-
     def create_cloud_menu(self):
         """ Menu for cloud points """
 
@@ -2887,7 +2899,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()
@@ -2996,6 +3008,29 @@ class WolfMapViewer(wx.Frame):
 
             return [xmin, ymin, xmax, ymax]
 
+    def get_bounds(self):
+        """
+        Retourne les limites de la zone d'affichage, voir aussi get_canvas_bounds
+
+        :return: ([xmin, xmax], [ymin, ymax])
+        """
+        xmin, ymin, xmax, ymax = self.get_canvas_bounds()
+        return ([xmin, xmax], [ymin, ymax])
+
+    def get_bounds_as_polygon(self) -> vector:
+        """
+        Retourne les limites de la zone d'affichage sous forme de polygone
+        :return: vector
+        """
+        xmin, ymin, xmax, ymax = self.get_canvas_bounds()
+        poly = vector()
+        poly.add_vertex(wolfvertex(xmin, ymin))
+        poly.add_vertex(wolfvertex(xmax, ymin))
+        poly.add_vertex(wolfvertex(xmax, ymax))
+        poly.add_vertex(wolfvertex(xmin, ymax))
+        poly.force_to_close()
+        return poly
+
     def Onmenuwalous(self, event: wx.MenuEvent):
 
         id = event.GetId()
@@ -3519,16 +3554,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 +3577,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..."):
 
@@ -4365,7 +4420,11 @@ class WolfMapViewer(wx.Frame):
 
         self.myinterp.interp_on_array(self.active_array, method)
 
-    def interpolate_triangulation(self):
+    def interpolate_triangulation(self, keep:Literal['all', 'above', 'below'] = 'all'):
+        """ Alias to interpolate on triangulation
+
+        :param keep: 'all' to keep all points, 'above' to keep only points above the current array's value, 'below' to keep only points below the current array's value
+        """
 
         if self.active_array is None:
             logging.warning(_('No active array -- Please activate an array first'))
@@ -4375,7 +4434,7 @@ class WolfMapViewer(wx.Frame):
             logging.warning(_('No active triangulation -- Please activate a triangulation first'))
             return
 
-        self.active_array.interpolate_on_triangulation(self.active_tri.pts, self.active_tri.tri, )
+        self.active_array.interpolate_on_triangulation(self.active_tri.pts, self.active_tri.tri, keep=keep)
 
     def compare_cloud2array(self):
         """
@@ -8404,7 +8463,13 @@ class WolfMapViewer(wx.Frame):
         #     self.import_3dfaces()
 
         elif itemlabel == _("Interpolate on active triangulation..."):
-            self.interpolate_triangulation()
+            self.interpolate_triangulation(keep='all')
+
+        elif itemlabel == _("Interpolate on active triangulation (keep only above)..."):
+            self.interpolate_triangulation(keep='above')
+
+        elif itemlabel == _("Interpolate on active triangulation (keep only below)..."):
+            self.interpolate_triangulation(keep='below')
 
         elif itemlabel==_("Compare cloud to array..."):
             self.compare_cloud2array()
@@ -11540,6 +11605,31 @@ class WolfMapViewer(wx.Frame):
 
                 dlg.Destroy()
 
+        elif _('Reload') in text:
+
+            if isinstance(self.selected_object, WolfArray):
+                if self.selected_object.filename is not None:
+
+                    dlg = wx.MessageDialog(None, _('Do you want to reload the file ?'), _('Reload'), wx.YES_NO | wx.NO_DEFAULT)
+                    ret = dlg.ShowModal()
+                    if ret == wx.ID_YES:
+                        self.selected_object.read_all()
+                        self.selected_object.mask_data(self.selected_object.nullvalue)
+                        self.selected_object.reset_plot()
+
+                    dlg.Destroy()
+            # elif isinstance(self.selected_object, Zones):
+            #     if self.selected_object.filename is not None:
+            #         dlg = wx.MessageDialog(None, _('Do you want to reload the file ?'), _('Reload'), wx.YES_NO | wx.NO_DEFAULT)
+            #         ret = dlg.ShowModal()
+            #         if ret == wx.ID_YES:
+            #             self.selected_object.read()
+
+            #         dlg.Destroy()
+
+            else:
+                logging.warning(_('Reload not yet implemented for this type of object'))
+
     def OnClose(self, event):
         """ Close the application """
 

wolfhece/PyGui.py

@@ -2915,6 +2915,12 @@ class Wolf2DGPUModel(GenMapManager):
         if force_reload:
             self._sim.reload_all()
             for cur in self.arrays.values():
+
+                if cur.idx == 'water surface elevation [m]':
+                    ## Force to recompute the water surface elevation
+                    cur.array.data[:,:] = self.arrays['bathymetry'].array.data[:,:] + self.arrays['h'].array.data[:,:]
+                    cur.array.mask[:,:] = self.arrays['bathymetry'].array.mask[:,:]
+
                 cur.reset_plot()
             # self.mapviewer.Refresh()
         else:

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 """