wolfhece 2.0.5__py3-none-any.whl → 2.0.6__py3-none-any.whl

wolfhece/GraphNotebook.py

@@ -576,7 +576,6 @@ class ManagerInterp(PlotPanel):
 
         #redécoupage du vecteur selon des nouvelles abscisses curvi
         curvec.myvertices=[]
-        curvec.nbvertices=0
         for curs in snew:
             mypt = curls.interpolate(curs)
             curvec.add_vertex(wolfvertex(mypt.x,mypt.y,mypt.z))

wolfhece/GraphProfile.py

@@ -512,11 +512,11 @@ class PlotCSAll(ProfilePanel):
 
         if reset:
             self.zones = None
-            self.copy_nbvertices = None
+            # self.copy_nbvertices = None
             self.copy_vertices = None
             # added
             self.copy_compare_vertices = None
-            self.copy_compare_nbvertices = None
+            # self.copy_compare_nbvertices = None
 
     def update_plots(self, update_image=False):
         #plots
@@ -1196,12 +1196,10 @@ class PlotCSAll(ProfilePanel):
         self._update_drawings()
 
     def _reset_profile_vertices(self):
-        if self.copy_vertices and self.copy_nbvertices:
+        if self.copy_vertices: # and self.copy_nbvertices:
             self.mycs.myvertices = self.copy_vertices
-            self.mycs.nbvertices = self.copy_nbvertices
             # added
             self.compare.myvertices = self.copy_compare_vertices
-            self.compare.nbvertices = self.copy_compare_nbvertices
 
     def update_profile_from_sz(self, event:wx.Event):
         """
@@ -1248,7 +1246,6 @@ class PlotCSAll(ProfilePanel):
 
         self.mycs.reset_prepare()
         self.mycs.myvertices=vertices
-        self.mycs.nbvertices = nbv
 
         self._update_drawings()
 
@@ -1353,9 +1350,9 @@ class PlotCSAll(ProfilePanel):
         if self.compare:
             # A copy of vertices is stored in memory to conserve the discretization of the initial profile.
             self.copy_vertices = copy.deepcopy(self.mycs.myvertices)
-            self.copy_nbvertices = copy.deepcopy(self.mycs.nbvertices)
+            # self.copy_nbvertices = copy.deepcopy(self.mycs.nbvertices)
             self.copy_compare_vertices = copy.deepcopy(self.compare.myvertices)
-            self.copy_compare_nbvertices = copy.deepcopy(self.compare.nbvertices)
+            # self.copy_compare_nbvertices = copy.deepcopy(self.compare.nbvertices)
 
             # Resetting the crossections characteristics after modifications from the table (cpgrid)
             self.mycs.reset_prepare()
@@ -1401,9 +1398,7 @@ class PlotCSAll(ProfilePanel):
             length_compare = self.compare.asshapely_ls()
             # Harmonized properties
             cs_vertices = []
-            cs_nb = 0
             compare_vertices = []
-            compare_nb = 0
 
             # process
             for i in new_sz:
@@ -1415,14 +1410,10 @@ class PlotCSAll(ProfilePanel):
                 curvert_compare = wolfvertex(coords_compare.x, coords_compare.y, coords_compare.z)
                 cs_vertices.append(curvert_cs)
                 compare_vertices.append(curvert_compare)
-                cs_nb += 1
-                compare_nb += 1
 
             # Update of the 2 profiles characteristics
             self.mycs.myvertices= cs_vertices
-            self.mycs.nbvertices = cs_nb
             self.compare.myvertices= compare_vertices
-            self.compare.nbvertices = compare_nb
 
 class windowsgrid(wx.Frame):
     """

wolfhece/Lidar2002.py

@@ -37,7 +37,6 @@ class ASC_file(Lidar2002):
         self.dy = 1.
         
         self.filename = fname
-        self.nbdims=2
     
     def read_data_XYZ(self):
         with open(self.filename,'r') as f:

wolfhece/PyCrosssections.py

@@ -18,6 +18,7 @@ import wx
 from typing import Union, Literal
 
 from .PyTranslate import _
+from .drawing_obj import Element_To_Draw
 from .PyVertexvectors import vector,zone,Zones
 from .PyVertex import wolfvertex,cloud_vertices, getIfromRGB
 from .lazviewer.laz_viewer import xyz_laz_grids, myviewer
@@ -425,7 +426,6 @@ class profile(vector):
         if sz.shape[1]==2 and xy1.shape==(2,) and xy2.shape==(2,):
             if not np.array_equal(xy1,xy2):
                 self.myvertices=[]
-                self.nbvertices = 0
 
                 dx, dy = xy2[0]-xy1[0], xy2[1]-xy1[1]
                 norm = np.linalg.norm([dx,dy])
@@ -1159,8 +1159,6 @@ class profile(vector):
         # Deep copies
         # 1. Vertices
         copied_profile.myvertices = copy.deepcopy(self.myvertices)
