wolfhece 2.1.122__py3-none-any.whl → 2.1.124__py3-none-any.whl

wolfhece/PyDraw.py

@@ -5355,7 +5355,7 @@ class WolfMapViewer(wx.Frame):
                     except Exception as e:
                         logging.error(_('Error in tiles import : ')+ str(e))
                 else:
-                    logging.warning(_('File does not exist : ')+ curfile)
+                    logging.warning(_('File does not exist : ')+ str(curfile))
             else:
                 logging.warning(_('Bad parameter in project file - tiles'))
 
@@ -5386,7 +5386,7 @@ class WolfMapViewer(wx.Frame):
                         except Exception as e:
                             logging.error(_('Error in vector import : ')+ str(e))
                     else:
-                        logging.info(_('File does not exist : ') + name)
+                        logging.info(_('File does not exist : ') + str(name))
             else:
                 logging.warning(_('Bad parameter in project file - vector'))
 
@@ -5406,7 +5406,7 @@ class WolfMapViewer(wx.Frame):
                         except Exception as e:
                             logging.error(_('Error in array import : ')+ str(e))
                     else:
-                        logging.info(_('File does not exist : ') + name)
+                        logging.info(_('File does not exist : ') + str(name))
             else:
                 logging.warning(_('Bad parameter in project file - array'))
 
@@ -5426,7 +5426,7 @@ class WolfMapViewer(wx.Frame):
                         except Exception as e:
                             logging.error(_('Error in cloud import : ') + str(e))
                     else:
-                        logging.info(_('File does not exist : ') + name)
+                        logging.info(_('File does not exist : ') + str(name))
             else:
                 logging.warning(_('Bad parameter in project file - cloud'))
 
@@ -5448,7 +5448,7 @@ class WolfMapViewer(wx.Frame):
                         except Exception as e:
                             logging.error(_('Error in wolf2d import : ')+ str(e))
                     else:
-                        logging.info(_('Directory does not exist ')) + simdir
+                        logging.info(_('Directory does not exist ')) + str(simdir)
 
                 self.menu_wolf2d()
             else:
@@ -5473,7 +5473,7 @@ class WolfMapViewer(wx.Frame):
                         except Exception as e:
                             logging.error(_('Error in gpu2d import : ')+ str(e))
                     else:
-                        logging.info(_('Bad directory : ') + simdir)
+                        logging.info(_('Bad directory : ') + str(simdir))
 
                     pgbar.Update(pgbar.GetValue() + 1)
 
@@ -5500,9 +5500,9 @@ class WolfMapViewer(wx.Frame):
 
                             self.project_pal[curid] = mypal
                         else:
-                            logging.warning(_('Bad palette file : ')+ name)
+                            logging.warning(_('Bad palette file : ')+ str(name))
                     else:
-                        logging.info(_('Bad parameter in project file - palette : ')+ name)
+                        logging.info(_('Bad parameter in project file - palette : ')+ str(name))
             else:
                 logging.warning(_('Bad parameter in project file - palette'))
 
@@ -5530,11 +5530,11 @@ class WolfMapViewer(wx.Frame):
                                     curarray.updatepalette(0)
                                     curarray.reset_plot()
                                 else:
-                                    logging.warning(_('Bad parameter in project file - palette-array : ')+ id_array)
+                                    logging.warning(_('Bad parameter in project file - palette-array : ')+ str(id_array))
                             except Exception as e:
                                 logging.error(_('Error in palette-array link : ')+ str(e))
                         else:
-                            logging.warning(_('Bad parameter in project file - palette-array : ')+ id_pal)
+                            logging.warning(_('Bad parameter in project file - palette-array : ')+ str(id_pal))
                 else:
                     logging.warning(_('No palettes found in project file ! -- Add palette group in the .proj'))
             else:
@@ -6598,12 +6598,13 @@ class WolfMapViewer(wx.Frame):
         dlg = wx.SingleChoiceDialog(None, _("Pick a colormap"), "Choices", choices)
 
         if self.active_laz is not None:
-            dlg.SetSelection(ass_values.index(self.active_laz.associated_color))
+            if self.active_laz.associated_color is not None:
+                dlg.SetSelection(ass_values.index(self.active_laz.associated_color))
 
         ret = dlg.ShowModal()
         if ret == wx.ID_CANCEL:
             dlg.Destroy()
-            return
+            return self.active_laz.associated_color
 
         colormap = dlg.GetStringSelection()
         idx = choices.index(colormap)
@@ -9467,7 +9468,7 @@ class WolfMapViewer(wx.Frame):
         # all_ids = self.get_list_keys(None, checked_state=None)
         if id.lower() in all_ids:
             endid = 1
