wolfhece 2.1.106__py3-none-any.whl → 2.1.107__py3-none-any.whl

wolfhece/PyDraw.py

@@ -8720,6 +8720,37 @@ class WolfMapViewer(wx.Frame):
                 self.add_object('vector', newobj= cont, id= cont.idx)
                 self.Paint()
 
+        elif text == _('Rebin'):
+
+            if isinstance(self.selected_object, WolfArray):
+                dlg = wx.TextEntryDialog(self, _('Enter the rebin factor (>1 will decrease the resolution, <1 will increase the resolution) :'), _('Rebin'), '1')
+                if dlg.ShowModal() == wx.ID_OK:
+                    res = dlg.GetValue()
+                    dlg.Destroy()
+                    try:
+                        res = float(res)
+
+                        ops = ['Mean', 'Sum', 'Max', 'Min', 'Median']
+                        dlg_op = wx.SingleChoiceDialog(None, _('Choose the operation'), _('Operation'), ops, style=wx.CHOICEDLG_STYLE)
+                        ret = dlg_op.ShowModal()
+
+                        if ret != wx.ID_OK:
+                            dlg_op.Destroy()
+                            logging.info(_('Rebin cancelled'))
+                            return
+
+                        op = dlg_op.GetSelection()
+                        dlg_op.Destroy()
+
+                        self.selected_object.rebin(res, ops[op].lower())
+                    except:
+                        logging.warning(_('Invalid value for rebin factor'))
+                        return
+                else:
+                    dlg.Destroy()
+            else:
+                logging.warning(_('Rebin not yet implemented for this type of object'))
+
         elif _('Convert to mono-block') in text:
 
             if isinstance(self.selected_object, WolfArrayMB):
@@ -10958,6 +10989,7 @@ class WolfMapViewer(wx.Frame):
             tracks.append(_('Convert to multi-blocks (result)'))
             tracks.append(_('Export to Shape file'))
             tracks.append(_('Export active zone to Shape file'))
+            tracks.append(_('Rebin'))
 
             # Récupération des items du menu contextuel
             menuitems = self.popupmenu.GetMenuItems()
@@ -10983,6 +11015,7 @@ class WolfMapViewer(wx.Frame):
                 if bc is not None:
                     self.popupmenu.Append(wx.ID_ANY, _('Boundary conditions'), _('Boundary conditions'))
                 self.popupmenu.Append(wx.ID_ANY, _('Contours'))
+                self.popupmenu.Append(wx.ID_ANY, _('Rebin'), _('Change the spatial resolution'))
 
             # Add specific menu items for WolfArrayMB
             if isinstance(self.selected_object, WolfArrayMB):

wolfhece/apps/version.py

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

wolfhece/images_tiles.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 from osgeo import gdal
 import logging
 from pathlib import Path

wolfhece/lazviewer/laz_viewer.py

