wolfhece 2.0.12__py3-none-any.whl → 2.0.13__py3-none-any.whl

wolfhece/PyDraw.py

@@ -1680,22 +1680,25 @@ class WolfMapViewer(wx.Frame):
         self.mimicme()
 
     def setsizecanvas(self,width,height):
+        """ Redimensionne la fenêtre graphique """
         self.canvas.SetClientSize(width, height)
 
     def updatescalefactors(self):
+        """ Mise à jour des facteurs d'échelle """
         width, height = self.canvas.GetSize()
 
         self.sx = 1
         self.sy = 1
-        if width > 0:
+        if self.width > 0 and width >0 :
             self.sx = float(width) / self.width
-        if height > 0:
+        if self.height > 0 and height > 0 :
             self.sy = float(height) / self.height
 
         self.sx = min(self.sx, self.sy)
         self.sy = self.sx
 
     def add_viewer_and_link(self):
+        """ Ajout d'une nouvelle fenêtre de visualisation et liaison avec la fenêtre courante """
         dlg = wx.TextEntryDialog(self, _('Enter a caption for the new window'))
 
         ret = dlg.ShowModal()
@@ -1707,6 +1710,8 @@ class WolfMapViewer(wx.Frame):
         newcap = dlg.GetValue()
         dlg.Destroy()
         newview = WolfMapViewer(None, newcap, w=600, h=600, wxlogging=self.wxlogging, wolfparent=self.wolfparent)
+        newview.add_grid()
+        newview.add_WMS()
 
         if self.linkedList is None:
             self.linkedList = [self]
@@ -1718,11 +1723,15 @@ class WolfMapViewer(wx.Frame):
             curview.linkedList = self.linkedList
             curview.link_shareopsvect = False
 
+        logging.info(_('New viewer added and linked'))
+
     def add_grid(self):
+        """ Ajout d'une grille """
         mygrid = Grid(1000.)
         self.add_object('vector', newobj=mygrid, ToCheck=False, id='Grid')
 
     def add_WMS(self):
+        """ Ajout de couches WMS """
         xmin = 0
         xmax = 0
         ymin = 0
@@ -5523,11 +5532,17 @@ class WolfMapViewer(wx.Frame):
                 self.active_zone = self.active_vector.parentzone
                 self.active_zones.expand_tree(self.active_zone)
 
-        elif self.action == 'select node by node':
-            currray: WolfArray
-            curarray = self.active_array
-            curarray.mngselection.add_node_to_selection(x, y)
-            curarray.mngselection.update_nb_nodes_sections()
+        elif 'select node by node' in self.action:
+
+            if 'results' in self.action:
+                curobj:Wolfresults_2D
+                curobj = self.active_res2d.mngselection
+            else:
+                curobj: WolfArray
+                curobj = self.active_array.mngselection
+
+            curobj.add_node_to_selection(x, y)
+            curobj.update_nb_nodes_sections()
             self.Paint()
 
         elif 'select by tmp vector' in self.action or 'select by vector' in self.action:
@@ -6214,7 +6229,7 @@ class WolfMapViewer(wx.Frame):
             elif self.action == 'select active vector2':
                 self.end_action(_('End of vector selection'))
 
-            elif self.action == 'select node by node':
+            elif 'select node by node' in self.action:
                 self.end_action(_('End of node by node selection'))
 
         self.copyfrom = None
@@ -6618,6 +6633,20 @@ class WolfMapViewer(wx.Frame):
             if key == wx.WXK_DELETE:
                 self.removeobj()
 
+            elif key == wx.WXK_ESCAPE:
+
+                logging.info(_('Escape key pressed -- Set all active objects and "action" to None'))
+
+                self.action = None
+                self.active_array = None
+                self.active_vector = None
+                self.active_zone = None
+                self.active_zones = None
+                self.active_res2d = None
+                self.active_tile = None
+                self.active_particle_system = None
+                self.active_vertex = None
+
             elif key == ord('C'):
 
                  self.copy_canvasogl(mpl = False)
@@ -6712,6 +6741,9 @@ class WolfMapViewer(wx.Frame):
                 if self.active_array is not None:
                     self.active_array.myops.select_node_by_node()
 
+                if self.active_res2d is not None:
+                    self.active_res2d.properties.select_node_by_node()
+
             elif key == ord('V'):  # V
                 if self.active_array is not None:
                     self.active_array.myops.select_vector_inside_manager()
@@ -6907,8 +6939,6 @@ class WolfMapViewer(wx.Frame):
             # Dessin du Front
             self._plotting(draw_type.WMSFORE)
 
-            # glFinish()
-
             # Gestion des BC (si actif)
             if self.active_bc is not None:
                 self.active_bc.plot()
@@ -6918,7 +6948,7 @@ class WolfMapViewer(wx.Frame):
             # except:
             #     pass
 
