wolfhece 2.1.50__py3-none-any.whl → 2.1.52__py3-none-any.whl

wolfhece/rem/REMMaker.py

@@ -1,13 +1,3 @@
-"""
-Author: HECE - University of Liege, Pierre Archambeau
-Date: 2024
-
-Copyright (c) 2024 University of Liege. All rights reserved.
-
-This script and its content are protected by copyright law. Unauthorized
-copying or distribution of this file, via any medium, is strictly prohibited.
-"""
-
 #!/usr/bin/env python
 import os
 import sys
@@ -228,8 +218,8 @@ class REMMaker(object):
         if self.count is not None and self.centerline_shp is None:
             raise ValueError(f'Obligation de donner un shapefile pour en sélectionner une géométrie.')
         if self.pres is not None:
-            gdal.Warp(f'{self.dem_name}_warp.tif', self.dem, xRes=self.pres, yRes=self.pres)
-            r = gdal.Open(f'{self.dem_name}_warp.tif', gdal.GA_ReadOnly)
+            gdal.Warp(os.path.join(self.out_dir, f'{self.dem_name}_warp.tif'), self.dem, xRes=self.pres, yRes=self.pres)
+            r = gdal.Open(os.path.join(self.out_dir, f'{self.dem_name}_warp.tif'), gdal.GA_ReadOnly)
         if self.bounds is not None:
             band = r.GetRasterBand(1)
             self.dem_array = band.ReadAsArray()
@@ -240,19 +230,19 @@ class REMMaker(object):
             min_x, max_x = sorted([upper_left_x, upper_left_x + x_size * cols])
             min_y, max_y = sorted([upper_left_y, upper_left_y + y_size * rows])
             if self.bounds[0] > min_x and self.bounds[1] > min_y and self.bounds[2] < max_x and self.bounds[3] < max_y:
-                gdal.Translate(f'{self.dem_name}_crop.tif', r, projWin=(self.bounds[0],self.bounds[3],self.bounds[2],self.bounds[1]))
-                r = gdal.Open(f'{self.dem_name}_crop.tif', gdal.GA_ReadOnly)
+                gdal.Translate(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), r, projWin=(self.bounds[0],self.bounds[3],self.bounds[2],self.bounds[1]))
+                r = gdal.Open(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), gdal.GA_ReadOnly)
             else:
                 raise ValueError(f"bounds choisi hors DEM. Redéfinir des limites contenues dans x={min_x,max_x:.3f} et y={min_y,max_y:.3f}")
         if self.count is not None:
             self.rivers:gpd.GeoDataFrame
             self.rivers = read_file(self.centerline_shp)
             upper_left_x, x_size, x_rot, upper_left_y, y_rot, y_size = r.GetGeoTransform()
-            gdal.Translate(f'{self.dem_name}_crop.tif', r, projWin=(self.rivers.bounds.iloc[self.count].minx-50*x_size,
+            gdal.Translate(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), r, projWin=(self.rivers.bounds.iloc[self.count].minx-50*x_size,
                                                                     self.rivers.bounds.iloc[self.count].maxy-50*y_size,
                                                                     self.rivers.bounds.iloc[self.count].maxx+50*x_size,
                                                                     self.rivers.bounds.iloc[self.count].miny+50*y_size))
-            r = gdal.Open(f'{self.dem_name}_crop.tif', gdal.GA_ReadOnly)
+            r = gdal.Open(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), gdal.GA_ReadOnly)
         self.proj = osr.SpatialReference(wkt=r.GetProjection())
         self.epsg_code = self.proj.GetAttrValue('AUTHORITY', 1)
         self.h_unit = self.proj.GetAttrValue('UNIT')
@@ -426,9 +416,9 @@ class REMMaker(object):
             self.river_coords = self.ix2coords(self.river_indices)
             self.river_wses = self.dem_array[self.river_indices]
         else:
-            self.rivers = read_file(f'{self.dem_name}_river_pts.shp')
+            self.rivers = os.path.join(self.out_dir, f'{self.dem_name}_river_pts.shp')
             self.rivers['curvi'] = self.river_curvi
-            self.rivers.to_file(f'{self.dem_name}_river_pts.shp', driver='ESRI Shapefile')
+            self.rivers.to_file(os.path.join(self.out_dir, f'{self.dem_name}_river_pts.shp'), driver='ESRI Shapefile')
             self.river_coords = np.array([curpt.xy for curpt in self.rivers.geometry])
             self.river_wses = np.array([curpt.z for curpt in self.rivers.geometry])
         return
