wolfhece 2.1.43__py3-none-any.whl → 2.1.44__py3-none-any.whl

wolfhece/PyVertexvectors.py

@@ -12,6 +12,7 @@ from os import path
 from typing import Union
 import numpy as np
 import wx
+import wx._dataview
 from wx.dataview import *
 from wx.core import BoxSizer, FlexGridSizer, TreeItemId
 from OpenGL.GL  import *
@@ -304,6 +305,9 @@ class Triangulation(Element_To_Draw):
             triangles.tofile(f,"")
 
     def read(self,fn:str):
+        """ Read a binary '.TRI' file """
+
+        fn = str(fn)
 
         if fn.endswith('.dxf'):
             self.import_dxf(fn)
@@ -1182,7 +1186,7 @@ class vector:
 
         coords=self.asnparray()
         return Polygon(coords)
-    
+
     def asshapely_pol3D(self) -> Polygon:
         """
         Conversion des coordonnées en Polygon Shapely
@@ -1190,7 +1194,7 @@ class vector:
 
         coords=self.asnparray3d()
         return Polygon(coords)
-    
+
     def asshapely_ls3d(self) -> LineString:
         """
         Conversion des coordonnées en Linestring Shapely
@@ -1593,9 +1597,9 @@ class vector:
             if self.myprop.filled:
 
                 import triangle
-                
+
                 ls = self.asshapely_pol()
-                
+
                 if False:
 
                     #FIXME : Shapely have not constrained Delaunay triangulation -- using Delaunay from Wolf Fortran instead
@@ -2422,6 +2426,8 @@ class zone:
 
         from osgeo import gdal, osr, gdalconst,ogr
 
+        fn = str(fn)
+
         # create the spatial reference system, Lambert72
         srs = osr.SpatialReference()
         srs.ImportFromEPSG(31370)
@@ -2600,7 +2606,7 @@ class zone:
             if len(self.myvectors) == 0:
                 logging.warning(_('No vector in zone -- {}').format(self.myname))
                 return
-            
+
             try:
                 if self.idgllist==-99999:
                     self.idgllist = glGenLists(1)
@@ -3178,27 +3184,47 @@ class zone:
         self.parent.fill_structure()
 
     def create_sliding_polygon_from_parallel(self,
-                                             ds:float,
+                                             poly_length:float,
                                              ds_sliding:float,
-                                             dpar:float,
-                                             dspar:float=None,
+                                             farthest_parallel:float,
+                                             interval_parallel:float=None,
                                              intersect=None,
                                              howmanypoly=1,
-                                             eps_inter:float=0.25):
+                                             eps_offset:float=0.25):
         """
-        Création de polygones depuis des vecteurs parallèles
+        Create sliding polygons from a support vector.
 
-        La zone à traiter ne peut contenir qu'un seul vecteur
+        "poly_length" is the length of the polygons.
+        "ds_sliding" is the sliding length.
 
-        Une zone de résultat est ajouté à l'objet
+        If "ds_sliding" is lower than "ds", the polygons are overlapping.
+        If "ds_sliding" is greater than "ds", the polygons are separated.
+        If "ds_sliding" is equal to "ds", the polygons are adjacent.
+
+        The zone to be processed can only contain 1 vector.
+        A result zone is added to the object.
+
+        The sliding polygons are created on the basis of the left
+        and right parallels of the central vector.
+
+        "farthest_parallel" is the farthest parallel.
+        "interval_parallel" is the distance between each parallels. If not defined, it is equal to "farthest_parallel".
 
-        ds :            size/length of the polygon, adjusted on the basis of a number of polygons rounded up to the nearest integer
-        ds_sliding :    sliding length
-        dpar :          position of the parallels
-        dspar :         parallel intervals (internal computation)
-        intersect :     zone class containing constraints
-        howmanypoly :   number of transversal polygons (1 = one large polygon, 2 = 2 polygons - one left and one right)
-        eps_inter :     space width impose to the "intersect"
+        Lateral sides of the polygons are defined by projecting the
+        points/vertices of the support vector onto the parallels,
+        from the nearest to the farthest.
+
+        The method first creates the parallels.
+        Then, it intersects the parallels with the constraints defined in the "intersect" zone.
+        The intersection is done with an offset defined by "eps_offset".
+
+        :param poly_length: size/length of the polygon, adjusted on the basis of a number of polygons rounded up to the nearest integer
+        :param ds_sliding: sliding length
+        :param farthest_parallel: position of the parallels
+        :param interval_parallel: parallel intervals (internal computation)
+        :param intersect:  zone class containing constraints
+        :param howmanypoly: number of transversal polygons (1 = one large polygon, 2 = 2 polygons - one left and one right)
+        :param eps_offset: space width impose to the "intersect"
         """
 
         assert self.nbvectors==1, _('The zone must contain 1 and only 1 vector')
