wolfhece 2.1.51__py3-none-any.whl → 2.1.53__py3-none-any.whl

wolfhece/wolf_array.py

@@ -1521,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)
@@ -2681,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()
@@ -2731,9 +2732,13 @@ class Ops_Array(wx.Frame):
                 curarray.shading = True
 
             alpha = float(self.palalphahillshade.GetValue()) / 100.
-            if curarray.shaded.alpha != alpha:
-                curarray.shaded.alpha = alpha
-                curarray.shading = True
+
+            if curarray.shaded is None:
+                logging.error('No shaded array')
+            else:
+                if curarray.shaded.alpha != alpha:
+                    curarray.shaded.alpha = alpha
+                    curarray.shading = True
 
         if dellists:
             self.refresh_array()
@@ -4443,6 +4448,25 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self.add_ops_sel() # Ajout d'un gestionnaire de sélection et d'opérations
 
+    def set_opacity(self, alpha:float):
+        """ Set the transparency of the array """
+
+        if alpha <0.:
+            alpha = 0.
+
+        if alpha > 1.:
+            alpha = 1.
+
+        self.alpha = alpha
+
+        if self.myops is not None:
+            self.myops.palalpha.SetValue(0)
+            self.myops.palalphaslider.SetValue(int(alpha*100))
+
+        self.reset_plot()
+
+        return self.alpha
+
     @property
     def memory_usage(self):
         """
@@ -4599,7 +4623,6 @@ class WolfArray(Element_To_Draw, header_wolf):
     @property
     def nullvalue(self) -> float:
         """ Return the null value """
-
         return self._nullvalue
 
     @nullvalue.setter
@@ -4608,6 +4631,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 """
@@ -5792,6 +5825,10 @@ class WolfArray(Element_To_Draw, header_wolf):
     def hillshade(self, azimuth:float, angle_altitude:float):
         """ Create a hillshade array  -- see "hillshade" function accelerated by JIT"""
 
+        if self.shaded is None:
+            logging.error(_('No shaded array'))
+            return
+
         self.shaded.set_header(self.get_header())
         self.shaded.array = hillshade(self.array.data, azimuth, angle_altitude)
         self.shaded.delete_lists()
@@ -7205,6 +7242,29 @@ class WolfArray(Element_To_Draw, header_wolf):
         else:
             logging.warning(_('Type not supported : ')+str(self.dtype))
 
+    def fillin_from_ijz(self, ijz:np.ndarray):
+        """ Remplissage du tableau à partir d'un tableau ijz """
+
+        try:
+            i = ijz[:, 0].astype(int)
+            j = ijz[:, 1].astype(int)
+        except Exception as e:
+            logging.error(_('Error in conversion of ijz to int : ')+str(e))
+            return
+
+        if self.dtype == np.float32:
+            self.array.data[i, j] = np.float32(ijz[:, 2])
+        elif self.dtype == np.float64:
+            self.array.data[i, j] = np.float64(ijz[:, 2])
+        elif self.dtype == np.int32:
+            self.array.data[i, j] = np.int32(ijz[:, 2])
+        elif self.dtype == np.int16:
+            self.array.data[i, j] = np.int16(ijz[:, 2])
+        elif self.dtype == np.int8:
+            self.array.data[i, j] = np.int8(ijz[:, 2])
+        else:
+            logging.warning(_('Type not supported : ')+str(self.dtype))
+
     def mask_force_null(self):
         """
         Force to unmask all and mask null value

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 """
 
@@ -1722,6 +1769,18 @@ class OneWolfResult:
 
         self.mngselection = SelectionData(self._current)
 
+    def set_opacity(self, alpha:float):
+        """ Set the transparency of the array """
+
+        if alpha <0.:
+            alpha = 0.
+
+        if alpha > 1.:
+            alpha = 1.
+
+        self.alpha = alpha
+
+        return self.alpha
 
     @property
     def min_field_size(self):
@@ -2185,6 +2244,16 @@ class Wolfresults_2D(Element_To_Draw):
         self.myops = None
         self._active_blocks = 0
 
+
+    def set_opacity(self, alpha:float):
+        """ Set the transparency of the array """
+
+        self.alpha = alpha
+
+        self.reset_plot()
+
+        return self.alpha
+
     @property
     def SelectionData(self) -> SelectionDataMB:
         """ Return the data of the selection """
