wolfhece 2.1.53__py3-none-any.whl → 2.1.55__py3-none-any.whl

wolfhece/PyDraw.py

@@ -247,7 +247,7 @@ class WolfMapViewer(wx.Frame):
     context: GLContext  # context OpenGL
     mytooltip: Wolf_Param  # Objet WOLF permettant l'analyse de ce qui est sous la souris
     treelist: TreeListCtrl  # Gestion des éléments sous forme d'arbre
-    lbl_selecteditem: StaticText
+    _lbl_selecteditem: StaticText
     leftbox: BoxSizer
 
     # DEPRECEATED
@@ -611,7 +611,7 @@ class WolfMapViewer(wx.Frame):
 
         # ajout d'une liste en arbre des objets
         self.treelist = TreeListCtrl(self, style= wx.dataview.TL_CHECKBOX | wx.LC_EDIT_LABELS | wx.TR_FULL_ROW_HIGHLIGHT)
-        self.lbl_selecteditem = StaticText(self, style=wx.ALIGN_CENTER_HORIZONTAL)
+        self._lbl_selecteditem = StaticText(self, style=wx.ALIGN_CENTER_HORIZONTAL)
         self.selected_object = None
 
         self.root = self.treelist.GetRootItem()
@@ -641,17 +641,15 @@ class WolfMapViewer(wx.Frame):
         # dimensionnement et positionnement de l'arbre
         self.leftbox = BoxSizer(orient=wx.VERTICAL)
         self.leftbox.Add(self.treelist, 1, wx.LEFT)
-        self.leftbox.Add(self.lbl_selecteditem, 0, wx.LEFT)
+        self.leftbox.Add(self._lbl_selecteditem, 0, wx.LEFT)
         self.treelist.SetSize(self.treewidth, height)
 
 
         self.CreateStatusBar(1)
 
-        # self.lbl_selecteditem.SetSize(self.treewidth,30)
         self.SetSizer(self.leftbox)
 
         # self.treelist.SetPosition((0,0))
-        # self.lbl_selecteditem.SetPosition((0,height-30))
 
         # fenêtre ToolTip
         self.mytooltip = Wolf_Param(self, "Values", to_read=False, withbuttons=False)