@@ -463,9 +453,9 @@ class REMMaker(object):
         logging.info("Interpolating river elevation across DEM extent.")
         if not self.k:
             self.k = self.estimate_k()
-        self.rivers = read_file(f'{self.dem_name}_river_pts.shp')
+        self.rivers = read_file(self.river_shp)
         self.rivers['curvi'] = self.river_curvi
-        self.rivers.to_file(f'{self.dem_name}_river_pts.shp', driver='ESRI Shapefile')
+        self.rivers.to_file(self.river_shp, driver='ESRI Shapefile')
         logging.info(f"Using k = {self.k} nearest neighbors.")
         # coords to interpolate over (don't interpolate where DEM is null or on centerline where REM = 0)
         interp_indices = np.where(~(np.isnan(self.dem_array) | (self.centerline_array == 1)))
@@ -513,9 +503,9 @@ class REMMaker(object):
         if self.bounds is None and self.count is None:
             r = gdal.Open(self.dem, gdal.GA_ReadOnly)
         if self.bounds is not None or self.count is not None:
-            r = gdal.Open(f'{self.dem_name}_crop.tif', gdal.GA_ReadOnly)
+            r = gdal.Open(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), gdal.GA_ReadOnly)
         if self.pres is not None and self.bounds is None and self.count is None:
-            r = gdal.Open(f'{self.dem_name}_warp.tif', gdal.GA_ReadOnly)
+            r = gdal.Open(os.path.join(self.out_dir, f'{self.dem_name}_warp.tif'), gdal.GA_ReadOnly)
         driver = gdal.GetDriverByName("GTiff")
         rem = driver.CreateCopy(self.rem_ras, r, strict=0)
         # fill with REM array
@@ -565,9 +555,9 @@ class REMMaker(object):
         if self.bounds is None and self.count is None:
             dem_viz = RasterViz(self.dem, out_dir=self.cache_dir, out_ext=".tif")
         if self.bounds is not None or self.count is not None:
-            dem_viz = RasterViz(f'{self.dem_name}_crop.tif', out_dir=self.cache_dir, out_ext=".tif")
+            dem_viz = RasterViz(os.path.join(self.out_dir, f'{self.dem_name}_crop.tif'), out_dir=self.cache_dir, out_ext=".tif")
         if self.pres is not None and self.bounds is None and self.count is None:
-            dem_viz = RasterViz(f'{self.dem_name}_warp.tif', out_dir=self.cache_dir, out_ext=".tif")
+            dem_viz = RasterViz(os.path.join(self.out_dir, f'{self.dem_name}_warp.tif'), out_dir=self.cache_dir, out_ext=".tif")
         dem_viz.make_hillshade(multidirectional=True, z=z)
         # make color-relief of REM in cache dir
         rem_viz = RasterViz(self.rem_ras, out_dir=self.cache_dir, out_ext=".tif", make_png=make_png, make_kmz=make_kmz, *args, **kwargs)

wolfhece/rem/RasterViz.py

@@ -1,13 +1,3 @@
-"""
-Author: HECE - University of Liege, Pierre Archambeau
-Date: 2024
-
-Copyright (c) 2024 University of Liege. All rights reserved.
-
-This script and its content are protected by copyright law. Unauthorized
-copying or distribution of this file, via any medium, is strictly prohibited.
-"""
-
 #!/usr/bin/env python
 import os
 import sys
@@ -26,46 +16,46 @@ This script can be called from Python using its class/methods or as a CLI utilit
 
 CLI Usage:
 
-"python RasterViz.py viz_type [-z (default=1)] [-alt (default=45)] [-azim (default=315)] [-multidirectional] 
-    [-cmap (default=terrain)] [-out_ext tif | img (default=tif)] [-make_png] [-make_kmz] [-docker] [-shell] 
+"python RasterViz.py viz_type [-z (default=1)] [-alt (default=45)] [-azim (default=315)] [-multidirectional]
+    [-cmap (default=terrain)] [-out_ext tif | img (default=tif)] [-make_png] [-make_kmz] [-docker] [-shell]
     /path/to/dem"
 
 Options:
-    
-    viz_type: string corresponding to raster product to be produced, one of the following strings: 
+
+    viz_type: string corresponding to raster product to be produced, one of the following strings:
         ["hillshade", "slope", "aspect", "roughness", "color-relief", "hillshade-color"]
-    
+
     -z: only if using "hillshade" or "hillshade-color" viz_type,
         factor to scale/exaggerate vertical topographic differences. Default 1 (no rescale).
-    
-    -alt: only if using "hillshade" or "hillshade-color" viz_type, 
+
+    -alt: only if using "hillshade" or "hillshade-color" viz_type,
           altitude of light source in degrees [0-90]. Default 45.
