wolfhece 2.1.118__py3-none-any.whl → 2.1.119__py3-none-any.whl

wolfhece/PyDraw.py

@@ -25,9 +25,11 @@ try:
     import glob
     import traceback
     from datetime import datetime, timedelta
+    from sklearn import linear_model, datasets
+
 except ImportError as e:
     print(e)
-    raise ImportError("Error importing wxPython, numpy, PIL, json, glob, traceback. Please check your installation.")
+    raise ImportError("Error importing wxPython, numpy, PIL, json, glob, traceback, sklearn. Please check your installation.")
 
 try:
     from osgeo import gdal
@@ -84,7 +86,7 @@ try:
     from .Results2DGPU import wolfres2DGPU
     from .PyCrosssections import crosssections, profile, Interpolator, Interpolators
     from .GraphNotebook import PlotNotebook
-    from .lazviewer.laz_viewer import myviewer, read_laz, clip_data_xyz, xyz_laz_grids, choices_laz_colormap, Classification_LAZ, Base_LAZ_Data, viewer as viewerlaz
+    from .lazviewer.laz_viewer import myviewer, read_laz, clip_data_xyz, xyz_laz_grids, choices_laz_colormap, Classification_LAZ, Wolf_LAZ_Data, viewer as viewerlaz
     from . import Lidar2002
     from .picc import Picc_data, Cadaster_data
     from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier
@@ -112,6 +114,7 @@ try:
     from .lagrangian.particle_system_ui import Particle_system_to_draw as Particle_system
     from .opengl.py3d import Wolf_Viewer3D
     from .pyGui1D import GuiNotebook1D
+    from .matplotlib_fig import Matplotlib_Figure as MplFig
 except ImportError as e:
     print(e)
     raise ImportError("Error importing pyshields, pyviews, PyConfig, GraphProfile, pybridges, tools_mpl, wolf_tiles, lagrangian.particle_system_ui, opengl.py3d, pyGui1D. Please check your installation.")
@@ -1172,7 +1175,7 @@ class WolfMapViewer(wx.Frame):
     myimagestiles: list[ImagesTiles]
     mypartsystems: list[Particle_system]
     myviewers3d:list[Wolf_Viewer3D]
-    mylazdata:list[Base_LAZ_Data]
+    mylazdata:list[Wolf_LAZ_Data]
 
     sim_explorers: dict[Wolfresults_2D:Sim_Explorer]
 
@@ -1204,7 +1207,7 @@ class WolfMapViewer(wx.Frame):
     active_bridge: Bridge
     active_weirs : Weirs
     active_weir : Weir
