wolfhece 2.2.17__py3-none-any.whl → 2.2.20__py3-none-any.whl

wolfhece/PyDraw.py

@@ -2077,7 +2077,7 @@ class WolfMapViewer(wx.Frame):
         self.popupmenu = wx.Menu()
         self.popupmenu.Bind(wx.EVT_MENU, self.OnPopupItemSelected)
 
-        for text in [_('Save'), _('Save as'), _('Rename'), _('Duplicate'), _('Delete'), _('Up'), _('Down'), _('Check/Uncheck'), _('Properties')]:
+        for text in [_('Save'), _('Save as'), _('Rename'), _('Duplicate'), _('Delete'), _('Up'), _('Down'), _('Check/Uncheck'), _('Properties'), _('Reload')]:
             item = self.popupmenu.Append(-1, text)
 
         self.menubar = wx.MenuBar()
@@ -2295,9 +2295,9 @@ class WolfMapViewer(wx.Frame):
 
         self.analyzeplot.AppendSeparator()
 
-        self.analyzemenu.Append(wx.ID_ANY,_('Plot...'),self.analyzeplot)
-        self.analyzemenu.Append(wx.ID_ANY,_('Export...'),self.analyzeexport)
-        self.analyzemenu.Append(wx.ID_ANY,_('Inpaint...'),self.analyzeinpaint)
+        self.analyzemenu.Append(wx.ID_ANY,_('Plot...'), self.analyzeplot)
+        self.analyzemenu.Append(wx.ID_ANY,_('Export...'), self.analyzeexport)
+        self.analyzemenu.Append(wx.ID_ANY,_('Inpaint...'), self.analyzeinpaint)
 
 
         self.analyzeinpaint.Append(wx.ID_ANY, _("Inpaint active array..."), _("Inpaint active array"))
@@ -2700,12 +2700,19 @@ class WolfMapViewer(wx.Frame):
             self.trianglesmenu = wx.Menu()
             self.menubar.Append(self.trianglesmenu, _('&Triangulations'))
 
-            self._menuinteractptri = self.trianglesmenu.Append(wx.ID_ANY, _("Interpolate on active triangulation..."), _("InterpolateTri"))
+            self._menuinteractptri = self.trianglesmenu.Append(wx.ID_ANY, _("Interpolate on active triangulation..."),
+                                                               _('Interpolate active array on active triangulation'))
+
+            self._menuinteractptri_above = self.trianglesmenu.Append(wx.ID_ANY, _("Interpolate on active triangulation (keep only above)..."),
+                                                                     _('Interpolate active array on active triangulation but keep only values above the array'))
+
+            self._menuinteractptri_below = self.trianglesmenu.Append(wx.ID_ANY, _("Interpolate on active triangulation (keep only below)..."),
+                                                                     _('Interpolate active array on active triangulation but keep only values below the array'))
+
             self._menucomparetri = self.trianglesmenu.Append(wx.ID_ANY, _("Compare triangles to array..."), _("Comparison"))
             self._menumovetri = self.trianglesmenu.Append(wx.ID_ANY, _("Move triangles..."), _("Move triangles"))
             self._menurotatetri = self.trianglesmenu.Append(wx.ID_ANY, _("Rotate triangles..."), _("Rotate triangles"))
 
-
     def create_cloud_menu(self):
         """ Menu for cloud points """
 
@@ -3001,6 +3008,29 @@ class WolfMapViewer(wx.Frame):
 
             return [xmin, ymin, xmax, ymax]
 
+    def get_bounds(self):
+        """
+        Retourne les limites de la zone d'affichage, voir aussi get_canvas_bounds
+
+        :return: ([xmin, xmax], [ymin, ymax])
+        """
+        xmin, ymin, xmax, ymax = self.get_canvas_bounds()
+        return ([xmin, xmax], [ymin, ymax])
+
+    def get_bounds_as_polygon(self) -> vector:
+        """
+        Retourne les limites de la zone d'affichage sous forme de polygone
+        :return: vector
+        """
+        xmin, ymin, xmax, ymax = self.get_canvas_bounds()
+        poly = vector()
+        poly.add_vertex(wolfvertex(xmin, ymin))
+        poly.add_vertex(wolfvertex(xmax, ymin))
+        poly.add_vertex(wolfvertex(xmax, ymax))
+        poly.add_vertex(wolfvertex(xmin, ymax))
+        poly.force_to_close()
+        return poly
+
     def Onmenuwalous(self, event: wx.MenuEvent):
 
         id = event.GetId()