@@ -3215,12 +3241,16 @@ class zone:
         # Returned zone
         myparallels = zone()
 
-        if dspar is None :
-            dspar : dpar
+        if interval_parallel is None :
+            interval_parallel : farthest_parallel
+
+        if interval_parallel > farthest_parallel:
+            logging.warning(_('dspar is greater than dpar --> dspar is set to dpar'))
+            interval_parallel = farthest_parallel
 
         # All parallel distances
-        all_par = np.arange(0, dpar, dspar)[1:]
-        all_par = np.concatenate((all_par,[dpar]))
+        all_par = np.arange(0, farthest_parallel, interval_parallel)[1:]
+        all_par = np.concatenate((all_par,[farthest_parallel]))
 
         for curpar in tqdm(all_par):
             # add current parallel to the dicts
@@ -3231,10 +3261,12 @@ class zone:
             myparallels.add_vector(vecright[curpar], forceparent=True)
 
             if isinstance(intersect, zone):
+                # Some constraints are defined
+                #
                 # gestion de vecteurs d'intersection
                 for curint in intersect.myvectors:
                     # bouclage sur les vecteurs
-                    curint2 = curint.parallel_offset(eps_inter, side='right')
+                    curint2 = curint.parallel_offset(eps_offset, side='right')
 
                     # recherche si une intersection existe
                     pt, dist = vecleft[curpar].intersection(curint, eval_dist=True, force_single=True)
@@ -3262,7 +3294,6 @@ class zone:
 
                         # mise à jour des caractéristiques
                         vecleft[curpar].find_minmax()
-                        vecleft[curpar].nbvertices = len(vecleft[curpar].myvertices)
                         vecleft[curpar].update_lengths()
 
                     pt, dist = vecright[curpar].intersection(curint, eval_dist=True, force_single=True)
@@ -3279,7 +3310,6 @@ class zone:
 
                         vecright[curpar].myvertices = vec1.myvertices.copy() + subs2.myvertices.copy() + subs.myvertices.copy() + vec2.myvertices.copy()
 
-                        vecright[curpar].nbvertices = len(vecright[curpar].myvertices)
                         vecright[curpar].update_lengths()
                         vecright[curpar].find_minmax()
 
@@ -3293,7 +3323,7 @@ class zone:
 
         #Dimensional distances along center vector
         sloc = np.asarray([float(ds_sliding) * cur for cur in range(nb)])
-        sloc2 = sloc + float(ds)
+        sloc2 = sloc + float(poly_length)
         sloc2[sloc2>veccenter.length2D]=veccenter.length2D
 
         #Points along center vector
@@ -3358,8 +3388,8 @@ class zone:
                 curvec=vector(name='poly'+str(i), parentzone=zonepoly)
 
                 #Substring for Left and Right
-                sublsl=vecleft[dpar].substring(pt1[-1], pt2[-1], is3D=False, adim=False)
-                sublsr=vecright[dpar].substring(pt3[-1], pt4[-1], is3D=False, adim=False)
+                sublsl=vecleft[farthest_parallel].substring(pt1[-1], pt2[-1], is3D=False, adim=False)
+                sublsr=vecright[farthest_parallel].substring(pt3[-1], pt4[-1], is3D=False, adim=False)
                 sublsr.reverse()
                 sublsc=veccenter.substring(ptc1,ptc2,is3D=False, adim=False)
 
@@ -3373,7 +3403,6 @@ class zone:
                 curvec.myvertices = sublsl.myvertices.copy() + downl[1:].copy() + [sublsc.myvertices[-1].copy()] + downr[:-1].copy() + sublsr.myvertices.copy() + upr[1:].copy() + [sublsc.myvertices[0].copy()] + upl[:-1].copy()
                 for curvert in curvec.myvertices:
                     curvert.z = smean
-                curvec.nbvertices = len(curvec.myvertices)
 
                 #force to close the polygon
                 curvec.close_force()
