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

wolfhece/apps/version.py

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

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)
@@ -6610,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
 
@@ -6618,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)
 
@@ -6633,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
@@ -6673,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
@@ -7034,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.54.dist-info → wolfhece-2.1.55.dist-info}/METADATA

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

@@ -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=VRy6F5ChUfqB8ziDAI8XrE54XWrtAicYVQyMieLaIXU,372460
+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=CMpY0e6nzRUMGj9Dheyh-mTZLDI1l4fvptoARGgcN9I,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
@@ -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.54.dist-info/METADATA,sha256=7QrfsLJM8f7GK2x3Gg8xH6vJfGWupV1EmqcST4rlVw8,2541
-wolfhece-2.1.54.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.54.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.54.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.54.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,,