-    
-    -azim: only if using "hillshade" or "hillshade-color" viz_type, 
+
+    -azim: only if using "hillshade" or "hillshade-color" viz_type,
            azimuth of light source in degrees [0-360]. Default 315.
-    
-    -multidirectional: only if using "hillshade" or "hillshade-color" viz_type. 
+
+    -multidirectional: only if using "hillshade" or "hillshade-color" viz_type.
                        Makes multidirectional hillshade, overriding alt and azim args.
-    
+
     -cmap: only if using "color-relief" viz_type, name of a matplotlib or seaborn colormap. Default "terrain".
            (see https://matplotlib.org/stable/gallery/color/colormap_reference.html)
-    
+
     -out_ext: the extension/file format to use for geodata outputs (tif or img). Default "tif".
-    
+
     -make_png: output a png version (EPSG:3857) of the viz_type in addition to the viz raster in source projection.
-    
+
     -make_kmz: output a kmz version of the viz_type in addition to the viz raster in source projection.
-    
+
     -docker: run GDAL commands from within the osgeo/gdal docker container. This makes it run slightly slower but will
              be needed to run all features if gdal install is on a version <2.2. If using docker, input path must be
              within the working directory path or a subdirectory.
-             
+
     -shell: call GDAL functions (gdaldem, gdal_translate, gdalwarp) as shell commands instead of using Python bindings.
             This may be faster than using pure Python but requires additional environment configuration.
 
     /path/to/dem.tif: path to input DEM, currently assumed to be in GeoTIFF format.
 
-Notes: Output file naming convention uses the DEM basename as a prefix, then viz_type and file extension. 
+Notes: Output file naming convention uses the DEM basename as a prefix, then viz_type and file extension.
        E.g. output.tin.tif --> output_hillshade.tif, output_hillshade.png, output_hillshade.kmz.
        Outputs are saved to the working directory.
 

wolfhece/wolf_array.py

@@ -95,6 +95,39 @@ WOLF_ARRAY_MB = [WOLF_ARRAY_MB_SINGLE, WOLF_ARRAY_MB_INTEGER, WOLF_ARRAY_MNAP_IN
 
 VERSION_RGB = 2
 
+from numba import jit
+
+@jit(nopython=True)
+def custom_gradient(array: np.ndarray):
+    """ Calculate the gradient manually """
+    grad_x = np.zeros_like(array)
+    grad_y = np.zeros_like(array)
+
+    for i in range(1, array.shape[0] - 1):
+        for j in range(1, array.shape[1] - 1):
+            grad_x[i, j] = (array[i + 1, j] - array[i - 1, j]) / 2.0
+            grad_y[i, j] = (array[i, j + 1] - array[i, j - 1]) / 2.0
+
+    return grad_x, grad_y
+
+@jit(nopython=True)
+def hillshade(array:np.ndarray, azimuth:float, angle_altitude:float) -> np.ndarray:
+    """ Create a hillshade array """
+
+    azimuth = 360.0 - azimuth
+
+    x, y = custom_gradient(array)
+    slope = np.pi / 2. - np.arctan(np.sqrt(x * x + y * y))
+    aspect = np.arctan2(-x, y)
+    azimuthrad = azimuth * np.pi / 180.
+    altituderad = angle_altitude * np.pi / 180.
+
+    shaded = np.sin(altituderad) * np.sin(slope) + np.cos(altituderad) * \
+             np.cos(slope) * np.cos((azimuthrad - np.pi / 2.) - aspect)
+    shaded += 1.
+    shaded *= .5
+
+    return shaded.astype(np.float32)
 class Rebin_Ops(Enum):
     MIN = 0
     MEAN = 1
@@ -1488,7 +1521,7 @@ class Ops_Array(wx.Frame):
 
         self.palimage = wx.Button(self.Palette, wx.ID_ANY, _("Create image"), wx.DefaultPosition, wx.DefaultSize, 0)
         self.palimage.SetToolTip(_('Generate colormap image (horizontal, vertical or both) and save to disk'))
-        self.paldistribute = wx.Button(self.Palette, wx.ID_ANY, _("Distribute"), wx.DefaultPosition, wx.DefaultSize, 0)
+        self.paldistribute = wx.Button(self.Palette, wx.ID_ANY, _("Evenly spaced"), wx.DefaultPosition, wx.DefaultSize, 0)
         self.paldistribute.SetToolTip(_('Set colormap values based on minimum+maximum or minimum+step'))
         if self.parentarray.mypal.automatic:
             self.palauto.SetValue(1)
@@ -2648,7 +2681,8 @@ class Ops_Array(wx.Frame):
         myarray.mypal.export_image()
 
     def Onpaldistribute(self, event:wx.MouseEvent):
-        """ Distribute values in palette """
+        """ Evenly spaced values in palette """
+
         myarray: WolfArray
         myarray = self.parentarray
         myarray.mypal.distribute_values()
@@ -4566,7 +4600,6 @@ class WolfArray(Element_To_Draw, header_wolf):
     @property
     def nullvalue(self) -> float:
         """ Return the null value """
-
         return self._nullvalue
 
     @nullvalue.setter
@@ -4575,6 +4608,16 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self._nullvalue = value
 
+    @property
+    def nodata(self) -> float:
+        """ alias for nullvalue """
+        return self._nullvalue
+
+    @nodata.setter
+    def nodata(self, value:float):
+        """ alias for nullvalue """
+        self._nullvalue = value
+
     @property
     def SelectionData(self) -> SelectionData:
         """ Return the data of the selection """
@@ -5757,23 +5800,10 @@ class WolfArray(Element_To_Draw, header_wolf):
         return mytri, znull
 
     def hillshade(self, azimuth:float, angle_altitude:float):
-        """ Create a hillshade array """
-
-        azimuth = 360.0 - azimuth
-
-        x, y = np.gradient(self.array)
-        slope = np.pi / 2. - np.arctan(np.sqrt(x * x + y * y))
-        aspect = np.arctan2(-x, y)
-        azimuthrad = azimuth * np.pi / 180.
-        altituderad = angle_altitude * np.pi / 180.
-
-        shaded = np.sin(altituderad) * np.sin(slope) + np.cos(altituderad) * np.cos(slope) * np.cos(
-            (azimuthrad - np.pi / 2.) - aspect)
-        shaded += 1.
-        shaded *= .5
+        """ Create a hillshade array  -- see "hillshade" function accelerated by JIT"""
 
         self.shaded.set_header(self.get_header())
-        self.shaded.array = shaded
+        self.shaded.array = hillshade(self.array.data, azimuth, angle_altitude)
         self.shaded.delete_lists()
 
     def get_gradient_norm(self):
@@ -7616,20 +7646,22 @@ class WolfArray(Element_To_Draw, header_wolf):
                                      WOLF_ARRAY_FULL_INTEGER16,
                                      WOLF_ARRAY_FULL_INTEGER16_2,
                                      WOLF_ARRAY_FULL_INTEGER,
-                                     WOLF_ARRAY_FULL_DOUBLE]:
+                                     WOLF_ARRAY_FULL_DOUBLE,
+                                     WOLF_ARRAY_HILLSHAPE]:
                 # FIXME: Currently, only some types are supported in Cython/OpenGL library
                 self._tmp_float32 = self.array.astype(dtype=np.float32)
             else:
                 self._tmp_float32 = None
 
 