@@ -3403,8 +3432,8 @@ class zone:
                 curvecright=vector(name='poly'+str(i+1),parentzone=zonepolyright)
 
                 #Substring for Left and Right
-                sublsl=vecleft[dpar].substring(pt1[-1], pt2[-1], is3D=False, adim=False)
-                sublsr=vecright[dpar].substring(pt3[-1], pt4[-1], is3D=False, adim=False)
+                sublsl=vecleft[farthest_parallel].substring(pt1[-1], pt2[-1], is3D=False, adim=False)
+                sublsr=vecright[farthest_parallel].substring(pt3[-1], pt4[-1], is3D=False, adim=False)
                 sublsr.reverse()
 
                 sublsc=veccenter.substring(ptc1,ptc2,is3D=False, adim=False)
@@ -3425,8 +3454,6 @@ class zone:
                     curvert.z = smean
                 for curvert in curvecright.myvertices:
                     curvert.z = smean
-                curvecleft.nbvertices = len(curvecleft.myvertices)
-                curvecright.nbvertices = len(curvecright.myvertices)
 
                 curvecleft.close_force()
                 curvecright.close_force()
@@ -3993,9 +4020,9 @@ class Zones(wx.Frame, Element_To_Draw):
         return len(self.myzones)
 
     def import_shapefile(self, fn:str, bbox:Polygon = None):
-        """ 
-        Import shapefile by using geopandas 
-        
+        """
+        Import shapefile by using geopandas
+
         Shapefile == 1 zone
 
         """
@@ -4019,13 +4046,13 @@ class Zones(wx.Frame, Element_To_Draw):
             self.add_zone(newzone)
 
     def export_to_shapefile(self, filename:str):
-        """ 
+        """
         Export to shapefile.
 
         The first vector of each zone will be exported.
 
         If you want to export all vectors, you have to use "export_shape" of the zone object.
-        
+
         FIXME: Add support of data fields
         """
 
@@ -4039,7 +4066,7 @@ class Zones(wx.Frame, Element_To_Draw):
             if curzone.nbvectors == 0:
                 logging.warning(_('Zone {} contains no vector'.format(curzone.myname)))
                 continue
-            
+
             elif curzone.nbvectors>1:
                 logging.warning(_('Zone {} contains more than one vector -- only the first one will be exported'.format(curzone.myname)))
 
@@ -4062,16 +4089,16 @@ class Zones(wx.Frame, Element_To_Draw):
         gdf.to_file(filename)
 
     def export_active_zone_to_shapefile(self, filename:str):
-        """ 
+        """
         Export the active_zone to shapefile.
         """
 
         if self.active_zone is None:
             logging.warning(_('No active zone'))
             return
-        
+
         self.active_zone.export_shape(filename)
-    
+
     def import_gdb(self, fn:str, bbox:Polygon = None):
         """ Import gdb by using geopandas and Fiona"""
 
@@ -4395,6 +4422,9 @@ class Zones(wx.Frame, Element_To_Draw):
 
         si c'est le cas, self.filename est modifié
         """
+
+        filename = str(filename)
+
         if filename!='':
             self.filename=filename
 
@@ -4538,7 +4568,7 @@ class Zones(wx.Frame, Element_To_Draw):
             self.xls=CpGrid(self,-1,wx.WANTS_CHARS)
             self.xls.CreateGrid(10,6)
 
-            self.addrows = wx.Button(self,label=_('Add rows'))
+            self.addrows = wx.Button(self,label=_('Add rows to grid'))
             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)
 
@@ -4618,6 +4648,10 @@ class Zones(wx.Frame, Element_To_Draw):
             self.polyfrompar.SetToolTip(_("Create polygons in a new zone from parallels defined by " + _('Add and parallel') + _(" and a 2D curvilinear distance \n Useful for plotting some results or analyse data inside each polygon")))
             self.polyfrompar.Bind(wx.EVT_BUTTON,self.Oncreatepolygons)
 
+            self.slidingpoly = wx.Button(self,label=_('Create sliding polygons'))
+            self.slidingpoly.SetToolTip(_("Create sliding polygons in a new zone"))
+            self.slidingpoly.Bind(wx.EVT_BUTTON,self.Oncreateslidingpoly)
+
             # Added
             self.getxyfromsz = wx.Button(self, label = _('Get xy from sz'))
             self.getxyfromsz.SetToolTip(_("Populate the X an Y columns based on: \n - Given sz coordinates, \n - The X and Y coordinates of the initial point (s = 0) and,  \n - The X and Y coordinates of a second point (any other point with an S coordinate)"))