-    active_laz : Base_LAZ_Data
+    active_laz : Wolf_LAZ_Data
 
     def __init__(self,
                  wxparent = None,
@@ -4007,7 +4010,7 @@ class WolfMapViewer(wx.Frame):
         self.ymin = self.mousey - height / 2.
         self.ymax = self.ymin + height
 
-    def setbounds(self,updatescale=True):
+    def setbounds(self, updatescale=True):
         """
         Calcule les limites visibles de la fenêtrte graphique sur base des
         facteurs d'échelle courants
@@ -5542,7 +5545,7 @@ class WolfMapViewer(wx.Frame):
         curbounds = [[self.xmin, self.xmin + self.width], [self.ymin, self.ymin + self.height]]
 
         if self.active_laz is None:
-            newobj = Base_LAZ_Data()
+            newobj = Wolf_LAZ_Data()
             newobj.classification = self.mylazgrid.colors
             newobj.from_grid(self.mylazgrid, curbounds)
 
@@ -5553,7 +5556,7 @@ class WolfMapViewer(wx.Frame):
             ret = dlg.ShowModal()
 
             if ret == wx.ID_YES:
-                newobj = Base_LAZ_Data()
+                newobj = Wolf_LAZ_Data()
                 newobj.classification = self.mylazgrid.colors
                 newobj.from_grid(self.mylazgrid, curbounds)
 
@@ -5588,14 +5591,14 @@ class WolfMapViewer(wx.Frame):
             else:
                 logging.info(_('Filter cancelled'))
 
-    def decimate_laz_data(self, factor:int = 10):
-        """ Decimate data """
+    def descimate_laz_data(self, factor:int = 10):
+        """ Descimate data """
 
         if self.active_laz is None:
             logging.warning(_('No laz data'))
             return
 
-        self.active_laz.decimate(factor)
+        self.active_laz.descimate(factor)
 
     def select_active_array_from_laz(self, array:WolfArray = None, used_codes:list = None, chunk_size:float = 500.):
         """ select some nodes from laz data
@@ -5953,7 +5956,7 @@ class WolfMapViewer(wx.Frame):
             fn = dlg.GetPath()
             dlg.Destroy()
 
-        self.mylazdata.append(Base_LAZ_Data())
+        self.mylazdata.append(Wolf_LAZ_Data())
         self.active_laz = self.mylazdata[-1]
         self.active_laz.from_file(fn)
 
@@ -6209,14 +6212,22 @@ class WolfMapViewer(wx.Frame):
         """ Select laz source """
 
         if self.active_laz is None and self.mylazgrid is None:
-            logging.warning(_('No LAZ data loaded !'))
+            logging.warning(_('No LAZ data loaded/initialized !'))
             return None
         elif self.active_laz is None:
+            # No active laz data
             laz_source = self.mylazgrid
         elif self.mylazgrid is None:
+            # No laz grid
             laz_source = self.active_laz
         else:
+            # We have both
             choices = [_('From active LAZ data'), _('From newly extracted data')]
+
+            keys = self.get_list_keys(draw_type.LAZ, None)
+            if len(keys) > 1:
+                choices.append(_('From multiple LAZ data'))
+
             dlg = wx.SingleChoiceDialog(None, _("Pick a data source"), "Choices", choices)
             ret = dlg.ShowModal()
             if ret == wx.ID_CANCEL:
@@ -6229,8 +6240,22 @@ class WolfMapViewer(wx.Frame):
 
             if idx == 0:
                 laz_source = self.active_laz
-            else:
+            elif idx == 1:
                 laz_source = self.mylazgrid
+            else:
+                dlg = wx.MultiChoiceDialog(None, _('Choose the LAZ data to use\n\nIf multiple, a new one will be created !'), _('LAZ data'), keys)
+                if dlg.ShowModal() == wx.ID_OK:
+                    used_keys = dlg.GetSelections()
+                    used_keys = [keys[cur] for cur in used_keys]
+                    laz_source = Wolf_LAZ_Data()
+                    for curkey in used_keys:
+                        laz_source.merge(self.get_obj_from_id(curkey, draw_type.LAZ))
+
+                    self.add_object('laz', newobj=laz_source, id = 'Merged LAZ data')
+                    dlg.Destroy()
+                else:
+                    dlg.Destroy()
+                    return None
 
         return laz_source
 
@@ -6240,7 +6265,7 @@ class WolfMapViewer(wx.Frame):
         dlg = wx.SingleChoiceDialog(None, _("Pick a colormap"), "Choices", choices)
 
         if self.active_laz is not None:
-            dlg.SetSelection(self.active_laz.associated_color)
+            dlg.SetSelection(ass_values.index(self.active_laz.associated_color))
 
         ret = dlg.ShowModal()
         if ret == wx.ID_CANCEL:
@@ -6597,7 +6622,13 @@ class WolfMapViewer(wx.Frame):
 
                 dlg.Destroy()
 
-            fig, ax = self.active_vector.plot_mpl(True, False)
+            # Création d'un graphique matplotlib sous wx
+            figmpl = MplFig()
+            figmpl.presets()
+            figmpl.Hide()
+            fig, ax = figmpl.get_figax()
+
+            # fig, ax = self.active_vector.plot_mpl(True, False)
 
             linkedarrays = self.get_linked_arrays()
 
@@ -6627,8 +6658,10 @@ class WolfMapViewer(wx.Frame):
                     ax.plot([curs-.1, curs+.1], [curz+tolval, curz+tolval], c='black', linewidth=0.5)
                     ax.plot([curs-.1, curs+.1], [curz-tolval, curz-tolval], c='black', linewidth=0.5)
 
-                fig.canvas.draw()
-                fig.canvas.flush_events()
+                # fig.canvas.draw()
+                # fig.canvas.flush_events()
+
+            figmpl.Show()
 
         elif itemlabel == _("Compute and apply unique colormap on all..."):
             self.uniquecolormap()
@@ -6649,6 +6682,7 @@ class WolfMapViewer(wx.Frame):
             self.filter_inundation()
 
         elif itemlabel == _("Plot active polygons..."):
+
             if self.active_zone is None:
                 logging.warning(_('No active zone ! -- please select a zone containing polygons !'))
                 return
@@ -6678,7 +6712,14 @@ class WolfMapViewer(wx.Frame):
                 logging.info(_('Sole polygon detected'))
                 plotzone = [self.active_zone]
 
-            fig, ax = plt.subplots(1, 1)
+            # Création d'un graphique matplotlib sous wx
+            figmpl = MplFig()
+            figmpl.presets()
+            figmpl.Hide()
+
+            fig, ax = figmpl.get_figax()
+
+            # fig, ax = plt.subplots(1, 1)
 
             linkedarrays = {}
 
@@ -6719,9 +6760,12 @@ class WolfMapViewer(wx.Frame):
                 # sole polygon
                 plotzone[0].plot_linked_polygons(fig, ax, linkedarrays, linked_vec=linkedvecs)
 
-            ax.grid()
-            ax.legend()
-            fig.show()
+            # ax.grid()
+            # ax.legend()
+            # fig.show()
+
+            figmpl.Show()
+            figmpl.CenterOnScreen()
 
         elif itemlabel == _("Manage banks..."):
 
@@ -6983,7 +7027,7 @@ class WolfMapViewer(wx.Frame):
                 return
 
             # Choose a decimation factor - integer
-            dlg = wx.NumberEntryDialog(None, _('Your dataset contains {} points.\nWould you like to decimate?').format(self.active_laz.num_points),
+            dlg = wx.NumberEntryDialog(None, _('Your dataset contains {} points.\nWould you like to descimate?').format(self.active_laz.num_points),
                                         _('Decaimate factor'), _('Decimation'), 0, 0, 100)
 
             ret = dlg.ShowModal()
@@ -6992,11 +7036,11 @@ class WolfMapViewer(wx.Frame):
                 dlg.Destroy()
                 return
 
-            decimate_fact = dlg.GetValue()
+            descimate_fact = dlg.GetValue()
             dlg.Destroy()
 
-            if decimate_fact > 0:
-                self.active_laz.decimate(decimate_fact)
+            if descimate_fact > 0:
+                self.active_laz.descimate(descimate_fact)
                 logging.info(_('New count : {}').format(self.active_laz.num_points))
 
         elif itemlabel == _('Clip LAZ grid on current zoom'):
@@ -7014,8 +7058,8 @@ class WolfMapViewer(wx.Frame):
             if self.active_laz.data.shape[0] > 100_000_000:
 
                 # Choose a decimation factor - integer
-                dlg = wx.NumberEntryDialog(None, _('Your data selection is very large (>100 M)\nWould you like to decimate?'),
-                                           _('Decaimate factor'), _('Decimation'), 0, 0, 100)
+                dlg = wx.NumberEntryDialog(None, _('Your data selection is very large (>100 M)\nWould you like to descimate?\n\n{} points').format(self.active_laz.data.shape[0]),
+                                           _('Descimate factor'), _('Decimation'), 0, 0, 100)
 
                 ret = dlg.ShowModal()
 
@@ -7023,11 +7067,11 @@ class WolfMapViewer(wx.Frame):
                     dlg.Destroy()
                     return
 
-                decimate_fact = dlg.GetValue()
+                descimate_fact = dlg.GetValue()
                 dlg.Destroy()
 
-                if decimate_fact > 0:
-                    self.decimate_laz_data(decimate_fact)
+                if descimate_fact > 0:
+                    self.descimate_laz_data(descimate_fact)
 
         elif itemlabel == _('Fill active array from LAZ data'):
 
@@ -8680,7 +8724,7 @@ class WolfMapViewer(wx.Frame):
             curtree = self.myitemslaz
 
             if newobj is None:
-                newobj = Base_LAZ_Data(mapviewer=self)
+                newobj = Wolf_LAZ_Data(mapviewer=self)
                 newobj.from_file(filename)
 
             self.mylazdata.append(newobj)
@@ -9361,10 +9405,20 @@ class WolfMapViewer(wx.Frame):
 
                     fdlg.Destroy()
 
+                elif isinstance(self.selected_object, Wolf_LAZ_Data):
+                    filterArray = "Dump (*.dump)|*.dmp|all (*.*)|*.*"
+                    fdlg = wx.FileDialog(self, "Choose file name for LAZ data :" + self.selected_object.idx, wildcard=filterArray,
+                                            style=wx.FD_SAVE)
+                    ret = fdlg.ShowModal()
+                    if ret == wx.ID_OK:
+                        self.selected_object.saveas(fdlg.GetPath())
+
+                    fdlg.Destroy()
+
         elif text == _('Properties'):
 
             myobj = self.selected_object
-            if type(myobj) in [WolfArray, WolfArrayMB, WolfArrayMNAP, Zones, Wolfresults_2D, wolfres2DGPU, Particle_system, Picc_data, Cadaster_data, hydrometry_wolfgui, Bridge, Weir, Base_LAZ_Data]:
+            if type(myobj) in [WolfArray, WolfArrayMB, WolfArrayMNAP, Zones, Wolfresults_2D, wolfres2DGPU, Particle_system, Picc_data, Cadaster_data, hydrometry_wolfgui, Bridge, Weir, Wolf_LAZ_Data]:
                 myobj.show_properties()
 
             elif isinstance(myobj, cloud_vertices):
@@ -9514,22 +9568,27 @@ class WolfMapViewer(wx.Frame):
 
         elif _('Set colormap') in text:
 
-            if isinstance(self.selected_object, Base_LAZ_Data):
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
                 self.selected_object.associated_color = self._choice_laz_colormap()
 
         elif _('Edit colormap') in text:
 
-            if isinstance(self.selected_object, Base_LAZ_Data):
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
                 self.selected_object.interactive_update_colors()
 
         elif _('Set classification') in text:
 
-            if isinstance(self.selected_object, Base_LAZ_Data):
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
                 self.selected_object.set_classification(self._choice_laz_classification())
 
+        elif _('Edit selection') in text:
+
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
+                self.selected_object._edit_selection()
+
         elif _('All to cloud') in text:
 
-            if isinstance(self.selected_object, Base_LAZ_Data):
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
 
                 if self.selected_object.num_points > 100000:
                     dlg = wx.MessageDialog(None, _('The number of points is high, it could take some time to convert to cloud.\nDo you want to continue ?'), _('Warning'), wx.YES_NO | wx.NO_DEFAULT)
@@ -9546,7 +9605,7 @@ class WolfMapViewer(wx.Frame):
 
         elif _('Selection to cloud') in text:
 
-            if isinstance(self.selected_object, Base_LAZ_Data):
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
 
                 xyz = self.selected_object.xyz_selected
                 if xyz.shape[0] ==0:
@@ -9566,14 +9625,75 @@ class WolfMapViewer(wx.Frame):
                 newcloud.init_from_nparray(xyz)
                 self.add_object('cloud', newobj=newcloud, id=self.selected_object.idx + '_cloud_sel')
 
+        elif _('Selection to vector') in text:
+
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
+
+                if self.active_zone is None:
+                    logging.warning(_('No active zone selected'))
+                    return
+
+                xyz = self.selected_object.xyz_selected
+                if xyz.shape[0] ==0:
+                    logging.warning('No points selected')
+                    return
+
+                if xyz.shape[0] > 100000:
+                    dlg = wx.MessageDialog(None, _('The number of points is high, it could take some time to convert to cloud.\nDo you want to continue ?'), _('Warning'), wx.YES_NO | wx.NO_DEFAULT)
+                    ret = dlg.ShowModal()
+
+                    if ret != wx.ID_YES:
+                        dlg.Destroy()
+
+                        return
+
+                def approximate_vector(xyz):
+                    """ Get a cloud of points and return a vector
+                    based on the best approximated segment
+                    and points projected on its trace
+                    """
+
+                    # best approximation of the segment
+                    # based on the RANSAC algorithm from scikit-learn
+                    model = linear_model.RANSACRegressor()
+                    model.fit(xyz[:,0].reshape(-1,1), xyz[:,1])
+
+                    # get the points projected on the segment
+                    proj = model.predict(xyz[:,0].reshape(-1,1))
+
+                    # get the coordinates of the projected points
+                    xyz_proj = np.zeros((xyz.shape[0],3))
+                    xyz_proj[:,0] = xyz[:,0]
+                    xyz_proj[:,1] = proj
+                    xyz_proj[:,2] = xyz[:,2]
+
+                    #Sort the points
+                    idx = np.argsort(xyz_proj[:,0])
+                    xyz_proj = xyz_proj[idx]
+
+                    return xyz_proj
+
+                newvector = vector(name = self.selected_object.idx + '_vector_sel', fromnumpy= approximate_vector(xyz))
+                self.active_zone.add_vector(newvector, forceparent=True)
+                self.active_zone.parent.find_minmax(True)
+                self.active_zone.parent.reset_listogl()
+
+                self.active_zone.parent.fill_structure()
+                self.Refresh()
+
         elif _('Play') in text:
 
-            if isinstance(self.selected_object, Base_LAZ_Data):
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
                 self.selected_object.play_flight()
 
+        elif _('Add point') in text:
+
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
+                self.selected_object.add_pose_in_memory()
+
         elif _('Record') in text:
 
-            if isinstance(self.selected_object, Base_LAZ_Data):
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
 
                 dlg = wx.DirDialog(self, _('Choose a directory to save the video'), style=wx.DD_DEFAULT_STYLE)
                 if dlg.ShowModal() == wx.ID_OK:
@@ -9583,7 +9703,7 @@ class WolfMapViewer(wx.Frame):
 
         elif _('Load flight') in text:
 
-            if isinstance(self.selected_object, Base_LAZ_Data):
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
                 dlg = wx.FileDialog(self, _('Choose a file to load the flight'), wildcard='JSON (*.json)|*.json|All (*.*)|*.*', style=wx.FD_OPEN)
                 if dlg.ShowModal() == wx.ID_OK:
                     self.selected_object.load_flight(dlg.GetPath())
@@ -9592,7 +9712,7 @@ class WolfMapViewer(wx.Frame):
 
         elif _('Save flight') in text:
 
-            if isinstance(self.selected_object, Base_LAZ_Data):
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
                 dlg = wx.FileDialog(self, _('Choose a file to save the flight'), wildcard='JSON (*.json)|*.json|All (*.*)|*.*', style=wx.FD_SAVE)
                 if dlg.ShowModal() == wx.ID_OK:
                     self.selected_object.save_flight(dlg.GetPath())
@@ -10311,14 +10431,27 @@ class WolfMapViewer(wx.Frame):
 
         self.mousex = self.mousedown[0]
         self.mousey = self.mousedown[1]
-        self.mousedown = (0., 0.)
+        # self.mousedown = (0., 0.)
         self.oneclick = False
         self.setbounds()
 
         if ctrldown:
-            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))
-                self.Refresh()
+            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))
+                    self.Refresh()
+
+                if self.active_laz is not None:
+                    if self.active_laz.viewer is not None:
+                        self.active_laz.force_view(self.mousex, self.mousey, self.active_array.get_value(self.mousex, self.mousey))
+            else:
+                if self.active_viewer3d is not None:
+                    self.active_viewer3d.force_view(self.mousex, self.mousey)
+                    self.Refresh()
+
+                if self.active_laz is not None:
+                    if self.active_laz.viewer is not None:
+                        self.active_laz.force_view(self.mousex, self.mousey)
 
     def OnLDown(self, e):
 
