wolfhece 2.2.47__py3-none-any.whl → 2.2.48__py3-none-any.whl

wolfhece/PyDraw.py

@@ -102,8 +102,10 @@ except ImportError as e:
 
 try:
     from .dike import DikeWolf, InjectorWolf as InjectorDike
+    WOLFPYDIKE_AVAILABLE = True
 except:
     logging.warning(_("Missing package. Install wolfpydike module via pip."))
+    WOLFPYDIKE_AVAILABLE = False
 
 try:
     from .hydrometry.kiwis_wolfgui import hydrometry_wolfgui
@@ -2142,9 +2144,11 @@ class WolfMapViewer(wx.Frame):
     myviewers3d:list[Wolf_Viewer3D]
     mylazdata:list[Wolf_LAZ_Data]
     mydrownings: list[Drowning_victim_Viewer]
-    mydikes: list[DikeWolf]
     mypicturecollections: list[PictureCollection]
-    myinjectors: list[InjectorDike]
+
+    if WOLFPYDIKE_AVAILABLE:
+        mydikes: list[DikeWolf]
+        myinjectors: list[InjectorDike]
 
     mymplfigs:list[MplFigViewer]
 
@@ -2180,8 +2184,11 @@ class WolfMapViewer(wx.Frame):
     active_weir : Weir
     active_laz : Wolf_LAZ_Data
     active_drowning: Drowning_victim_Viewer
-    active_dike : DikeWolf
-    active_injector : InjectorDike
+
+    if WOLFPYDIKE_AVAILABLE:
+        active_dike : DikeWolf
+        active_injector : InjectorDike
+
     active_picturecollection: PictureCollection
     active_alaro: IRM_Alaro
 
@@ -2406,7 +2413,9 @@ class WolfMapViewer(wx.Frame):
         create_acceptability = self.menucreateobj.Append(wx.ID_ANY, _('Create acceptability manager...'), _('Create acceptability manager'))
         create_inbe = self.menucreateobj.Append(wx.ID_ANY, _('Create INBE manager...'), _('Create INBE manager'))
         createdrowning = self.menucreateobj.Append(wx.ID_ANY, _('Create a drowning...'),_('Create a drowning'))
-        createdike = self.menucreateobj.Append(wx.ID_ANY, _('Create dike...'), _('New dike'))
+
+        if WOLFPYDIKE_AVAILABLE:
+            createdike = self.menucreateobj.Append(wx.ID_ANY, _('Create dike...'), _('New dike'))
 
         self.filemenu.AppendSeparator()
 
@@ -2434,7 +2443,9 @@ class WolfMapViewer(wx.Frame):
         addweirs = self.menuaddobj.Append(wx.ID_ANY, _('Add weirs...'), _('Add bridges from directory'))
         addview = self.menuaddobj.Append(wx.ID_ANY, _('Add view...'), _('Add view from project file'))
         adddrowning = self.menuaddobj.Append(wx.ID_ANY, _('Add a drowning result...'),_('Add a drowning result'))
-        adddike = self.menuaddobj.Append(wx.ID_ANY, _('Add dike...'), _('Add dike'))
+
+        if WOLFPYDIKE_AVAILABLE:
+            adddike = self.menuaddobj.Append(wx.ID_ANY, _('Add dike...'), _('Add dike'))
 
         self.precomputed_menu = None
         if self.default_dem != "":
@@ -4295,6 +4306,9 @@ class WolfMapViewer(wx.Frame):
 
     def Onmenudike(self, event: wx.MenuEvent):
 
+        if not WOLFPYDIKE_AVAILABLE:
+            raise ImportError('WolfPyDike not installed -- Please install WolfPyDike from pip to use this feature')
+
         id = event.GetId()
         item = self.menubar.FindItemById(event.GetId())
 
@@ -6182,9 +6196,11 @@ class WolfMapViewer(wx.Frame):
         self.myviewerslaz = []
         self.mylazdata = []
         self.mydrownings = []
