wolfhece 2.1.93__py3-none-any.whl → 2.1.94__py3-none-any.whl

wolfhece/PyDraw.py

@@ -899,8 +899,8 @@ class WolfMapViewer(wx.Frame):
 
         # SIMULATION 2D
 
-        sim2d = self.filemenu.Append(wx.ID_ANY, _('Create/Open multiblock model'), _('Create or open a multiblock model in a new viewer'))
-        check2D = self.filemenu.Append(wx.ID_ANY, _('Check headers'), _('Check the header .txt files from an existing 2D simulation'))
+        sim2d = self.filemenu.Append(wx.ID_ANY, _('Create/Open multiblock model'), _('Create or open a multiblock model in the viewer --> CPU/Fortran Wolf2D model'))
+        check2D = self.filemenu.Append(wx.ID_ANY, _('Check headers'), _('Check the header .txt files from an existing 2D CPU simulation'))
 
         self.filemenu.AppendSeparator()
 

wolfhece/PyVertexvectors.py

@@ -11,6 +11,7 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 from os import path
 from typing import Union
 import numpy as np
+import triangle.tri
 import wx
 import wx._dataview
 from wx.dataview import *
@@ -34,6 +35,7 @@ import geopandas as gpd
 import io
 from typing import Union, Literal
 from pathlib import Path
+import triangle
 
 from .wolf_texture import genericImagetexture
 from .textpillow import Font_Priority
@@ -1657,8 +1659,6 @@ class vector:
 
             if self.myprop.filled:
 
-                import triangle
-
                 ls = self.asshapely_pol()
 
                 if False:
@@ -1679,14 +1679,26 @@ class vector:
                 else:
                     #En attendant de lier WOLF-Fortran, on utilise la triangulation contrainte de la librairie Triangle -- https://rufat.be/triangle/
                     xx, yy = ls.exterior.xy
-                    geom = {'vertices' : np.array([xx,yy]).T, 'segments' : np.array([[i,i+1] for i in range(len(xx)-1)]+[[len(xx)-1,0]])}
-                    delaunay = triangle.triangulate(geom,'p')
 
-                    for curtri in delaunay['triangles']:
-                        glBegin(GL_POLYGON)
-                        for i in range(3):
-                            glVertex2d(delaunay['vertices'][curtri[i]][0],delaunay['vertices'][curtri[i]][1])
-                        glEnd()
+                    # On translate les coordonnées pour éviter les erreurs de triangulation
+                    tr_x = np.array(xx).min()
+                    tr_y = np.array(yy).min()
+
+                    xx = np.array(xx)-tr_x
+                    yy = np.array(yy)-tr_y
+
+                    geom = {'vertices' : [[x,y] for x,y in zip(xx[:-1],yy[:-1])], 'segments' : [[i,i+1] for i in range(len(xx)-2)]+[[len(xx)-2,0]]}
+
+                    try:
+                        delaunay = triangle.triangulate(geom, 'p')
+                        for curtri in delaunay['triangles']:
+                            glBegin(GL_POLYGON)
+                            for i in range(3):
+                                # on retraduit les coordonnées pour revenir dans le monde réel
+                                glVertex2d(delaunay['vertices'][curtri[i]][0] + tr_x, delaunay['vertices'][curtri[i]][1] + tr_y)
+                            glEnd()
+                    except:
+                        pass
 
             else:
                 all_polys = self.get_subpolygons()
@@ -4345,7 +4357,8 @@ class Zones(wx.Frame, Element_To_Draw):
                  need_for_wx: bool = False,
                  bbox:Polygon = None,
                  find_minmax:bool = True,
