wolfhece 2.2.7__py3-none-any.whl → 2.2.8__py3-none-any.whl

wolfhece/apps/version.py

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

wolfhece/lifewatch.py

@@ -72,6 +72,10 @@ class LifeWatch_Legend(Enum):
     # NODATA46 = (46, (246,146,246,255)) # Not used
     NODATA_BLACK = (100, (0, 0, 0), 'Nodata', '') # Outside Belgium/Wallonia
 
+    @property
+    def code(self) -> int:
+        return self.value[0]
+
     @classmethod
     def reference(cls) -> str:
         """

wolfhece/wolf_array.py

@@ -1256,7 +1256,9 @@ class header_wolf():
     def _rasterize_segment(self,
                            x1:float, y1:float,
                            x2:float, y2:float,
-                           xstart:float=None, ystart:float=None) -> list[list[float]]:
+                           xstart:float=None,
+                           ystart:float=None,
+                           n_packet:int = 10) -> list[list[float]]:
         """
         Rasterize a segment according to the grid
         where the grid is defined by the borders of the array.
@@ -1288,11 +1290,55 @@ class header_wolf():
         while length >= prec:
 
             if np.abs(direction[0])>= np.abs(direction[1]):
-                xstart += self.dx * np.sign(direction[0])
+
+                if length > n_packet*prec:
+                    # I we are far from the end of the segment, we can use the n_packet to rasterize
+                    # this will be used to avoid to many straight lines
+                    nx = np.abs(int(direction[0] * (n_packet-1))) # number of points in x direction
+                    ny = np.abs(int(direction[1] * (n_packet-1))) # number of points in y direction
+
+                    n_common = min(nx, ny) # number of common points
+
+                    for i in range(n_common):
+                        xstart += self.dx * np.sign(direction[0])
+                        points.append([xstart, ystart])
+                        ystart += self.dy * np.sign(direction[1])
+                        points.append([xstart, ystart])
+
+                    for i in range(nx - n_common):
+                        xstart += self.dx * np.sign(direction[0])
+                        points.append([xstart, ystart])
+
+                    for j in range(ny - n_common):
+                        ystart += self.dy * np.sign(direction[1])
+                        points.append([xstart, ystart])
+                else:
+                    xstart += self.dx * np.sign(direction[0])
+                    points.append([xstart, ystart])
             else:
-                ystart += self.dy * np.sign(direction[1])
+                if length > n_packet*prec:
+                    nx = np.abs(int(direction[0] * (n_packet-1)))
+                    ny = np.abs(int(direction[1] * (n_packet-1)))
 
-            points.append([xstart, ystart])
+                    n_common = min(nx, ny)
+
+                    for j in range(n_common):
+                        ystart += self.dy * np.sign(direction[1])
+                        points.append([xstart, ystart])
+                        xstart += self.dx * np.sign(direction[0])
+                        points.append([xstart, ystart])
+
+                    for j in range(ny - n_common):
+                        ystart += self.dy * np.sign(direction[1])
+                        points.append([xstart, ystart])
+
+                    for i in range(nx - n_common):
+                        xstart += self.dx * np.sign(direction[0])
+                        points.append([xstart, ystart])
+
+                else:
+                    ystart += self.dy * np.sign(direction[1])
+                    points.append([xstart, ystart])
 
             direction = np.array([x2-xstart, y2-ystart])
 
@@ -1302,7 +1348,7 @@ class header_wolf():
 
         return points
 