+        self.mypicturecollections = []
+
         self.mydikes = []
         self.myinjectors = []
-        self.mypicturecollections = []
+
 
         self.mymplfigs = []
 
@@ -12114,6 +12130,10 @@ class WolfMapViewer(wx.Frame):
 
         elif which.lower() == 'dike':
 
+            if not WOLFPYDIKE_AVAILABLE:
+                logging.error('WolfPyDike module not available - cannot add dike')
+                return -1
+
             curdict = self.mydikes
             curtree = self.myitemsdike
 
@@ -14468,22 +14488,23 @@ class WolfMapViewer(wx.Frame):
             logging.info(_('Activating Drowning victim event : ' + nameitem))
             self.active_drowning = myobj
 
-        elif type(myobj) == DikeWolf:
-            logging.info(_('Activating DikeWolf : ' + nameitem))
-            self.active_dike = myobj
-            if myobj.injector is not None:
-                self.active_injector = myobj.injector
-                logging.info(_('Activating InjectorDike : ' + nameitem))
+        elif WOLFPYDIKE_AVAILABLE:
+            if type(myobj) == DikeWolf:
+                logging.info(_('Activating DikeWolf : ' + nameitem))
+                self.active_dike = myobj
+                if myobj.injector is not None:
+                    self.active_injector = myobj.injector
+                    logging.info(_('Activating InjectorDike : ' + nameitem))
 
-            if ctrl:
-                myobj.show_properties()
+                if ctrl:
+                    myobj.show_properties()
 
-        elif type(myobj) == InjectorDike:
-            logging.info(_('Activating InjectorDike : ' + nameitem))
-            self.active_injector = myobj
+            elif type(myobj) == InjectorDike:
+                logging.info(_('Activating InjectorDike : ' + nameitem))
+                self.active_injector = myobj
 
-            if ctrl:
-                myobj.show_properties()
+                if ctrl:
+                    myobj.show_properties()
 
     def _update_mytooltip(self):
         """ Update the tooltip with the values of the active arrays and results at position x,y """

wolfhece/apps/version.py

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

wolfhece/report/compare_cs_dem.py

@@ -618,7 +618,8 @@ class CSvsDEM():
         if output_file.exists():
             logging.warning(f"Output file {output_file} already exists. It will be overwritten.")
 
-        page = CSvsDEM_IndividualLayout(_("Group {} - Index {} - Cross-Section {}").format(self.index_group, self.index_cs, self._cs.myname))
+        diff_left, diff_right = self.differences
+        page = CSvsDEM_IndividualLayout(_("Group {} - Index {} - CS {} - Delta_left {} - Delta_right {}").format(self.index_group, self.index_cs, self._cs.myname, diff_left, diff_right))
         page.create_report()
         self._complete_report(page)
         page.save_report(output_file)

wolfhece/wolf_array.py

@@ -7698,18 +7698,32 @@ class WolfArray(Element_To_Draw, header_wolf):
 
     def interpolate_on_polygon(self, working_vector: vector,
                                method:Literal["nearest", "linear", "cubic"]="linear",
-                               keep:Literal['all', 'below', 'above'] = 'all'):
+                               keep:Literal['all', 'below', 'above'] = 'all',
+                               rescale:bool = False):
         """
-        Interpolation sous un polygone
+        Interpolation sous un polygone.
 
         L'interpolation a lieu :
           - uniquement dans les mailles sélectionnées si elles existent
           - dans les mailles contenues dans le polygone sinon
 
         On utilise ensuite "griddata" de Scipy pour interpoler les altitudes des mailles
-        depuis les vertices 3D du polygone
+        depuis les vertices 3D du polygone.
+
+        :ATTENTION: l'interpolation est réalisée en réels flottants 64 bits. Le résultat sera ensuite transformé dans le type de la matrice.
+
+        :param working_vector: vector - polygon with z values
+        :param method: interpolation method - 'nearest', 'linear' or 'cubic'
+        :param keep: 'all' to keep all interpolated values
+                     'below' to keep only values below the current value in the array
+                     'above' to keep only values above the current value in the array
+        :param rescale: rescale the input data to [0, 1] for better numerical stability (only for 'linear' and 'cubic' methods)
+        :return: None
         """
 