@@ -2352,6 +2421,13 @@ class Wolfresults_2D(Element_To_Draw):
 
     @alpha.setter
     def alpha(self, value:float):
+
+        if value <0.:
+            value = 0.
+
+        if value > 1.:
+            value = 1.
+
         for i in range(self.nb_blocks):
             self[i].alpha = value
 
@@ -4137,6 +4213,7 @@ class Wolfresults_2D(Element_To_Draw):
 
     def reset_plot(self,whichpal=0):
         """Reset du dessin"""
+
         self.delete_lists()
         self.get_working_array()
         self.updatepalette(whichpal)

{wolfhece-2.1.51.dist-info → wolfhece-2.1.53.dist-info}/METADATA

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

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=uL1DJVmDI2xVSE7H6n3icn3QbsPtTHeg8E-6wkDloKw,476914
 wolfhece/PyConfig.py,sha256=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=_Rfx59LMopR0Cx00d1RRF5Gb-WNxfA2v2RjkOfm84Yo,390847
+wolfhece/PyDraw.py,sha256=lUdilikBoeFPN4LgyqIb3j6dYMbraLjrRJC1ZLGz4OU,399455
 wolfhece/PyGui.py,sha256=aRWv9tBpRl7sKEd2gHWj8Bss0ZOKbGlUYIehWHFm8WY,105008
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -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=-8D5YtLIC79-mk7LcRsOQ6fFRMBoUAc_p3ulrxxaiEc,370408
+wolfhece/wolf_array.py,sha256=D_m0Ap85wGp94zXtk5hJlorn98tQjKFLKHqCqZEId2c,372225
 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=1rzkcZtS6Y8bn8izX-kTePpstrPi9TiOkw9XBueG1fk,168078
 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=v7Yu3aHd9cB-wNpcJSWRz8Ru3iyXgqym6gfyLAymfjE,388
+wolfhece/apps/version.py,sha256=bJO-UJatgh92ntk1GePpqNMUqpjjt1S7VkCtLXOP6kE,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
@@ -143,7 +143,7 @@ wolfhece/lagrangian/particles.py,sha256=S52_-3rzgVhift6l4Gznvsf_RTggzvNaD1dPvQUr
 wolfhece/lagrangian/velocity_field.py,sha256=oGVjNm98gEpawreFIrC1lDyC5bEhkk2CsyYAlF1Kq50,10574
 wolfhece/lazviewer/__init__.py,sha256=0SNDEKGad6e2AwxjalcPqb2bdW6crmXQFxWUY13PiVU,223
 wolfhece/lazviewer/_add_path.py,sha256=GDwPnzHuGRXGriDNcu1SQ6HetFDGIApeAQZEzYArGvI,605
-wolfhece/lazviewer/laz_viewer.py,sha256=EHg-7MGRASevT3tmOwIGWdZZqo8cvEbTt8J2Ei9v1X8,42205
+wolfhece/lazviewer/laz_viewer.py,sha256=duHEeLb4GpwY9TxHqrDaamZ4IBx7VyoU_mdpDRqA-BI,42667
 wolfhece/lazviewer/libs/Qt5Core.dll,sha256=sTJ_ctYFY9KHMNytF-lzH_078zIvnKTjN-71FDkOWPw,4924928
 wolfhece/lazviewer/libs/Qt5Gui.dll,sha256=07BeaOeYByraGkKYeDiSDYLawHM8tyd55pVJlKbZ4Y0,5436416
 wolfhece/lazviewer/libs/Qt5Network.dll,sha256=U-9FiLE9LUKru8r8EQxTnwwlMpwS8JzUtenhkKTCox0,1038336
@@ -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
@@ -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.51.dist-info/METADATA,sha256=QE7DXFrJsneMtWd4s8LYYAPYtycGTAGsF3RYO8exoSo,2541
-wolfhece-2.1.51.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.51.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.51.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.51.dist-info/RECORD,,
+wolfhece-2.1.53.dist-info/METADATA,sha256=dr2FjHrOvOyyI9-bFpd9KIcWNHjXTGtbEUcJyfQZwEI,2541
+wolfhece-2.1.53.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.53.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.53.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.53.dist-info/RECORD,,