@@ -4625,20 +4659,29 @@ class Zones(wx.Frame, Element_To_Draw):
 
             boxright.Add(self.xls,1,wx.EXPAND)
             boxright.Add(self.addrows,0,wx.EXPAND)
-            boxright.Add(self.capturevertices,0,wx.EXPAND)
-            boxright.Add(self.dynapar,0,wx.EXPAND)
+
+            boxright.Add(self.updatevertices,0,wx.EXPAND)
+
+            subboxadd = BoxSizer(orient=wx.HORIZONTAL)
+            subboxadd.Add(self.capturevertices,1,wx.EXPAND)
+            subboxadd.Add(self.dynapar,1,wx.EXPAND)
+            boxright.Add(subboxadd,0,wx.EXPAND)
+
+            subboxmod = wx.BoxSizer(wx.HORIZONTAL)
+            subboxmod.Add(self.modifyvertices,1,wx.EXPAND)
+            subboxmod.Add(self.insertvertices,1,wx.EXPAND)
+            boxright.Add(subboxmod,0,wx.EXPAND)
+
             boxright.Add(self.createapar,0,wx.EXPAND)
             boxright.Add(self.reverseorder,0,wx.EXPAND)
-            boxright.Add(self.modifyvertices,0,wx.EXPAND)
-            boxright.Add(self.insertvertices,0,wx.EXPAND)
             boxright.Add(self.splitvertices,0,wx.EXPAND)
+
             # boxright.Add(self.zoomonactive,0,wx.EXPAND)
             boxright.Add(boxzoom,0,wx.EXPAND)
-            boxright.Add(self.sascending,0,wx.EXPAND)
             boxright.Add(self.evaluates,0,wx.EXPAND)
-            boxright.Add(self.getxyfromsz,0,wx.EXPAND) # Added
             boxright.Add(self.interpxyz,0,wx.EXPAND)
-            boxright.Add(self.updatevertices,0,wx.EXPAND)
+            boxright.Add(self.sascending,0,wx.EXPAND)
+            boxright.Add(self.getxyfromsz,0,wx.EXPAND) # Added
 
             self.butgetval = wx.Button(self,label=_('Get values (self or active array)'))
             self.butgetval.SetToolTip(_("Get values of the attached/active array on each vertex of the active vector and update the editor"))
@@ -4674,9 +4717,9 @@ class Zones(wx.Frame, Element_To_Draw):
             self.addzone = wx.Button(self,label=_('Add zone'))
             self.addvector = wx.Button(self,label=_('Add vector'))
             self.deletezone = wx.Button(self,label=_('Delete zone'))
-            self.findactivevector = wx.Button(self,label=_('Find in whole zones'))
+            self.findactivevector = wx.Button(self,label=_('Find in all'))
             self.findactivevector.SetToolTip(_("Search and activate the nearest vector by mouse click (Searching window : all zones)"))
-            self.findactivevectorcurz = wx.Button(self,label=_('Find in active zone'))
+            self.findactivevectorcurz = wx.Button(self,label=_('Find in active'))
             self.findactivevectorcurz.SetToolTip(_("Search and activate the nearest vector by mouse click (Searching window : active zone)"))
             self.deletevector = wx.Button(self,label=_('Delete vector'))
 
@@ -4704,11 +4747,17 @@ class Zones(wx.Frame, Element_To_Draw):
             boxadd.Add(self.labelactzone,1,wx.EXPAND)
             boxadd.Add(self.addzone,1,wx.EXPAND)
             boxadd.Add(self.addvector,1,wx.EXPAND)
-            boxadd.Add(self.findactivevector,1,wx.EXPAND)
-            boxadd.Add(self.findactivevectorcurz,1,wx.EXPAND)
-            boxdelete.Add(self.deletezone,1,wx.EXPAND)
-            boxdelete.Add(self.deletevector,1,wx.EXPAND)
-            boxdelete.Add(boxupdown,1,wx.EXPAND)
+
+            subboxadd = wx.BoxSizer(wx.HORIZONTAL)
+            subboxadd.Add(self.findactivevector,1,wx.EXPAND)
+            subboxadd.Add(self.findactivevectorcurz,1,wx.EXPAND)
+            boxadd.Add(subboxadd,1,wx.EXPAND)
+
+            subboxdelete = wx.BoxSizer(wx.HORIZONTAL)
+            subboxdelete.Add(self.deletezone,1,wx.EXPAND)
+            subboxdelete.Add(self.deletevector,1,wx.EXPAND)
+
+            boxdelete.Add(subboxdelete,1,wx.EXPAND)
 
             boxupdown.Add(boxupdownz,1,wx.EXPAND)
             boxupdown.Add(boxupdownv,1,wx.EXPAND)