+        if self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER8, WOLF_ARRAY_FULL_INTEGER16]:
+            logging.info(_('Your array contains integer data. The interpolation will be done in float and then converted to integer using "np.ceil" operator.'))
+
         if vector.area == 0.:
             logging.error(_('The polygon has no area'))
             return
@@ -7756,7 +7770,7 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         xyz = working_vector.asnparray3d()
 
-        newvalues = griddata(xyz[:, :2], xyz[:, 2], destxy, method=method, fill_value=-99999.)
+        newvalues = griddata(xyz[:, :2], xyz[:, 2], destxy, method=method, fill_value=-99999., rescale = rescale)
 
         if keep == 'all':
             locmask = np.where(newvalues != -99999.)
@@ -7765,6 +7779,11 @@ class WolfArray(Element_To_Draw, header_wolf):
         elif keep == 'above':
             locmask = np.where((newvalues != -99999.) & (newvalues > self.array.data[destij[:, 0], destij[:, 1]]))
 
+        if self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER8, WOLF_ARRAY_FULL_INTEGER16]:
+            logging.debug(_('Converting interpolated values to integer using "np.ceil" operator'))
+            newvalues = np.ceil(newvalues)
+            newvalues = newvalues.astype(self.array.dtype)
+
         self.array.data[destij[locmask][:, 0], destij[locmask][:, 1]] = newvalues[locmask]
 
     def rasterize_vector_valuebyid(self, working_vector: vector, id,

{wolfhece-2.2.47.dist-info → wolfhece-2.2.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.47
+Version: 2.2.48
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece
@@ -73,7 +73,7 @@ Requires-Dist: tabulate
 Requires-Dist: ipympl
 Requires-Dist: contextily
 Requires-Dist: pefile
-Requires-Dist: wolfpydike==0.1.3
+Requires-Dist: wolfpydike==0.1.4
 Requires-Dist: PyMuPDF
 Requires-Dist: eccodes
 Requires-Dist: dataframe_image

{wolfhece-2.2.47.dist-info → wolfhece-2.2.48.dist-info}/RECORD

@@ -9,7 +9,7 @@ wolfhece/MulticriteriAnalysis.py,sha256=vGmkzYagZohNe0XjwGJ6VUXcDPjOt80lNFthXpzx
 wolfhece/PandasGrid.py,sha256=etfVhIHzja4Z1EUY6BcDOKX-w7V-Xou1yaf0NMqmclo,4599
 wolfhece/PyConfig.py,sha256=13DDWjJdohYHwn1uRVHB0s8Jcwq_b9pwcwbAr8NlZyc,19667
 wolfhece/PyCrosssections.py,sha256=kCZBlX3idRY-QqJRHE6MPm4Qxz0AOVublV-JSJYUab8,184622
-wolfhece/PyDraw.py,sha256=Wby6vq-xxQUIF-PoNNBJ4GNgrP6Ug5RX5A3eylYEDP8,744285
+wolfhece/PyDraw.py,sha256=bAZGNQrwTJvdPCTnuPZbhj7IvXf9fcPIYofL5U72J9w,744916
 wolfhece/PyGui.py,sha256=z8m4M4Q7DVnRt_bEpEDjUl5x0FMkmsEnH2XHnGKWo14,185336
 wolfhece/PyGuiHydrology.py,sha256=dmBlRO8AljsvCPH6eVt0l9ZLx7g5j7Ubl9Srk7ECwyA,34693
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
@@ -68,7 +68,7 @@ wolfhece/textpillow.py,sha256=7hgfsLYAaE_rNKD-g8xsON8sdWvoV8vbqnGGxIayShE,14137
 wolfhece/tools2d_dll.py,sha256=TfvvmyZUqEZIH0uHwUCJf0bdmCks_AiidDt23Unsp5w,13550
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
 wolfhece/toolshydrology_dll.py,sha256=cIGyhxV8H5f7GXhDqAamM7uC0W0hQTou3eTkqZdnqBE,5656
-wolfhece/wolf_array.py,sha256=AlVT-1o8D3UWIQcvBUP_oklHOx-vY__9cqdnF8lUtag,588219
+wolfhece/wolf_array.py,sha256=eQGVH_yuJDqLixaho4JZzdPLf6pRf2jgrok86Uy6YUU,589560
 wolfhece/wolf_hist.py,sha256=fTEb60Q4TEwobdZsRU4CFXAId1eOKdWAqF8lnF1xEWc,3590
 wolfhece/wolf_texture.py,sha256=Pt1j_lX74p70Fj3y3qYxYMuN8gghVd8_ih1vFhTIdkA,23884
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
@@ -96,7 +96,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=EdGDN9NhudIiP7c3gVqj7dp4MWFB8ySizM_tpMnsgpE,3091
-wolfhece/apps/version.py,sha256=yOcKnPSbBIuPo1EH2qe5sbCPJ9lY1HrQWjZYeyCTgb0,388
+wolfhece/apps/version.py,sha256=kWKMCvHZwgWn23QbobBBBQzDHb6aopNtwTwORkNiRX8,388
 wolfhece/apps/wolf.ico,sha256=ej-kLodlUrQLsFDxpDhu2Mak7BTuWw6c9NCJaCBOkHI,238323
 wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2.png,sha256=YXd-MbtlxWRq38l5L6ky4Lg80DFuoZEKdbDwmeSsWqo,24714
@@ -287,7 +287,7 @@ wolfhece/rem/__init__.py,sha256=S2-J5uEGK_VaMFjRUYFIdSScJjZyuXH4RmMmnG3OG7I,19
 wolfhece/report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/report/common.py,sha256=7nRf1DEXancWsh3V-mqSIqqleaquxn7HemTPTR-8cZ0,21311
 wolfhece/report/compare_arrays.py,sha256=vduobNVgrhWC1LNgCNP7MJ5Dv1Bs-6omUqacbV9-H4w,44050
-wolfhece/report/compare_cs_dem.py,sha256=KujOAaHoHEFyDYrRpAzkUqHgeTFhBpe4xi2efTCz_ig,59517
+wolfhece/report/compare_cs_dem.py,sha256=kojFuXYEUGBB1dgt2W7CROU8ic9idHgQjiHkJHBFPRw,59612
 wolfhece/report/pdf.py,sha256=WNz-uPDASvAtnP-rJaRRdz0nwiSs8XXWe4622FmeVVM,1953
 wolfhece/report/reporting.py,sha256=JUEXovx_S4jpYkJEBU0AC-1Qw2OkkWyV3VAp6iOfSHc,19494
 wolfhece/report/simplesimgpu.py,sha256=nQK1lY9-uSNTA34N9D5U_ftgCVaSMjtq1zPzz2nO7ts,58622
@@ -324,8 +324,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=u4C7CXe_bUyGKx7c_Bi0x9
 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.47.dist-info/METADATA,sha256=E2D4W6SdupEluafVKCe7arDTdJcFpE5BniIeE35l0AU,2792
-wolfhece-2.2.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.47.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.47.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.47.dist-info/RECORD,,
+wolfhece-2.2.48.dist-info/METADATA,sha256=4QTa1R2s7lMNa7-ld4itSLW-MEE3w4erdAGxarCPOsY,2792
+wolfhece-2.2.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.48.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.48.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.48.dist-info/RECORD,,