-    def rasterize_vector(self, vector2raster:vector, outformat:Union[np.ndarray, vector]=vector) -> Union[np.ndarray,vector]:
+    def rasterize_vector_along_grid(self, vector2raster:vector, outformat:Union[np.ndarray, vector]=vector) -> Union[np.ndarray,vector]:
         """
         Rasterize a vector according to the grid
 
@@ -1337,6 +1383,14 @@ class header_wolf():
 
             return newvector
 
+    def rasterize_vector(self, vector2raster:vector, outformat:Union[np.ndarray, vector]=vector) -> Union[np.ndarray,vector]:
+        """ DEPRECATED since 2.2.8 -- use rasterize_vector_along_grid instead.
+
+        Will be removed in 2.3.0
+        """
+        logging.warning(_('rasterize_vector is deprecated since 2.2.8 -- use rasterize_vector_along_grid instead'))
+        return self.rasterize_vector_along_grid(vector2raster, outformat=outformat)
+
     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
@@ -5397,7 +5451,7 @@ class WolfArray(Element_To_Draw, header_wolf):
                 assert np_source.shape == (self.nbx, self.nby), _('Shape of np_source is not compatible with header')
 
                 if self.dtype != np_source.dtype:
-                    logging.warning(_('dtype of np_source is not compatible with header -- Conversion will be done'))
+                    logging.warning(_(f"dtype of np_source is not compatible with header -- Conversion will be done to match wolf header's type {self.dtype}"))
                     np_source = np_source.astype(self.dtype)
 
                 self.array = ma.MaskedArray(np_source, mask= np_source[:,:] == self.nullvalue, copy=False, order='C')
@@ -6771,6 +6825,7 @@ class WolfArray(Element_To_Draw, header_wolf):
                 return
 
             destij = self.xy2ij_np(destxy)
+
         elif self.mngselection.myselection == 'all':
             destij = np.where(self.array.mask == False)
             destij = np.array(destij).transpose()
@@ -6792,9 +6847,6 @@ class WolfArray(Element_To_Draw, header_wolf):
 
             destij = self.xy2ij_np(destxy)
 
-        # if convert_xy2ij:
-        #     destij = np.asarray([list(self.get_ij_from_xy(x, y)) for x, y in destxy])
-
         xyz = working_vector.asnparray3d()
 
         newvalues = griddata(xyz[:, :2], xyz[:, 2], destxy, method=method, fill_value=-99999.)
@@ -6802,6 +6854,62 @@ class WolfArray(Element_To_Draw, header_wolf):
         locmask = np.where(newvalues != -99999.)
         self.array.data[destij[locmask][:, 0], destij[locmask][:, 1]] = newvalues[locmask]
 
+    def rasterize_vector_valuebyid(self, working_vector: vector, id,
+                        method:Literal["nearest", "linear", "cubic"]="linear"):
+        """
+        Rasterize a vector using the value of the id
+        """
+
+        if not isinstance(working_vector, vector):
+            logging.error(_('working_vector must be a vector. You provided a {}').format(type(working_vector)))
+            return
+
+        if working_vector.get_value(id) is None:
+            logging.error(_('No value for id {}').format(id))
+            return
+
+        val = working_vector.get_value(id)
+        if val is None:
+            logging.error(_('No value for id {}').format(id))
+            return
+
+        try:
+            val = float(val)
+        except:
+            logging.error(_('Value for id {} is not a number').format(id))
+            return
+
+        newvec = working_vector.deepcopy()
+        newvec.z = val
+
+        self.interpolate_on_polygon(newvec, method)
+
+    def rasterize_zone_valuebyid(self, working_zone: zone, id,
+                        method:Literal["nearest", "linear", "cubic"]="linear"):
+        """
+        Rasterize a zone using the value of the id
+        """
+
+        if not isinstance(working_zone, zone):
+            logging.error(_('working_zone must be a zone. You provided a {}').format(type(working_zone)))
+            return
+
+        for curvec in working_zone.myvectors:
+            self.rasterize_vector_valuebyid(curvec, id, method)
+
+    def rasterize_zones_valuebyid(self, working_zones: Zones, id,
+                        method:Literal["nearest", "linear", "cubic"]="linear"):
+        """
+        Rasterize a zone using the value of the id
+        """
+
+        if not isinstance(working_zones, Zones):
+            logging.error(_('working_zone must be a zone. You provided a {}').format(type(working_zones)))
+            return
+
+        for curzone in working_zones.myzones:
+            self.rasterize_zone_valuebyid(curzone, id, method)
+
     def interpolate_on_polygons(self, working_zone:zone, method:Literal["nearest", "linear", "cubic"]="linear"):
         """
         Interpolation sous plusieurs polygones d'une même zone

wolfhece/wolfresults_2D.py

@@ -3797,7 +3797,7 @@ class Wolfresults_2D(Element_To_Draw):
 
         myhead = self.get_header_block(1)
         if to_rasterize:
-            myvect = myhead.rasterize_vector(myvect)
+            myvect = myhead.rasterize_vector_along_grid(myvect)
 
         mynormals = myvect.get_normal_segments()
         xy_center = myvect.get_center_segments()
@@ -3877,7 +3877,7 @@ class Wolfresults_2D(Element_To_Draw):
             for i in tqdm(range(nb)):
                 if i == 0:
                     myhead = self.get_header_block(1)
-                    vect_raster = myhead.rasterize_vector(vect)
+                    vect_raster = myhead.rasterize_vector_along_grid(vect)
                 self.read_oneresult(i)
                 q.append(self._plot_one_q_raster_splitting(vect_raster, True, to_rasterize=False))
 
@@ -3892,7 +3892,7 @@ class Wolfresults_2D(Element_To_Draw):
 
             for i in range(len(vect)):
                 q[vect[i].myname] = []
-                vect_raster.append(myhead.rasterize_vector(vect[i]))
+                vect_raster.append(myhead.rasterize_vector_along_grid(vect[i]))
 
             for i in tqdm(range(nb)):
                 self.read_oneresult(i)
@@ -3982,7 +3982,7 @@ class Wolfresults_2D(Element_To_Draw):
                 elif x_or_y == 'border':
                     if i==0:
                         myhead = self.get_header_block(1)