-        # if self.shading:
-        #     pond = (self.shaded.array-.5)*2.
-        #     pmin = (1. - self.shaded.alpha) * self.rgb
-        #     pmax = self.shaded.alpha * np.ones(self.rgb.shape) + (1. - self.shaded.alpha) * self.rgb
-        #     for i in range(4):
-        #         self.rgb[pond<0,i] = self.rgb[pond<0,i] * (1.+pond[pond<0]) - pmin[pond<0,i] * pond[pond<0]
-        #         self.rgb[pond>0,i] = self.rgb[pond>0,i] * (1.-pond[pond>0]) + pmax[pond>0,i] * pond[pond>0]
+        if VERSION_RGB==1 :
+            if self.shading:
+                pond = (self.shaded.array-.5)*2.
+                pmin = (1. - self.shaded.alpha) * self.rgb
+                pmax = self.shaded.alpha * np.ones(self.rgb.shape) + (1. - self.shaded.alpha) * self.rgb
+                for i in range(4):
+                    self.rgb[pond<0,i] = self.rgb[pond<0,i] * (1.+pond[pond<0]) - pmin[pond<0,i] * pond[pond<0]
+                    self.rgb[pond>0,i] = self.rgb[pond>0,i] * (1.-pond[pond>0]) + pmax[pond>0,i] * pond[pond>0]
 
         if VERSION_RGB==1 : self.rgb[self.array.mask] = [1., 1., 1., 0.]
 
@@ -7719,11 +7751,15 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if self.wolftype != WOLF_ARRAY_HILLSHAPE and self.shading:
             self.hillshade(self.azimuthhill, self.altitudehill)