@@ -4390,7 +4420,11 @@ class WolfMapViewer(wx.Frame):
 
         self.myinterp.interp_on_array(self.active_array, method)
 
-    def interpolate_triangulation(self):
+    def interpolate_triangulation(self, keep:Literal['all', 'above', 'below'] = 'all'):
+        """ Alias to interpolate on triangulation
+
+        :param keep: 'all' to keep all points, 'above' to keep only points above the current array's value, 'below' to keep only points below the current array's value
+        """
 
         if self.active_array is None:
             logging.warning(_('No active array -- Please activate an array first'))
@@ -4400,7 +4434,7 @@ class WolfMapViewer(wx.Frame):
             logging.warning(_('No active triangulation -- Please activate a triangulation first'))
             return
 
-        self.active_array.interpolate_on_triangulation(self.active_tri.pts, self.active_tri.tri, )
+        self.active_array.interpolate_on_triangulation(self.active_tri.pts, self.active_tri.tri, keep=keep)
 
     def compare_cloud2array(self):
         """
@@ -8429,7 +8463,13 @@ class WolfMapViewer(wx.Frame):
         #     self.import_3dfaces()
 
         elif itemlabel == _("Interpolate on active triangulation..."):
-            self.interpolate_triangulation()
+            self.interpolate_triangulation(keep='all')
+
+        elif itemlabel == _("Interpolate on active triangulation (keep only above)..."):
+            self.interpolate_triangulation(keep='above')
+
+        elif itemlabel == _("Interpolate on active triangulation (keep only below)..."):
+            self.interpolate_triangulation(keep='below')
 
         elif itemlabel==_("Compare cloud to array..."):
             self.compare_cloud2array()
@@ -11565,6 +11605,31 @@ class WolfMapViewer(wx.Frame):
 
                 dlg.Destroy()
 
+        elif _('Reload') in text:
+
+            if isinstance(self.selected_object, WolfArray):
+                if self.selected_object.filename is not None:
+
+                    dlg = wx.MessageDialog(None, _('Do you want to reload the file ?'), _('Reload'), wx.YES_NO | wx.NO_DEFAULT)
+                    ret = dlg.ShowModal()
+                    if ret == wx.ID_YES:
+                        self.selected_object.read_all()
+                        self.selected_object.mask_data(self.selected_object.nullvalue)
+                        self.selected_object.reset_plot()
+
+                    dlg.Destroy()
+            # elif isinstance(self.selected_object, Zones):
+            #     if self.selected_object.filename is not None:
+            #         dlg = wx.MessageDialog(None, _('Do you want to reload the file ?'), _('Reload'), wx.YES_NO | wx.NO_DEFAULT)
+            #         ret = dlg.ShowModal()
+            #         if ret == wx.ID_YES:
+            #             self.selected_object.read()
+
+            #         dlg.Destroy()
+
+            else:
+                logging.warning(_('Reload not yet implemented for this type of object'))
+
     def OnClose(self, event):
         """ Close the application """
 
@@ -13144,7 +13209,7 @@ class WolfMapViewer(wx.Frame):
         width, height = self.canvas.GetSize()
 
         if iwidth == 0 or iheight == 0:
-            logging.error(_('Width or height of the canvas is null -- Please check the "findminmax" routine in "Autoscale" !'))
+            logging.warning(_('Width or height of the canvas is null -- Please check the "findminmax" routine in "Autoscale" !'))
             iwidth = 1
             iheight = 1
 

wolfhece/PyGui.py

@@ -2915,6 +2915,12 @@ class Wolf2DGPUModel(GenMapManager):
         if force_reload:
             self._sim.reload_all()
             for cur in self.arrays.values():
+
+                if cur.idx == 'water surface elevation [m]':
+                    ## Force to recompute the water surface elevation
+                    cur.array.data[:,:] = self.arrays['bathymetry'].array.data[:,:] + self.arrays['h'].array.data[:,:]
+                    cur.array.mask[:,:] = self.arrays['bathymetry'].array.mask[:,:]
+
                 cur.reset_plot()
             # self.mapviewer.Refresh()
         else:

wolfhece/PyVertexvectors.py

@@ -27,6 +27,7 @@ from matplotlib.axes import Axes
 from matplotlib.figure import Figure
 from matplotlib import cm
 from matplotlib.colors import Colormap
+from matplotlib.tri import Triangulation as mpl_tri
 
 import struct
 import pyvista as pv
@@ -414,6 +415,22 @@ class Triangulation(Element_To_Draw):
         else:
             logging.warning('No triangles to plot')
 
+    @property
+    def mpl_triangulation(self) -> mpl_tri:
+        """ Return the triangulation as a Matplotlib Triangulation object """
+        if self.nb_tri>0:
+            return mpl_tri(self.pts[:,0], self.pts[:,1], self.tri)
+        else:
+            logging.warning('No triangles to plot')
+            return None
+
+    def plot_matplotlib_3D(self, ax:Axes, color='black', alpha=0.2, lw=1.5, edgecolor='k', shade=True, **kwargs):
+        """ Plot the triangulation in Matplotlib 3D
+        """
+        if self.nb_tri>0:
+            ax.plot_trisurf(self.mpl_triangulation, Z=self.pts[:,2], color=color, alpha=alpha, lw=lw, edgecolor=edgecolor, shade=shade, **kwargs)
+        else:
+            logging.warning('No triangles to plot')
 
     def find_minmax(self,force):
         """ Find the min and max of the triangulation
