wolfhece 2.1.39__py3-none-any.whl → 2.1.40__py3-none-any.whl

wolfhece/PyPalette.py

@@ -514,10 +514,25 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
 
     def defaultgray(self):
         """Palette grise par défaut dans WOLF"""
+
         self.nb = 2
         self.values = np.asarray([0., 1.], dtype=np.float64)
         self.colors = np.asarray([[0, 0, 0, 255], [255, 255, 255, 255]], dtype=np.int32)
 
+        # self.nb = 11
+        # self.values = np.asarray([0., 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.], dtype=np.float64)
+        # self.colors = np.asarray([[0, 0, 0, 255],
+        #                           [22, 22, 22, 255],
+        #                             [44, 44, 44, 255],
+        #                             [66, 66, 66, 255],
+        #                             [88, 88, 88, 255],
+        #                             [110, 110, 110, 255],
+        #                             [132, 132, 132, 255],
+        #                             [154, 154, 154, 255],
+        #                             [176, 176, 176, 255],
+        #                             [198, 198, 198, 255],
+        #                             [255, 255, 255, 255]], dtype=np.int32)
+
         self.fill_segmentdata()
 
     def fill_segmentdata(self):

wolfhece/apps/version.py

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

wolfhece/pyviews.py

@@ -11,18 +11,25 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 import logging
 
 from .drawing_obj import Element_To_Draw
-from .wolf_array import WolfArray,WolfArrayMB, VERSION_RGB
+from .wolf_array import WolfArray, WolfArrayMB, VERSION_RGB, wolfpalette
 from .PyParams import Wolf_Param, key_Param, Type_Param
 
+
 class WolfViews(Element_To_Draw):
+    """ Class to permit complex views, combination of
+    different objects which can be plotted.
+
+    Inherits from Element_To_Draw."""
 
     def __init__(self, idx: str = '', plotted: bool = True, mapviewer=None, need_for_wx: bool = False) -> None:
+        """ Constructor of the class WolfViews."""
+
         super().__init__(idx, plotted, mapviewer, need_for_wx)
 
         self.view = []
         self.pals = []
 
-    def read_from_file(self,fn):
+    def read_from_file(self, fn):
         myproject = Wolf_Param(None, filename=fn, toShow=False)
 
         mykeys = ['cross_sections', 'vector', 'array']
@@ -57,7 +64,6 @@ class WolfViews(Element_To_Draw):
         #             else:
         #                 wx.LogMessage(_('Bad parameter in project file - array : ')+ curname[key_Param.VALUE])
 
-
         #     if 'wolf2d' in myproject.myparams.keys():
         #         for curid, curname in zip(myproject.myparams['wolf2d'].keys(), myproject.myparams['wolf2d'].values()):
         #             if exists(curname[key_Param.VALUE]):
@@ -157,58 +163,110 @@ class WolfViews(Element_To_Draw):
         #     del wait
 
     def change_gui(self, newmapviewer):
+        """ Change the mapviewer of the view and all its elements."""
+
         self.mapviewer = newmapviewer
 
         for cur in self.view:
-            if isinstance(cur,WolfArray) or isinstance(cur,WolfArrayMB):
+            if isinstance(cur, WolfArray) or isinstance(cur, WolfArrayMB):
                 cur.change_gui(newmapviewer)
             else:
                 cur.mapviewer = newmapviewer
 
-    def add_elemt(self,added_elemt,pal=None):
+    def add_elemt(self, added_elemt, pal=None):
+        """ Add an element to the view.
+
+        :param added_elemt: Element to add.
+        :param pal: Palette to use for the element.
+        """
+
+        assert isinstance(added_elemt, Element_To_Draw), 'The element to add must be a subclass of Element_To_Draw'
+
         self.view.append(added_elemt)
         self.pals.append(pal)
 
-    def add_elemts(self,added_elemts:list,pals=None):
+    def add_elemts(self, added_elemts: list, pals=None):
+        """ Add a list of elements to the view.
+
+        :param added_elemts: List of elements to add.
+        :param pals: List of palettes to use for the elements.
+        """
+
+        for cur in added_elemts:
+            assert isinstance(cur, Element_To_Draw), 'The element to add must be a subclass of Element_To_Draw'
+
         self.view += added_elemts
 
         if pals is None:
             self.pals += [None]*len(added_elemts)
         else:
+            if len(pals) != len(added_elemts):
+                logging.warning('The number of palettes must be the same as the number of elements.')
+
+                if len(pals) < len(added_elemts):
+                    logging.warning('The missing palettes will be set to None.')
+                    pals += [None]*(len(added_elemts)-len(pals))
+                else:
+                    logging.warning('The extra palettes will be ignored.')
+                    pals = pals[:len(added_elemts)]
+
             self.pals += pals
 
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
+        """ Plot the view. """
 
         if self.plotted:
 
             for cur, pal in zip(self.view, self.pals):
+                # iterate over the elements and their palettes
+                pal: wolfpalette
+
                 oldplotted = cur.plotted
-                cur.plotted=True
+                cur.plotted = True
 
-                if isinstance(cur,WolfArray):
-                    if VERSION_RGB ==1:
+                if isinstance(cur, WolfArray):
+                    #
+                    if VERSION_RGB == 1:
+                        # Will be deprecated in future versions
                         if cur.rgb is None:
                             if pal is not None:
                                 cur.rgb = pal.get_rgba(cur.array)
                             else:
                                 cur.mypal.defaultgray_minmax(cur.array)
                                 cur.rgb = cur.mypal.get_rgba(cur.array)
+                        cur.plot(sx, sy, xmin, ymin, xmax, ymax)
                     elif VERSION_RGB == 2:
                         if pal is None:
-                            cur.mypal.defaultgray_minmax(cur.array)
+                            # using the current palette
+                            cur.plot(sx, sy, xmin, ymin, xmax, ymax)
+                        else:
+                            # using the palette passed as argument
+
+                            # memorize the current palette
+                            oldpal = cur.mypal
+                            # change the palette
+                            cur.mypal = pal
+                            # plot the array
+                            cur.plot(sx, sy, xmin, ymin, xmax, ymax)
+                            # restore the palette
+                            cur.mypal = oldpal
+
+                else:
+                    cur.plot(sx, sy, xmin, ymin, xmax, ymax)
 
-                cur.plot(sx,sy,xmin,ymin,xmax,ymax)
                 cur.plotted = oldplotted
 
     def find_minmax(self):
+        """ Find the spatial bounds of the view."""
+
         xmin = 1.e30
         ymin = 1.e30
         xmax = -1.e30
         ymax = -1.e30
 
         for cur in self.view:
-            if isinstance(cur,WolfArray) or isinstance(cur,WolfArrayMB):
-                x,y = cur.get_bounds()
+            if isinstance(cur, WolfArray) or isinstance(cur, WolfArrayMB):
+                x, y = cur.get_bounds()
                 xmin = min(x[0], xmin)
                 xmax = max(x[1], xmax)
                 ymin = min(y[0], ymin)

wolfhece/wolfresults_2D.py

@@ -4045,8 +4045,11 @@ class Wolfresults_2D(Element_To_Draw):
         self.palgray.defaultgray()
         self.palblue.defaultblue()
 
-        self.palgray.values[0],self.palgray.values[-1] = self.get_min_max(views_2D.TOPOGRAPHY)
-        self.palblue.values[0],self.palblue.values[-1] = self.get_min_max(views_2D.WATERDEPTH)
+        locmin, locmax = self.get_min_max(views_2D.TOPOGRAPHY)
+        self.palgray.distribute_values(locmin, locmax)
+
+        locmin, locmax = self.get_min_max(views_2D.WATERDEPTH)
+        self.palblue.distribute_values(locmin, locmax)
 
         if self.mypal.automatic:
             # self.mypal.default16()