@@ -10384,7 +10517,7 @@ class WolfMapViewer(wx.Frame):
             if ctrl:
                 myobj.show_properties()
 
-        elif type(myobj) == Base_LAZ_Data:
+        elif type(myobj) == Wolf_LAZ_Data:
 
             self.active_laz = myobj
 
@@ -12123,6 +12256,7 @@ class WolfMapViewer(wx.Frame):
             tracks.append(_('Edit colormap'))
             tracks.append(_('Set classification'))
             tracks.append(_('Convert to...'))
+            tracks.append(_('Edit selection'))
             tracks.append(_('All to cloud'))
             tracks.append(_('Selection to cloud'))
 
@@ -12174,7 +12308,7 @@ class WolfMapViewer(wx.Frame):
                 self.popupmenu.Append(wx.ID_ANY, _('Export to Shape file'), _('Export to Shape file'))
                 self.popupmenu.Append(wx.ID_ANY, _('Export active zone to Shape file'), _('Export active zone to Shape file'))
 
-            if isinstance(self.selected_object, Base_LAZ_Data):
+            if isinstance(self.selected_object, Wolf_LAZ_Data):
 
                 colrmapmenu = wx.Menu()
                 self.popupmenu.AppendSubMenu(colrmapmenu, _('Colormap'))