@@ -1107,9 +1124,9 @@ if :\n \
             self.myprops[('Move','Delta Y')] = 0.
 
             self.parent.update_lengths()
-            self.myprops[( 'Geometry','Length 2D')] = self.parent.length2D
-            self.myprops[( 'Geometry','Length 3D')] = self.parent.length3D
-            self.myprops[( 'Geometry','Surface')] = self.parent.area
+            self.myprops[( 'Geometry','Length 2D')] = self.parent.length2D if self.parent.length2D is not None else 0.
+            self.myprops[( 'Geometry','Length 3D')] = self.parent.length3D if self.parent.length3D is not None else 0.
+            self.myprops[( 'Geometry','Surface')] = self.parent.area if self.parent.area is not None else 0.
 
             self.myprops.Populate()
 class vector:
@@ -1748,12 +1765,11 @@ class vector:
                 prepare(self._polygon)
 
 
-    def projectontrace(self, trace):
+    def projectontrace(self, trace:"vector"):
         """
         Projection du vecteur sur une trace (type 'vector')
 
-        Return :
-          Nouveau vecteur contenant les infos de position sur la trace et d'altitude (s,z)
+        :return: Nouveau vecteur contenant les infos de position sur la trace et d'altitude (s,z) aux positions (x,y)
         """
 
         # trace:vector
@@ -1770,11 +1786,12 @@ class vector:
 
         return newvec
 
-    def parallel_offset(self, distance=5., side='left'):
+    def parallel_offset(self, distance=5., side:Literal['left', 'right']='left'):
         """
-        The distance parameter must be a positive float value.
+        Create a parallel offset of the vector
 
-        The side parameter may be ‘left’ or ‘right’. Left and right are determined by following the direction of the given geometric points of the LineString.
+        :param distance: The distance parameter must be a positive float value.
+        :param side: The side parameter may be ‘left’ or ‘right’. Left and right are determined by following the direction of the given geometric points of the LineString.
         """
 
         if self.nbvertices<2:
@@ -1883,6 +1900,9 @@ class vector:
         """
         Ajout de vertices depuis une matrice numpy -- shape = (nb_vert,2 ou 3)
         """
+
+        assert isinstance(xyz, np.ndarray), "xyz must be a numpy array of shape (nb_vert, 2 or 3)"
+
         if xyz.dtype==np.int32:
             xyz = xyz.astype(np.float64)
 
@@ -2764,6 +2784,7 @@ class vector:
                 exit=False
 
         if exit:
+            logging.warning(_('No plotted linked arrays'))
             return
 
         k=0
@@ -3088,6 +3109,7 @@ class vector:
             curvert.x = newx
 
         self._reset_listogl()
+        self.reset_linestring()
 
     @y.setter
     def y(self, new_y:np.ndarray | list):
@@ -3104,13 +3126,26 @@ class vector:
             curvert.y = newy
 
         self._reset_listogl()