-                 shared:bool = False) -> None:
+                 shared:bool = False,
+                 colors:dict = None) -> None:
         """
         Objet de gestion et d'affichage d'informations vectorielles
 
@@ -4482,6 +4495,9 @@ class Zones(wx.Frame, Element_To_Draw):
             if find_minmax:
                 self.find_minmax(True)
 
+        if colors is not None:
+            self.colorize_data(colors, filled=True)
+
         if plotted and self.has_OGLContext and not self.shared:
             self.prep_listogl()
 
@@ -4686,7 +4702,7 @@ class Zones(wx.Frame, Element_To_Draw):
 
             assert isinstance(self.mapviewer, WolfMapViewer), _('Bad mapviewer -- verify your code or bad parent')
 
-    def colorize_data(self, colors:dict[str:list[int]]) -> None:
+    def colorize_data(self, colors:dict[str:list[int]], filled:bool = False) -> None:
         """
         Colorize zones based on a dictionary of colors
 
@@ -4706,7 +4722,7 @@ class Zones(wx.Frame, Element_To_Draw):
                 curvect.myprop.color = curcolor
                 curvect.myprop.alpha = 180
                 curvect.myprop.transparent = True
-                curvect.myprop.filled = True
+                curvect.myprop.filled = filled
 
     def set_width(self, width:int) -> None:
         """ Change with of all vectors in all zones """
@@ -4881,8 +4897,12 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         Préparation des listes OpenGL pour augmenter la vitesse d'affichage
         """
-        for curzone in self.myzones:
-            curzone.prep_listogl()
+
+        try:
+            for curzone in self.myzones:
+                curzone.prep_listogl()
+        except:
+            logging.warning(_('Error while preparing OpenGL lists'))
 
     def check_plot(self):
         """

wolfhece/apps/version.py

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

wolfhece/picc.py

@@ -62,8 +62,7 @@ class Picc_data(Element_To_Draw):
         datafile = data_dir / self._filename_vector
 
         if datafile.exists():
-            self.zones = Zones(data_dir / self._filename_vector, bbox = bbox, mapviewer=self.mapviewer)
-            self.zones.prep_listogl()
+            self.zones = Zones(data_dir / self._filename_vector, bbox = bbox, mapviewer=self.mapviewer, colors= self._colors)
         else:
             logging.error(_('File not found : {}').format(datafile))
 
@@ -89,8 +88,7 @@ class Picc_data(Element_To_Draw):
                             self.data_dir = Path(pathname).parent
                             data_dir = self.data_dir
                             self._filename_vector = Path(pathname).name
-                            self.zones = Zones(pathname, bbox = bbox, mapviewer=self.mapviewer, parent=self)
-                            self.zones.prep_listogl()
+                            self.zones = Zones(pathname, bbox = bbox, mapviewer=self.mapviewer, parent=self, colors=self._colors)
                         except:
                             logging.error(_('File not found : {}').format(pathname))
 
@@ -105,8 +103,7 @@ class Picc_data(Element_To_Draw):
                             self.data_dir = Path(pathname).parent
                             data_dir = self.data_dir
                             self._filename_vector = ''
-                            self.zones = Zones(pathname, bbox = bbox, mapviewer=self.mapviewer, parent=self)
-                            self.zones.prep_listogl()
+                            self.zones = Zones(pathname, bbox = bbox, mapviewer=self.mapviewer, parent=self, colors= self._colors)
 
                         except:
                             logging.error(_('Dirrectory not a gdb : {}').format(pathname))
@@ -121,11 +118,6 @@ class Picc_data(Element_To_Draw):
             else:
                 logging.error(_('Point file not found : {}').format(pointfile))
 
