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

wolfhece/apps/splashscreen.py

@@ -19,7 +19,7 @@ from   wx.adv import SplashScreen as SplashScreen,SPLASH_CENTRE_ON_SCREEN,SPLASH
 
 try:
     from ..libs import wolfogl
-except:
+except ImportError:
     print("** WolfOGL not found **")
     print("Without WolfOGL, the application will not work !")
     print("Please reinstall 'wolfhece' package -- pip install wolfhece --force-reinstall")
@@ -38,7 +38,7 @@ class WolfLauncher(SplashScreen):
 
         # try:
         #     wolfogl.init()
-        # except Exception as e:
+        # except ImportError:
         #     print("Error initializing WolfOGL -- We must stop here !")
         #     print("Please reinstall 'wolfhece' package -- pip install wolfhece")
         #     exit()

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 1
-        self.patch = 38
+        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,54 +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):
-                oldplotted = cur.plotted
-                cur.plotted=True
+            for cur, pal in zip(self.view, self.pals):
+                # iterate over the elements and their palettes
+                pal: wolfpalette
 
-                if isinstance(cur,WolfArray):
-                    if cur.rgb is None:
-                        if pal is not None:
-                            if VERSION_RGB ==1: cur.rgb = pal.get_rgba(cur.array)
+                oldplotted = cur.plotted
+                cur.plotted = True
+
+                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:
+                            # using the current palette
+                            cur.plot(sx, sy, xmin, ymin, xmax, ymax)
                         else:
-                            cur.mypal.defaultgray_minmax(cur.array)
-                            if VERSION_RGB ==1: cur.rgb = cur.mypal.get_rgba(cur.array)
+                            # 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/wolf_array.py

@@ -53,7 +53,7 @@ from .drawing_obj import Element_To_Draw
 
 try:
     from .libs import wolfogl
-except:
+except ImportError:
     msg=_('Error importing wolfogl.pyd')
     msg+=_('   Python version : ' + sys.version)
     msg+=_('   If your Python version is not 3.10.x, you need to get an adapted library in wolfhece library path libs')
@@ -4163,7 +4163,7 @@ class WolfArray(Element_To_Draw, header_wolf):
                  create:bool        = False,
                  mapviewer          = None,
                  nullvalue:float    = 0.,
-                 srcheader:header_wolf  = None,
+                 srcheader:header_wolf = None,
                  idx:str            = '',
                  plotted:bool       = False,
                  need_for_wx:bool   = False,
@@ -4173,7 +4173,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         Constructor of the WolfArray class
 
         :param fname: filename/filepath - if provided, the file will be read on disk
-        :param mold: initialize from a copy a the mold object --> must be a WolArray
+        :param mold: initialize from a copy a the mold object --> must be a WolArray if not None
         :param masknull: mask data based on the nullvalue
         :param crop: crop data based on the spatial extent [[xmin, xmax],[ymin,ymax]]
         :param whichtype: type of the numpy array (float32 as default)
@@ -4188,7 +4188,11 @@ class WolfArray(Element_To_Draw, header_wolf):
         :param mask_source: mask to link to the data
 
         """
-        # wolfogl.powermode('ON')
+        try:
+            pass
+            # wolfogl.powermode('ON')
+        except PermissionError:
+            print(_('wolfogl not available -- Pleas check your wolfhece installation'))
 
         Element_To_Draw.__init__(self, idx, plotted, mapviewer, need_for_wx)
         header_wolf.__init__(self)
@@ -6182,6 +6186,9 @@ class WolfArray(Element_To_Draw, header_wolf):
         else:
             newArray.array = np.ma.masked_array(self.array + other.array, self.array.mask)
         newArray.count()
+
+        assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
+
         return newArray
 
     def __mul__(self, other):
@@ -6208,6 +6215,9 @@ class WolfArray(Element_To_Draw, header_wolf):
         else:
             newArray.array = np.ma.masked_array(self.array * other.array, self.array.mask)
         newArray.count()
+
+        assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
+
         return newArray
 
     def __sub__(self, other):
@@ -6234,6 +6244,9 @@ class WolfArray(Element_To_Draw, header_wolf):
         else:
             newArray.array = np.ma.masked_array(self.array - other.array, self.array.mask)
         newArray.count()
+
+        assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
+
         return newArray
 
     def __pow__(self, other):
@@ -6256,6 +6269,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         newArray.array = np.ma.masked_array(self.array ** other, self.array.mask)
         newArray.count()
+
+        assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
+
         return newArray
 
     def __truediv__(self, other):
@@ -6282,6 +6298,9 @@ class WolfArray(Element_To_Draw, header_wolf):
         else:
             newArray.array = np.ma.masked_array(np.where(other == 0., 0., self.array / other.array), self.array.mask)
         newArray.count()
+
+        assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
+
         return newArray
 
     def concatenate(self, list_arr:list["WolfArray"], nullvalue:float = 0.):

wolfhece/wolfresults_2D.py

@@ -1787,14 +1787,20 @@ class OneWolfResult:
             self._current.rgb = curpal.get_rgba(self._current.array)
             self._current.rgb[self._current.array.mask] = [1., 1., 1., 1.]
 
-        if which == 'wd_u':
-            self._view.pals = [bluepal,curpal]
-        elif which =='t_wl_q':
-            self._view.pals = [graypal,curpal,None]
-        elif which =='t_wd_q':
-            self._view.pals = [graypal,bluepal,None]
-        elif which =='t_wd_u':
-            self._view.pals = [graypal,bluepal,None]
+        if which in [views_2D.WD_Q, views_2D.WD_U]:
+            self._view.pals = [curpal, None]
+        elif which in [views_2D.WL_U, views_2D.WL_Q]:
+            self._view.pals = [curpal, None]
+
+        elif which == views_2D.T_WL_Q:
+            self._view.pals = [graypal, curpal, None]
+        elif which == views_2D.T_WL_Q:
+            self._view.pals = [graypal, curpal, None]
+
+        elif which == views_2D.T_WD_Q:
+            self._view.pals = [graypal, bluepal, None]
+        elif which == views_2D.T_WD_U:
+            self._view.pals = [graypal, bluepal, None]
 
     def get_critdiam(self, which:int) -> WolfArray:
         """
