wolfhece 2.1.109__py3-none-any.whl → 2.1.111__py3-none-any.whl

wolfhece/wolf_array.py

@@ -9410,15 +9410,31 @@ class WolfArray(Element_To_Draw, header_wolf):
         cs = plt.contour(x, y, self.array, levels=levels)
 
         zones = Zones(idx = self.idx + '_contour', mapviewer = self.get_mapviewer())
-        for collection, level in zip(cs.collections, cs.levels):
-            zone_level = zone(name=f'Contour {level}')
-            for idx, path in enumerate(collection.get_paths()):
-                vector_level = vector(name=f'Contour {level} - {idx}')
-                for vertices in path.to_polygons(closed_only=False):
+
+        if hasattr(cs, 'collections'):
+            # MATPLOTLIB <=3.8
+            logging.debug('MATPLOTLIB <=3.8')
+            logging.info(_('DEPRECATED: MATPLOTLIB <=3.8 -- You should consider upgrading to a more recent version of Matplotlib'))
+            for collection, level in zip(cs.collections, cs.levels):
+                zone_level = zone(name=f'Contour {level}')
+                for idx, path in enumerate(collection.get_paths()):
+                    vector_level = vector(name=f'Contour {level} - {idx}')
+                    for vertices in path.to_polygons(closed_only=False):
+                        for vertex in vertices:
+                            vector_level.add_vertex(wolfvertex(vertex[0], vertex[1]))
+                zone_level.add_vector(vector_level, forceparent=True)
+                zones.add_zone(zone_level, forceparent=True)
+        else:
+            # MATPLOTLIB >3.8
+            logging.debug('MATPLOTLIB >3.8')
+            for path, level in zip(cs.get_paths(), cs.levels):
+                zone_level = zone(name=f'Contour {level}')
+                for idx, vertices in enumerate(path.to_polygons(closed_only=False)):
+                    vector_level = vector(name=f'Contour {level} - {idx}')
                     for vertex in vertices:
                         vector_level.add_vertex(wolfvertex(vertex[0], vertex[1]))
                 zone_level.add_vector(vector_level, forceparent=True)
-            zones.add_zone(zone_level, forceparent=True)
+                zones.add_zone(zone_level, forceparent=True)
 
         return zones
 

wolfhece/wolfresults_2D.py

@@ -4096,7 +4096,7 @@ class Wolfresults_2D(Element_To_Draw):
 
             return vals,labs
         else:
-            return -1
+            return [-1],['-']
 
     def get_value_elevation(self, x:float, y:float, nullvalue=-1):
         """Return the value of the bed elevation at (X,Y) position"""

