wolfhece 2.1.115__py3-none-any.whl → 2.1.117__py3-none-any.whl

wolfhece/PyPalette.py

@@ -158,7 +158,12 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
             if minval == -99999:
                 dlg = wx.TextEntryDialog(None, _('Minimum value'), value=str(self.values[0]))
                 ret = dlg.ShowModal()
-                self.values[0] = dlg.GetValue()
+
+                try:
+                    self.values[0] = float(dlg.GetValue())
+                except:
+                    logging.warning('Bad value for minimum - No change')
+
                 dlg.Destroy()
             else:
                 self.values[0] = minval
@@ -172,12 +177,24 @@ class wolfpalette(wx.Frame, LinearSegmentedColormap):
                 if ret == wx.ID_YES:
                     dlg = wx.TextEntryDialog(None, _('Step value'), value='1')
                     ret = dlg.ShowModal()
-                    step = float(dlg.GetValue())
+
+                    try:
+                        step = float(dlg.GetValue())
+                    except:
+                        logging.warning('Bad value for step - using default value 0.1 m')
+                        step = 0.1
+
                     dlg.Destroy()
                 else:
                     dlg = wx.TextEntryDialog(None, _('Maximum value'), value=str(self.values[-1]))
                     ret = dlg.ShowModal()
-                    self.values[-1] = float(dlg.GetValue())
+
+                    try:
+                        self.values[-1] = float(dlg.GetValue())
+                    except:
+                        logging.warning('Bad value for maximum - using min value + 1 m')
+                        self.values[-1] = self.values[0] + 1.
+
                     dlg.Destroy()
 
             elif maxval != -99999:

wolfhece/PyParams.py

@@ -485,6 +485,21 @@ class Wolf_Param(wx.Frame):
         """ Return the number of incrementable groups """
         return len(self.myIncGroup.keys())
 
+    def get_group_keys(self) -> list[str]:
+        """ Return the keys of the active parameters """
+        return list(self.myparams.keys())
+
+    def get_default_group_keys(self) -> list[str]:
+        """ Return the keys of the default parameters """
+        return list(self.myparams_default.keys())
+
+    def get_param_keys(self, group:str) -> list[str]:
+        """ Return the keys of the active parameters """
+        if group in self.myparams.keys():
+            return list(self.myparams[group].keys())
+        else:
+            return []
+
     @property
     def callback(self):
         """ Return the callback function """
@@ -738,6 +753,18 @@ class Wolf_Param(wx.Frame):
     def SavetoFile(self, event:wx.MouseEvent):
         """ sauvegarde dans le fichier texte """
 
+        self.save()
+
+    def Save(self, filename:str = ''):
+        """ Save the parameters in a file """
+
+        if filename != '':
+            self.filename = filename
+
+        if self.filename=='':
+            logging.warning(_('No filename given'))
+            return
+
         with open(self.filename, 'w') as myfile:
 
             for group in self.myparams.keys():
@@ -745,8 +772,6 @@ class Wolf_Param(wx.Frame):
                 for param_name in self.myparams[group].keys():
                     myfile.write(param_name +'\t' + str(self.myparams[group][param_name][key_Param.VALUE])+'\n')
 
-            myfile.close()
-
     def Reload(self, event:wx.MouseEvent):
         """ relecture du fichier sur base du nom déjà connu """
         if self.filename=='':

wolfhece/apps/version.py

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

wolfhece/lazviewer/laz_viewer.py

@@ -43,6 +43,8 @@ class Colors_Lazviewer(Enum):
 class Classification_LAZ():
 
     def __init__(self) -> None:
+
+        self.class_name = 'SPW-Geofit 2023'
         self.classification:dict[str,str,list[float,float,float,float]] = {}
         self.test_wx()
 
@@ -53,6 +55,7 @@ class Classification_LAZ():
 
     def init_2013(self):
 