@@ -53,6 +53,7 @@ class Classification_LAZ():
     def init_2013(self):
 
         self.classification={
+            0  : ['0', 'Pas de classification', Colors.rgb_withalpha_float('black',.2),],
             1  : ['Hors-sol', 'building, toits et autres', Colors.rgb_withalpha_float('white',.2),],
             2  : ['Sol', 'y compris talus et digues', Colors.rgb_withalpha_float('brown',1.)],
             4  : ['Végétation', 'y compris la végétation linéaire', Colors.rgb_withalpha_float('forestgreen',1.)],
@@ -62,6 +63,7 @@ class Classification_LAZ():
     def init_2023(self):
 
         self.classification={
+            0  : ['0', 'Pas de classification', Colors.rgb_withalpha_float('black',.2),],
             1  : ['Défaut', 'Voiture, câbles électrique, points de végétation diffus, Sursol non utile', Colors.rgb_withalpha_float('white',.2),],
             2  : ['Sol', 'Tous les éléments du sol y compris les descentes de garage en sous-sol', Colors.rgb_withalpha_float('gray',1.)],
             4  : ['Végétation', 'Végétation', Colors.rgb_withalpha_float('forestgreen',1.)],

{wolfhece-2.1.106.dist-info → wolfhece-2.1.107.dist-info}/METADATA

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

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=Bb1T8qjgKMChadJYDrHO9uo6CwItiAXScZpYkDXqZF8,11387
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=pSNMh5KuYXgw4CMA0b5tbGni2QfEc2V2IRVmPMz4ntM,480761
+wolfhece/PyDraw.py,sha256=prtoxdiwAkS7V_H16bRchSjv-Zd3U5yfzASckTeSt1A,482283
 wolfhece/PyGui.py,sha256=pD_t3leVt8U9tzFnSMGsF-Ds4m0qPwLb_Tc8fQT34GQ,144147
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -32,7 +32,7 @@ wolfhece/drawing_obj.py,sha256=7vY04B6r08nurTTFmBXHyR5tVIF1YzAEw_uz4pqTDIw,4233
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
 wolfhece/friction_law.py,sha256=MtZJLo-pTj3-Fw-w12z1LSgSIDrH-JGR0iD9wer_fpQ,5498
 wolfhece/gpuview.py,sha256=Jql8pLZ0PpvZ_ScT-U4jsXANZ9j4-m_RWhsLA2HISuQ,24544
-wolfhece/images_tiles.py,sha256=npR3IJTVEsmgNQP0opVD8g40sBruxLNdmq29A90cVUY,2929
+wolfhece/images_tiles.py,sha256=w5BX6kRqA0wW9TWyKrJUIRl-XyqHclq_kp5ET2VA0Sg,3227
 wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4465
 wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
 wolfhece/irm_qdf.py,sha256=KyrIk0Gu50Q702EWxRpwKTWI2KGjtHA1l8CL-Y469O0,26394
@@ -80,7 +80,7 @@ wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefg
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=U-1Ed3Iyh77BiyLsxRW_EJiRSbsCERPs30JqPCz2o6s,389
+wolfhece/apps/version.py,sha256=c9nOMzTjOuC2UwtGbI20MfQvPwFWRLi2f8faqmnTTnY,389
 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
@@ -154,7 +154,7 @@ wolfhece/lagrangian/particles.py,sha256=S52_-3rzgVhift6l4Gznvsf_RTggzvNaD1dPvQUr
 wolfhece/lagrangian/velocity_field.py,sha256=oGVjNm98gEpawreFIrC1lDyC5bEhkk2CsyYAlF1Kq50,10574
 wolfhece/lazviewer/__init__.py,sha256=lz60EpQOBZ-zjvYzff6Y11jzAmC7mjOaxRYAfoqizQs,473
 wolfhece/lazviewer/_add_path.py,sha256=GDwPnzHuGRXGriDNcu1SQ6HetFDGIApeAQZEzYArGvI,605
-wolfhece/lazviewer/laz_viewer.py,sha256=woY6BTu6_Qomx_UsVxHXPuD8j-r9CemM0pJ-H9OMNU8,43244
+wolfhece/lazviewer/laz_viewer.py,sha256=XQ7vL8NU-igBEFQHSIQjFbKQYnt4sbZ-J6YLmzaxt3s,43426
 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
@@ -293,8 +293,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.106.dist-info/METADATA,sha256=zF3O-oD6-npmbSexAZwCntdKPYpjKbK8GvjIoufqoU8,2618
-wolfhece-2.1.106.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-wolfhece-2.1.106.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.106.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.106.dist-info/RECORD,,
+wolfhece-2.1.107.dist-info/METADATA,sha256=oztMOI4pukBY5To8ukz2RPo2f3K4XEmC0k161JWzdkE,2618
+wolfhece-2.1.107.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+wolfhece-2.1.107.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.107.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.107.dist-info/RECORD,,