{wolfhece-2.1.109.dist-info → wolfhece-2.1.111.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wolfhece
-Version: 2.1.109
+Version: 2.1.111
 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
@@ -37,7 +37,7 @@ Requires-Dist: owslib
 Requires-Dist: beautifulsoup4
 Requires-Dist: requests
 Requires-Dist: notebook
-Requires-Dist: matplotlib==3.6.*
+Requires-Dist: matplotlib==3.10.*
 Requires-Dist: mkl
 Requires-Dist: python-gettext
 Requires-Dist: shapely

{wolfhece-2.1.109.dist-info → wolfhece-2.1.111.dist-info}/RECORD

@@ -7,16 +7,16 @@ 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=qlb1ClUTY9yDtPfXTyT6TnbGqhaLiXL3wd3Ri9AePOc,488365
+wolfhece/PyDraw.py,sha256=upQGIk2ZZXot6jyPjfbIrommg1AHRvb24q-Rz1dySg0,497162
 wolfhece/PyGui.py,sha256=Ceaby7kyTFf-eZQy4b6sI_b6y2ssN37bSGWBqOcb5VM,144145
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
-wolfhece/PyPalette.py,sha256=81n1P-olOe4wElTLv-miSDhqvJU_RHcxgfpHt794dSw,31436
+wolfhece/PyPalette.py,sha256=-D2sC7wzGGW8yBtiwXc1CsxHpCj-olxGohZrsdzmaCM,31794
 wolfhece/PyParams.py,sha256=GRp1zZDUJIjs8PtjwScDdov-E9orr1JWOntDazN5AOw,98577
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=qFf8UPvkbwumRRfjpBcgZmqpHtcEtIEoUh30rWFF-lQ,45205
-wolfhece/PyVertexvectors.py,sha256=d84gTrFXonYblgaQMJ9N0GcKWOPd85kJPlV_N9FpwuQ,280672
+wolfhece/PyVertexvectors.py,sha256=_-F8qHtWKGJgMbRebk5TbQ7LeLUl9r6nRDjgTxt9IJQ,283050
 wolfhece/PyWMS.py,sha256=WmOzHP02wVcB5RGJAlENL_NzF9rYfvLxslRFyxaEt1Q,6615
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -37,7 +37,7 @@ wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4
 wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
 wolfhece/irm_qdf.py,sha256=KyrIk0Gu50Q702EWxRpwKTWI2KGjtHA1l8CL-Y469O0,26394
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
-wolfhece/matplotlib_fig.py,sha256=SRAAOBz8Y2B9Xc9jA6ZLbVaSw_6oAIBR_We_jdvwvIw,69511
+wolfhece/matplotlib_fig.py,sha256=nWhac23K6eQJGXhDFiakmT52j-QUzlMHQmZ2je56GVE,81119
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
 wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,5205
@@ -52,13 +52,13 @@ wolfhece/pywalous.py,sha256=mWB7UxlYMIbPxNUDlONQEjcOOy9VSaRU9aYWZ5IFLu8,19164
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=B7q_eS0SDcoO3erW362UOus3ApiOy4_jWrpUtUNSL3E,423223
+wolfhece/wolf_array.py,sha256=8CzabYInhFmOjr-Wwfse5L0Ylx3SsjkUylitOSOm4Oo,424148
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=ecoXXmmcLuyG1oPqU2dB_k03qMTCLTVQoSq1xi1EalU,17359
 wolfhece/wolf_tiles.py,sha256=-YfTelZjpfgqZXd1yMsGFajz_oDISXkC0zB5fW-8MBY,10486
 wolfhece/wolf_vrt.py,sha256=NcPZYW4bu06IpqQuiutoAhCvDkeZ3TzOVb8z4wTQ1h8,14319
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=Z-SKkipwbChyf9V4777nacKNd5p0aimORjC6evg5zeI,184819
+wolfhece/wolfresults_2D.py,sha256=GbuYSN1haTctY9AqUyAt1xQCOVpoUgSURD9d2XIqRXw,184827
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
 wolfhece/acceptability/Parallels.py,sha256=njrJFH_tTdQUg2px-QqQR6VdhImP1TEujLhpM3JEKNo,4001
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -76,11 +76,11 @@ wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
 wolfhece/apps/acceptability.py,sha256=hMIxTRNQARTTWJJaakb6kEK9udNh-w64VDgxxezVk3k,790
 wolfhece/apps/check_install.py,sha256=Zb_HE43sT6f-BOjvQUa-Kur6TjedFKUcwZOgTkKH3Sc,2398
 wolfhece/apps/check_version.py,sha256=Zze7ltzcM2ZzIGMwkcASIjapCG8CEzzW9kwNscA3NhM,1768
-wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefgmk,5334
+wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVzzA,9106
 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=8TeUFKF4fnleDiIjOTuhQTBUInamT8Zh5Q7qRDvk2x4,389
+wolfhece/apps/version.py,sha256=_E5zp4InRVxGzGtcse3-ynBytT7LFkwOrTupyZusKys,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
@@ -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.109.dist-info/METADATA,sha256=WNTPztYbROy00T05fggMqd3xndJna-m0pRa9RANfpws,2618
-wolfhece-2.1.109.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wolfhece-2.1.109.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.109.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.109.dist-info/RECORD,,
+wolfhece-2.1.111.dist-info/METADATA,sha256=2qEAB6gzSOu-t6WAFWuvDKlIbcjK-CghDSUnaL7E5sA,2619
+wolfhece-2.1.111.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wolfhece-2.1.111.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.111.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.111.dist-info/RECORD,,