-            self.updatepalette(0)
-            self.shaded.updatepalette(0)
+
+            if VERSION_RGB==1 :
+                self.updatepalette(0)
+                self.shaded.updatepalette(0)
+
             self.shading=False
             if self.mapviewer is not None:
-                if not self.idx + '_hillshade' in self.mapviewer.get_list_keys(self.mapviewer.ARRAYS, False) :# .added['arrays'].keys():
+                from .PyDraw import draw_type
+                if not self.idx + '_hillshade' in self.mapviewer.get_list_keys(drawing_type=draw_type.ARRAYS, checked_state= None) :# .added['arrays'].keys():
                     self.mapviewer.add_object('array', newobj=self.shaded, ToCheck=True, id=self.idx + '_hillshade')
 
         try:
@@ -7739,12 +7775,14 @@ class WolfArray(Element_To_Draw, header_wolf):
                             mylist = self.mygrid[cursize]['mylists'][i, j]
                             if mylist > 0:
                                 glCallList(self.mygrid[cursize]['mylists'][i, j])
-                    except:
-                        pass
+                    except Exception as e:
+                        logging.error(_('OpenGL error in WolfArray.plot 1 -- Please report this case with the data file and the context in which the error occured'))
+                        logging.error(e)
 
             glDisable(GL_BLEND)
-        except:
-            logging.error(_('OpenGL error in WolfArray.plot -- Please report this case with the data file and the context in which the error occured'))
+        except Exception as e:
+            logging.error(_('OpenGL error in WolfArray.plot 2 -- Please report this case with the data file and the context in which the error occured'))
+            logging.error(e)
 
         self.plotting = False
 
@@ -7793,9 +7831,7 @@ class WolfArray(Element_To_Draw, header_wolf):
     def fillonecellgrid(self, curscale, loci, locj, force=False):
         """ Fill one cell of the plotted grid """
 
-
-
-        cursize = curscale  # 2**curscale
+        cursize = curscale
 
         if not cursize in self.mygrid.keys():
             return
@@ -7875,22 +7911,28 @@ class WolfArray(Element_To_Draw, header_wolf):
                             elif self.nbnotnull > 0:
                                 wolfogl.addmeall_double_pal(self.array, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
                                                 jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst))
-                        elif self.wolftype != WOLF_ARRAY_FULL_SINGLE:
+                        elif self.wolftype not in [WOLF_ARRAY_FULL_SINGLE, WOLF_ARRAY_HILLSHAPE]:
                             if self.nbnotnull != self.nbx * self.nby:
                                 if self.nbnotnull > 0:
                                     wolfogl.addme_pal(self._tmp_float32, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
-                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst))
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), -1.)
                             elif self.nbnotnull > 0:
                                 wolfogl.addmeall_pal(self._tmp_float32, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
-                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst))
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), -1.)
                         else:
+                            clr_float = self.mypal.colorsflt.copy()
+                            clr_float[:,3] = self.alpha
+                            if '_hillshade' in self.idx:
+                                clr_float[1,3] = 0.
+
                             if self.nbnotnull != self.nbx * self.nby:
                                 if self.nbnotnull > 0:
-                                    wolfogl.addme_pal(self.array, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart, jend, istart, iend, cursize,
-                                                self.nullvalue, self.alpha, int(self.mypal.interval_cst))
+
+                                    wolfogl.addme_pal(self.array, clr_float, self.mypal.values, ox, oy, dx, dy, jstart, jend, istart, iend, cursize,
+                                                self.nullvalue, self.alpha, int(self.mypal.interval_cst), -1.)
                             elif self.nbnotnull > 0:
-                                wolfogl.addmeall_pal(self.array, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart, jend, istart, iend, cursize,
-                                                self.nullvalue, self.alpha, int(self.mypal.interval_cst))
+                                wolfogl.addmeall_pal(self.array, clr_float, self.mypal.values, ox, oy, dx, dy, jstart, jend, istart, iend, cursize,
+                                                self.nullvalue, self.alpha, int(self.mypal.interval_cst), -1.)
 
                 except Exception as e:
                     logging.error(repr(e))

wolfhece/wolfresults_2D.py

@@ -243,8 +243,13 @@ class Props_Res_2D(wx.Frame):
 
         self._cm_save = wx.Button(self._panel_colormap, wx.ID_ANY, _("Save to file"), wx.DefaultPosition, wx.DefaultSize, 0)
         self._cm_save.SetToolTip(_('Save colormap on .pal file'))
+
         self._cm_load = wx.Button(self._panel_colormap, wx.ID_ANY, _("Load from file"), wx.DefaultPosition, wx.DefaultSize, 0)
         self._cm_load.SetToolTip(_('Load colormap from .pal file'))