-                        vect_raster = myhead.rasterize_vector(vect)
+                        vect_raster = myhead.rasterize_vector_along_grid(vect)
                     q.append(self._plot_one_q_raster_splitting(vect_raster, absolute, to_rasterize = False))
 
             ax.plot(times,q, c='blue', label=vect.myname)
@@ -4000,7 +4000,7 @@ class Wolfresults_2D(Element_To_Draw):
             for i in range(len(vect)):
                 q[i]= []
                 if x_or_y[i] == 'border':
-                    vect_raster.append(myhead.rasterize_vector(vect[i]))
+                    vect_raster.append(myhead.rasterize_vector_along_grid(vect[i]))
 
             for i in tqdm(range(nb)):
                 self.read_oneresult(i)
@@ -4063,7 +4063,7 @@ class Wolfresults_2D(Element_To_Draw):
                 elif x_or_y == 'border':
                     if i==0:
                         myhead = self.get_header_block(1)
-                        vect_raster = myhead.rasterize_vector(vect)
+                        vect_raster = myhead.rasterize_vector_along_grid(vect)
                     q.append(self._plot_one_q_raster_splitting(vect_raster, absolute, to_rasterize = False))
 
             fig.plot(times,q, c='blue', label=vect.myname)
@@ -4081,7 +4081,7 @@ class Wolfresults_2D(Element_To_Draw):
             for i in range(len(vect)):
                 q[i]= []
                 if x_or_y[i] == 'border':
-                    vect_raster.append(myhead.rasterize_vector(vect[i]))
+                    vect_raster.append(myhead.rasterize_vector_along_grid(vect[i]))
 
             for i in tqdm(range(nb)):
                 self.read_oneresult(i)

{wolfhece-2.2.7.dist-info → wolfhece-2.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.7
+Version: 2.2.8
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.2.7.dist-info → wolfhece-2.2.8.dist-info}/RECORD

@@ -41,7 +41,7 @@ wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
 wolfhece/irm_qdf.py,sha256=DMdDEAYbgYxApObm6w-dZbBmA8ec6PghBLXR2lUEZLc,27457
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/lagrange_multiplier.py,sha256=0G-M7b2tGzLx9v0oNYYq4_tLAiHcs_39B4o4W3TUVWM,6567
-wolfhece/lifewatch.py,sha256=AszCItQCq3Z3d-gznsjtYU9FIKJaWAcr1gafBxb-qHs,16265
+wolfhece/lifewatch.py,sha256=Q_Wy6VGkrD-xxY0fv3PKpT8U8oXxNMgiLlrAE3bMheo,16340
 wolfhece/matplotlib_fig.py,sha256=vnFI6sghw9N9jKhR8X1Z4aWli_5fPNylZQtFuujFJDY,84075
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
@@ -58,13 +58,13 @@ wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools2d_dll.py,sha256=oU0m9XYAf4CZsMoB68IuKeE6SQh-AqY7O5NVED8r9uw,13125
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=8ZM75yOInSkoJQsKaCABmgP_j2KLevO5BgxsSmvRvi8,491510
+wolfhece/wolf_array.py,sha256=HwOejG8kYTQ1l6c3RX8nuFwMAuySTWfgsxIvZl_Ivcg,496150
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=IvFtekT5iLU2sivZOOlJXpE4CevjTQYSxHaOp4cH_wI,17723
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
 wolfhece/wolf_vrt.py,sha256=wbxXVN7TL9zgdyF79S-4e3pje6wJEAgBEfF_Y8kkzxs,14271
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=5Ser0lcfoGbsHLASx_1UtxmanYDGSuOCMgaadSNTHzs,218154
+wolfhece/wolfresults_2D.py,sha256=N-L9gmurQEMUjrC23HJjWRRaIxvcdhk6R8KKcb94LJw,218231
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
 wolfhece/acceptability/Parallels.py,sha256=2wVkfJYor4yl7VYiAZiGGTFwtAab2z66ZfRtBliVweE,4088
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -86,7 +86,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=eCPAUYscZPWDYKBHDBWum_VIcE7WXOCBe1GLHL3KUmU,3088
-wolfhece/apps/version.py,sha256=UGz-NV4qzN96AWCtJsnDr27SQMMZUOgYsoje1cRxP8s,387
+wolfhece/apps/version.py,sha256=VLekoececzg7H4Z0hu97fb37nDVx-7ndJhfqA8urYqc,387
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -314,8 +314,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.2.7.dist-info/METADATA,sha256=L3cl2QpOoOfUeWa8ox5Y41HslP4ad6In6xbQi1Ydk5U,2744
-wolfhece-2.2.7.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-wolfhece-2.2.7.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.2.7.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.7.dist-info/RECORD,,
+wolfhece-2.2.8.dist-info/METADATA,sha256=SZScGuzekEdz_ReMj94rQMIwrfNH3QMhDq0eEb-of9k,2744
+wolfhece-2.2.8.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+wolfhece-2.2.8.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.2.8.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.8.dist-info/RECORD,,