-        if self.zones is not None:
-            if colorize:
-                self.zones.colorize_data(self._colors)
-                self.zones.prep_listogl()
-
 
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """ Plot data in OpenGL context
@@ -191,7 +183,7 @@ class Picc_data(Element_To_Draw):
 
         if self.mapviewer is not None:
             self.mapviewer.Active_vector(vector_to_activate)
-        
+
         else:
             logging.warning(_('No mapviewer to activate vector !'))
 
@@ -199,13 +191,13 @@ class Picc_data(Element_To_Draw):
         """ Activate a zone """
 
         self.active_zone = zone_to_activate
-        
+
         if len(zone_to_activate.myvectors) > 0:
             self.active_vector = zone_to_activate.myvectors[0]
 
         if self.mapviewer is not None:
             self.mapviewer.Active_vector(self.active_vector)
-        
+
         else:
             logging.warning(_('No mapviewer to activate zone !'))
 

{wolfhece-2.1.93.dist-info → wolfhece-2.1.94.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.93
+Version: 2.1.94
 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
@@ -13,6 +13,7 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Python: <3.11,>=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: wxpython
+Requires-Dist: fiona
 Requires-Dist: msvc-runtime
 Requires-Dist: colorlog==6.7.*
 Requires-Dist: intel-fortran-rt

{wolfhece-2.1.93.dist-info → wolfhece-2.1.94.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=UNtl5UzZ399JqjJT67-4DWaIkv76sc1FiEsSDJpXlL0,10458
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=KkqxUazcXhenwBVCE69EHd_lt0g9fiX6R4p3IBS2pnI,442172
+wolfhece/PyDraw.py,sha256=CiXP4_VfENyacuzwp-AzIPSkZKtlW6xHN6I8jYJBqY0,442203
 wolfhece/PyGui.py,sha256=HY0beOMSp1JEyq8-vfVynzVrmKxvaO_sJSMwlNqCNrg,105289
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -16,7 +16,7 @@ wolfhece/PyParams.py,sha256=6fREK5cUCGw84SDyPvuSzidnX-9BXOX3fve5XBG1K_I,98114
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=aj1Xp6n0pMb_q6AMADHnQ9pgjjRU4EQm0m4Tmc1uoEM,41912
-wolfhece/PyVertexvectors.py,sha256=BLIs97SN45nFQn2T1brzN9c4FIzNNzB0WaM1kUd-E1g,251815
+wolfhece/PyVertexvectors.py,sha256=JV7a4kN4hbwR4fNHATl3X3iuZ7Vh2vyThxVWKtNWSrQ,252593
 wolfhece/PyWMS.py,sha256=fyyzm2HFwq8aRwVYHKiBatcZOeKnFi6DWhv4nfscySQ,4602
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -36,7 +36,7 @@ wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
 wolfhece/irm_qdf.py,sha256=KyrIk0Gu50Q702EWxRpwKTWI2KGjtHA1l8CL-Y469O0,26394
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
-wolfhece/picc.py,sha256=ueujnw03BQz-nPxKGzfDzZbtruTzvnqd6Gm8lOvBYzw,8802
+wolfhece/picc.py,sha256=oATEiPmj_om7TIOWucNZszIu8K18yq8yKU_GwpGJEMs,8531
 wolfhece/pyGui1D.py,sha256=9g7OS3YiKsqy--6y0cBD7x2gaqTTYFXWkxImpgnTA20,121937
 wolfhece/pybridges.py,sha256=EU_r6yRYDf5zKmwwXEBsGYvTKFbSfE3iTxPwusKR-1I,57398
 wolfhece/pydike.py,sha256=hPBQsmSTW4QAp1wcOzb-TL3L7eet2WT1sJx2q-WNQ-Q,2241
@@ -75,7 +75,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=uhn_xV3CTGZbQdI3Z2ZnOh4S6W8nowYt7Tj4x2XrHlo,388
+wolfhece/apps/version.py,sha256=rZi-X4W-8UB0KrenDxLV9h-lnAEpdduh_0hJNqjLsoY,388
 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
@@ -285,8 +285,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.93.dist-info/METADATA,sha256=Rws7W6QN1NdDV2S30eXAeX-vTVauNTaWIzCTfEzkOpk,2548
-wolfhece-2.1.93.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-wolfhece-2.1.93.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.93.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.93.dist-info/RECORD,,
+wolfhece-2.1.94.dist-info/METADATA,sha256=7QKX23LbIgX7dd_Qxm_3o1ItJk0-1y0clPJ_xQP3wwU,2570
+wolfhece-2.1.94.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+wolfhece-2.1.94.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.94.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.94.dist-info/RECORD,,