{wolfhece-2.1.39.dist-info → wolfhece-2.1.40.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ wolfhece/PyDraw.py,sha256=MQO149Cp8QtxWceXpKWLsDbE6JBrVbqEWoAOXWfHl2w,390751
 wolfhece/PyGui.py,sha256=_1LKelusQ-FS0AtgpwFiXKMZ2glky7K1WINTI93H0k0,103438
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
-wolfhece/PyPalette.py,sha256=uxibQSz5u1q8bgZv-VId6o_SI5TTfLHPs9DpJomVwSA,27179
+wolfhece/PyPalette.py,sha256=5TvXF5wWDxP4e70zO9B0UMgVP9c0oAzerM28aoJ1CTg,27982
 wolfhece/PyParams.py,sha256=wwgmP-_7wiiPLTcyX8a5jR6FyC1D2c4oBPc1VWQqtSA,97383
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
@@ -42,7 +42,7 @@ wolfhece/pydike.py,sha256=hPBQsmSTW4QAp1wcOzb-TL3L7eet2WT1sJx2q-WNQ-Q,2241
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=x-tnYLNq3MPV51NbaU14trgRj8qyUyOrMdF1zDsUX3I,37444
 wolfhece/pyshields.py,sha256=7k-qe2EJgr9fJE62jyPmlWQwRj8T0DK4iuMU844ZhYs,23281
-wolfhece/pyviews.py,sha256=jSTXCsmzw5OIZusj3Ynfd2o2XvRq7TaDnbt-dyNlbi0,10198
+wolfhece/pyviews.py,sha256=AUtJY5V43XVH9juIKUSsozKbpkXHCEkWxn0GWuvAo_0,12562
 wolfhece/pywalous.py,sha256=yRaWJjKckXef1d9D5devP0yFHC9uc6kRV4G5x9PNq9k,18972
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
@@ -53,7 +53,7 @@ wolfhece/wolf_texture.py,sha256=EqZI6qCR6ouT3wEtnG_NkVLdvUhfY65JVTj5b6o4lXI,1657
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
 wolfhece/wolf_vrt.py,sha256=89XoDhCJMHiwPQUuOduxtTRKuIa8RDxgNqX65S4xp9M,10569
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=MlvE2OoSwk1P_CeTwotV1QDBJYeHhSCjUprG3c42tRc,165714
+wolfhece/wolfresults_2D.py,sha256=REuQy3fFiEUXt9lNZk0gOg7FbcDEjzAfFNa5H3JqOzg,165764
 wolfhece/xyz_file.py,sha256=Se4nCPwYAYLSA5i0zsbnZUKoAMAD0mK1FJea5WSZUkk,5755
 wolfhece/acceptability/Parallels.py,sha256=h4tu3SpC_hR5Hqa68aruxhtAyhs8u666YuZ40_fR5zg,3979
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -71,7 +71,7 @@ wolfhece/apps/check_install.py,sha256=icFpkjfwNGDX-0NZVa-ijrCrqmGHEKDiFphjN8uTyh
 wolfhece/apps/curvedigitizer.py,sha256=_hRR2PWow7PU7rTHIbc6ykZ08tCXcK9uy7RFrb4EKkE,5196
 wolfhece/apps/isocurrent.py,sha256=MuwTodHxdc6PrqNpphR2ntYf1NLL2n9klTPndGrOHDQ,4109
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=9TV-RYEEy9X0HeZ9xYxf6PRts-on5mB43zJZtbq4_bY,388
+wolfhece/apps/version.py,sha256=9XDKRloyrzZNK6z5DhCF-kSsL5NjAunRSHtKAYMCOGo,388
 wolfhece/apps/wolf.py,sha256=mM6Tyi4DlKQILmO49cDUCip9fYVy-hLXkY3YhZgIeUQ,591
 wolfhece/apps/wolf2D.py,sha256=yPQGee7fsegoQ8GfWKrWEjX1Az_ApL-UWlBiqPvaIyY,565
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -249,8 +249,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.39.dist-info/METADATA,sha256=83wPlCtt2A7BPb-3QuxZrLSWn3AGA5uppBHC79HuiBU,2463
-wolfhece-2.1.39.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-wolfhece-2.1.39.dist-info/entry_points.txt,sha256=yggeO1Fa80pi2BrOd9k5dTkiFlefGPwG6HztZhY0-qw,366
-wolfhece-2.1.39.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.39.dist-info/RECORD,,
+wolfhece-2.1.40.dist-info/METADATA,sha256=6rjW5iWLs6aXBGRGKa5nQ04PDAos4TOPGh8e0et5qhI,2463
+wolfhece-2.1.40.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+wolfhece-2.1.40.dist-info/entry_points.txt,sha256=yggeO1Fa80pi2BrOd9k5dTkiFlefGPwG6HztZhY0-qw,366
+wolfhece-2.1.40.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.40.dist-info/RECORD,,