-            while (id + str(endid).zfill(3)).lower() in ids:
+            while (id + str(endid).zfill(3)).lower() in all_ids:
                 endid += 1
             id = id + str(endid).zfill(3)
 
@@ -10249,7 +10250,10 @@ class WolfMapViewer(wx.Frame):
 
                 xyz = self.selected_object.xyz_selected
                 if xyz.shape[0] ==0:
-                    logging.warning('No points selected')
+                    logging.warning(_('No points selected'))
+
+                    if self.selected_object._myprops[('Selection', 'Codes')] != '':
+                        logging.info(_('You filtered the points with the codes : {}'.format(self.selected_object._myprops[('Selection', 'Codes')])))
                     return
 
                 if xyz.shape[0] > 100000:
@@ -11044,6 +11048,8 @@ class WolfMapViewer(wx.Frame):
         pos = e.GetPosition()
 
         ctrldown = e.ControlDown()
+        altdown = e.AltDown()
+        shiftdown = e.ShiftDown()
 
         x, y = self.getXY(pos)
 
@@ -11053,7 +11059,7 @@ class WolfMapViewer(wx.Frame):
         self.oneclick = False
         self.setbounds()
 
-        if ctrldown:
+        if shiftdown:
             if self.active_array is not None:
                 if self.active_viewer3d is not None:
                     self.active_viewer3d.force_view(self.mousex, self.mousey, self.active_array.get_value(self.mousex, self.mousey))

wolfhece/apps/version.py

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

wolfhece/lazviewer/laz_viewer.py

@@ -123,7 +123,7 @@ class Classification_LAZ():
 def choices_laz_colormap() -> list[str]:
 
     choices = [cur.name for cur in Colors_Lazviewer]
-    values  = [cur.value for cur in Colors_Lazviewer]
+    values  = [cur for cur in Colors_Lazviewer]
 
     return choices, values
 
@@ -699,8 +699,8 @@ class xyz_laz_grids():
         figmpl = MplFig(PRESET_LAYOUTS.DEFAULT)
 
         logging.info(_('Plotting'))
-        figmpl.plot(up_s,   up_z,  c=up_color  ,marker='.')
-        figmpl.plot(down_s, down_z,c=down_color,marker='+')
+        figmpl.scatter(up_s,   up_z,  c=up_color  ,marker='.')
+        figmpl.scatter(down_s, down_z,c=down_color,marker='+')
 
         if show:
             figmpl.Show()
@@ -764,7 +764,7 @@ class Wolf_LAZ_Data(Element_To_Draw):
         self.classification = Classification_LAZ() # Classification of LAZ data --> defining colors if codification is used
         self.classification.init_2023() # Default classification for LAZ data
 
-        self._associated_color:int = Colors_Lazviewer.CODE_2023.value # Associated color type for LAZ data
+        self._associated_color:int = Colors_Lazviewer.CODE_2023 # Associated color type for LAZ data
 
         self.viewer:viewer = None       # PPTK viewer
 
@@ -792,7 +792,7 @@ class Wolf_LAZ_Data(Element_To_Draw):
 
     def serialize(self):
         """ Serialize class : data and attributes """
