wolfhece 2.2.35__py3-none-any.whl → 2.2.37__py3-none-any.whl

wolfhece/analyze_poly.py

@@ -4,6 +4,7 @@ import numpy as np
 from shapely.geometry import Point, LineString
 from typing import Literal
 import pandas as pd
+import geopandas as gpd
 from pathlib import Path
 
 from .PyTranslate import _

wolfhece/apps/version.py

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

wolfhece/picc.py

@@ -19,6 +19,7 @@ from .PyTranslate import _
 from .PyVertexvectors import Zones, zone, vector, wolfvertex
 from .PyVertex import cloud_vertices, getRGBfromI, getIfromRGB
 from .drawing_obj import Element_To_Draw
+from .wolf_array import WolfArray
 
 class Picc_data(Element_To_Draw):
     """
@@ -38,7 +39,7 @@ class Picc_data(Element_To_Draw):
 
         self.data_dir = data_dir
         self._filename_vector = 'Wallonie.gdb' #'PICC_Vesdre.shp'
-        self._filename_points = 'PICC_Vesdre_points.shp'
+        self._filename_points = 'ADRESS_POINT.shp' #'PICC_Vesdre_points.shp'
         self.zones = None
         self.cloud = None
         self._colors = {'Habitation': [255, 0, 0], 'Annexe': [0, 255, 0], 'Culture, sport ou loisir': [0, 0, 255], 'Autre': [10, 10, 10]}
@@ -59,9 +60,11 @@ class Picc_data(Element_To_Draw):
         if data_dir is None:
             data_dir = self.data_dir
 
+        data_dir = Path(data_dir)
+
         datafile = data_dir / self._filename_vector
 
-        if datafile.exists():
+        if datafile.exists() and datafile.is_file():
             self.zones = Zones(data_dir / self._filename_vector, bbox = bbox, mapviewer=self.mapviewer, colors= self._colors)
         else:
             logging.info(_('File not found : {}').format(datafile))
@@ -118,6 +121,24 @@ class Picc_data(Element_To_Draw):
             else:
                 logging.error(_('Point file not found : {}').format(pointfile))
 
+                if self.mapviewer is not None:
+                    dlg = wx.FileDialog(None, _('Select a point file'), wildcard="Shapefile (*.shp)|*.shp|Gpkg (*.gpkg)|*.gpkg", style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
+                    if dlg.ShowModal() == wx.ID_CANCEL:
+                        dlg.Destroy()
+                        return
+
+                    pathname = dlg.GetPath()
+                    dlg.Destroy()
+
+                    try:
+                        self._filename_points = Path(pathname)
+
+                        self.cloud = cloud_vertices(pathname, bbox = bbox, mapviewer=self.mapviewer)
+                        self.cloud.myprop.width = 3
+                        self.cloud.myprop.color = getIfromRGB([0, 0, 255])
+                    except:
+                        logging.error(_('File not found : {}').format(pathname))
+
 
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """ Plot data in OpenGL context
@@ -132,10 +153,11 @@ class Picc_data(Element_To_Draw):
         """
 
         if self.zones is not None:
-            self.zones.plot(sx=sx, sy=sy, xmin=xmin, ymin=ymin, xmax=xmax, ymax=ymax, size=size)
+           self.zones.plot(sx=sx, sy=sy, xmin=xmin, ymin=ymin, xmax=xmax, ymax=ymax, size=size)
         if self.cloud is not None:
             self.cloud.plot(sx=sx, sy=sy, xmin=xmin, ymin=ymin, xmax=xmax, ymax=ymax, size=size)
 
+
     def check_plot(self):
         """ Generic function responding to check operation from mapviewer """
 
@@ -153,7 +175,7 @@ class Picc_data(Element_To_Draw):
 
             self.mapviewer.Refresh()
 
-    def uncheck_plot(self, unload: bool = True):
+    def uncheck_plot(self, unload: bool = True, reset_filename: bool = False):
         """ Generic function responding to uncheck operation from mapviewer """
 
         super().uncheck_plot(unload = unload)
@@ -162,6 +184,11 @@ class Picc_data(Element_To_Draw):
             self.zones = None
             self.cloud = None
 
+        if reset_filename:
+            self._filename_vector = ''
+            self._filename_points = ''
+            self.data_dir = Path(r'./data/PICC')
+
     def show_properties(self):
         """ Showing properties of the object """
 
@@ -201,6 +228,13 @@ class Picc_data(Element_To_Draw):
         else:
             logging.warning(_('No mapviewer to activate zone !'))
 
+    def extrude_polygons(self, dest_array: WolfArray):
+        """ Extrude the active polygon along the z-axis """
+
+        if self.zones is not None:
+            for curzone in self.zones.myzones:
+                dest_array.interpolate_on_polygons(curzone, keep = 'above')
+
 class Cadaster_data(Picc_data):
     """ Read and show cadaster data """
 

wolfhece/pydownloader.py

@@ -41,6 +41,7 @@ class DownloadFiles(Enum):
     JSONFILES = ('json',)
     TXTFILES = ('txt',)
     CSVFILES = ('csv',)
+    DXFFILES = ('dxf',)
 
 class DonwloadDirectories(Enum):
     """ Enum to define the directories for downloads. """

{wolfhece-2.2.35.dist-info → wolfhece-2.2.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.35
+Version: 2.2.37
 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.35.dist-info → wolfhece-2.2.37.dist-info}/RECORD

@@ -8,7 +8,7 @@ wolfhece/Model1D.py,sha256=snEmu8Uj2YGcp1ybPnly-4A389XRnuOujGduqInNcgw,477001
 wolfhece/PandasGrid.py,sha256=YIleVkUkoP2MjtQBZ9Xgwk61zbgMj4Pmjj-clVTfPRs,2353
 wolfhece/PyConfig.py,sha256=13DDWjJdohYHwn1uRVHB0s8Jcwq_b9pwcwbAr8NlZyc,19667
 wolfhece/PyCrosssections.py,sha256=2m372NSriH41AcIk723y2i44mwUXodbIMIzqkuVMjUY,127365
-wolfhece/PyDraw.py,sha256=yE3Cdhnr74yLnZBRN6vBu0xk3KXfg8Z5SA1P3jzORpM,688239
+wolfhece/PyDraw.py,sha256=F2zS8Mf8H44JDsV-ZaXaMIGx3lSFDUIyCeoLDQYRAiU,690532
 wolfhece/PyGui.py,sha256=mcLuHT_pGjW1ltJ-kjNFstVXyeBoZRCvM3vHWv5srB8,148594
 wolfhece/PyGuiHydrology.py,sha256=sKafpOopBg50L5llZCI_fZtbebVTDtxvoRI6-osUwhg,14745
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
@@ -17,7 +17,7 @@ wolfhece/PyParams.py,sha256=BgTAwxxq831rYEq_KLcFBX_upjiSUpVtfoQnCxCNWUI,100443
 wolfhece/PyPictures.py,sha256=5X2HBkZG1gTaMKMu6UoU-cOY8SRkFyPScJ8bhdoNY7g,18930
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=a56oY1NB45QnwARg96Tbnq-z-mhZKFkYOkFOO1lNtlk,51056
-wolfhece/PyVertexvectors.py,sha256=EBZLC54-xAyzofcru4lvdUy0uoZ7pltpZpmyJwtYM34,359259
+wolfhece/PyVertexvectors.py,sha256=LhuvLC-zrCMFmwo9JwxgME_3QnTeZMC0vgo8MHg4miw,374955
 wolfhece/PyWMS.py,sha256=XcSlav5icct2UwV7K2r7vpxa5rKZWiHkp732lI94HFI,31534
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -26,7 +26,7 @@ wolfhece/ReadDataDCENN.py,sha256=vm-I4YMryvRldjXTvRYEUCxZsjb_tM7U9yj6OaPyD0k,153
 wolfhece/Results2DGPU.py,sha256=ljMEKHGMbmIAZE6UmMmYDMFqFAwjzxxVUmZdHHb6aME,32106
 wolfhece/__init__.py,sha256=bh5zzt90fGJcc97d0DiuZsV9VxwBEy9HUBfexHmQDJk,1978
 wolfhece/_add_path.py,sha256=mAyu85CQHk0KgUI6ZizweeQiw1Gdyea9OEjGLC6lLA4,916
-wolfhece/analyze_poly.py,sha256=0eelAVQPsNM1PpDbdoNN2rXrZh1wyFkhsbHdGAm7p-k,60849
+wolfhece/analyze_poly.py,sha256=LewmoMSCAr_5zTeqKR0C1eWwjWh7zPjsSdsDyAV-yuk,60874
 wolfhece/analyze_vect.py,sha256=3lkMwaQ4KRddBVRvlP9PcM66wZwwC0eCmypP91AW-os,6015
 wolfhece/cli.py,sha256=h1tSMHALiftktreyugKcjbASXfpJUm9UYMeVxR-MtG4,6424
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
@@ -46,12 +46,12 @@ wolfhece/lifewatch.py,sha256=Q_Wy6VGkrD-xxY0fv3PKpT8U8oXxNMgiLlrAE3bMheo,16340
 wolfhece/matplotlib_fig.py,sha256=vnFI6sghw9N9jKhR8X1Z4aWli_5fPNylZQtFuujFJDY,84075
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/os_check.py,sha256=SUHyUZ_tuRDvL995LFoJ6ncE91HcYpd9xN8Tfcg4RUA,316
-wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
+wolfhece/picc.py,sha256=2haBqyY7tMphyifIPafPjC7ZnxZRcD585DDkgEFLATw,9988
 wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,5205
 wolfhece/pyGui1D.py,sha256=9g7OS3YiKsqy--6y0cBD7x2gaqTTYFXWkxImpgnTA20,121937
 wolfhece/pybridges.py,sha256=bFAqjL4ColeJtwvyCPGQ8VllWoq1RbVWXxFrdfrvqm8,65954
 wolfhece/pydike.py,sha256=dRb6qGkqoTXjf107KcajcIk1F_FuMPaOZLSwixT3dgA,11196
-wolfhece/pydownloader.py,sha256=sf8E_R_VgKG7TQJpW0Di3Obyp4d8WhIdfNBGRjsa738,10351
+wolfhece/pydownloader.py,sha256=5XzkmakblUmYr025NNZ8Ss7yeWCeNbrRJj1-YoAO10M,10376
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=NWaNeK0RSUeOkgukeogK9FLmQiDjGZ9yhqs9208fojM,46237
 wolfhece/pyshields.py,sha256=KMtUO5kD0lisKnJD1NsDz-qaY5DpFcmS4O3WkXtUSmo,27898
@@ -89,7 +89,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=egkJ-CI7PXqeLr957LgGxoLyrnz1dwvZQWu9BxkrZFY,388
+wolfhece/apps/version.py,sha256=UZe3RYrHjNWqrUoSi1X0dcpPsQWu6xdtW_vEQehWduM,388
 wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -308,8 +308,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.35.dist-info/METADATA,sha256=IlErgq8aClLEVML_ZDE1ViHY0wmA9LKENombtKwN2U4,2729
-wolfhece-2.2.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.35.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.35.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.35.dist-info/RECORD,,
+wolfhece-2.2.37.dist-info/METADATA,sha256=4emqUYlgiP4zz7VHzAxBZXBN8-fklrJF7eqNnV-Na4g,2729
+wolfhece-2.2.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.37.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.37.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.37.dist-info/RECORD,,