@@ -4719,15 +4768,19 @@ class Zones(wx.Frame, Element_To_Draw):
             boxupdownz.Add(self.downzone,1,wx.EXPAND)
 
             # boxdelete.Add(self.interpolate,1,wx.EXPAND)
-            boxdelete.Add(self.saveimages,1,wx.EXPAND)
-            boxdelete.Add(self.binfrom3,1,wx.EXPAND)
-            boxdelete.Add(self.trifromall,1,wx.EXPAND)
-            boxdelete.Add(self.trifromall_proj,1,wx.EXPAND)
-            boxdelete.Add(self.polyfrompar,1,wx.EXPAND)
+            boxtri = wx.BoxSizer(wx.VERTICAL)
+            boxtri.Add(self.saveimages,1,wx.EXPAND)
+            boxtri.Add(self.binfrom3,1,wx.EXPAND)
+            boxtri.Add(self.trifromall,1,wx.EXPAND)
+            boxtri.Add(self.trifromall_proj,1,wx.EXPAND)
+            boxtri.Add(self.polyfrompar,1,wx.EXPAND)
+            boxtri.Add(self.slidingpoly,1,wx.EXPAND)
 
             boxleft.Add(self.treelist,1,wx.EXPAND)
             boxleft.Add(boxadd,0,wx.EXPAND)
             boxleft.Add(boxdelete,0,wx.EXPAND)
+            boxleft.Add(boxupdown,0,wx.EXPAND)
+            boxleft.Add(boxtri,0,wx.EXPAND)
 
             box.Add(boxleft,1,wx.EXPAND)
             box.Add(boxright,1,wx.EXPAND)
@@ -4932,6 +4985,10 @@ class Zones(wx.Frame, Element_To_Draw):
         """
 
         def store_tree_state(tree:TreeListCtrl):
+            """ Store the state of the tree control.
+
+            Recursively store the state of the tree control in a list of item data.
+            """
 
             expended_items = []
             root = tree.GetRootItem()
@@ -4939,23 +4996,27 @@ class Zones(wx.Frame, Element_To_Draw):
             if root is None:
                 return
 
-            def traverse_and_store(item):
+            def traverse_and_store(item:wx._dataview.TreeListItem):
                 if not item.IsOk():
                     return
+
                 if tree.IsExpanded(item):
                     expended_items.append(tree.GetItemData(item))
 
-                child = tree.GetFirstChild(item)
-                while child.IsOk():
-                    traverse_and_store(child)
-                    child = tree.GetNextItem(child)
+                item = tree.GetNextItem(item)
+
+                traverse_and_store(item)
 
             traverse_and_store(root)
 
             return expended_items
 
         def restore_tree_state(tree:TreeListCtrl, expended_items):
-            
+            """ Restore the state of the tree control.
+
+            Recursively restore the state of the tree control from a list of item data.
+            """
+
             if len(expanded)==0:
                 # Nothing to do
                 return
@@ -4972,10 +5033,8 @@ class Zones(wx.Frame, Element_To_Draw):
                 if tree.GetItemData(item) in expended_items:
                     tree.Expand(item)
 
-                child = tree.GetFirstChild(item)
-                while child.IsOk():
-                    traverse_and_restore(child)
-                    child = tree.GetNextItem(child)
+                item = tree.GetNextItem(item)
+                traverse_and_restore(item)
 
             traverse_and_restore(root)
 
@@ -4999,10 +5058,11 @@ class Zones(wx.Frame, Element_To_Draw):
 
     def expand_tree(self, objzone=None):
         """
-        Développe la structure pour un objet spécifique stocké dans la self.treelist
+        Développe la structure pour un objet spécifique stocké dans la self.treelist.
 