+
+        self._cm_default_pal = wx.Button(self._panel_colormap, wx.ID_ANY, _("Load precomputed"), wx.DefaultPosition, wx.DefaultSize, 0)
+        self._cm_default_pal.SetToolTip(_('Load a default colormap available in the software'))
+
         self._cm_toimage = wx.Button(self._panel_colormap, wx.ID_ANY, _("Create image"), wx.DefaultPosition, wx.DefaultSize, 0)
         self._cm_toimage.SetToolTip(_('Generate colormap image (horizontal, vertical or both) and save to disk'))
         self._cm_distribute = wx.Button(self._panel_colormap, wx.ID_ANY, _("Distribute"), wx.DefaultPosition, wx.DefaultSize, 0)
@@ -296,7 +301,14 @@ class Props_Res_2D(wx.Frame):
 
         self._panel_colormap.sizer.Add(self._cm_choose_color, 1, wx.EXPAND)
         self._panel_colormap.sizer.Add(self._cm_apply, 1, wx.EXPAND)
-        self._panel_colormap.sizer.Add(self._cm_load, 1, wx.EXPAND)
+
+        sizer_loadpal = wx.BoxSizer(wx.HORIZONTAL)
+
+        self._panel_colormap.sizer.Add(sizer_loadpal, 1, wx.EXPAND)
+
+        sizer_loadpal.Add(self._cm_load, 1, wx.EXPAND)
+        sizer_loadpal.Add(self._cm_default_pal, 1, wx.EXPAND)
+
         self._panel_colormap.sizer.Add(self._cm_save, 1, wx.EXPAND)
         self._panel_colormap.sizer.Add(self._cm_toimage, 1, wx.EXPAND)
         self._panel_colormap.sizer.Add(self._cm_distribute, 1 , wx.EXPAND)
@@ -636,7 +648,10 @@ class Props_Res_2D(wx.Frame):
         self._Apply_Tools.Bind(wx.EVT_BUTTON, self.OnApplyTools)
         self._cm_apply.Bind(wx.EVT_BUTTON, self.Onupdatepal)
         self._cm_save.Bind(wx.EVT_BUTTON, self.Onsavepal)
+
         self._cm_load.Bind(wx.EVT_BUTTON, self.Onloadpal)
+        self._cm_default_pal.Bind(wx.EVT_BUTTON, self.Onloaddefaultpal)
+
         self._cm_toimage.Bind(wx.EVT_BUTTON, self.Onpalimage)
         self._cm_distribute.Bind(wx.EVT_BUTTON, self.Onpaldistribute)
         self._cm_choose_color.Bind(wx.EVT_BUTTON, self.OnClickColorPal)
@@ -712,7 +727,7 @@ class Props_Res_2D(wx.Frame):
         # Fill the grid
         self._parent.mypal.fillgrid(self._cm_grid)
 
-    def Onsavepal(self, event):
+    def Onsavepal(self, event:wx.MouseEvent):
         """ Save the colormap to a file """
 
         self._parent.mypal.savefile()
@@ -728,6 +743,38 @@ class Props_Res_2D(wx.Frame):
         self._parent.set_currentview()
         self.update_palette()
 
+    def Onloaddefaultpal(self, event:wx.MouseEvent):
+        """ Load default palette """
+
+        import glob
+        from pathlib import Path
+
+        # list of all .pal file in model directory
+
+        dirpal = Path(__file__).parent / 'models'
+
+        listpal = glob.glob(str(dirpal) + '/*.pal')
+
+        if len(listpal) == 0:
+            logging.info('No default palette found')
+            return
+
+        listpal = [Path(i).name for i in listpal]
+
+        dlg = wx.SingleChoiceDialog(None, 'Choose the default palette', 'Default palette', listpal)
+        ret = dlg.ShowModal()
+
+        if ret == wx.ID_CANCEL:
+            dlg.Destroy()
+
+        self._parent.mypal.readfile(str(dirpal / dlg.GetStringSelection()))
+
+        self._parent.mypal.automatic = False
+        self._cm_auto.SetValue(0)
+        self.update_palette()
+
+        self._parent.set_currentview()
+
     def Onpalimage(self, event):
         """ Export the colormap to an image """
 

