wolfhece 2.2.8__py3-none-any.whl → 2.2.9__py3-none-any.whl

wolfhece/wolf_array.py

@@ -10064,7 +10064,8 @@ class WolfArray(Element_To_Draw, header_wolf):
                         vmin:float=None, vmax:float=None,
                         figsize:tuple=None,
                         Walonmap:bool=False,
-                        cat:str='IMAGERIE/ORTHO_2022_ETE'):
+                        cat:str='IMAGERIE/ORTHO_2022_ETE',
+                        first_mask_data:bool=True):
         """
         Plot the array - Matplotlib version
 
@@ -10117,7 +10118,9 @@ class WolfArray(Element_To_Draw, header_wolf):
         :rtype: tuple
         """
 
-        self.mask_data(self.nullvalue)
+        if first_mask_data:
+            self.mask_data(self.nullvalue)
+    
         if update_palette:
             self.updatepalette(0)
 
@@ -10151,7 +10154,9 @@ class WolfArray(Element_To_Draw, header_wolf):
                            extent=(self.origx,
                                    self.origx + self.dx * self.nbx,
                                    self.origy,
-                                   self.origy + self.dy * self.nby))
+                                   self.origy + self.dy * self.nby),
+                            alpha=np.select([self.array.mask.T, ~self.array.mask.T], 
+                                            [np.zeros(self.shape).T, np.ones(self.shape).T]))
         else:
             im = ax.imshow(self.array.transpose(),
                            origin='lower',
@@ -10160,7 +10165,9 @@ class WolfArray(Element_To_Draw, header_wolf):
                                    self.origx + self.dx * self.nbx,
                                    self.origy,
                                    self.origy + self.dy * self.nby),
-                           vmin=vmin, vmax=vmax)
+                           vmin=vmin, vmax=vmax,
+                           alpha=np.select([self.array.mask.T, ~self.array.mask.T], 
+                                           [np.zeros(self.shape).T, np.ones(self.shape).T])                           )
         ax.set_aspect('equal')
 
         if getdata_im:
@@ -12083,7 +12090,15 @@ class WolfArrayMB(WolfArray):
 
         return newArray
 