+        self.reset_linestring()
 
     @z.setter
     def z(self, new_z:np.ndarray | float | list):
-        """ Set the z values of the vertices """
+        """ Set the z values of the vertices
+
+        /PARAM new_z: numpy array, float or list (but WolfArray is supported too)
+        """
+        from .wolf_array import WolfArray
 
         if isinstance(new_z, (int, float)):
             new_z = np.full(self.nbvertices, new_z, dtype=float)
+        elif isinstance(new_z, WolfArray):
+            wa = new_z
+
+            new_z = []
+            for curvert in self.myvertices:
+                i,j = wa.xy2ij(curvert.x, curvert.y)
+                if i>0 and j>0 and i < wa.nbx and j < wa.nby:
+                    new_z.append(wa.array[i, j])
 
         if isinstance(new_z, list):
             new_z = np.array(new_z)
@@ -3127,6 +3162,7 @@ class vector:
                 curvert.z = newz
 
         self._reset_listogl()
+        self.reset_linestring()
 
     @xyz.setter
     def xyz(self, new_xyz:np.ndarray | list):
@@ -3151,6 +3187,8 @@ class vector:
                 curvert.z = newxyz[2]
 
         self._reset_listogl()
+        self.reset_linestring()
+
 
     @xy.setter
     def xy(self, new_xy:np.ndarray | list):
@@ -3168,6 +3206,7 @@ class vector:
             curvert.y = newxy[1]
 
         self._reset_listogl()
+        self.reset_linestring()
 
     @xz.setter
     def xz(self, new_xz:np.ndarray | list):
@@ -3190,6 +3229,7 @@ class vector:
                 curvert.z = newxz[1]
 
         self._reset_listogl()
+        self.reset_linestring()
 
     @xyzi.setter
     def xyzi(self, new_xyzi:np.ndarray | list):
@@ -3209,6 +3249,7 @@ class vector:
             curvert.in_use = newxyzi[3]
 
         self._reset_listogl()
+        self.reset_linestring()
 
     @xyi.setter
     def xyi(self, new_xyi:np.ndarray | list):
@@ -3227,6 +3268,7 @@ class vector:
             curvert.in_use = newxyi[2]
 
         self._reset_listogl()
+        self.reset_linestring()
 
     @i.setter
     def i(self, new_i:np.ndarray | list):
@@ -3243,6 +3285,23 @@ class vector:
             curvert.in_use = newi
 
         self._reset_listogl()
+        self.reset_linestring()
+
+    @sz_curvi.setter
+    def sz_curvi(self, sz_new:np.ndarray | list):
+        """ Interpolate the vertices based on the curvilinear abscissa """
+
+        if isinstance(sz_new, list):
+            sz_new = np.array(sz_new)
+
+        f = interp1d(sz_new[:,0],sz_new[:,1], bounds_error=False, fill_value='extrapolate')
+
+        s = self.s_curvi
+        for idx, curvert in enumerate(self.myvertices):
+            curvert.z = f(s[idx])
+
+        self._reset_listogl()
+        self.reset_linestring()
 
     def __str__(self):
         return self.myname
@@ -3265,6 +3324,7 @@ class vector:
         if ndx>=0 and ndx < self.nbvertices:
             self.myvertices[ndx] = value
             self._reset_listogl()
+            self.reset_linestring()
         else:
             logging.warning(_('Index out of range'))
 
@@ -3273,6 +3333,7 @@ class vector:
         if ndx>=0 and ndx < self.nbvertices:
             self.myvertices.pop(ndx)
             self._reset_listogl()
+            self.reset_linestring()
         else:
             logging.warning(_('Index out of range'))
 
@@ -3290,6 +3351,7 @@ class vector:
 
         self.update_lengths()
         self._reset_listogl()
+        self.reset_linestring()
 
     def cut(self, s:float, is3D:bool=True, adim:bool=True, frombegin:bool=True):
         """
@@ -3312,6 +3374,7 @@ class vector:
         newvec.update_lengths()
 
         self._reset_listogl()
+        self.reset_linestring()
 
         return newvec
 
@@ -6333,7 +6396,7 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         Retourne la zone sur base de son nom ou de sa position
 
-        :param ndx: Clé ou index de zone -- si tuple, alors (idx_zone, idx_vect)
+        :param ndx: Clé ou index de zone -- si tuple, alors (idx_zone, idx_vect) ou (keyzone, keyvect)
 
         """
 