@@ -12188,12 +12322,16 @@ class WolfMapViewer(wx.Frame):
 
                 converttomenu.Append(wx.ID_ANY, _('All to cloud'), _('Convert all to cloud'))
                 converttomenu.Append(wx.ID_ANY, _('Selection to cloud'), _('Convert selection to cloud'))
+                converttomenu.Append(wx.ID_ANY, _('Selection to vector'), _('Convert selection to vector'))
+
+                self.popupmenu.Append(wx.ID_ANY, _('Edit selection'), _('Edit selection'))
 
                 moviemenu = wx.Menu()
                 self.popupmenu.AppendSubMenu(moviemenu, _('Movie'))
 
+                moviemenu.Append(wx.ID_ANY, _('Add point'), _('Add point passage'))
                 moviemenu.Append(wx.ID_ANY, _('Play'), _('Play'))
-                moviemenu.Append(wx.ID_ANY, _('Record'), _('Record'))
+                # moviemenu.Append(wx.ID_ANY, _('Record'), _('Record'))
                 moviemenu.Append(wx.ID_ANY, _('Load flight'), _('Load flight'))
                 moviemenu.Append(wx.ID_ANY, _('Save flight'), _('Save flight'))
 

wolfhece/PyVertexvectors.py

@@ -7673,6 +7673,11 @@ class Zones(wx.Frame, Element_To_Draw):
 
             if self.active_vector is None:
                 logging.warning(_('No vector in the active zone'))
+                if self.parent is not None:
+                    try:
+                        self.parent.Active_zone(self.active_zone)
+                    except:
+                        raise Warning(_('Not supported in the current parent -- see PyVertexVectors in Activate_zone function'))
             else:
                 self.labelactvect.SetLabel(self.active_vector.myname)
 

wolfhece/apps/version.py

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