@@ -3887,7 +3885,7 @@ class WolfMapViewer(wx.Frame):
 
         logging.info(_('Clip LAZ grid on current zoom {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
 
-    def select_active_array_from_laz(self, array:WolfArray = None, used_codes:list = None):
+    def select_active_array_from_laz(self, array:WolfArray = None, used_codes:list = None, chunk_size:float = 500.):
         """ select some nodes from laz data
 
         :param array: array to fill
@@ -3900,55 +3898,67 @@ class WolfMapViewer(wx.Frame):
             logging.error(_('No array'))
             return
 
-        curbounds = array.get_bounds()
-
-        logging.info(_('Scan Laz grid on current zoom {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
-        self.mylazdata = self.mylazgrid.scan(curbounds)
-        logging.info(_('Scan done'))
-
-        if used_codes is not None:
-            self.mylazdata = self.mylazdata[self.mylazdata[:, 3] in np.asarray(used_codes, dtype=np.float32)]
-        else:
+        if used_codes is None:
             keycode = [key for key,val in self.mylazgrid.colors.classification.items()]
             names = [val[0] for key,val in self.mylazgrid.colors.classification.items()]
 
             with wx.MultiChoiceDialog(None, _('Choose the codes to use'), _('Codes'), names) as dlg:
                 if dlg.ShowModal() == wx.ID_OK:
-                    data = {}
                     used_codes = dlg.GetSelections()
                     used_codes = [float(keycode[cur]) for cur in used_codes]
-
-                    for curcode in used_codes:
-                        data[curcode] = self.mylazdata[self.mylazdata[:, 3] == curcode]
                 else:
                     return
 
-        for curdata in data.values():
+        curbounds = array.get_bounds()
 
-            if curdata.shape[0] == 0:
-                continue
+        # align bounds on chunk_size
+        curbounds[0][0] = curbounds[0][0] - curbounds[0][0] % chunk_size
+        curbounds[0][1] = curbounds[0][1] + chunk_size - curbounds[0][1] % chunk_size
+        curbounds[1][0] = curbounds[1][0] - curbounds[1][0] % chunk_size
+        curbounds[1][1] = curbounds[1][1] + chunk_size - curbounds[1][1] % chunk_size
+
+        chunck_x = np.arange(curbounds[0][0], curbounds[0][1], chunk_size)
+        chunck_y = np.arange(curbounds[1][0], curbounds[1][1], chunk_size)
+
+        for curx in tqdm(chunck_x, 'Chunks'):
+            for cury in chunck_y:
+                curbounds = [[curx, curx + chunk_size], [cury, cury + chunk_size]]
 
-            i,j = array.get_ij_from_xy(curdata[:, 0], curdata[:, 1]) #= np.float32(self.mylazdata[:, 2])
+                logging.info(_('Scan {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
+                self.mylazdata = self.mylazgrid.scan(curbounds)
+                # logging.info(_('Scan done'))
 
-            keys = np.vstack((i,j)).T
+                data = {}
+                for curcode in used_codes:
+                    data[curcode] = self.mylazdata[self.mylazdata[:, 3] == curcode]
 
-            # unique keys
-            keys = np.unique(keys, axis=0)
+                for curdata in data.values():
 
-            array.SelectionData._add_nodes_to_selectionij(keys, verif = False)
+                    if curdata.shape[0] == 0:
+                        continue
+
+                    i,j = array.get_ij_from_xy(curdata[:, 0], curdata[:, 1]) #= np.float32(self.mylazdata[:, 2])
+
+                    keys = np.vstack((i,j)).T
+
+                    # unique keys
+                    keys = np.unique(keys, axis=0)
+
+                    array.SelectionData._add_nodes_to_selectionij(keys, verif = False)
 
         array.SelectionData.update_nb_nodes_selection()
         self.Paint()
 
         logging.info(_('Selection done'))
 
-    def fill_active_array_from_laz(self, array:WolfArray = None, used_codes:list = None, operator:int = None):
+    def fill_active_array_from_laz(self, array:WolfArray = None, used_codes:list = [], operator:int = -1, chunk_size:float = 500.):
         """ Fill active array with laz data
 
         :param array: array to fill
         :param used_codes: codes to use
         :param operator: operator to use
         """
+
         if self.mylazgrid is None:
             return
 
@@ -3956,15 +3966,7 @@ class WolfMapViewer(wx.Frame):
             logging.error(_('No array'))
             return
 
-        curbounds = array.get_bounds()
-
-        logging.info(_('Scan Laz grid on current zoom {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
-        self.mylazdata = self.mylazgrid.scan(curbounds)
-        logging.info(_('Scan done'))
-
-        if used_codes is not None:
-            self.mylazdata = self.mylazdata[self.mylazdata[:, 3] in np.asarray(used_codes, dtype=np.float32)]
-        else:
+        if len(used_codes) == 0 :
             keycode = [key for key,val in self.mylazgrid.colors.classification.items()]
             names = [val[0] for key,val in self.mylazgrid.colors.classification.items()]
 
@@ -3973,14 +3975,11 @@ class WolfMapViewer(wx.Frame):
                     data = {}
                     used_codes = dlg.GetSelections()
                     used_codes = [float(keycode[cur]) for cur in used_codes]
-
-                    for curcode in used_codes:
-                        data[curcode] = self.mylazdata[self.mylazdata[:, 3] == curcode]
                 else:
                     return
 
-        if operator is None:
-            with wx.SingleChoiceDialog(None, _('Choose the operator'), _('Operator'), ['max', 'min', 'mean', 'median', 'sum']) as dlg:
+        if operator == -1:
+            with wx.SingleChoiceDialog(None, _('Choose the operator'), _('Operator'), ['max', 'percentile 95', 'percentile 5', 'min', 'mean', 'median', 'sum']) as dlg:
                 if dlg.ShowModal() == wx.ID_OK:
                     if dlg.GetStringSelection() == 'max':
                         operator = np.max
@@ -3992,48 +3991,108 @@ class WolfMapViewer(wx.Frame):
                         operator = np.median
                     elif dlg.GetStringSelection() == 'sum':
                         operator = np.sum
+                    elif dlg.GetStringSelection() == 'percentile 95':
+                        operator = lambda x: np.percentile(x, 95)
+                    elif dlg.GetStringSelection() == 'percentile 5':
+                        operator = lambda x: np.percentile(x, 5)
                 else:
                     return
 
-        for curdata in data.values():
+        with wx.NumberEntryDialog(None, _('Minimum number of points to operate'), _('Minimum'), _('Minimum points'), 1, 1, 20) as dlg:
+            if dlg.ShowModal() == wx.ID_OK:
+                minpoints = dlg.GetValue()
+            else:
+                return
 
-            if curdata.shape[0] == 0:
-                continue
+        bounds = array.get_bounds()
+
+        # align bounds on chunk_size
+        bounds[0][0] = bounds[0][0] - bounds[0][0] % chunk_size
+        bounds[0][1] = bounds[0][1] + chunk_size - bounds[0][1] % chunk_size
+        bounds[1][0] = bounds[1][0] - bounds[1][0] % chunk_size
+        bounds[1][1] = bounds[1][1] + chunk_size - bounds[1][1] % chunk_size
+
+        chunks_x = np.arange(bounds[0][0], bounds[0][1], chunk_size)
+        chunks_y = np.arange(bounds[1][0], bounds[1][1], chunk_size)
+
+        for curx in tqdm(chunks_x, 'Chunks'):
+            for cury in chunks_y:
+
+                curbounds = [[curx, curx + chunk_size], [cury, cury + chunk_size]]
+
+                logging.info(_('Scan {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
+                self.mylazdata = self.mylazgrid.scan(curbounds)
+                # logging.info(_('Scan done'))
+
+                if len(self.mylazdata) == 0:
+                    continue
 
-            i,j = array.get_ij_from_xy(curdata[:, 0], curdata[:, 1]) #= np.float32(self.mylazdata[:, 2])
+                # Test codes
+                data = {}
+                for curcode in used_codes:
+                    data[curcode] = self.mylazdata[self.mylazdata[:, 3] == curcode]
 
-            # sort i, j and z
-            i = np.asarray(i, dtype=np.int32)
-            j = np.asarray(j, dtype=np.int32)
-            z = np.asarray(curdata[:, 2], dtype=np.float32)
+                # Treat data for each code
+                for curdata in data.values():
 
-            keys = np.vstack((i,j)).T
+                    if curdata.shape[0] == 0:
+                        continue
+                    else:
+                        logging.info(_('Code {} : {} points'.format(curdata[0,3], curdata.shape[0])))
+
+                    # get i,j from x,y
+                    i,j = array.get_ij_from_xy(curdata[:, 0], curdata[:, 1]) #= np.float32(self.mylazdata[:, 2])
+
+                    # keep only valid points -- inside the array
+                    used = np.where((i >=0) & (i < array.nbx) & (j >=0) & (j < array.nby))[0]
+
+                    if len(used) == 0:
+                        continue
+
+                    i = i[used]
+                    j = j[used]
+                    z = curdata[used, 2]
+
+                    # create a key array
+                    keys = np.vstack((i,j)).T
+                    # find unique keys
+                    keys = np.unique(keys, axis=0)
 
-            ijz = np.hstack((keys,z.reshape(-1,1)))
+                    # create a ijz array
+                    ijz = np.vstack((i, j, z)).T
 
-            # unique keys
-            keys = np.unique(keys, axis=0)
+                    # sort ijz array according to keys
+                    #
+                    # the most important indice is the last one enumerated in lexsort
+                    # see : https://numpy.org/doc/stable/reference/generated/numpy.lexsort.html
+                    ijz = ijz[np.lexsort((ijz[:,1], ijz[:,0]))]
 
-            ijz = ijz[np.lexsort((ijz[:,1], ijz[:,0]))]
+                    # find first element of each key
+                    idx = np.where(np.abs(np.diff(ijz[:,0])) + np.abs(np.diff(ijz[:,1])) != 0)[0]
 
-            # find first element of each key
-            idx = np.where(np.diff(ijz[:,0]) + np.diff(ijz[:,1]) != 0)[0]
-            idx = np.concatenate((idx, [ijz.shape[0]]))
+                    # add last element
+                    idx = np.concatenate((idx, [ijz.shape[0]]))
 
-            # apply operator
-            vals = {}
-            start_ii = 0
-            for ii, key in enumerate(keys):
+                    assert len(idx) == keys.shape[0], 'Error in filling'
 
-                end_ii = idx[ii]+1
-                if key[0] >=0 and key[0] < array.nbx and key[1] >=0 and key[1] < array.nby:
-                    vals[(key[0], key[1])] = operator(ijz[start_ii:end_ii,2])
-                start_ii = end_ii
+                    logging.info(_('Cells to fill : {}'.format(len(idx))))
 
-            # create a new ijz array
-            newijz = np.asarray([[key[0], key[1], val] for key, val in vals.items()], dtype = np.float32)
+                    # apply operator
+                    vals = {}
+                    start_ii = 0
+                    for ii, key in enumerate(keys):
+                        end_ii = idx[ii]+1
 
-            array.fillin_from_ijz(newijz)
+                        if end_ii - start_ii >= minpoints:
+                            vals[(key[0], key[1])] = operator(ijz[start_ii:end_ii,2])
+
+                        start_ii = end_ii
+
+                    if len(vals) > 0:
+                        # create a new ijz array
+                        newijz = np.asarray([[key[0], key[1], val] for key, val in vals.items()], dtype = np.float32)
+
+                        array.fillin_from_ijz(newijz)
 
         array.reset_plot()
         self.Paint()
@@ -4073,7 +4132,7 @@ class WolfMapViewer(wx.Frame):
 
         self.mylazgrid = xyz_laz_grids(dirlaz)
 
-        dlg = wx.SingleChoiceDialog(None, _('Choose the classification'), _('Classification'), ['SPW 2013-2014', 'SPW-Geofit 2023'], wx.CHOICEDLG_STYLE)
+        dlg = wx.SingleChoiceDialog(None, _('Choose the classification'), _('Classification'), ['SPW-Geofit 2023', 'SPW 2013-2014'], wx.CHOICEDLG_STYLE)
         ret = dlg.ShowModal()
         if ret != wx.ID_OK:
             dlg.Destroy()
@@ -4274,7 +4333,7 @@ class WolfMapViewer(wx.Frame):
         item = self.menubar.FindItemById(event.GetId())
 
         if item is not None:
-            self.StatusBar.SetStatusText(item.GetHelp())
+            self.set_statusbar_text(item.GetHelp())
 
     def _select_laz_source(self):
         """ Select laz source """
@@ -7624,6 +7683,14 @@ class WolfMapViewer(wx.Frame):
                 self.active_bc.Show()
                 return
 
+    def set_statusbar_text(self, txt:str):
+        """ Set the status bar text """
+        self.StatusBar.SetStatusText(txt)
+
+    def set_label_selecteditem(self, nameitem:str):
+        """ Set the label of the selected item in the tree list """
+        self._lbl_selecteditem.SetLabel(nameitem)
+
     def OnActivateTreeElem(self, e): #:dataview.TreeListEvent ):
         """ Activate the selected item in the tree list """
         curzones: Zones
@@ -7643,7 +7710,7 @@ class WolfMapViewer(wx.Frame):
 
         myobj = self.treelist.GetItemData(myitem)
         self.selected_object = myobj
-        self.lbl_selecteditem.SetLabel(nameitem)
+        self.set_label_selecteditem(nameitem)
 
         #FIXME : To generalize using draw_type
         if type(myobj) == Zones:
@@ -7689,7 +7756,7 @@ class WolfMapViewer(wx.Frame):
 
             txt += ' ; Type : ' + self.active_array.dtype_str
 
-            self.StatusBar.SetStatusText(txt)
+            self.set_statusbar_text(txt)
 
 
         elif type(myobj) in [WolfViews]:
@@ -8430,9 +8497,9 @@ class WolfMapViewer(wx.Frame):
         """ Message to end action """
 
         if which == 0:
-            self.StatusBar.SetStatusText(_('Action in progress... -- To quit, press "RETURN" or "double clicks RIGHT" or press "ESC"'))
+            self.set_statusbar_text(_('Action in progress... -- To quit, press "RETURN" or "double clicks RIGHT" or press "ESC"'))
         else:
-            self.StatusBar.SetStatusText('')
+            self.set_statusbar_text('')
 
     def start_action(self, action:str, message:str=''):
         """ Message to start action """
@@ -8756,7 +8823,8 @@ class WolfMapViewer(wx.Frame):
                 self.active_vertex = None
                 self.active_cloud = None
 
-                self.StatusBar.SetStatusText(_('Esc pressed - No more action in progress'))
+                self.set_statusbar_text(_('Esc pressed - No more action in progress - No more active object'))
+                self.set_label_selecteditem('')
 
             elif key == ord('C'):
 

wolfhece/PyVertexvectors.py

@@ -886,6 +886,18 @@ if :\n \
         self.myprops.Show()
 
         self.myprops.SetTitle(_('Vector properties - {}'.format(self.parent.myname)))
+
+        if self.parent.get_mapviewer() is not None:
+            self.myprops.SetIcon(self.parent.get_mapviewer().GetIcon())
+        else:
+            try:
+                icon = wx.Icon()
+                icon_path = Path(__file__).parent / "apps/wolf_logo.bmp"
+                icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+                self.myprops.SetIcon(icon)
+            except Exception as e:
+                logging.warning('Problem with icon for properties window : {}'.format(e))
+
         self.myprops.Center()
         self.myprops.Raise()
 
@@ -1017,6 +1029,15 @@ class vector:
         if fromshapely is not None:
             self.import_shapelyobj(fromshapely)
 
+    def get_mapviewer(self):
+        """
+        Retourne l'instance de la mapviewer
+        """
+        if self.parentzone is not None:
+            return self.parentzone.get_mapviewer()
+        else:
+            return None
+
     def show_properties(self):
         """ Show the properties """
 
@@ -1029,11 +1050,6 @@ class vector:
         if self.myprop is not None:
             self.myprop.hide_properties()
 
-    def get_mapviewer(self):
-        """ Return the mapviewer """
-
-        return self.parentzone.get_mapviewer()
-
     def get_normal_segments(self) -> np.ndarray:
         """
         Return the normals of each segment
@@ -4866,6 +4882,18 @@ class Zones(wx.Frame, Element_To_Draw):
 
             self.SetSizer(box)
 
+            if self.get_mapviewer() is not None:
+                self.SetIcon(self.get_mapviewer().GetIcon())
+
+            if self.idx == '':
+                if self.parent is not None:
+                    try:
+                        self.SetTitle(_('Zones associated to : {}'.format(self.parent.idx)))
+                    except:
+                        logging.warning(_('No parent idx found'))
+            else:
+                self.SetTitle(_('Zones : {}'.format(self.idx)))
+
             self.init_struct=False
 
 

wolfhece/apps/version.py

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

wolfhece/lazviewer/laz_viewer.py

@@ -502,7 +502,10 @@ class xyz_laz_grids():
         ret = [cur.scan(bounds) for cur in self.grids]
         ret = [cur for cur in ret if len(cur)>0]
 
-        return np.concatenate(ret)
+        if len(ret)==0:
+            return np.asarray([])
+        else:
+            return np.concatenate(ret)
 
     def read_dir(self, dir_grids):
         dirs = listdir(dir_grids)

wolfhece/wolf_array.py

@@ -40,7 +40,7 @@ import wx
 from scipy.interpolate import interp2d, griddata
 from scipy.ndimage import laplace, label, sum_labels
 import pygltflib
-from shapely.geometry import Point, LineString, MultiLineString
+from shapely.geometry import Point, LineString, MultiLineString, Polygon, MultiPolygon, MultiPoint
 from shapely.ops import linemerge, substring, polygonize_full
 from os.path import dirname,basename,join
 import logging
@@ -1137,7 +1137,7 @@ class header_wolf():
 
             return newvector
 
-    def get_xy_infootprint_vect(self, myvect: vector, eps:float = 0.) -> tuple[np.ndarray,np.ndarray]:
+    def get_xy_infootprint_vect(self, myvect: vector | Polygon, eps:float = 0.) -> tuple[np.ndarray,np.ndarray]:
         """
         Return the coordinates of the cells in the footprint of a vector
 
@@ -1154,7 +1154,7 @@ class header_wolf():
 
         return mypts,myptsij
 
-    def get_ij_infootprint_vect(self, myvect: vector, eps:float = 0.) -> np.ndarray:
+    def get_ij_infootprint_vect(self, myvect: vector | Polygon, eps:float = 0.) -> np.ndarray:
         """
         Return the indices of the cells in the footprint of a vector
 
@@ -1162,8 +1162,16 @@ class header_wolf():
         :return : numpy array of indices
         """
 
-        i1, j1 = self.get_ij_from_xy(myvect.xmin+eps, myvect.ymin+eps)
-        i2, j2 = self.get_ij_from_xy(myvect.xmax-eps, myvect.ymax-eps)
+        if isinstance(myvect, Polygon):
+            xmin, ymin, xmax, ymax = myvect.bounds
+        elif isinstance(myvect, vector):
+            xmin, ymin, xmax, ymax = myvect.xmin, myvect.ymin, myvect.xmax, myvect.ymax
+        else:
+            logging.error(_('The object must be a vector or a Polygon'))
+            return np.array([])
+
+        i1, j1 = self.get_ij_from_xy(xmin+eps, ymin+eps)
+        i2, j2 = self.get_ij_from_xy(xmax-eps, ymax-eps)
 
         i1 = max(i1,0) # FIXME Why ??? How could i,j be negative ? --> because this fucntion can be called with a vector that is not in the array (e.g. a vector defined by clicks in the UI)
         j1 = max(j1,0)
@@ -1412,6 +1420,11 @@ class Ops_Array(wx.Frame):
         if self.wx_exists:
             self.set_GUI()
 
+    @property
+    def idx(self):
+        """ Return the idx of the parentarray """
+        return self.parentarray.idx
+
     def get_mapviewer(self):
         """ Retourne l'instance WolfMapViewer """
         return self.mapviewer
@@ -4609,6 +4622,10 @@ class WolfArray(Element_To_Draw, header_wolf):
         """ Affichage des propriétés de la matrice dans une fenêtre wxPython """
         if self.wx_exists and self.myops is not None:
             self.myops.SetTitle(_('Operations on array: ') + self.idx)
+
+            if self.mapviewer is not None:
+                self.myops.SetIcon(self.mapviewer.GetIcon())
+
             self.myops.Show()
 
             self.myops.Center()
@@ -6601,7 +6618,7 @@ class WolfArray(Element_To_Draw, header_wolf):
     # These functions can not be stored in header_wolf, because wa can use the mask of the array to limit the search
     # These functions are also present in WolfResults_2D, but they are not exactly the same due to the structure of the results
     # *************************************************************************************************************************
-    def get_xy_inside_polygon(self, myvect: vector, usemask:bool=True):
+    def get_xy_inside_polygon(self, myvect: vector | Polygon, usemask:bool=True):
         """
         Return the coordinates inside a polygon
 
@@ -6609,9 +6626,15 @@ class WolfArray(Element_To_Draw, header_wolf):
         :param usemask : limit potential nodes to unmaksed nodes
         """
 
-        myvect.find_minmax()
+        if isinstance(myvect, vector):
+            # force la mise à jour des min/max
+            myvect.find_minmax()
+            # Conversion des coordonnées en numpy pour plus d'efficacité (du moins on espère)
+            myvert = myvect.asnparray()
+        elif isinstance(myvect, Polygon):
+            myvert = myvect.exterior.coords[:-1]
+
         mypointsxy, mypointsij = self.get_xy_infootprint_vect(myvect)
-        myvert = myvect.asnparray()
         path = mpltPath.Path(myvert)
         inside = path.contains_points(mypointsxy)
 
@@ -6624,6 +6647,34 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         return mypointsxy
 
+    def get_xy_inside_polygon_shapely(self, myvect: vector | Polygon, usemask:bool=True):
+        """
+        Return the coordinates inside a polygon
+
+        :param myvect : target vector
+        :param usemask : limit potential nodes to unmaksed nodes
+        """
+
+        if isinstance(myvect, vector):
+            # force la mise à jour des min/max
+            myvect.find_minmax()
+            polygon = myvect.asshapely_pol()
+        elif isinstance(myvect, Polygon):
+            polygon = myvect
+
+        mypointsxy, mypointsij = self.get_xy_infootprint_vect(myvect)
+
+        inside = np.asarray([polygon.contains(Point(x,y)) for x,y in mypointsxy])
+
+        mypointsxy = mypointsxy[np.where(inside)]
+
+        if usemask:
+            mypointsij = mypointsij[np.where(inside)]
+            mymask = np.logical_not(self.array.mask[mypointsij[:, 0], mypointsij[:, 1]])
+            mypointsxy = mypointsxy[np.where(mymask)]
+
+        return mypointsxy
+
     def get_xy_under_polyline(self, myvect: vector, usemask:bool=True):
         """
         Return the coordinates along a polyline
@@ -6664,6 +6715,23 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         return mypointsij
 
+    def intersects_polygon(self, myvect: vector | Polygon, usemask:bool=True):
+        """ Return True if the array intersects the polygon
+
+        :param myvect : target vector
+        :param usemask : limit potential nodes to unmaksed nodes
+        """
+
+        return self.get_xy_inside_polygon(myvect, usemask).shape[0] > 0
+
+    def intersects_polygon_shapely(self, myvect: vector | Polygon, eps:float = 0., usemask:bool=True):
+        """ Return True if the array intersects the polygon
+
+        :param myvect : target vector
+        :param usemask : limit potential nodes to unmaksed nodes
+        """
+        return self.get_xy_inside_polygon_shapely(myvect, usemask).shape[0] > 0
+
     def get_ij_under_polyline(self, myvect: vector, usemask:bool=True):
         """
         Return the indices along a polyline
@@ -7025,6 +7093,8 @@ class WolfArray(Element_To_Draw, header_wolf):
         else:
             self.array = np.kron(self.array, np.ones((int(1/factor), int(1/factor)), dtype=self.array.dtype))
 
+            self.mask_data(self.nullvalue)
+
         self.count()
 
         # rebin must not change the type of the array

{wolfhece-2.1.53.dist-info → wolfhece-2.1.55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.53
+Version: 2.1.55
 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.53.dist-info → wolfhece-2.1.55.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=uL1DJVmDI2xVSE7H6n3icn3QbsPtTHeg8E-6wkDloKw,476914
 wolfhece/PyConfig.py,sha256=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=lUdilikBoeFPN4LgyqIb3j6dYMbraLjrRJC1ZLGz4OU,399455
+wolfhece/PyDraw.py,sha256=Ib7Rix3QAjR9X0o1E-80_91QsKhWtxmnR2QA89WIPQU,402676
 wolfhece/PyGui.py,sha256=aRWv9tBpRl7sKEd2gHWj8Bss0ZOKbGlUYIehWHFm8WY,105008
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -16,7 +16,7 @@ wolfhece/PyParams.py,sha256=wwgmP-_7wiiPLTcyX8a5jR6FyC1D2c4oBPc1VWQqtSA,97383
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=MtZVjIWIi62QX_oqNosb56xPgjhOGVeGz-XsD82tsNg,40614
-wolfhece/PyVertexvectors.py,sha256=KMXJB_zFi54I73jk_fGtSTxqTQhnCwngeEjJyLdgGDo,235914
+wolfhece/PyVertexvectors.py,sha256=mZlu2IeCQH-VdDQrw_fYbns3NQ_qdfbb3ndqzfjC_nI,237049
 wolfhece/PyWMS.py,sha256=fyyzm2HFwq8aRwVYHKiBatcZOeKnFi6DWhv4nfscySQ,4602
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -48,7 +48,7 @@ wolfhece/pywalous.py,sha256=yRaWJjKckXef1d9D5devP0yFHC9uc6kRV4G5x9PNq9k,18972
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=D_m0Ap85wGp94zXtk5hJlorn98tQjKFLKHqCqZEId2c,372225
+wolfhece/wolf_array.py,sha256=Yg3iX0hPXkdJTuwu6rXlRee2w6hL595_4RZWCUrFWKc,374869
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
@@ -72,7 +72,7 @@ wolfhece/apps/check_install.py,sha256=SG024u18G7VRLKynbp7DKD1jImtHwuWwN4bJWHm-YH
 wolfhece/apps/curvedigitizer.py,sha256=_hRR2PWow7PU7rTHIbc6ykZ08tCXcK9uy7RFrb4EKkE,5196
 wolfhece/apps/isocurrent.py,sha256=MuwTodHxdc6PrqNpphR2ntYf1NLL2n9klTPndGrOHDQ,4109
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=bJO-UJatgh92ntk1GePpqNMUqpjjt1S7VkCtLXOP6kE,388
+wolfhece/apps/version.py,sha256=POD15Cc2AZYe1VXE08EaduFN-zrnSaxN6wGC-H49Xoo,388
 wolfhece/apps/wolf.py,sha256=mM6Tyi4DlKQILmO49cDUCip9fYVy-hLXkY3YhZgIeUQ,591
 wolfhece/apps/wolf2D.py,sha256=yPQGee7fsegoQ8GfWKrWEjX1Az_ApL-UWlBiqPvaIyY,565
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -143,7 +143,7 @@ wolfhece/lagrangian/particles.py,sha256=S52_-3rzgVhift6l4Gznvsf_RTggzvNaD1dPvQUr
 wolfhece/lagrangian/velocity_field.py,sha256=oGVjNm98gEpawreFIrC1lDyC5bEhkk2CsyYAlF1Kq50,10574
 wolfhece/lazviewer/__init__.py,sha256=0SNDEKGad6e2AwxjalcPqb2bdW6crmXQFxWUY13PiVU,223
 wolfhece/lazviewer/_add_path.py,sha256=GDwPnzHuGRXGriDNcu1SQ6HetFDGIApeAQZEzYArGvI,605
-wolfhece/lazviewer/laz_viewer.py,sha256=duHEeLb4GpwY9TxHqrDaamZ4IBx7VyoU_mdpDRqA-BI,42667
+wolfhece/lazviewer/laz_viewer.py,sha256=zuXMSh50HZGcduD5dWsrxrNu9qcxg-NfQr6Rg5sKxO8,42746
 wolfhece/lazviewer/libs/Qt5Core.dll,sha256=sTJ_ctYFY9KHMNytF-lzH_078zIvnKTjN-71FDkOWPw,4924928
 wolfhece/lazviewer/libs/Qt5Gui.dll,sha256=07BeaOeYByraGkKYeDiSDYLawHM8tyd55pVJlKbZ4Y0,5436416
 wolfhece/lazviewer/libs/Qt5Network.dll,sha256=U-9FiLE9LUKru8r8EQxTnwwlMpwS8JzUtenhkKTCox0,1038336
@@ -280,8 +280,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.53.dist-info/METADATA,sha256=dr2FjHrOvOyyI9-bFpd9KIcWNHjXTGtbEUcJyfQZwEI,2541
-wolfhece-2.1.53.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.53.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.53.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.53.dist-info/RECORD,,
+wolfhece-2.1.55.dist-info/METADATA,sha256=RauQP3GnJ5Y_HTZ_79bVAZVYSVulNhDpEsPp1dPVLHc,2541
+wolfhece-2.1.55.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.55.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.55.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.55.dist-info/RECORD,,