@@ -6698,16 +6761,26 @@ class Zones(wx.Frame, Element_To_Draw):
             self.xls.CreateGrid(10,6)
 
             sizer_add_update = BoxSizer(orient=wx.HORIZONTAL)
-            self.addrows = wx.Button(self,label=_('Add rows'))
+            self.addrows = wx.Button(self,label=_('Rows+'))
             self.addrows.SetToolTip(_("Add rows to the grid --> Useful for manually adding some points to a vector"))
             self.addrows.Bind(wx.EVT_BUTTON,self.Onaddrows)
 
-            self.updatevertices = wx.Button(self,label=_('Update coordinates'))
+            self.updatevertices = wx.Button(self,label=_('Update'))
             self.updatevertices.SetToolTip(_("Transfer the coordinates from the editor to the memory and update the plot"))
             self.updatevertices.Bind(wx.EVT_BUTTON,self.Onupdatevertices)
 
+            self.plot_mpl = wx.Button(self,label=_('Plot xy'))
+            self.plot_mpl.SetToolTip(_("Plot the active vector in a new window (matplotlib)"))
+            self.plot_mpl.Bind(wx.EVT_BUTTON,self.Onplotmpl)
+
+            self.plot_mplsz = wx.Button(self,label=_('Plot sz'))
+            self.plot_mplsz.SetToolTip(_("Plot the active vector in a new window (matplotlib)"))
+            self.plot_mplsz.Bind(wx.EVT_BUTTON,self.Onplotmplsz)
+
             sizer_add_update.Add(self.addrows,1, wx.EXPAND)
             sizer_add_update.Add(self.updatevertices,3, wx.EXPAND)
+            sizer_add_update.Add(self.plot_mpl,1, wx.EXPAND)
+            sizer_add_update.Add(self.plot_mplsz,1, wx.EXPAND)
 
             self.capturevertices = wx.Button(self,label=_('Add'))
             self.capturevertices.SetToolTip(_("Capture new points from mouse clicks \n\n Keyboard 'Return' to stop the action ! "))
@@ -6725,6 +6798,10 @@ class Zones(wx.Frame, Element_To_Draw):
             self.createapar.SetToolTip(_("Create a single parallel to the currently activated vector as a new vector in the same zone"))
             self.createapar.Bind(wx.EVT_BUTTON,self.OnAddPar)
 
+            self._btn_simplify = wx.Button(self,label=_('Simplify'))
+            self._btn_simplify.SetToolTip(_("Simplify the currently activated vector using the Douglas-Peucker algorithm"))
+            self._btn_simplify.Bind(wx.EVT_BUTTON,self.Onsimplify)
+
             sizer_reverse_split = BoxSizer(orient=wx.HORIZONTAL)
             self.reverseorder = wx.Button(self,label=_('Reverse points order'))
             self.reverseorder.SetToolTip(_("Reverse the order/sens of the currently activated vector -- Overwrite the data"))
@@ -6734,6 +6811,10 @@ class Zones(wx.Frame, Element_To_Draw):
             self.sascending.SetToolTip(_("Check whether the vertices of the activated vector are ordered according to increasing 's' defined as 2D geometric distance \n If needed, invert some positions and return information to the user"))
             self.sascending.Bind(wx.EVT_BUTTON,self.Onsascending)
 
+            self._btn_buffer = wx.Button(self,label=_('Buffer'))
+            self._btn_buffer.SetToolTip(_("Create a buffer around the currently activated vector\nThe buffer replaces the current vector"))
+            self._btn_buffer.Bind(wx.EVT_BUTTON,self.Onbuffer)
+
             self.insertvertices = wx.Button(self,label=_('Insert'))
             self.insertvertices.SetToolTip(_("Insert new vertex into the currently active vector from mouse clicks \n The new vertex is inserted along the nearest segment  \n\n Keyboard 'Return' to stop the action ! "))
             self.insertvertices.Bind(wx.EVT_BUTTON,self.Oninsert)
@@ -6830,7 +6911,11 @@ class Zones(wx.Frame, Element_To_Draw):
             subboxmod.Add(self.insertvertices,1,wx.EXPAND)
             boxright.Add(subboxmod,0,wx.EXPAND)
 