-        # 2. Number of vertices
-        copied_profile.nbvertices = copy.deepcopy(self.nbvertices)
         # 3. The river banks
         copied_profile.bankleft = copy.deepcopy(self.bankleft)
         copied_profile.bankright = copy.deepcopy(self.bankright)
@@ -1670,7 +1668,7 @@ class profile(vector):
 
 
 
-class crosssections():
+class crosssections(Element_To_Draw):
     """
     Gestion de sections en travers pour différents formats
         - SPW 2000 --> format ='2000'
@@ -1705,7 +1703,12 @@ class crosssections():
                  myfile,
                  format:typing.Literal['2000','2022','vecz','sxy']='2022',
                  dirlaz:typing.Union[str, xyz_laz_grids] =r'D:\OneDrive\OneDrive - Universite de Liege\Crues\2021-07 Vesdre\CSC - Convention - ARNE\Data\LAZ_Vesdre\2023',
-                 mapviewer = None) -> None:
+                 mapviewer = None,
+                 idx='',
+                 plotted=True) -> None:
+
+
+        super().__init__(idx=idx, plotted= plotted, mapviewer=mapviewer, need_for_wx=False)
 
         self.filename=myfile
         self.myzones=None
@@ -1740,8 +1743,6 @@ class crosssections():
         self.sorted = {}
         self.plotted = False
 
-        self.mapviewer = mapviewer
-
         if format=='2000':
             self.format='2000'
             lines.pop(0)
@@ -1872,7 +1873,6 @@ class crosssections():
                 cursect=curdict['cs']
 
                 cursect.myvertices = curvec.myvertices
-                cursect.nbvertices = curvec.nbvertices
 
         elif format=='sxy':
             self.format='sxy'
@@ -1984,7 +1984,6 @@ class crosssections():
 
             cursect = curdict['cs'] = profile(name=curvec.myname,parent=self)
             cursect.myvertices = curvec.myvertices
-            cursect.nbvertices = curvec.nbvertices
 
     def get_linked_arrays(self):
         """
@@ -2064,17 +2063,14 @@ class crosssections():
 
         newvec = vector(name='left',is2D=False,parentzone=newzone)
         newvec.myvertices=left
-        newvec.nbvertices=len(left)
         newzone.add_vector(newvec)
 
         newvec = vector(name='bed',is2D=False,parentzone=newzone)
         newvec.myvertices=bed
-        newvec.nbvertices=len(bed)
         newzone.add_vector(newvec)
 
         newvec = vector(name='right',is2D=False,parentzone=newzone)
         newvec.myvertices=right
-        newvec.nbvertices=len(right)
         newzone.add_vector(newvec)
 
     def link_external_zones(self,mylink:Zones):
@@ -2275,7 +2271,7 @@ class crosssections():
 
         gltf.save(fn)
 
-    def set_zones(self,forceupdate=False):
+    def set_zones(self, forceupdate:bool=False):
         if forceupdate:
             self.myzone=None
             self.myzones=None
@@ -2292,6 +2288,8 @@ class crosssections():
                 self.myzone.add_vector(curprof)
                 curprof.parentzone=self.myzone
 
+            self._prep_listogl()
+
     def showstructure(self, parent=None, forceupdate=False):
         self.set_zones()
         self.myzones.showstructure(parent, forceupdate)
@@ -2344,12 +2342,6 @@ class crosssections():
 
         self.set_zones(True)
 
-    def check_plot(self):
-        self.plotted = True
-
-    def uncheck_plot(self,unload=True):
-        self.plotted = False
-
     def saveas(self,filename=None):
         self.forcesuper=False
 
@@ -2467,7 +2459,7 @@ class crosssections():
 
         return len(mysorted)
 
-    def find_minmax(self,update=False):
+    def find_minmax(self, update:bool=False):
         if update:
             for idx,vect in self.myprofiles.items():
                 vect['cs'].find_minmax()
@@ -2477,11 +2469,14 @@ class crosssections():
         self.xmax=max(vect['cs'].xmax for idx,vect in self.myprofiles.items())
         self.ymax=max(vect['cs'].ymax for idx,vect in self.myprofiles.items())
 
-    def plot(self):
+    def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
+        """ Plotting cross-sections """
         self.set_zones()
-        self.myzones.plot()
-        # for idx,curvect in self.myprofiles.items():
-        #     curvect['cs'].plot()
+        self.myzones.plot(sx, sy, xmin, ymin, xmax, ymax, size)
+
+    def _prep_listogl(self):
+        """ Prepare list of GL objects """
+        self.myzones.prep_listogl()
 
     def saveas_wolfvec(self,filename:str):
 
@@ -3000,8 +2995,8 @@ class Interpolators():
         """
         Constructeur de la classe Interpolators
 
-        @param banks: Zones contenant les vecteurs supports
-        @param cs: objet 'crosssections' contenant les sections en travers --> voir PyCrosssections
+        :param banks: Zones contenant les vecteurs supports
+        :param cs: objet 'crosssections' contenant les sections en travers --> voir PyCrosssections
         """
 
         self.mybanks = [curv for curzone in banks.myzones for curv in curzone.myvectors]