@@ -4039,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.38.dist-info → wolfhece-2.1.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.38
+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.38.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=lqWd-jZkEyYeeAyaiIaGZq_bxXRiiMhDXN68QYoVCfU,26181
+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,18 +42,18 @@ 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=G4PHtXJ8F9PQDt_hcKnxF5kmA1_Fy-8hGiJN2wa_9j4,10017
+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
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=m0Akg1jpe8L7139afVANhqUI09q7YlQvlGm2mcs7gJQ,356155
+wolfhece/wolf_array.py,sha256=7-5l96kuQdTE3CStLyf8PkyRD3QX1Us7DOTbF7INepY,356721
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=EqZI6qCR6ouT3wEtnG_NkVLdvUhfY65JVTj5b6o4lXI,16576
 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=U6k8BeQj2g3EUpAQq7m0nSdLtNKrrn_knWKKs1KoAQ8,165462
+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
@@ -70,8 +70,8 @@ wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
 wolfhece/apps/check_install.py,sha256=icFpkjfwNGDX-0NZVa-ijrCrqmGHEKDiFphjN8uTyh8,928
 wolfhece/apps/curvedigitizer.py,sha256=_hRR2PWow7PU7rTHIbc6ykZ08tCXcK9uy7RFrb4EKkE,5196
 wolfhece/apps/isocurrent.py,sha256=MuwTodHxdc6PrqNpphR2ntYf1NLL2n9klTPndGrOHDQ,4109
-wolfhece/apps/splashscreen.py,sha256=Z95ca-r_SZFpTJZIILuAcKyzl6ElZR08Y5mpQ5y4ZDc,2920
-wolfhece/apps/version.py,sha256=oID8AvPVNdgq4kmuDFo7jFiw8pv1XddrAgr_ttxcAgk,388
+wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
+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
@@ -171,7 +171,7 @@ wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqa
 wolfhece/lazviewer/viewer/viewer.py,sha256=8_MQCaQOS0Z_oRPiGoRy1lq-aCirReX3hWEBjQID0ig,24665
 wolfhece/libs/get_infos.cp310-win_amd64.pyd,sha256=45b6uo0r2zPD4KbpHR8QZC0TwQHDb9S0It7-kv0GWTA,77824
 wolfhece/libs/verify_wolf.cp310-win_amd64.pyd,sha256=ceWkovmTDfQcIzlxOBjUUDoHu6ZglOlUFADaRuAe3WM,127488
-wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=1nQE30ZDXTmnjnaJisDDlP5zvt5Chu2Lxz1a-bZTY1A,294912
+wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=e27Epa44wBSrXiwzeUpl2ud8oCPJpFbfWd_5P5l6sAo,294912
 wolfhece/libs/wolfpy.cp310-win_amd64.pyd,sha256=6omqEaxmQll-Gg24e90wVomAB9rO_tyyOES2FewXn58,36457472
 wolfhece/libs/GL/gl.h,sha256=IhsS_fOLa8GW9MpiLZebe9QYRy6uIB_qK_uQMWMOoeg,46345
 wolfhece/libs/GL/glaux.h,sha256=I3vxXdrzVH05TmjEeAOgKn3egbPt34WMjbeKq5LaBvE,7130
@@ -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.38.dist-info/METADATA,sha256=YabVhQz0G97k82q5CR8b4lqyCKpVhdhWpbIrjeJ9Yuw,2463
-wolfhece-2.1.38.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-wolfhece-2.1.38.dist-info/entry_points.txt,sha256=yggeO1Fa80pi2BrOd9k5dTkiFlefGPwG6HztZhY0-qw,366
-wolfhece-2.1.38.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.38.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,,