-        L'objet peut être une 'zone' ou un 'vector' --> see more in 'fill_structure'
+        L'objet peut être une 'zone' ou un 'vector' --> see more in 'fill_structure'.
         """
+
         if self.wx_exists:
             if self.xls is not None:
                 root = self.treelist.GetRootItem()
@@ -5023,6 +5083,7 @@ class Zones(wx.Frame, Element_To_Draw):
         Ajoute de nouveaux vertices au vecteur courant
         Fonctionne par clicks souris via le GUI wx de WolfMapViewer
         """
+
         if self.wx_exists:
             # N'est pas à strictement parlé dépendant de wx mais n'a de sens
             # que si le mapviewer est défini --> si un GUI wx existe
@@ -5039,6 +5100,7 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         Renverse le vecteur courant
         """
+
         if self.wx_exists:
             # N'est pas à strictement parlé dépendant de wx mais n'a de sens
             # que si le mapviewer est défini --> si un GUI wx existe
@@ -5052,6 +5114,7 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         Ajout d'une parallèle au vecteur courant via le bouton adhoc
         """
+
         if self.wx_exists:
             if self.verify_activevec():
                 return
@@ -5075,6 +5138,7 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         Ajoute des vertices au vecteur courant et crée des parallèles gauche-droite
         """
+
         if self.wx_exists:
             if self.verify_activevec():
                 return
@@ -5093,6 +5157,7 @@ class Zones(wx.Frame, Element_To_Draw):
 
         Retourne un message avec les valeurs modifiées le cas échéant
         """
+
         if self.wx_exists:
             if self.verify_activevec():
                 return
@@ -5117,6 +5182,7 @@ class Zones(wx.Frame, Element_To_Draw):
 
         --> action active jusqu'à sélectionne une autre action ou touche Entrée
         """
+
         if self.wx_exists:
             if self.verify_activevec():
                 return
@@ -5129,6 +5195,7 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         Zoom sur le vecteur actif dans le mapviewer
         """
+
         if self.wx_exists:
             if self.verify_activevec():
                 return
@@ -5139,6 +5206,7 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         Zoom sur le vertex actif dans le mapviewer
         """
+
         if self.wx_exists:
             if self.verify_activevec():
                 return
@@ -5152,6 +5220,7 @@ class Zones(wx.Frame, Element_To_Draw):
         --> soit la matrice courante
         --> soit la matrice active de l'interface parent
         """
+
         if self.verify_activevec():
             return
 
@@ -5172,6 +5241,7 @@ class Zones(wx.Frame, Element_To_Draw):
         Crée une nouvelle zone contenant une copie du vecteur
         Le nombre de vertices est conservé
         """
+
         if self.parent is not None:
             if self.verify_activevec():
                 return
@@ -5217,12 +5287,14 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         Enregistrement d'une image pour tous les vecteurs
         """
+
         self.save_images_fromvec()
 
     def Oncreatepolygons(self, event:wx.MouseEvent):
         """
         Création de polygones depuis des paralèles contenues dans la zone active
         """
+
         if self.active_zone is None:
             return
 
@@ -5253,6 +5325,89 @@ class Zones(wx.Frame, Element_To_Draw):
 
             self.active_zone.create_polygon_from_parallel(ds,nb)
 