-            boxright.Add(self.createapar,0,wx.EXPAND)
+            subboxparsimpl = wx.BoxSizer(orient=wx.HORIZONTAL)
+            subboxparsimpl.Add(self.createapar,1,wx.EXPAND)
+            subboxparsimpl.Add(self._btn_simplify,1,wx.EXPAND)
+
+            boxright.Add(subboxparsimpl,0,wx.EXPAND)
 
             sizer_reverse_split.Add(self.reverseorder,1,wx.EXPAND)
             sizer_reverse_split.Add(self.splitvertices,1,wx.EXPAND)
@@ -6848,8 +6933,11 @@ class Zones(wx.Frame, Element_To_Draw):
             box_s.Add(self.getxyfromsz,1,wx.EXPAND) # Added
 
             boxright.Add(self.interpxyz,0,wx.EXPAND)
-            boxright.Add(self.sascending,0,wx.EXPAND)
 
+            _sizer_ascbuffer = wx.BoxSizer(wx.HORIZONTAL)
+            _sizer_ascbuffer.Add(self.sascending,1,wx.EXPAND)
+            _sizer_ascbuffer.Add(self._btn_buffer,1,wx.EXPAND)
+            boxright.Add(_sizer_ascbuffer,0,wx.EXPAND)
 
             sizer_values_surface = wx.BoxSizer(wx.HORIZONTAL)
             self.butgetval = wx.Button(self,label=_('Get values'))
@@ -7256,6 +7344,46 @@ class Zones(wx.Frame, Element_To_Draw):
             self.fill_structure()
             self.active_vector._reset_listogl()
 
+    def Onsimplify(self, event:wx.MouseEvent):
+        """
+        Simplify the active vector using the Douglas-Peucker algorithm
+        """
+
+        if self.verify_activevec():
+            return
+
+        tolerance = 1.0
+        if self.wx_exists:
+
+            dlg = wx.TextEntryDialog(None, _('Tolerance ?'), value='1.0')
+            ret = dlg.ShowModal()
+            tolerance = dlg.GetValue()
+            dlg.Destroy()
+            try:
+                tolerance = float(tolerance)
+            except:
+                logging.warning(_('Bad value -- Retry !'))
+                return
+
+        new_ls = self.active_vector.linestring.simplify(tolerance, preserve_topology=True)
+
+        xy = new_ls.xy # shape (2, n)
+        xy = np.array(xy).T # shape (n, 2)
+
+        if len(xy) == 0:
+            logging.warning(_('No points to add'))
+            return
+
+        tmp = self.active_vector.deepcopy().linestring
+        self.active_vector.reset()
+        for x, y in xy:
+            pt = Point(x, y)
+            self.active_vector.add_vertex(wolfvertex(x, y, tmp.interpolate(tmp.project(pt)).z))
+
+        self.xls_active_vector()
+        self.active_vector._reset_listogl()
+
+
     def OnAddPar(self, event:wx.MouseEvent):
         """
         Ajout d'une parallèle au vecteur courant via le bouton adhoc
@@ -7370,6 +7498,37 @@ class Zones(wx.Frame, Element_To_Draw):
                 dlg.ShowModal()
                 dlg.Destroy()
 
+    def Onbuffer(self, e:wx.MouseEvent):
+        """ Create a buffer around the currently activated vector.
+        The buffer replaces the active vector in the same zone."""
+
+        if self.wx_exists:
+            if self.verify_activevec():
+                return
+
+            dlg = wx.TextEntryDialog(None, _('Buffer distance ?'), value='5.0')
+            ret = dlg.ShowModal()
+            dist = dlg.GetValue()
+            dlg.Destroy()
+            try:
+                dist = float(dist)
+            except:
+                logging.warning(_('Bad value -- Retry !'))
+                return
+            if dist <= 0:
+                logging.warning(_('Buffer distance must be > 0 -- Retry !'))
+                return
+
+            if self.active_vector.nbvertices == 1:
+                self.active_vector.myvertices = self.active_vector.myvertices * 3
+                logging.warning(_('The active vector has only one vertex. It will be duplicated to create a buffer.'))
+            if self.active_vector.nbvertices == 2:
+                self.active_vector.myvertices = self.active_vector.myvertices + [self.active_vector.myvertices[0]]
+                logging.warning(_('The active vector has only two vertices. The first one will be duplicated to create a buffer.'))
+
+            self.active_vector.buffer(dist)
+            self.active_vector._reset_listogl()
+
     def Onmodify(self, event:wx.MouseEvent):
         """
         Permet la modification interactive de vertex dans le vector actif