+        self.class_name = 'SPW 2013-2014'
         self.classification={
             0  : ['0', 'Pas de classification', Colors.rgb_withalpha_float('black',.2),],
             1  : ['Hors-sol', 'building, toits et autres', Colors.rgb_withalpha_float('white',.2),],
@@ -63,6 +66,7 @@ class Classification_LAZ():
 
     def init_2023(self):
 
+        self.class_name = 'SPW-Geofit 2023'
         self.classification={
             0  : ['0', 'Pas de classification', Colors.rgb_withalpha_float('black',.2),],
             1  : ['Défaut', 'Voiture, câbles électrique, points de végétation diffus, Sursol non utile', Colors.rgb_withalpha_float('white',.2),],

wolfhece/wolf_tiles.py

@@ -56,8 +56,8 @@ class Tiles(Zones):
 
     def set_comp_dir(self, comp_dir:str = None):
         """
-        Ajout d'un répertoire de comparaison
-        Si le répertoire de comparaison est différent de celui des données alors la valeur renvoyée sera le différentiel
+        Ajout d'un répertoire de comparaison.
+        Si le répertoire de comparaison est différent de celui des données alors la valeur renvoyée sera le différentiel.
 
         Delta = comparaison - source
         """

{wolfhece-2.1.115.dist-info → wolfhece-2.1.117.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wolfhece
-Version: 2.1.115
+Version: 2.1.117
 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.115.dist-info → wolfhece-2.1.117.dist-info}/RECORD

@@ -5,14 +5,14 @@ wolfhece/GraphProfile.py,sha256=OCgJo0YFFBI6H1z-5egJsOOoWF_iziiza0-bbPejNMc,6965
 wolfhece/Lidar2002.py,sha256=bX-nIzdpjD7rOfEgJpTeaW6rIdAXwDp_z4YTM9CgANY,6068
 wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
-wolfhece/PyConfig.py,sha256=Bb1T8qjgKMChadJYDrHO9uo6CwItiAXScZpYkDXqZF8,11387
+wolfhece/PyConfig.py,sha256=gyl1MesSJZaVpC1XtvD78PpnE1VD3hGM3HPQXTJ3eJg,12963
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=efChYsrkRWnVYJJecpVJoUUEajOGus6_05OHrmKMfc0,502367
+wolfhece/PyDraw.py,sha256=4WS6eJ30xWx_vJPuiusn9Jnee3ujN7cMJGiMfVTSJOk,525450
 wolfhece/PyGui.py,sha256=RlrLoCBdbiMnR4FSUD1yuy8fs--hxUl_zPu7zuduCLE,144706
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
-wolfhece/PyPalette.py,sha256=n3Aj6vgxj8LCN-aNR4Q9NY215Cf4GMthb33UGsl3BUg,31828
-wolfhece/PyParams.py,sha256=GRp1zZDUJIjs8PtjwScDdov-E9orr1JWOntDazN5AOw,98577
+wolfhece/PyPalette.py,sha256=Ayz0lqOPfUgjPpqvxragBSd7v47Z79roEy7thwVlH7M,32370
+wolfhece/PyParams.py,sha256=u_yGvrUqgLLkytZ7lGCIFi-7rQC0H2vRDw-MtmdvKPQ,99394
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=qFf8UPvkbwumRRfjpBcgZmqpHtcEtIEoUh30rWFF-lQ,45205
@@ -55,7 +55,7 @@ wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
 wolfhece/wolf_array.py,sha256=tmNeSS0MgZCxoxqHWb3ZW-HdeZCbWYDTq4C80WG7nWs,427777
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=ecoXXmmcLuyG1oPqU2dB_k03qMTCLTVQoSq1xi1EalU,17359
-wolfhece/wolf_tiles.py,sha256=-YfTelZjpfgqZXd1yMsGFajz_oDISXkC0zB5fW-8MBY,10486
+wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
 wolfhece/wolf_vrt.py,sha256=NcPZYW4bu06IpqQuiutoAhCvDkeZ3TzOVb8z4wTQ1h8,14319
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
 wolfhece/wolfresults_2D.py,sha256=GbuYSN1haTctY9AqUyAt1xQCOVpoUgSURD9d2XIqRXw,184827
@@ -80,7 +80,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=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=EyQh37QGtlBEUyYiAlz_IouaM-UGYFtRP6aZcJqEcwg,389
+wolfhece/apps/version.py,sha256=78epDKXV-PQjaa5Lw4DEWQ98ocEOTdy4DngHeOxmCa4,389
 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
@@ -154,7 +154,7 @@ wolfhece/lagrangian/particles.py,sha256=S52_-3rzgVhift6l4Gznvsf_RTggzvNaD1dPvQUr
 wolfhece/lagrangian/velocity_field.py,sha256=oGVjNm98gEpawreFIrC1lDyC5bEhkk2CsyYAlF1Kq50,10574
 wolfhece/lazviewer/__init__.py,sha256=lz60EpQOBZ-zjvYzff6Y11jzAmC7mjOaxRYAfoqizQs,473
 wolfhece/lazviewer/_add_path.py,sha256=GDwPnzHuGRXGriDNcu1SQ6HetFDGIApeAQZEzYArGvI,605
-wolfhece/lazviewer/laz_viewer.py,sha256=RENRGgW5BYaM97i6a0D5tgqtTswt3bJ7h5LPNqj5QQA,44124
+wolfhece/lazviewer/laz_viewer.py,sha256=bCfMzEr4w3OwQEQKHhAaDudQ2fcj6vot7g3f7zod1iE,44259
 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
@@ -293,8 +293,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.115.dist-info/METADATA,sha256=qEqSZhvJvgQbQKdX-NHur3c_tbeYO7QeQYkDWrPvTlE,2587
-wolfhece-2.1.115.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wolfhece-2.1.115.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.115.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.115.dist-info/RECORD,,
+wolfhece-2.1.117.dist-info/METADATA,sha256=iHYdNpmm0UZPQ3tfZVdkFMm8E_N9LLzEnEeJpvROUHU,2587
+wolfhece-2.1.117.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wolfhece-2.1.117.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.117.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.117.dist-info/RECORD,,