-        return {'bounds':self._bounds, 'data':str(self._filename) + '.npz', 'associated_color':self._associated_color,
+        return {'bounds':self._bounds, 'data':str(self._filename) + '.npz', 'associated_color':self._associated_color.value,
                 'point_size':self._point_size, 'bg_color':self._bg_color, 'bg_color_top':self._bg_color_top,
                 'bg_color_bottom':self._bg_color_bottom, 'floor_level':self._floor_level, 'floor_color':self._floor_color,
                 'show_grid':self._show_grid, 'show_axis':self._show_axis, 'show_info':self._show_info}
@@ -838,8 +838,12 @@ class Wolf_LAZ_Data(Element_To_Draw):
         return self._associated_color
 
     @associated_color.setter
-    def associated_color(self, value:int):
-        self._associated_color = value
+    def associated_color(self, value:int | Colors_Lazviewer):
+
+        if isinstance(value, int):
+            self._associated_color = Colors_Lazviewer(value)
+        else:
+            self._associated_color = value
         self.set_colors()
 
     def merge(self, other:"Wolf_LAZ_Data"):
@@ -1331,9 +1335,9 @@ class Wolf_LAZ_Data(Element_To_Draw):
         ret = props.addparam('Floor', 'Level', self._floor_level, Type_Param.Float, 'Floor level')
         ret = props.addparam('Floor', 'Color', self._floor_color, Type_Param.Color, 'Floor color')
 
-        ret = props.addparam('Infos', 'Grid', self._show_grid, Type_Param.Logical, 'Show grid')
-        ret = props.addparam('Infos', 'Axis', self._show_axis, Type_Param.Logical, 'Show axis')
-        ret = props.addparam('Infos', 'values', self._show_info, Type_Param.Logical, 'Show info')
+        # ret = props.addparam('Infos', 'Grid', self._show_grid, Type_Param.Logical, 'Show grid')
+        # ret = props.addparam('Infos', 'Axis', self._show_axis, Type_Param.Logical, 'Show axis')
+        # ret = props.addparam('Infos', 'values', self._show_info, Type_Param.Logical, 'Show info')
 
         ret = props.addparam('Points', 'Size', self._point_size, Type_Param.Float, 'Point size')
 
@@ -1426,7 +1430,7 @@ class Wolf_LAZ_Data(Element_To_Draw):
                 xyz[i,0] = float(xls.GetCellValue(i,0))
                 xyz[i,1] = float(xls.GetCellValue(i,1))
                 xyz[i,2] = float(xls.GetCellValue(i,2))
-                codes[i] = int(xls.GetCellValue(i,3))
+                codes[i] = float(xls.GetCellValue(i,3))
         except Exception as e:
             logging.error(e)
             logging.warning(_('Bad values in grid - Check your input'))
@@ -1556,9 +1560,9 @@ class Wolf_LAZ_Data(Element_To_Draw):
         color = np.asarray(props[('Floor', 'Color')])
         self.floor_color(color / 255.)
 
-        self.show_grid(props[('Infos', 'Grid')])
-        self.show_axis(props[('Infos', 'Axis')])
-        self.show_info(props[('Infos', 'values')])
+        # self.show_grid(props[('Infos', 'Grid')])
+        # self.show_axis(props[('Infos', 'Axis')])
+        # self.show_info(props[('Infos', 'values')])
 
         self.point_size = props[('Points', 'Size')]
 
@@ -1568,7 +1572,7 @@ class Wolf_LAZ_Data(Element_To_Draw):
             self._select_only_codes = list(set([int(curcode) for curcode in codes_sel]))
         except Exception as e:
             logging.error(e)
-            logging.warning(_('Nullify selection filter - Check your input'))
+            logging.warning(_('Nullify selection filter - Check your input - Must be a list of integers separated by commas'))
             self._select_only_codes = []
 
     def _fill_props(self, full:bool = False):
@@ -1599,9 +1603,9 @@ class Wolf_LAZ_Data(Element_To_Draw):
             props[('Floor', 'Level')] = self._floor_level
             props[('Floor', 'Color')] = self._floor_color
 
-            props[('Infos', 'Grid')] = self._show_grid
-            props[('Infos', 'Axis')] = self._show_axis
-            props[('Infos', 'values')] = self._show_info
+            # props[('Infos', 'Grid')] = self._show_grid
+            # props[('Infos', 'Axis')] = self._show_axis
+            # props[('Infos', 'values')] = self._show_info
 
             props[('Points', 'Size')] = self._point_size
 
@@ -1610,6 +1614,15 @@ class Wolf_LAZ_Data(Element_To_Draw):
     def show_properties(self):
         """ Surcharged method (see Element_To_Draw) to show properties from MapViewer"""
         if self.viewer is None:
+            logging.info(_('No viewer / No properties'))
+            return
+
+        # test if a connexion exists
+        try:
+            lookat = self.viewer.get('lookat')
+        except:
+            self.viewer = None
+            logging.info(_('No viewer / No properties'))
             return
 
         self._create_props()

wolfhece/matplotlib_fig.py

@@ -2102,13 +2102,13 @@ class Matplotlib_Figure(wx.Frame):
 
         ax.scatter(x, y, **kwargs)
 
-        new_props = Matplolib_line_properties(ax.get_lines()[-1], self._axes_properties[idx_ax])
+        # new_props = Matplolib_line_properties(ax.get_lines()[-1], self._axes_properties[idx_ax])
 
-        if self.wx_exists:
-            new_props.add_props_to_sizer(self._collaps_pane.GetPane(), self._sizer_grid_props)
+        # if self.wx_exists:
+        #     new_props.add_props_to_sizer(self._collaps_pane.GetPane(), self._sizer_grid_props)
 
         ax_prop:Matplotlib_ax_properties = self._axes_properties[idx_ax]
-        ax_prop._lines.append(new_props)
+        # ax_prop._lines.append(new_props)
         ax_prop.get_properties()
 
         if self.wx_exists:

wolfhece/scenario/update_void.py

@@ -150,7 +150,7 @@ class Update_Sim:
         """
         pass
 
-    def update_deck(self, roof:WolfArray):
+    def update_deck(self, deck:WolfArray):
         """
         FR
 

{wolfhece-2.1.122.dist-info → wolfhece-2.1.124.dist-info}/METADATA

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

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=gyl1MesSJZaVpC1XtvD78PpnE1VD3hGM3HPQXTJ3eJg,12963
 wolfhece/PyCrosssections.py,sha256=igU_ELrg5VrHU6RNbF5tHxPyVImpR3xdpfopJYc7haw,114711
-wolfhece/PyDraw.py,sha256=NI6VlLwgkrfkvYyrBsajZVMcfGE3zt3p4r3weW1eMbo,568090
+wolfhece/PyDraw.py,sha256=d4VmLpDLnbR_jw1Bjp8Hd7GX-0MiABaRFFBZWTX6qhY,568550
 wolfhece/PyGui.py,sha256=5ANCUmsBwsx_h-GWqV9xwnSQyGJ16mSObOm-h3_7LIQ,144708
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -37,7 +37,7 @@ wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4
 wolfhece/ins.py,sha256=uUeLMS1n3GPnfJhxl0Z2l-UXpmPUgthuwct282OOEzk,36184
 wolfhece/irm_qdf.py,sha256=DMdDEAYbgYxApObm6w-dZbBmA8ec6PghBLXR2lUEZLc,27457
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
-wolfhece/matplotlib_fig.py,sha256=iWtREWS-_e0DdWxMJsXBvLSwMprlAMY_gie7DZ6UIbw,84067
+wolfhece/matplotlib_fig.py,sha256=vnFI6sghw9N9jKhR8X1Z4aWli_5fPNylZQtFuujFJDY,84075
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
 wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,5205
@@ -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=4a2x2BBkIPKIrtQtYKbwz5_RxP-dx_Xshx9VBKawrwc,389
+wolfhece/apps/version.py,sha256=vKWzYKmXCd1RCcT66fDHO8Udxy0xzt6HlLaQF0NL_2w,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=XgMEXRhFhx9-B1hUsP7Zr199zNljYwT5dGMYSB9jRa4,639
-wolfhece/lazviewer/laz_viewer.py,sha256=QhLRTBbwsKHhRTVPdpUII75g4tSKLuBWwHth-IjwVII,76845
+wolfhece/lazviewer/laz_viewer.py,sha256=QZbQLX0Kz0VdqGvdpCwA6-9_Q1kGi0DJ4u9ygA9luEY,77339
 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
@@ -274,7 +274,7 @@ wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 wolfhece/scenario/check_scenario.py,sha256=d-LWa_FxmPxTSc_H1lDHwqLB6TCqj1IUrRJhatfPMMA,5623
 wolfhece/scenario/config_manager.py,sha256=HlMjAbyK9im0UrvVQIxc_MS7bakqO4OSV1c7JZrL5uk,113847
 wolfhece/scenario/imposebc_void.py,sha256=PqA_99hKcaqK5zsK6IRIc5Exgg3WVpgWU8xpwNL49zQ,5571
-wolfhece/scenario/update_void.py,sha256=8h7EwZskrgzuSClhBFWtZI948CV2B2MqBQmxQ5HNFR0,10033
+wolfhece/scenario/update_void.py,sha256=Yb7TMIUx9Gzm9_6qRMJnF39Uqi17dIkMmscSXo2WaTs,10033
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
 wolfhece/shaders/geom_grid.glsl,sha256=7eAkutCrwoeJpIdF69Ar7K18YyClvVG8ArJJARcmC-Q,742
 wolfhece/shaders/quad_frag_shader.glsl,sha256=GYGg9q4vFXiMuLK-pxSLz7crAE3dvlzJ7-e7PMfwSq0,1227
@@ -295,8 +295,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.122.dist-info/METADATA,sha256=rgSH96HdGA8CjVJzmIKJlrwM5h8_-IvMRKUGmDNJrrM,2587
-wolfhece-2.1.122.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-wolfhece-2.1.122.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.122.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.122.dist-info/RECORD,,
+wolfhece-2.1.124.dist-info/METADATA,sha256=jCOH--k0Mh3lNE5lm5hjJkmMzisMo7oVWtFYJm1qw-Q,2587
+wolfhece-2.1.124.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+wolfhece-2.1.124.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.124.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.124.dist-info/RECORD,,