-    def plot_matplotlib(self, figax:tuple=None, getdata_im:bool=False, update_palette:bool=True, vmin:float=None, vmax:float=None, figsize:tuple=None, Walonmap:bool=False, cat:str='IMAGERIE/ORTHO_2022_ETE'):
+    def plot_matplotlib(self, 
+                        figax:tuple=None, 
+                        getdata_im:bool=False, 
+                        update_palette:bool=True, 
+                        vmin:float=None, vmax:float=None, 
+                        figsize:tuple=None, 
+                        Walonmap:bool=False, 
+                        cat:str='IMAGERIE/ORTHO_2022_ETE',
+                        first_mask_data:bool=True):
         """
         Plot the multi-block (MB) array - Matplotlib version
 
@@ -12142,7 +12157,14 @@ class WolfArrayMB(WolfArray):
         # Convert to single block
         single_block = self.as_WolfArray()
 
-        return single_block.plot_matplotlib(figax=figax, getdata_im=getdata_im, update_palette=update_palette, vmin=vmin, vmax=vmax, figsize=figsize, Walonmap=Walonmap, cat=cat)
+        return single_block.plot_matplotlib(figax=figax, 
+                                            getdata_im=getdata_im, 
+                                            update_palette=update_palette, 
+                                            vmin=vmin, vmax=vmax, 
+                                            figsize=figsize, 
+                                            Walonmap=Walonmap, 
+                                            cat=cat,
+                                            first_mask_data=first_mask_data)
 
 
 class WolfArrayMNAP(WolfArrayMB):

{wolfhece-2.2.8.dist-info → wolfhece-2.2.9.dist-info}/METADATA

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

@@ -8,7 +8,7 @@ wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PandasGrid.py,sha256=YIleVkUkoP2MjtQBZ9Xgwk61zbgMj4Pmjj-clVTfPRs,2353
 wolfhece/PyConfig.py,sha256=Y0wtSIFpAMYa7IByh7hbW-WEOVjNsQEduq7vhIYdZQw,16716
 wolfhece/PyCrosssections.py,sha256=igU_ELrg5VrHU6RNbF5tHxPyVImpR3xdpfopJYc7haw,114711
-wolfhece/PyDraw.py,sha256=mCIcXgtTT3vvixO_bvo76HlgK9p1MKk1GljGGIuIosw,631732
+wolfhece/PyDraw.py,sha256=F2iKDT-hqIgBTFfq5ochWSQsrPgRjgiYWRoG7Fg16DQ,631736
 wolfhece/PyGui.py,sha256=IU97wVlmer3Q2MpWbJv4MQWH7nYbc5uN4pRzhr4jdlM,145197
 wolfhece/PyGuiHydrology.py,sha256=sKafpOopBg50L5llZCI_fZtbebVTDtxvoRI6-osUwhg,14745
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
@@ -16,8 +16,8 @@ wolfhece/PyPalette.py,sha256=k9b_95GYD0USQ8DS5zGXeZ577712U6772kmhEbJtlXw,35406
 wolfhece/PyParams.py,sha256=Dh9C_WYICMjo3m9roRySsu8ZgFzzYhSr6RpbaXZni0M,99423
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
-wolfhece/PyVertex.py,sha256=WboSqzI0fYI7wLk-jtgQ0ykX5QBKuVJuoavc8NnjEoo,46593
-wolfhece/PyVertexvectors.py,sha256=0lt0YyHIz_IxgXqdqPlTDruDwjeP6L1Dw6B2Q35a8kQ,325801
+wolfhece/PyVertex.py,sha256=XGmTP35UTe94904Q7Wpg0J5WiifW_xxmMZgENcrUoew,49792
+wolfhece/PyVertexvectors.py,sha256=yPqE1rmqCSAucjNjSo1_srKHMwjqYWe0lx7S2Wbpryw,327905
 wolfhece/PyWMS.py,sha256=LWkQk3R7miiVal-n5K5P5ClSQJA_vi5ImBxYGuxCx9A,9122
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -48,7 +48,7 @@ wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
 wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,5205
 wolfhece/pyGui1D.py,sha256=9g7OS3YiKsqy--6y0cBD7x2gaqTTYFXWkxImpgnTA20,121937
 wolfhece/pybridges.py,sha256=bFAqjL4ColeJtwvyCPGQ8VllWoq1RbVWXxFrdfrvqm8,65954
-wolfhece/pydike.py,sha256=hPBQsmSTW4QAp1wcOzb-TL3L7eet2WT1sJx2q-WNQ-Q,2241
+wolfhece/pydike.py,sha256=bKUwVvFMtAI4np4JJAkIa4xBDLw9l4py3l-Mjlfr_rM,2242
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=WubNPQEk4fC--4qIHZK6mJqQnRs4mAWUpmjRL8q33Sw,46069
 wolfhece/pyshields.py,sha256=6YncgmcA6QvbyIl4jbFRf24uJVjhiSplQKWtZH42lXI,24108
@@ -58,7 +58,7 @@ wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools2d_dll.py,sha256=oU0m9XYAf4CZsMoB68IuKeE6SQh-AqY7O5NVED8r9uw,13125
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=HwOejG8kYTQ1l6c3RX8nuFwMAuySTWfgsxIvZl_Ivcg,496150
+wolfhece/wolf_array.py,sha256=PlImSCX5lUeoqPR7ogqak_Zl6dLyGn5EXUzeD_6-xAU,497218
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=IvFtekT5iLU2sivZOOlJXpE4CevjTQYSxHaOp4cH_wI,17723
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
@@ -86,7 +86,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=eCPAUYscZPWDYKBHDBWum_VIcE7WXOCBe1GLHL3KUmU,3088
-wolfhece/apps/version.py,sha256=VLekoececzg7H4Z0hu97fb37nDVx-7ndJhfqA8urYqc,387
+wolfhece/apps/version.py,sha256=o3OeBwd6Tgmc0fmEMZt8FtBtsdsee74REzxvxPvGof4,387
 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
@@ -130,15 +130,17 @@ wolfhece/ftp/downloader.py,sha256=NANzxSzdcp25dFMYin5QA9UnFexNe6-W2AqqTzUE4f4,52
 wolfhece/hydrology/Catchment.py,sha256=AKMIkGyMUK1TC_lKNZxFYwPt9bYtLOf0vLXILmZuTas,144465
 wolfhece/hydrology/Comparison.py,sha256=5uHQlKZgNUzpUM0xmLZUePuhq38x7w_hsIPO5Lm8lTE,84244
 wolfhece/hydrology/Dumping.py,sha256=SHGYXr30nMOGPSLArMvAzVxGyLywLf4i267166oUHhQ,2403
-wolfhece/hydrology/Optimisation.py,sha256=soT2TsM443uzqUFYOVDhj2oyLPF6Ob5YhRefSQLKkUM,149243
+wolfhece/hydrology/Internal_variables.py,sha256=F-eLtV3pjzkPkp12qxSDYJsiInvGx-IPqIouTmaQMjg,10141
+wolfhece/hydrology/Models_characteristics.py,sha256=qBvmyjpND_hPybR8M5s-FckUViwGdjxr3vv6PvtdQ-s,12614
+wolfhece/hydrology/Optimisation.py,sha256=6UEeWmNfuuDUnyIVZAkSMy74PCl5nub8Pz4xvCoVDAQ,166919
 wolfhece/hydrology/Outlet.py,sha256=jdjYN2gIolQJ5prf1wVfxm7cp_YguwQ0JMRsC9ks-Tg,10519
 wolfhece/hydrology/PostProcessHydrology.py,sha256=GS2dm9ahDb856apXvTM-oyusTn0xj-ySNpKbHa_jQdw,7419
 wolfhece/hydrology/PyWatershed.py,sha256=a26M6tVe4hrQ-a8FyAx7H9-RZcVCU5BBzFff4_YT0UU,97665
 wolfhece/hydrology/RetentionBasin.py,sha256=vFvpnomo5h8ZWq3Hq-YlxRnyqyQqHrojABMKzu3RP6E,83358
-wolfhece/hydrology/SubBasin.py,sha256=wFPehJ0vbZM9nZjEdttuch3Dmt8LzDtRVsF5E8pxM4E,178326
+wolfhece/hydrology/SubBasin.py,sha256=_grNjUSgFVViH0HDmRKyYt-ag9Y63y9hVOqVXOfk2OQ,182478
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/hydrology/constant.py,sha256=0o6l8zwLESlW6G9vYNFlUJV4YhcDq6_jnCN28DNchmU,1634
-wolfhece/hydrology/cst_exchanges.py,sha256=w83FyI1gOQ5EjTWb9usLfakQAJwv52u8_Hap2Nih570,39593
+wolfhece/hydrology/cst_exchanges.py,sha256=yT2cSIXjlfshPkSAdhyBxYwCPZ5L9s75BYM24tEO6_4,39699
 wolfhece/hydrology/data_treatment.py,sha256=vHNtEvXHJOdGHjaNjbTTvVoFQjVee-AdspJEesxVNuQ,34967
 wolfhece/hydrology/forcedexchanges.py,sha256=MrzMqKISX6G6t3XwkyFQa6tVFfTTC8ifm_nSvrOy5-8,2259
 wolfhece/hydrology/plot_hydrology.py,sha256=M1cujLxA03SG8P7CkIPVIsrbfsbCwZPpLHQHN2xxm4w,35708
@@ -196,7 +198,7 @@ wolfhece/lazviewer/viewer/viewer.exe,sha256=jRy4FhrTa7yN0Cp5dBvCGAL_oBOCqMYbu-dS
 wolfhece/lazviewer/viewer/viewer.py,sha256=5igxFDFZMnnnhF3oFbEHKLfgiK4TUgXEZHsgOJbtNY4,25319
 wolfhece/lazviewer/viewer/viewer_np1_23_5.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqaJntumJc,202240
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
-wolfhece/libs/WolfDll.dll,sha256=iGTdK8Hb4OKxh3xCOuYrK2KCfDlUJGl50FGUP160ddQ,134159360
+wolfhece/libs/WolfDll.dll,sha256=DlSlpFVicaGgBImvKSXHExgNNKphDwzCYW_w4EVrl8g,134153216
 wolfhece/libs/Wolf_tools.dll,sha256=HN4spQRt0f2hWm_4FsYdRuBo0hiCKFYnD0rOnJGJcAU,144569856
 wolfhece/libs/__init__.py,sha256=x7QvPd7hjL-Xl7RjlA8y6rcvKCkYu3JpFE3YnzUJeCY,3326
 wolfhece/libs/api-ms-win-crt-heap-l1-1-0.dll,sha256=r0euvgZa8vBFoZ8g7H5Upuc8DD6aUQimMJWnIyt1OBo,19720
@@ -314,8 +316,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.2.8.dist-info/METADATA,sha256=SZScGuzekEdz_ReMj94rQMIwrfNH3QMhDq0eEb-of9k,2744
-wolfhece-2.2.8.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-wolfhece-2.2.8.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.2.8.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.8.dist-info/RECORD,,
+wolfhece-2.2.9.dist-info/METADATA,sha256=74AfxciyoQG4-CEALkQzsakBxo5x04S9O2ZXDjoLWgc,2744
+wolfhece-2.2.9.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+wolfhece-2.2.9.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.2.9.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.9.dist-info/RECORD,,