{wolfhece-2.1.50.dist-info → wolfhece-2.1.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.50
+Version: 2.1.52
 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,14 +13,14 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Python: <3.11,>=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: wxpython
-Requires-Dist: colorlog ==6.7.*
+Requires-Dist: colorlog==6.7.*
 Requires-Dist: intel-fortran-rt
 Requires-Dist: scikit-learn
 Requires-Dist: cryptography
-Requires-Dist: jax ==0.4.30
+Requires-Dist: jax==0.4.30
 Requires-Dist: triangle
-Requires-Dist: numpy ==1.23.*
-Requires-Dist: pyopengl ==3.1.*
+Requires-Dist: numpy==1.23.*
+Requires-Dist: pyopengl==3.1.*
 Requires-Dist: pandas
 Requires-Dist: geopandas
 Requires-Dist: scipy
@@ -33,7 +33,7 @@ Requires-Dist: graphviz
 Requires-Dist: beautifulsoup4
 Requires-Dist: requests
 Requires-Dist: notebook
-Requires-Dist: matplotlib ==3.6.*
+Requires-Dist: matplotlib==3.6.*
 Requires-Dist: mkl
 Requires-Dist: python-gettext
 Requires-Dist: shapely
@@ -49,10 +49,10 @@ Requires-Dist: python-docx
 Requires-Dist: pygltflib
 Requires-Dist: ezdxf
 Requires-Dist: pyvista
-Requires-Dist: tqdm ==4.64.*
+Requires-Dist: tqdm==4.64.*
 Requires-Dist: osmnx
 Requires-Dist: tifffile
-Requires-Dist: numba ==0.58.*
+Requires-Dist: numba==0.58.*
 Requires-Dist: xmltodict
 Requires-Dist: opencv-python
 Requires-Dist: xarray

{wolfhece-2.1.50.dist-info → wolfhece-2.1.52.dist-info}/RECORD

@@ -11,7 +11,7 @@ wolfhece/PyDraw.py,sha256=_Rfx59LMopR0Cx00d1RRF5Gb-WNxfA2v2RjkOfm84Yo,390847
 wolfhece/PyGui.py,sha256=aRWv9tBpRl7sKEd2gHWj8Bss0ZOKbGlUYIehWHFm8WY,105008
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
-wolfhece/PyPalette.py,sha256=5TvXF5wWDxP4e70zO9B0UMgVP9c0oAzerM28aoJ1CTg,27982
+wolfhece/PyPalette.py,sha256=3ehK6H2PvqSe0zICR1HyNs6KQokR1DmnAh4LwYnLIcU,28009
 wolfhece/PyParams.py,sha256=wwgmP-_7wiiPLTcyX8a5jR6FyC1D2c4oBPc1VWQqtSA,97383
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
@@ -48,13 +48,13 @@ 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=HnrviXNSps9LFDERXyeZmI0L2ovFYY4rBHInPBZLRGw,368994
+wolfhece/wolf_array.py,sha256=4B0rihTY4yu0t8mrt99aV_3VCf0PP_K72SAFFkycclc,370660
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 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=f6ezVnKw9LFjh1ynYkga-llDIsDF3BPpR-GYX38-YfE,166127
+wolfhece/wolfresults_2D.py,sha256=J6GBaLlwtRQKRsFnZzvxc-5m9QVSzN0xCiMJA-yXIHs,167541
 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
@@ -72,7 +72,7 @@ wolfhece/apps/check_install.py,sha256=SG024u18G7VRLKynbp7DKD1jImtHwuWwN4bJWHm-YH
 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=3OLK8XkmHW4Hi1ttOxzIDZZILVtXKvYakGuhqG-0N4U,388
+wolfhece/apps/version.py,sha256=9OZ-YcusCh_gbdccX8m4dCLa-9wqi_9uiTxPepfbdRA,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
@@ -191,7 +191,7 @@ wolfhece/libs/vcomp100.dll,sha256=NKvXc8hc4MrFa9k8ErALA6OmldGfR3zidaZPCZhMVJI,57
 wolfhece/libs/vcruntime140.dll,sha256=gPBsB0DzEBn3b7E5ihESs-AtG4Cu59OnONR1QI17TGA,98720
 wolfhece/libs/vcruntime140_1.dll,sha256=KZJoe26L6i76Krqne_OribgfhN6LxJQEcs0Xn_01hP8,38304
 wolfhece/libs/verify_wolf.cp310-win_amd64.pyd,sha256=Cej6r7o8cOF58sXs97kjPN4ddd-ZjDyYZ_WkR0Nmivo,128512
-wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=e27Epa44wBSrXiwzeUpl2ud8oCPJpFbfWd_5P5l6sAo,294912
+wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=l2ZpPh_dGLWcvYxM0BdLHhfSYrLhQI5rT59rRwyQjCY,296448
 wolfhece/libs/wolfpy.cp310-win_amd64.pyd,sha256=6omqEaxmQll-Gg24e90wVomAB9rO_tyyOES2FewXn58,36457472
 wolfhece/libs/zlib1.dll,sha256=E9a0e62VgmG1A8ohZzhVCmmfGtbyXxXu4aFeADTNJ30,77824
 wolfhece/libs/GL/gl.h,sha256=IhsS_fOLa8GW9MpiLZebe9QYRy6uIB_qK_uQMWMOoeg,46345
@@ -224,10 +224,12 @@ wolfhece/models/Froude.pal,sha256=FmrvUI01fv4k0ygqDJEYdC1M9Fn72Sr6Sn2IlZAm0KA,13
 wolfhece/models/HECE_169.pptx,sha256=OWJtsWz504A-REFaaxw8lwStHyQU2l7KEeiE7IZvtbk,3396930
 wolfhece/models/Risque_TAF.pal,sha256=Tnbx-_gIyCszzwmwo0I9vvFfVVKmATjFXS89AoZwTOs,135
 wolfhece/models/blue.pal,sha256=s9-wEPzSiKMMHuKofUB2FPjmyO7HfGM2xWaUJwsKAY8,39
+wolfhece/models/blues.pal,sha256=0ZEU1p9EcKwsCvNjU0s9_9aVakqQ71LDNoddVBAluEs,509
 wolfhece/models/classes.pal,sha256=3gbCVboKhCYJZYOZVHeIco1kJJuSg0VE8BvX5JK6fTU,273
 wolfhece/models/diff16.pal,sha256=Pkp9kQ1GvmAKz3lgwohsw8eQySjVVKHbjhoWw-gZ6Nc,303
 wolfhece/models/diff3.pal,sha256=qk-yGgJr_FHdW7p7i93GFsH9ClT0dl5nqa9G1lLh7Z0,50
 wolfhece/models/haut_coul.pal,sha256=eEwfZ-noqp09YvH3uvElLRgf4xcgaZIfyk4ntqlVTss,496
+wolfhece/models/mako.pal,sha256=F988XGge2o7edAoQwU2CR-40daEz5uA0Bi4_12Ekj8Y,8624
 wolfhece/models/red.pal,sha256=W6oeIjDCoGCsJDZPH2K4jfyfPmCMlH9rfRi4PTs-n28,33
 wolfhece/models/reg_20cm.pal,sha256=S_lFMUkc_L9ih0k0XnOG7W9_PCg9J2Lm9ZMS-nloJ1E,366
 wolfhece/models/shields.pal,sha256=TwPhfaly2j3ZRM5ahlz7xH19NArZlalxYNy1L_UnJoA,166
@@ -247,8 +249,8 @@ wolfhece/pythonfortran/example_numpy_memory.py,sha256=o3hzJDw7YtE4v0FXI3-l2VzupC
 wolfhece/pythonfortran/tools.py,sha256=oYh9MguRYEGNGKVbHqQW2V9okZJLs3n4Qs-vLWPmBe4,2462
 wolfhece/radar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/radar/wolfradar.py,sha256=mvsVf6-4KCqVF6kWsKfPuM7KPqRdYHuIZAbb8kzXAZU,10032
-wolfhece/rem/REMMaker.py,sha256=xPEnjOJCDzAjf2k1SzQI1oSj4mbrcCD9PTOV3HlXCoM,31088
-wolfhece/rem/RasterViz.py,sha256=JaAdbJHjvrNpJ5kuMNY-JPDTSRWm0Pw6k3JNGoWp5HQ,29426
+wolfhece/rem/REMMaker.py,sha256=k1kOb_69kNw00HRPbTc_E2XTypiyV0mADDbW5etkBAs,31079
+wolfhece/rem/RasterViz.py,sha256=fnyMfAJZDoS-rjagsNRGLndS-UYNUzMY4DgenjD3Y_4,29068
 wolfhece/rem/__init__.py,sha256=S2-J5uEGK_VaMFjRUYFIdSScJjZyuXH4RmMmnG3OG7I,19
 wolfhece/report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/report/reporting.py,sha256=JUEXovx_S4jpYkJEBU0AC-1Qw2OkkWyV3VAp6iOfSHc,19494
@@ -278,8 +280,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.50.dist-info/METADATA,sha256=hDyP3-DlayT9vmBCHDj-deR_EczWlyXfofxjPknApok,2548
-wolfhece-2.1.50.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.50.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.50.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.50.dist-info/RECORD,,
+wolfhece-2.1.52.dist-info/METADATA,sha256=dUwuLJdHXEFQCK3QEjlpob02jeFO6Ix1VENGT7JnBSk,2541
+wolfhece-2.1.52.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.52.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.52.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.52.dist-info/RECORD,,