@@ -7941,6 +8100,9 @@ class Zones(wx.Frame, Element_To_Draw):
         # Getting s values and Z values from the xls grid
         # s in column 4 and z in column 2
         # The first row is the header
+        nbrows = self.xls.GetNumberRows()
+        if self.xls.GetCellValue(nbrows-1,4) != '':
+            self.xls.AppendRows(1)
         i = 0
         while self.xls.GetCellValue(i,4) != '':
                 s = self.xls.GetCellValue(i,4)
@@ -8024,7 +8186,21 @@ class Zones(wx.Frame, Element_To_Draw):
 
         self.find_minmax(True)
 
-    def update_from_sz_support(self, vec: vector, sz:np.ndarray, dialog_box = True):
+    def update_from_sz_support(self,
+                               vec: vector,
+                               sz:np.ndarray,
+                               dialog_box = True,
+                               method:Literal['2D', '3D'] = '3D'):
+        """ Update the coordinates from the support vector and a sz array.
+
+        The support vector is used to interpolate the z values, at the s values.
+        It must long enough to cover the s values.
+
+        :param vec: The vector to update. It is also the support vector.
+        :param sz: The sz array to use for the update
+        :param dialog_box: If True, a dialog box will be shown to choose the method
+        :param method: The method to use for the interpolation. '2D' or '3D'
+        """
 
         if sz.shape[0] ==0:
             logging.warning(_('No data to update'))
@@ -8046,8 +8222,12 @@ class Zones(wx.Frame, Element_To_Draw):
 
             method=dlg.GetStringSelection()
             dlg.Destroy()
-        else:
-            method = '2D'
+        # else:
+        #     method = '2D'
+
+        if method not in ['2D', '3D']:
+            logging.warning(_('Method not supported -- only 2D and 3D are supported'))
+            return
 
         if method == '2D':
             if sz[-1,0] > support_vec.length2D:
@@ -8060,18 +8240,21 @@ class Zones(wx.Frame, Element_To_Draw):
 
         vec.myvertices = []
         for s,z in sz:
-            new_vertex = support_vec.interpolate(s, method == '3D', adim= False)
+            new_vertex = support_vec.interpolate(s, method == method, adim= False)
             new_vertex.z = z
             vec.add_vertex(new_vertex)
 
+        vec._reset_listogl()
+        vec.update_lengths()
+
         self.find_minmax(True)
 
-    def evaluate_s (self, vec: vector =None, dialog_box = True):
+    def evaluate_s(self, vec: vector =None, dialog_box = True):
         """
-        Calcule la position curviligne du vecteur encodé
+        Calcule la position curviligne du vecteur encodé.
 
-        Le calcul peut être mené en 2D ou en 3D
-        Remplissage du tableur dans la 5ème colonne
+        Le calcul peut être mené en 2D ou en 3D.
+        Remplissage du tableur dans la 5ème colonne.
         """
 
         curv = vec
@@ -8143,6 +8326,33 @@ class Zones(wx.Frame, Element_To_Draw):
         self.active_vector.updatefromgrid(self.xls)
         self.find_minmax(True)
 
+    def Onplotmpl(self, event:wx.MouseEvent):
+        """
+        Plot active vector in matplotlib
+        """
+
+        if self.verify_activevec():
+            return
+
+        fig, ax = plt.subplots()
+        self.active_vector.plot_matplotlib(ax)
+        ax.set_aspect('equal')
+        fig.show()
+
+    def Onplotmplsz(self, event:wx.MouseEvent):
+        """
+        Plot active vector in matplotlib with sz values
+        """
+        if self.verify_activevec():
+            return
+
+        fig, ax = plt.subplots()
+        s, z = self.active_vector.sz_curvi
+        ax.plot(s, z)
+        ax.set_xlabel('s')
+        ax.set_ylabel('z')
+        fig.show()
+
     def Onaddrows(self, event:wx.MouseEvent):
         """
         Ajout de lignes au tableur