+    def Oncreateslidingpoly(self, event:wx.MouseEvent):
+        """
+        Create sliding polygons from a support vector
+        """
+
+        if self.active_zone is None:
+            logging.warning(_('No active zone - Nothing to do !'))
+            return
+
+        if self.active_zone.nbvectors!=1:
+            logging.error(_('The active zone must contain 1 vector and only 1'))
+            dlg = wx.MessageDialog(None,_('The active zone must contain 1 vector and only 1'),style=wx.OK)
+            dlg.ShowModal()
+            dlg.Destroy()
+            return
+
+        #dialog box for length, sliding length, farthest parallel and parallel interval
+        dlg=wx.NumberEntryDialog(None,_('What is the desired longitudinal size [cm] ?'),'ds','ds size',5000,1,100000)
+        ret=dlg.ShowModal()
+        if ret==wx.ID_CANCEL:
+            dlg.Destroy()
+            return
+
+        ds=float(dlg.GetValue())/100.
+
+        dlg.Destroy()
+
+        dlg=wx.NumberEntryDialog(None,_('What is the desired sliding length [cm] ?'),'sliding','sliding size',5000,1,100000)
+        ret=dlg.ShowModal()
+        if ret==wx.ID_CANCEL:
+            dlg.Destroy()
+            return
+
+        sliding=float(dlg.GetValue())/100.
+
+        dlg.Destroy()
+
+        dlg=wx.NumberEntryDialog(None,_('What is the desired farthest parallel [cm] ?'),'farthest','farthest size',10000,1,100000)
+        ret=dlg.ShowModal()
+        if ret==wx.ID_CANCEL:
+            dlg.Destroy()
+            return
+
+        farthest=float(dlg.GetValue())/100.
+
+        dlg.Destroy()
+
+        dlg=wx.NumberEntryDialog(None,_('What is the desired parallel interval [cm] ?'),'interval','interval size',int(farthest*10.),1,int(farthest*100.))
+        ret=dlg.ShowModal()
+        if ret==wx.ID_CANCEL:
+            dlg.Destroy()
+            return
+
+        interval=float(dlg.GetValue())/100.
+
+        dlg.Destroy()
+
+        zones_names=[curz.myname for curz in self.myzones]
+        if "intersect" in zones_names:
+            dlg = wx.MessageDialog(None,_('Do you want to use the intersect zone ?'),style=wx.YES_NO)
+            ret=dlg.ShowModal()
+            if ret==wx.ID_YES:
+                inter = True
+            else:
+                inter = False
+            dlg.Destroy()
+        else:
+            inter = False
+
+        inter_zone = None
+        if inter:
+            inter_zone = self.myzones[zones_names.index("intersect")]
+
+        dlg = wx.MessageDialog(None,_('Do you want to separate left and right polygons ?'),style=wx.YES_NO)
+        ret=dlg.ShowModal()
+        if ret==wx.ID_YES:
+            howmany = 2
+        else:
+            howmany = 1
+
+        self.active_zone.create_sliding_polygon_from_parallel(ds, sliding, farthest, interval, inter_zone, howmany)
+
+
     def Oncreatebin(self,event:wx.MouseEvent):
         """
         Création d'un canal sur base de 3 parallèles
@@ -5985,7 +6140,7 @@ class Zones(wx.Frame, Element_To_Draw):
 
         Pousse la même information dans l'objet parent s'il existe
         """
-        
+
         if self.wx_exists:
             self.active_zone = object
 

wolfhece/apps/version.py

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

{wolfhece-2.1.43.dist-info → wolfhece-2.1.44.dist-info}/METADATA

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

@@ -15,7 +15,7 @@ wolfhece/PyParams.py,sha256=wwgmP-_7wiiPLTcyX8a5jR6FyC1D2c4oBPc1VWQqtSA,97383
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=vJ-NbnhPiTuFvDfAF7wfrEzVmladx5Ts0zKsyfySV3Q,40390
-wolfhece/PyVertexvectors.py,sha256=a-e3nXcFxlhYz99N-7ID006fmhFZVHPqu5shwYI-kkY,228768
+wolfhece/PyVertexvectors.py,sha256=9MT7Qa37dnItmL4ml9O0NUY4SAee2SMWLd2FfL1oMTg,233710
 wolfhece/PyWMS.py,sha256=fyyzm2HFwq8aRwVYHKiBatcZOeKnFi6DWhv4nfscySQ,4602
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -71,7 +71,7 @@ wolfhece/apps/check_install.py,sha256=icFpkjfwNGDX-0NZVa-ijrCrqmGHEKDiFphjN8uTyh
 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=bdB4GLg3IhfwQHauAp6z5E9rLmkR59cxO5aUkbNU2TU,388
+wolfhece/apps/version.py,sha256=42X8KC4MhMsyZkkbTyYj1S26AzOp9fQtCIqVNikPw5o,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
@@ -276,8 +276,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.43.dist-info/METADATA,sha256=FUr3BN23BBFsn9AwKtIf3LAphvxPmNW5opQgwtJZAVU,2463
-wolfhece-2.1.43.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.43.dist-info/entry_points.txt,sha256=yggeO1Fa80pi2BrOd9k5dTkiFlefGPwG6HztZhY0-qw,366
-wolfhece-2.1.43.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.43.dist-info/RECORD,,
+wolfhece-2.1.44.dist-info/METADATA,sha256=z3vYq9zp0CQf9Rg8X1x3H2PER-At8R863VPkddKCfYo,2463
+wolfhece-2.1.44.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.44.dist-info/entry_points.txt,sha256=yggeO1Fa80pi2BrOd9k5dTkiFlefGPwG6HztZhY0-qw,366
+wolfhece-2.1.44.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.44.dist-info/RECORD,,