-            glFlush()
+            # glFlush()
             self.canvas.SwapBuffers()
         else:
             raise NameError(

wolfhece/PyGui.py

@@ -27,7 +27,7 @@ except:
 from .PyConfig import WolfConfiguration, ConfigurationKeys
 from .pylogging import create_wxlogwindow
 
-# FIXME : Is it necessary to override wx.Frame ? WolfMapManager is a wx.Frame. 
+# FIXME : Is it necessary to override wx.Frame ? WolfMapManager is a wx.Frame.
 #         Is it sufficient to run a wx.App ?
 class GenMapManager(wx.Frame):
     mapviewer:WolfMapViewer
@@ -75,12 +75,12 @@ class GenMapManager(wx.Frame):
         """
         Setup of a WolfMapViewer
         """
-        self.mapviewer = WolfMapViewer(None, 
-                                       title=title, 
-                                       wolfparent= wolfparent, 
+        self.mapviewer = WolfMapViewer(None,
+                                       title=title,
+                                       wolfparent= wolfparent,
                                        wxlogging=self.mylogs)
-        self.add_grid()
-        self.add_WMS()
+        self.mapviewer.add_grid()
+        self.mapviewer.add_WMS()
 
     def get_mapviewer(self):
         # Retourne une instance WolfMapViewer
@@ -89,45 +89,53 @@ class GenMapManager(wx.Frame):
     def get_configuration(self):
         return self._configuration
 
-    def add_grid(self):
-        mygrid=Grid(1000.)
-        self.mapviewer.add_object('vector',newobj=mygrid,ToCheck=False,id='Grid')
-
-    def add_WMS(self):
-        xmin=0
-        xmax=0
-        ymin=0
-        ymax=0
-        orthos={'IMAGERIE':{'1971':'ORTHO_1971','1994-2000':'ORTHO_1994_2000',
-                        '2006-2007':'ORTHO_2006_2007',
-                        '2009-2010':'ORTHO_2009_2010',
-                        '2012-2013':'ORTHO_2012_2013',
-                        '2015':'ORTHO_2015','2016':'ORTHO_2016','2017':'ORTHO_2017',
-                        '2018':'ORTHO_2018','2019':'ORTHO_2019','2020':'ORTHO_2020',
-                        '2021':'ORTHO_2021'}}
-        for idx,(k,item) in enumerate(orthos.items()):
-            for kdx,(m,subitem) in enumerate(item.items()):
-                self.mapviewer.add_object(which='wmsback',
-                                            newobj=imagetexture('PPNC',m,k,subitem,
-                                                                self.mapviewer,xmin,xmax,ymin,ymax,-99999,1024),
-                                            ToCheck=False,id='PPNC '+m)
-
-        self.mapviewer.add_object(which='wmsback',
-                                  newobj=imagetexture('PPNC','Orthos France','OI.OrthoimageCoverage.HR','',
-                                                      self.mapviewer,xmin,xmax,ymin,ymax,-99999,1024,France=True,epsg='EPSG:27563'),
-                                          ToCheck=False,id='Orthos France')
-
-        forelist={'EAU':{'Aqualim':'RES_LIMNI_DGARNE','Alea':'ALEA_INOND','Lidaxes':'LIDAXES','Juillet 2021':'ZONES_INONDEES','Juillet 2021 IDW':'ZONES_INONDEES$IDW'},
-                    'LIMITES':{'Secteurs Statistiques':'LIMITES_QS_STATBEL'},
-                    'INSPIRE':{'Limites administratives':'AU_wms'},
-                    'PLAN_REGLEMENT':{'Plan Percellaire':'CADMAP_2021_PARCELLES'}}
-
-        for idx,(k,item) in enumerate(forelist.items()):
-            for kdx,(m,subitem) in enumerate(item.items()):
-                self.mapviewer.add_object(which='wmsfore',
-                            newobj=imagetexture('PPNC',m,k,subitem,
-                            self.mapviewer,xmin,xmax,ymin,ymax,-99999,1024),
-                            ToCheck=False,id=m)
+    # def add_grid(self, tomapviewer:WolfMapViewer=None):
+    #     """ Add a grid to the mapviewer """
+    #     mygrid=Grid(1000.)
+
+    #     if tomapviewer is None:
+    #         tomapviewer = self.mapviewer
+    #     tomapviewer.add_object('vector',newobj=mygrid,ToCheck=False,id='Grid')
+
+    # def add_WMS(self, tomapviewer:WolfMapViewer=None):
+    #     """ Add WMS layers to the mapviewer """
+    #     if tomapviewer is None:
+    #         tomapviewer = self.mapviewer
+
+    #     xmin=0
+    #     xmax=0
+    #     ymin=0
+    #     ymax=0
+    #     orthos={'IMAGERIE':{'1971':'ORTHO_1971','1994-2000':'ORTHO_1994_2000',
+    #                     '2006-2007':'ORTHO_2006_2007',
+    #                     '2009-2010':'ORTHO_2009_2010',
+    #                     '2012-2013':'ORTHO_2012_2013',
+    #                     '2015':'ORTHO_2015','2016':'ORTHO_2016','2017':'ORTHO_2017',
+    #                     '2018':'ORTHO_2018','2019':'ORTHO_2019','2020':'ORTHO_2020',
+    #                     '2021':'ORTHO_2021'}}
+    #     for idx,(k,item) in enumerate(orthos.items()):
+    #         for kdx,(m,subitem) in enumerate(item.items()):
+    #             tomapviewer.add_object(which='wmsback',
+    #                                         newobj=imagetexture('PPNC',m,k,subitem,
+    #                                                             tomapviewer,xmin,xmax,ymin,ymax,-99999,1024),
+    #                                         ToCheck=False,id='PPNC '+m)
+
+    #     tomapviewer.add_object(which='wmsback',
+    #                               newobj=imagetexture('PPNC','Orthos France','OI.OrthoimageCoverage.HR','',
+    #                                                   tomapviewer,xmin,xmax,ymin,ymax,-99999,1024,France=True,epsg='EPSG:27563'),
+    #                                       ToCheck=False,id='Orthos France')
+
+    #     forelist={'EAU':{'Aqualim':'RES_LIMNI_DGARNE','Alea':'ALEA_INOND','Lidaxes':'LIDAXES','Juillet 2021':'ZONES_INONDEES','Juillet 2021 IDW':'ZONES_INONDEES$IDW'},
+    #                 'LIMITES':{'Secteurs Statistiques':'LIMITES_QS_STATBEL'},
+    #                 'INSPIRE':{'Limites administratives':'AU_wms'},
+    #                 'PLAN_REGLEMENT':{'Plan Percellaire':'CADMAP_2021_PARCELLES'}}
+
+    #     for idx,(k,item) in enumerate(forelist.items()):
+    #         for kdx,(m,subitem) in enumerate(item.items()):
+    #             tomapviewer.add_object(which='wmsfore',
+    #                         newobj=imagetexture('PPNC',m,k,subitem,
+    #                         tomapviewer,xmin,xmax,ymin,ymax,-99999,1024),
+    #                         ToCheck=False,id=m)
 
 class MapManager(GenMapManager):
     def __init__(self,*args, **kw):
@@ -294,8 +302,8 @@ class HydrologyModel(GenMapManager):
         self.mapviewer.add_object(which='other',newobj=self.SPWstations,ToCheck=False,id='SPW-MI stations')
         self.mapviewer.add_object(which='other',newobj=self.DCENNstations,ToCheck=False,id='SPW-DCENN stations')
 
-        self.add_grid()
-        self.add_WMS()
+        self.mapviewer.add_grid()
+        self.mapviewer.add_WMS()
 
         self.mapviewer.findminmax(True)
         self.mapviewer.Autoscale(False)

wolfhece/PyPalette.py

@@ -480,10 +480,17 @@ class wolfpalette(wx.Frame,LinearSegmentedColormap):
                 myfile.write(str(self.colors[i,1])+'\n')
                 myfile.write(str(self.colors[i,2])+'\n')
 
-    def isopop(self,array: ma.masked_array,nbnotnull=99999):
+    def isopop(self, array: ma.masked_array, nbnotnull:int=99999):
         """Remplissage des valeurs de palette sur base d'une équirépartition de valeurs"""
 
         sortarray = array.flatten(order='F')
+
+        idx_nan = np.where(np.isnan(sortarray))
+        if idx_nan[0].size > 0:
+            sortarray = np.delete(sortarray, idx_nan)
+            nbnotnull -= idx_nan[0].size
+            logging.warning('NaN values found in array - removed from palette')
+
         sortarray.sort(axis=-1)
 
         #valeurs min et max

wolfhece/Results2DGPU.py

@@ -18,7 +18,7 @@ try:
     from wolfgpu.results_store import ResultsStore, ResultType
 except :
     logging.error(_("Unable to import wolfgpu.results_store.ResultsStore. Please install wolfgpu package or add a symlink to the wolfgpu package in the wolfhece directory"))
-    raise ImportError(_("Unable to import wolfgpu.results_store.ResultsStore. Please install wolfgpu package or add a symlink to the wolfgpu package in the wolfhece directory"))
+    # raise ImportError(_("Unable to import wolfgpu.results_store.ResultsStore. Please install wolfgpu package or add a symlink to the wolfgpu package in the wolfhece directory"))
 
 def _load_res(x) -> tuple[csr_array, csr_array, csr_array]:
     store:ResultsStore

wolfhece/mesh2d/bc_manager.py

@@ -721,7 +721,7 @@ class BcManager(wx.Frame):
                     namebc=self._find_EnumName_TypeBC(tbc)
 
                     if(str(val)!='99999.0'):
-                        text+= "simul.add_boundary_condition(i={}, j={},bc_type=BoundaryConditionsTypes.{}, bc_value={}, border=Direction.{}\n".format(i,j,namebc,val,direction)
+                        text+= "simul.add_boundary_condition(i={}, j={},bc_type=BoundaryConditionsTypes.{}, bc_value={}, border=Direction.{})\n".format(i,j,namebc,val,direction)
         return text
 
     def parse(self, text:str):

wolfhece/scenario/config_manager.py

@@ -615,13 +615,14 @@ class Config_Manager_2D_GPU:
         if (self.workingdir / 'bathymetry.tif').exists():
             locheader = self.get_header()
             infilzones = WolfArray(srcheader=locheader, whichtype= WOLF_ARRAY_FULL_INTEGER)
-            infilzones.array.data[:,:] = -1
-            infilzones.write_all(str(self.workingdir / 'infiltration_zones.tif'))
+            infilzones.array.data[:,:] = 0
+            infilzones.nullvalue = -1
+            infilzones.write_all(str(self.workingdir / 'infiltration.tif'))
 
-            if (self.workingdir / 'infiltration_zones.tif').exists():
-                logging.info(_('infiltration_zones.tif created and set to -1 ! -- Please edit it !'))
+            if (self.workingdir / 'infiltration.tif').exists():
+                logging.info(_('infiltration.tif created and set to -1 ! -- Please edit it !'))
             else:
-                logging.error(_("infiltration_zones.tif not created ! --  Does 'bathymetry.tif' or any '.tif' file exist in the root directory ?"))
+                logging.error(_("infiltration.tif not created ! --  Does 'bathymetry.tif' or any '.tif' file exist in the root directory ?"))
         else:
             logging.error(_("No 'bathymetry.tif' file found in the root directory !"))
 
@@ -1118,6 +1119,10 @@ class UI_Manager_2D_GPU():
 
         self._parent.load_data()
 
+        if allsims is None:
+            logging.error(_('No simulation created !'))
+            return
+
         if len(allsims)>0:
 
             self._txtctrl.write(_('You have created {} simulations\n\n'.format(len(allsims))))

wolfhece/scenario/imposebc_void.py

@@ -3,11 +3,15 @@ import ast
 import importlib.util
 from pathlib import Path
 import tempfile
+import logging
 
 from wolfhece.wolf_array import WolfArray
 from wolfhece.PyVertexvectors import Zones, zone, vector, wolfvertex
-from wolfgpu.simple_simulation import SimpleSimulation, BoundaryConditionsTypes, Direction
 
+try:
+    from wolfgpu.simple_simulation import SimpleSimulation, BoundaryConditionsTypes, Direction
+except:
+    logging.error(_('WOLFGPU not installed !'))
 
 class Impose_Boundary_Conditions:
     """

wolfhece/shaders/quad_geom_shader.glsl

@@ -0,0 +1,33 @@
+#version 460 core
+
+layout (points) in;
+layout (triangle_strip, max_vertices = 4) out;
+
+uniform sampler2D texture;
+uniform float zScale;
+uniform float dx;
+uniform float origx;
+uniform float origy;
+
+void main() {
+
+    float halfdx = dx/2.0;
+
+    vec2 texCoord = (gl_in[0].gl_Position.xy - vec2(origx, origy)) / dx + 0.5;
+
+    float zValue = texture(texture, texCoord).r * zScale;
+
+    gl_Position = vec4(gl_in[0].gl_Position.x - halfdx, gl_in[0].gl_Position.y - halfdx, zValue, 1.0);
+    EmitVertex();
+
+    gl_Position = vec4(gl_in[0].gl_Position.x + halfdx, gl_in[0].gl_Position.y - halfdx, zValue, 1.0);
+    EmitVertex();
+
+    gl_Position = vec4(gl_in[0].gl_Position.x + halfdx, gl_in[0].gl_Position.y + halfdx, zValue, 1.0);
+    EmitVertex();
+
+    gl_Position = vec4(gl_in[0].gl_Position.x - halfdx, gl_in[0].gl_Position.y + halfdx, zValue, 1.0);
+    EmitVertex();
+
+    EndPrimitive();
+}

wolfhece/shaders/simple_vertex_shader_wo_mvp.glsl

@@ -0,0 +1,7 @@
+#version 460 core
+layout (location = 0) in vec2 aVertex;
+
+void main()
+{
+    gl_Position = vec4(aVertex, 0.0, 1.0);
+}

wolfhece/wolf_array.py

@@ -2443,24 +2443,35 @@ class SelectionData():
     def get_script(self, which:int = None) -> str:
         """ Get script of the current selection or of a stored one """
 
-        txt = 'script adapted to a WolfGPU script -- (i,j) are 1-based -- Do not forget to adapt BC type, value and direction\n\n'
+        txt = '# script adapted to a WolfGPU script\n'
+        txt += '#  - (i,j) are 1-based for add_boundary_condition -- Do not forget to adapt BC type, value and direction or use BC Manager\n'
+        txt += '#  - (i,j) are 0-based for infiltration zones\n\n'
 
         if which is None:
             curlist = self.myselection
+            idx = 0
         else:
             if str(which) in self.selections:
-                txt += 'Selection {}\n'.format(which)
+                txt += '# Selection {}\n'.format(which)
                 curlist = self.selections[str(which)]['select']
+                idx = which
             else:
                 logging.error(_('Selection {} does not exist').format(which))
                 return ''
 
+        txt += '# For boundary conditions :\n'
         for cur in curlist:
             i,j = self.parent.get_ij_from_xy(cur[0], cur[1], aswolf=True)
             txt += "simul.add_boundary_condition(i={}, j={}, bc_type=BoundaryConditionsTypes.FROUDE_NORMAL, bc_value=.3, border=Direction.LEFT)".format(i, j) + '\n'
 
-        txt += '\n\nIf needed, selection as string :\n'
+        txt += '\n\n# For infiltration zones :\n'
+        for cur in curlist:
+            i,j = self.parent.get_ij_from_xy(cur[0], cur[1], aswolf=True)
+            txt += "infiltration_zones.array[{},{}]={}".format(i-1, j-1, idx) + '\n'
+
+        txt += '\n\n"""If needed, selection as string :\n'
         txt += self.get_string(which)
+        txt += '"""\n'
 
         return txt
 
@@ -2594,7 +2605,8 @@ class SelectionData():
         # le but est de ne conserver que les coordonnées des CG de mailles
         i, j = self.parent.get_ij_from_xy(x, y)
 
-        if i>=0 and j>=0 and i<self.parent.nbx and j<self.parent.nby:
+        if self.parent.check_bounds_ij(i, j):
+        # if i>=0 and j>=0 and i<self.parent.nbx and j<self.parent.nby:
             self.add_node_to_selectionij(i, j, verif)
 
     def add_nodes_to_selection(self, xy:list[float], verif:bool=True):
@@ -2688,14 +2700,17 @@ class SelectionData():
         path = mpltPath.Path(myvect.asnparray())
         inside = path.contains_points(mypoints)
 
-        if self.parent.myops.selectrestricttomask.IsChecked():
-            self.hideselection=True
+        self.hideselection=False
+        if self.parent.myops is not None:
+            if self.parent.myops.selectrestricttomask.IsChecked():
+                self.hideselection=True
 
         self.add_nodes_to_selection(mypoints[np.where(inside)], verif=nbini != 0)
 
-        if len(self.myselection) > 0:
-            if self.parent.myops.selectrestricttomask.IsChecked():
-                self.condition_select('Mask',0)
+        if self.parent.myops is not None:
+            if len(self.myselection) > 0:
+                if self.parent.myops.selectrestricttomask.IsChecked():
+                    self.condition_select('Mask',0)
 
         self.hideselection=False
         self.update_nb_nodes_sections()
@@ -2710,8 +2725,9 @@ class SelectionData():
 
         self.add_nodes_to_selectionij(mypoints, verif=nbini != 0)
 
-        if self.parent.myops.selectrestricttomask.IsChecked():
-            self.condition_select('Mask',0)
+        if self.parent.myops is not None:
+            if self.parent.myops.selectrestricttomask.IsChecked():
+                self.condition_select('Mask',0)
 
         self.update_nb_nodes_sections()
 
@@ -2738,12 +2754,13 @@ class SelectionData():
         else:
             self.update_plot_selection = True
 
-        self.parent.myops.nbselect.SetLabelText(str(nb))
-        if nb>0:
-            self.parent.myops.minx.SetLabelText(str(np.min(np.asarray(self.myselection)[:, 0])))
-            self.parent.myops.miny.SetLabelText(str(np.min(np.asarray(self.myselection)[:, 1])))
-            self.parent.myops.maxx.SetLabelText(str(np.max(np.asarray(self.myselection)[:, 0])))
-            self.parent.myops.maxy.SetLabelText(str(np.max(np.asarray(self.myselection)[:, 1])))
+        if self.parent.myops is not None:
+            self.parent.myops.nbselect.SetLabelText(str(nb))
+            if nb>0:
+                self.parent.myops.minx.SetLabelText(str(np.min(np.asarray(self.myselection)[:, 0])))
+                self.parent.myops.miny.SetLabelText(str(np.min(np.asarray(self.myselection)[:, 1])))
+                self.parent.myops.maxx.SetLabelText(str(np.max(np.asarray(self.myselection)[:, 0])))
+                self.parent.myops.maxy.SetLabelText(str(np.max(np.asarray(self.myselection)[:, 1])))
 
     def condition_select(self, cond, condval, condval2=0, usemask=False):
         array = self.parent.array
@@ -3423,6 +3440,16 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self.add_ops_sel() # Ajout d'un gestionnaire de sélection et d'opérations
 
+
+    def check_bounds_ij(self, i:int, j:int):
+        """Check if i and j are inside the array bounds"""
+        return i>=0 and j>=0 and i<self.nbx and j<self.nby
+
+    def check_bounds_xy(self, x:float, y:float):
+        """Check if i and j are inside the array bounds"""
+        i,j = self.get_ij_from_xy(x,y)
+        return self.check_bounds_ij(i,j)
+
     def show_properties(self):
         """ Affichage des propriétés de la matrice dans une fenêtre wxPython """
         if self.wx_exists and self.myops is not None:
@@ -3497,6 +3524,15 @@ class WolfArray(Element_To_Draw, header_wolf):
             - mask data outisde linkedvec
         """
         self.array[np.where(self.array<eps)] = 0.
+
+        idx_nan  = np.where(np.isnan(self.array))
+        if len(idx_nan[0])>0:
+            self.array[idx_nan] = 0.
+            self.array.mask[idx_nan] = True
+            logging.warning(_('NaN values found in the array'))
+            for i,j in zip(idx_nan[0],idx_nan[1]):
+                logging.warning(f'NaN at {i+1},{j+1} -- 1-based')
+
         if self.linkedvec is not None:
             self.mask_outsidepoly(self.linkedvec)
 
@@ -5666,7 +5702,6 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self.plotting = False
 
-        # glFinish()
         # Plot selected nodes
         if self.mngselection is not None:
             self.mngselection.plot_selection()
@@ -5678,7 +5713,7 @@ class WolfArray(Element_To_Draw, header_wolf):
     def delete_lists(self):
         """ Delete OpenGL lists """
 
-        logging.info(_('OpenGL lists - deletion -- array {}'.format(self.idx)))
+        logging.debug(_('OpenGL lists - deletion -- array {}'.format(self.idx)))
         for idx, cursize in enumerate(self.mygrid):
             curlist = self.mygrid[cursize]
             nbx = curlist['nbx']
@@ -6003,6 +6038,18 @@ class WolfArrayMB(WolfArray):
         super().__init__(fname, mold, masknull, crop, whichtype, preload, create, mapviewer, nullvalue, srcheader)
         # self.wolftype = whichtype
 
+    def check_bounds_ij(self, i:int, j:int):
+        """Check if i and j are inside the array bounds"""
+        x,y = self.get_xy_from_ij(i,j)
+        return self.check_bounds_xy(x,y)
+
+    def check_bounds_xy(self, x:float, y:float):
+        """Check if i and j are inside the array bounds"""
+
+        xmin, xmax, ymin, ymax = self.get_bounds()
+
+        return x>=xmin and x<=xmax and y>=ymin and y<=ymax
+
     def __getitem__(self, block_key:Union[int,str]) -> WolfArray:
         """Access a block of this multi-blocks array."""
         if isinstance(block_key,int):

wolfhece/wolfresults_2D.py

@@ -63,7 +63,7 @@ except Exception as ex:
 
     raise Exception(msg)
 
-from .wolf_array import WolfArray, getkeyblock, header_wolf, WolfArrayMB, WolfArrayMNAP, header_wolf
+from .wolf_array import WolfArray, getkeyblock, header_wolf, WolfArrayMB, WolfArrayMNAP, header_wolf, SelectionData
 from .mesh2d import wolf2dprev
 from .PyVertexvectors import vector, zone, Zones
 
@@ -1148,10 +1148,10 @@ class Props_Res_2D(wx.Frame):
 
     #     self.myzones.saveas(self.fnsave)
 
-    # def select_node_by_node(self):
-    #     if self._mapviewer is not None:
-    #         self._mapviewer.action = 'select node by node'
-    #         self._mapviewer.active_array = self._parent
+    def select_node_by_node(self):
+        if self._mapviewer is not None:
+            self._mapviewer.action = 'select node by node - results'
+            self._mapviewer.active_res2d = self._parent
 
     # def select_zone_inside_manager(self):
 
@@ -2002,6 +2002,36 @@ class Wolfresults_2D(Element_To_Draw):
         self.properties:Props_Res_2D = None
         self.set_properties()
 
+        self.mngselection = SelectionData(self)
+        self.mngselection.dx, self.mngselection.dy = self[0].dx, self[0].dy
+        self.myops = None
+
+    def get_bounds(self, abs=True):
+        """
+        Return bounds in coordinates
+
+        :param abs = if True, add translation to (x, y) (coordinate to global space)
+        :return : tuple of two lists of two floats - ([xmin, xmax],[ymin, ymax])
+        """
+        if abs:
+            return ([self.origx + self.translx, self.origx + self.translx + float(self.nbx) * self.dx],
+                    [self.origy + self.transly, self.origy + self.transly + float(self.nby) * self.dy])
+        else:
+            return ([self.origx, self.origx + float(self.nbx) * self.dx],
+                    [self.origy, self.origy + float(self.nby) * self.dy])
+
+    def check_bounds_ij(self, i:int, j:int):
+        """Check if i and j are inside the array bounds"""
+        x,y = self.get_xy_from_ij(i,j)
+        return self.check_bounds_xy(x,y)
+
+    def check_bounds_xy(self, x:float, y:float):
+        """Check if i and j are inside the array bounds"""
+
+        (xmin, xmax), (ymin, ymax) = self.get_bounds()
+
+        return x>=xmin and x<=xmax and y>=ymin and y<=ymax
+
     @property
     def nullvalue(self):
         return self.epsilon
@@ -2115,7 +2145,7 @@ class Wolfresults_2D(Element_To_Draw):
 
     def __next__(self):
         self._iter += 1
-        return self[self._iter-1]
+        return self[self._iter]
 
     def as_WolfArray(self, copyarray:bool=True) -> Union[WolfArray, WolfArrayMB]:
         """Récupération d'une matrice MB ou Mono sur base du résultat courant"""
@@ -2388,7 +2418,7 @@ class Wolfresults_2D(Element_To_Draw):
                     curblock.min_field_size = minsize
 
         if which in views_2D:
-            self.delete_lists()
+            # self.delete_lists()
 
             self._which_current_view = which
 
@@ -2419,7 +2449,7 @@ class Wolfresults_2D(Element_To_Draw):
                 self.update_zoom_factor()
 
             # self.mypal.automatic = True
-            self.reset_plot()
+            # self.reset_plot()
 
             self.plotting=False
             self.mimic_plotdata()
@@ -3292,22 +3322,34 @@ class Wolfresults_2D(Element_To_Draw):
         else:
             return nullvalue
 
-    def get_xy_from_ij(self, i, j, which_block, aswolf=False, abs=True):
+    def get_xy_from_ij(self, i:int, j:int, which_block:int=1, aswolf:bool=False, abs:bool=True):
         """
         Retourne les coordonnées (x,y) depuis les indices (i,j) et le numéro de block
+
+        :param i: i index
+        :param j: j index
+        :param which_block: block number; 1-based;
+        :param aswolf: True to add 1 to i and j to match the VB6/Fortran numbering format
+        :param abs: True to return absolute coordinates
         """
 
         x,y = self.myblocks[getkeyblock(which_block,False)].waterdepth.get_xy_from_ij(i, j, aswolf=aswolf, abs=abs)
         return x,y
 
-    def get_ij_from_xy(self, x:float, y:float, which_block, aswolf=False, abs=True):
+    def get_ij_from_xy(self, x:float, y:float, which_block:int = 1, aswolf=False, abs=True):
         """
         Retrouve les indices d'un point (x,y) dans un bloc spécifique
 
         Utilise la routine du même nom dans la martrice 'waterdepth'
+
+        :param x: x coordinate
+        :param y: y coordinate
+        :param which_block: block number; 1-based;
+        :param aswolf: True to add 1 to i and j to match the VB6/Fortran numbering format
+        :param abs: True to return absolute coordinates
         """
 
-        i,j = self.myblocks[getkeyblock(which_block,False)].waterdepth.get_ij_from_xy(x,y, aswolf=aswolf, abs=abs)
+        i,j = self.myblocks[getkeyblock(which_block, False)].waterdepth.get_ij_from_xy(x,y, aswolf=aswolf, abs=abs)
 
         return i,j # Par défaut en indices Python et non WOLF (VB6/Fortran)
 
@@ -3483,6 +3525,10 @@ class Wolfresults_2D(Element_To_Draw):
             self.myparam.weak_bc_x.myzones.plot()
             self.myparam.weak_bc_y.myzones.plot()
 
+        # Plot selected nodes
+        if self.mngselection is not None:
+            self.mngselection.plot_selection()
+
         self.mimic_plotdata(False)
 
     def fillonecellgrid(self,curscale,loci,locj,force=False):

{wolfhece-2.0.12.dist-info → wolfhece-2.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.0.12
+Version: 2.0.13
 Author-email: Stéphane Champailler <stephane.champailler@uliege.be>, Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.0.12.dist-info → wolfhece-2.0.13.dist-info}/RECORD

@@ -5,11 +5,11 @@ wolfhece/Lidar2002.py,sha256=sXZ6p8_EKI5l8fJswIMAABT6dqHKVexU52Tjl1uuisU,5770
 wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
 wolfhece/PyCrosssections.py,sha256=HtvhSracK8Yz6RCNQCfjzflvend_DtybI9mTb9gnTrs,111048
-wolfhece/PyDraw.py,sha256=u9D1rcpiV5Hh_uIfLprP-zYE0JvcScYbFkBCUKRgQiw,297692
-wolfhece/PyGui.py,sha256=WWu4CJrmwsih5c6YLoXnxGdtrCi77cefecMaqr_bVzc,52313
+wolfhece/PyDraw.py,sha256=LdJiB4GW-1s-b4VlMge0NYC2XQbb_Q4lIUR3ngYZO9s,298905
+wolfhece/PyGui.py,sha256=mzJCRjMHtebFrxmPnwUK6YpQgMf5iiiCTm0hCOuRsOY,52722
 wolfhece/PyGuiHydrology.py,sha256=t7EqOMyA1mkVg_aATMaduR-aqs04V-uRCifyHVmPqRs,7133
 wolfhece/PyHydrographs.py,sha256=2BqsvZSb8WuH22SYxU_BcakfA43yV_qA0ujWQE4uwQo,3407
-wolfhece/PyPalette.py,sha256=Y3GHvP-J56IsBeNsgn_bJR3tQwAISMZ9r-tcGIJ55wk,21544
+wolfhece/PyPalette.py,sha256=2nZnI1YlMP658F5A844b9Wnac5QMgaaYAsgpu4_TjP8,21814
 wolfhece/PyParams.py,sha256=PzGnWzlo7dyw9yaDZ90eS3HrXrPEukN1BOEtTPsthEU,77473
 wolfhece/PyPictures.py,sha256=wI6t38rmRiNG1pGWTXVW-nWQO2mg8SH7Gf-X2HIi02A,2023
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
@@ -20,7 +20,7 @@ wolfhece/RatingCurve.py,sha256=Psw4OknvqVXOjIomJxCW4hGd_q2HZ4DmcwV-wJXehds,21420
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=iP6hanwG6EzddcWF2zvsuU9JLfrPtq7-AOFwcz2HO8k,24469
 wolfhece/ReadDataDCENN.py,sha256=4OMDBgkZ_v7OWmVhyQ-reab7MPxGhFEDY2qS8yThhdM,1240
-wolfhece/Results2DGPU.py,sha256=JC-bCtBine4i-j9Ab3Hd_xuinuapgxGWRNGU-pchtsI,16016
+wolfhece/Results2DGPU.py,sha256=EeitHU4WsMpHsissLue_w9fxw2JEN2-poNDVnBgeTPg,16018
 wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/cli.py,sha256=Xj0yfgs7MnvNCk5Td_Qp_oz4DMI66eBHu2bkVrGW3OU,1828
@@ -45,12 +45,12 @@ wolfhece/pywalous.py,sha256=jwp251AzGBc0VmMzOqA0IJiRRa6yQIfccRM8lVGszIY,4474
 wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
 wolfhece/textpillow.py,sha256=YJxF4JzPv3G1oqenJgWVYq3OPZx9iFtrmeIfvBwbJVU,8735
 wolfhece/tools_mpl.py,sha256=q8Yc4aukPPiUcEzREvZRM_em67XqXaahdoaNt0DETfE,266
-wolfhece/wolf_array.py,sha256=vJFPzqNPloV_oQrl6Q2UvhaLHxCXnAWu_MqsfzZTzm0,276260
+wolfhece/wolf_array.py,sha256=eMdZcBQIqvBqIjzhYd-zKmsh50xnDpYZSbMt1EzTbZw,278186
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=quflEvi32lWSvOPa0aDCDl-8Jv-jGtLHbR2rdx67LsI,14883
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
 wolfhece/wolf_vrt.py,sha256=wuMPAXNYTByNGNtvWhwW1fQelPstAPTQZECgXHZ0oTM,5180
-wolfhece/wolfresults_2D.py,sha256=wiHpAQ8W6X3lyE3XkJBMEB198Pbp3i96WslCUXZjI2I,142147
+wolfhece/wolfresults_2D.py,sha256=l0E84-4h9AeyGGsrVaUSo5QZB8mjyf7TnKnhTlY7RA0,144087
 wolfhece/xyz_file.py,sha256=aQOcTHkHRhXHxL_WxTHwzygp6e47San7SHSpxKQU0dw,5457
 wolfhece/apps/ManageParams.py,sha256=its7JhceQiwzQVl95wA51GZs1zjtbpUNvbqvdvDTeyM,316
 wolfhece/apps/Optimisation_hydro.py,sha256=25H5PVN_Gh3mkDQ6BWbJjBqsGCNdGapZOqKECcOGJIQ,398
@@ -200,7 +200,7 @@ wolfhece/mar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mar/commontools.py,sha256=vCmoNI2sMOco6Y4KPpKb7WORq45qFU_lSxbKGV9oZ8A,53824
 wolfhece/mar/interface_MAR_WOLF.py,sha256=MWeXaHLDT4Eo9jZOAvz013lmpgGYT1v9VUYGAgBgSRU,21454
 wolfhece/mesh2d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/mesh2d/bc_manager.py,sha256=8WTKkWX_mwp-AihFkJWrcWxugrUTbTnAO4H867QLOkc,51172
+wolfhece/mesh2d/bc_manager.py,sha256=vSVogXy1x3A6fZKWA6mPZSGX2e3EAUVmEjD9Bgww_hU,51173
 wolfhece/mesh2d/cell_tracker.py,sha256=AR-Bty-QnrY1ni8Lwak2kU2UWMAJSBCF2ugl2YpfsB4,8660
 wolfhece/mesh2d/config_manager.py,sha256=0zVoSD4DNsm_180d8ulDLy8EGFBhTUVApBvRpY730Zk,15284
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=BaJeKHyJiKEFWBkTQeYsDBW86703ooj65MFVpPMgjLg,2810
@@ -224,19 +224,21 @@ wolfhece/rem/RasterViz.py,sha256=TDhWyMppcYBL71HfhpZuMgYKhz7faZg-MEOQJo_3Ivo,291
 wolfhece/rem/__init__.py,sha256=S2-J5uEGK_VaMFjRUYFIdSScJjZyuXH4RmMmnG3OG7I,19
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/scenario/check_scenario.py,sha256=Q0_jA3PYapcbCT881YojTwKoRi_RjZpevHXhtP9VoqE,4619
-wolfhece/scenario/config_manager.py,sha256=mcad9PXsMVYDLCCAYWbun_oercmEpt7pABVW6dfYUCA,55123
-wolfhece/scenario/imposebc_void.py,sha256=59MFld_jJq1m0O8f4Dlh_1wtBlHKNTCEjbEK2A1EaUo,5163
+wolfhece/scenario/config_manager.py,sha256=kYN2V82B8nwUUBmhPzoTATAPVncSg1s7pf4Inp_8WcU,55245
+wolfhece/scenario/imposebc_void.py,sha256=rZs_y0-dOeiHEw_hJyiPeEyL2fmOve-sFtrV57SWhe8,5247
 wolfhece/scenario/update_void.py,sha256=r9ztr9LlJbd6BgOK-KWpYvUAUakZCyze58-olucbVcI,7156
+wolfhece/shaders/quad_geom_shader.glsl,sha256=cHLwA6RfHIbzCB8S0Pu6C2Wi1i-DtGBYJdZWq-YBQ3M,922
 wolfhece/shaders/simple_fragment_shader.glsl,sha256=rk8uBroc8MX8r8K3S71zCSSMGtU27ChZIna-sTiIS9A,112
 wolfhece/shaders/simple_vertex_shader.glsl,sha256=crJlvIx-nNcUpKyK4KpJWR789xG-RqSa56yr4DRq4d4,285
+wolfhece/shaders/simple_vertex_shader_wo_mvp.glsl,sha256=CT5dr1s0kdL90MtZi22DelFzFVns-w0XcrVbPan6yOc,122
 wolfhece/sounds/son12.wav,sha256=iZJYSrKkE4HLXJwWzszVR07w_3d-WLO8npFlUcxQlrc,12664
 wolfhece/sounds/son6.wav,sha256=v7CFE-PlGvVcRC3oAaWBBGngutCDS_MUiCIhNHkpv2Y,7884
 wolfhece/sounds/sonsw1.wav,sha256=HhuGeZ3iIyJdDALmM-jvGZDkKw3IZ3JXCuQZkN3Zjtc,212550
 wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,110636
 wolfhece/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
-wolfhece-2.0.12.dist-info/METADATA,sha256=3-XSmtZBypcBJa0GTKvUpFQQXO-Qtv_Xd4ctVXrdUxA,2053
-wolfhece-2.0.12.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wolfhece-2.0.12.dist-info/entry_points.txt,sha256=IHhq-i2W9QpyXFHKe2Ld8j1R4hW5DmYqrZsuSsXkdEE,245
-wolfhece-2.0.12.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.0.12.dist-info/RECORD,,
+wolfhece-2.0.13.dist-info/METADATA,sha256=MzxbbpRv4ctOCVW9othMrQX-JbdBAkSk5BUYX3Fs4rM,2053
+wolfhece-2.0.13.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wolfhece-2.0.13.dist-info/entry_points.txt,sha256=IHhq-i2W9QpyXFHKe2Ld8j1R4hW5DmYqrZsuSsXkdEE,245
+wolfhece-2.0.13.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.13.dist-info/RECORD,,