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

wolfhece/PyCrosssections.py

@@ -26,6 +26,7 @@ from enum import Enum
 import logging
 import wx
 from typing import Union, Literal
+from pathlib import Path
 
 from .PyTranslate import _
 from .drawing_obj import Element_To_Draw
@@ -1722,7 +1723,7 @@ class crosssections(Element_To_Draw):
     mygenprofiles:dict
 
     def __init__(self,
-                 myfile,
+                 myfile:str = '',
                  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,
@@ -1754,9 +1755,12 @@ class crosssections(Element_To_Draw):
 
         if format in ['2000','2022','sxy']:
             self.filename=myfile
-            f=open(myfile,'r')
-            lines=f.read().splitlines()
-            f.close()
+            if Path(myfile).exists() and myfile!='':
+                f=open(myfile,'r')
+                lines=f.read().splitlines()
+                f.close()
+            else:
+                lines=[]
 
         self.myprofiles={}
         self.mygenprofiles={}
@@ -1768,214 +1772,215 @@ class crosssections(Element_To_Draw):
         self.sorted = {}
         self.plotted = False
 
-        if format=='2000':
-            self.format='2000'
-            lines.pop(0)
-            nameprev=''
-            index=0
-            for curline in lines:
-                vals=curline.split('\t')
-                name=vals[0]
-
-                if name!=nameprev:
-                    #création d'un nouveau dictionnaire
-                    self.myprofiles[name]={}
-                    curdict=self.myprofiles[name]
+        if len(lines)>0:
+            if format=='2000':
+                self.format='2000'
+                lines.pop(0)
+                nameprev=''
+                index=0
+                for curline in lines:
+                    vals=curline.split('\t')
+                    name=vals[0]
+
+                    if name!=nameprev:
+                        #création d'un nouveau dictionnaire
+                        self.myprofiles[name]={}
+                        curdict=self.myprofiles[name]
+                        curdict['index']=index
+                        index+=1
+                        curdict['cs']=profile(name=name,parent=self)
+                        cursect:profile
+                        cursect=curdict['cs']
+
+                    x=float(vals[1])
+                    y=float(vals[2])
+                    type=vals[3]
+                    z=float(vals[4])
+
+                    curvertex=wolfvertex(x,y,z)
+                    cursect.add_vertex(curvertex)
+                    if type=='LEFT':
+                        if cursect.bankleft is None:
+                            cursect.bankleft=wolfvertex(x,y,z)
+                            curdict['left']=cursect.bankleft
+                        else:
+                            logging.debug(name)
+                    elif type=='BED':
+                        if cursect.bed is None:
+                            cursect.bed=wolfvertex(x,y,z)
+                            curdict['bed']=cursect.bed
+                        else:
+                            logging.debug(name)
+                    elif type=='RIGHT':
+                        if cursect.bankright is None:
+                            cursect.bankright=wolfvertex(x,y,z)
+                            curdict['right']=cursect.bankright
+                        else:
+                            logging.debug(name)
+
+                    nameprev=name
+            elif format=='2022':
+                self.format='2022'
+                lines.pop(0)
+                nameprev=''
+                index=0
+                for curline in lines:
+                    vals=curline.split('\t')
+
+                    if vals[0].find('.')>0:
+                        name=vals[0].split('.')[0]
+                        xpos=1
+                        ypos=xpos+1
+                        zpos=ypos+1
+                        labelpos=zpos+1
+                    else:
+                        name=vals[0]
+                        xpos=2
+                        ypos=xpos+1
+                        zpos=ypos+1
+                        labelpos=zpos+1
+
+                    if name!=nameprev:
+                        #création d'un nouveau dictionnaire
+                        self.myprofiles[name]={}
+                        curdict=self.myprofiles[name]
+                        curdict['index']=index
+                        index+=1
+                        curdict['cs']=profile(name=name,parent=self)
+                        cursect:profile
+                        cursect=curdict['cs']
+
+                    x=float(vals[xpos].replace(',','.'))
+                    y=float(vals[ypos].replace(',','.'))
+                    z=float(vals[zpos].replace(',','.'))
+
+                    curvertex=wolfvertex(x,y,z)
+                    cursect.add_vertex(curvertex)
+
+                    type=''
+                    type=vals[labelpos]
+
+                    if type=='HBG':
+                        if cursect.bankleft is None:
+                            cursect.bankleft=wolfvertex(x,y,z)
+                            curdict['left']=cursect.bankleft
+                        else:
+                            logging.debug(name)
+                    elif type=='TWG':
+                        if cursect.bed is None:
+                            cursect.bed=wolfvertex(x,y,z)
+                            curdict['bed']=cursect.bed
+                        else:
+                            logging.debug(name)
+                    elif type=='HBD':
+                        if cursect.bankright is None:
+                            cursect.bankright=wolfvertex(x,y,z)
+                            curdict['right']=cursect.bankright
+                        else:
+                            logging.debug(name)
+
+                    nameprev=name
+            elif format=='vecz' or format=='zones':
+
+                if isinstance(myfile, Zones):
+                    self.filename=myfile.filename
+                    tmpzones=myfile
+                elif isinstance(myfile, str):
+                    self.filename=myfile
+                    tmpzones=Zones(myfile, find_minmax=False)
+
+                curzone:zone
+                curvec:vector
+                curzone=tmpzones.myzones[0]
+                index=0
+                for curvec in curzone.myvectors:
+
+                    self.myprofiles[curvec.myname]={}
+                    curdict=self.myprofiles[curvec.myname]
+
                     curdict['index']=index
+                    curdict['left']=None
+                    curdict['bed']=None
+                    curdict['right']=None
+
                     index+=1
-                    curdict['cs']=profile(name=name,parent=self)
+                    curdict['cs']=profile(name=curvec.myname,parent=self)
                     cursect:profile
                     cursect=curdict['cs']
 
-                x=float(vals[1])
-                y=float(vals[2])
-                type=vals[3]
-                z=float(vals[4])
+                    cursect.myvertices = curvec.myvertices
 
-                curvertex=wolfvertex(x,y,z)
-                cursect.add_vertex(curvertex)
-                if type=='LEFT':
-                    if cursect.bankleft is None:
-                        cursect.bankleft=wolfvertex(x,y,z)
-                        curdict['left']=cursect.bankleft
-                    else:
-                        print(name)
-                elif type=='BED':
-                    if cursect.bed is None:
-                        cursect.bed=wolfvertex(x,y,z)
-                        curdict['bed']=cursect.bed
-                    else:
-                        print(name)
-                elif type=='RIGHT':
-                    if cursect.bankright is None:
-                        cursect.bankright=wolfvertex(x,y,z)
-                        curdict['right']=cursect.bankright
-                    else:
-                        print(name)
-
-                nameprev=name
-        elif format=='2022':
-            self.format='2022'
-            lines.pop(0)
-            nameprev=''
-            index=0
-            for curline in lines:
-                vals=curline.split('\t')
-
-                if vals[0].find('.')>0:
-                    name=vals[0].split('.')[0]
-                    xpos=1
-                    ypos=xpos+1
-                    zpos=ypos+1
-                    labelpos=zpos+1
-                else:
-                    name=vals[0]
-                    xpos=2
-                    ypos=xpos+1
-                    zpos=ypos+1
-                    labelpos=zpos+1
-
-                if name!=nameprev:
-                    #création d'un nouveau dictionnaire
-                    self.myprofiles[name]={}
-                    curdict=self.myprofiles[name]
-                    curdict['index']=index
+            elif format=='sxy':
+                self.format='sxy'
+                nbpotsect = int(lines[0])
+                index=1
+                for i in range(nbpotsect):
+                    vals=lines[index].split(',')
+                    nbrel=int(vals[0])
                     index+=1
+                    sz = np.asarray([np.float64(cursz) for k in range(index,index+nbrel) for cursz in lines[k].split(',') ]).reshape([nbrel,2],order='C')
+                    self.mygenprofiles[i+1]=sz
+                    index+=nbrel
+
+                nbsect = int(lines[index])
+                # o linked position in a 2D array (i, j) (integer,integer) (optional)
+                # o datum (float) – added to the Z_min of the raw cross section (optional)
+                # o boolean value indicating whether the relative datum must be added (logical)
+                # o boolean value indicating whether it is a real or synthetic section (logical)
+                # o ID of the cross section to which this line relates (integer)
+                # o pair of coordinates of the left end point (float, float)
+                # o pair of coordinates of the right end point (float, float)
+                # o pair of coordinates of the minor bed (float, float) (optional)
+                # o pair of coordinates of the left bank in local reference (float, float) (optional)
+                # o pair of coordinates of the right bank in local reference (float, float) (optional)
+                # o boolean value indicating whether an attachment point has been defined (optional)
+                # # 2,2,0,#FALSE#,#TRUE#,16,222075.5,110588.5,222331.5,110777.5,99999,99999,99999,99999,99999,99999,#FALSE#
+                # 2,2,0,#FALSE#,#TRUE#,17,222131.6,110608.2,222364.4,110667.9,99999,99999,99999,99999,99999,99999,#FALSE#
+                index+=1
+                #création d'un nouveau dictionnaire
+                for i in range(nbsect):
+                    name=str(i+1)
+                    vals=lines[index].split(',')
+                    index+=1
+
+                    posi = int(vals[0])
+                    posj = int(vals[1])
+                    zdatum = float(vals[2])
+                    add_zdatum=vals[3]=='#TRUE#'
+                    real_sect=vals[4]=='#TRUE#'
+                    id = int(vals[5])
+                    startx=float(vals[6])
+                    starty=float(vals[7])
+                    endx=float(vals[8])
+                    endy=float(vals[9])
+                    beds=float(vals[10])
+                    bedz=float(vals[11])
+                    lbs=float(vals[12])
+                    lbz=float(vals[13])
+                    rbs=float(vals[14])
+                    rbz=float(vals[15])
+                    attached=vals[16]=='#TRUE#'
+
+                    curdict=self.myprofiles[name]={}
+                    curdict['index']=id
                     curdict['cs']=profile(name=name,parent=self)
                     cursect:profile
                     cursect=curdict['cs']
 
-                x=float(vals[xpos].replace(',','.'))
-                y=float(vals[ypos].replace(',','.'))
-                z=float(vals[zpos].replace(',','.'))
+                    cursect.zdatum = zdatum
+                    cursect.add_zdatum = add_zdatum
 
-                curvertex=wolfvertex(x,y,z)
-                cursect.add_vertex(curvertex)
+                    cursect.set_sz(self.mygenprofiles[id],[[startx,starty],[endx,endy]])
 
-                type=''
-                type=vals[labelpos]
-
-                if type=='HBG':
-                    if cursect.bankleft is None:
-                        cursect.bankleft=wolfvertex(x,y,z)
+                    if lbs!=99999:
+                        cursect.bankleft=wolfvertex(lbs,lbz)
                         curdict['left']=cursect.bankleft
-                    else:
-                        print(name)
-                elif type=='TWG':
-                    if cursect.bed is None:
-                        cursect.bed=wolfvertex(x,y,z)
+                    if beds!=99999:
+                        cursect.bed=wolfvertex(beds,bedz)
                         curdict['bed']=cursect.bed
-                    else:
-                        print(name)
-                elif type=='HBD':
-                    if cursect.bankright is None:
-                        cursect.bankright=wolfvertex(x,y,z)
+                    if rbs!=99999:
+                        cursect.bankright=wolfvertex(rbs,rbz)
                         curdict['right']=cursect.bankright
-                    else:
-                        print(name)
-
-                nameprev=name
-        elif format=='vecz' or format=='zones':
-
-            if isinstance(myfile, Zones):
-                self.filename=myfile.filename
-                tmpzones=myfile
-            elif isinstance(myfile, str):
-                self.filename=myfile
-                tmpzones=Zones(myfile, find_minmax=False)
-
-            curzone:zone
-            curvec:vector
-            curzone=tmpzones.myzones[0]
-            index=0
-            for curvec in curzone.myvectors:
-
-                self.myprofiles[curvec.myname]={}
-                curdict=self.myprofiles[curvec.myname]
-
-                curdict['index']=index
-                curdict['left']=None
-                curdict['bed']=None
-                curdict['right']=None
-
-                index+=1
-                curdict['cs']=profile(name=curvec.myname,parent=self)
-                cursect:profile
-                cursect=curdict['cs']
-
-                cursect.myvertices = curvec.myvertices
-
-        elif format=='sxy':
-            self.format='sxy'
-            nbpotsect = int(lines[0])
-            index=1
-            for i in range(nbpotsect):
-                vals=lines[index].split(',')
-                nbrel=int(vals[0])
-                index+=1
-                sz = np.asarray([np.float64(cursz) for k in range(index,index+nbrel) for cursz in lines[k].split(',') ]).reshape([nbrel,2],order='C')
-                self.mygenprofiles[i+1]=sz
-                index+=nbrel
-
-            nbsect = int(lines[index])
-            # o linked position in a 2D array (i, j) (integer,integer) (optional)
-            # o datum (float) – added to the Z_min of the raw cross section (optional)
-            # o boolean value indicating whether the relative datum must be added (logical)
-            # o boolean value indicating whether it is a real or synthetic section (logical)
-            # o ID of the cross section to which this line relates (integer)
-            # o pair of coordinates of the left end point (float, float)
-            # o pair of coordinates of the right end point (float, float)
-            # o pair of coordinates of the minor bed (float, float) (optional)
-            # o pair of coordinates of the left bank in local reference (float, float) (optional)
-            # o pair of coordinates of the right bank in local reference (float, float) (optional)
-            # o boolean value indicating whether an attachment point has been defined (optional)
-            # # 2,2,0,#FALSE#,#TRUE#,16,222075.5,110588.5,222331.5,110777.5,99999,99999,99999,99999,99999,99999,#FALSE#
-            # 2,2,0,#FALSE#,#TRUE#,17,222131.6,110608.2,222364.4,110667.9,99999,99999,99999,99999,99999,99999,#FALSE#
-            index+=1
-            #création d'un nouveau dictionnaire
-            for i in range(nbsect):
-                name=str(i+1)
-                vals=lines[index].split(',')
-                index+=1
-
-                posi = int(vals[0])
-                posj = int(vals[1])
-                zdatum = float(vals[2])
-                add_zdatum=vals[3]=='#TRUE#'
-                real_sect=vals[4]=='#TRUE#'
-                id = int(vals[5])
-                startx=float(vals[6])
-                starty=float(vals[7])
-                endx=float(vals[8])
-                endy=float(vals[9])
-                beds=float(vals[10])
-                bedz=float(vals[11])
-                lbs=float(vals[12])
-                lbz=float(vals[13])
-                rbs=float(vals[14])
-                rbz=float(vals[15])
-                attached=vals[16]=='#TRUE#'
-
-                curdict=self.myprofiles[name]={}
-                curdict['index']=id
-                curdict['cs']=profile(name=name,parent=self)
-                cursect:profile
-                cursect=curdict['cs']
-
-                cursect.zdatum = zdatum
-                cursect.add_zdatum = add_zdatum
-
-                cursect.set_sz(self.mygenprofiles[id],[[startx,starty],[endx,endy]])
-
-                if lbs!=99999:
-                    cursect.bankleft=wolfvertex(lbs,lbz)
-                    curdict['left']=cursect.bankleft
-                if beds!=99999:
-                    cursect.bed=wolfvertex(beds,bedz)
-                    curdict['bed']=cursect.bed
-                if rbs!=99999:
-                    cursect.bankright=wolfvertex(rbs,rbz)
-                    curdict['right']=cursect.bankright
 
         self.verif_bed()
         self.find_minmax(True)
@@ -1992,7 +1997,7 @@ class crosssections(Element_To_Draw):
         self.cloud_all.myprop.filled=True
         self.cloud_all.myprop.width=4
 
-    def add(self, newprofile):
+    def add(self, newprofile:profile | vector):
 
         if isinstance(newprofile, profile):
             curvec = newprofile
@@ -2381,7 +2386,7 @@ class crosssections(Element_To_Draw):
             self.filename = filename
 
         if self.filename is None:
-            print(_('No Filename -- Retry !'))
+            logging.error(_('No Filename -- Retry !'))
             return
 
         if self.filename.endswith('.vecz'):
@@ -2494,14 +2499,22 @@ class crosssections(Element_To_Draw):
         return len(mysorted)
 
     def find_minmax(self, update:bool=False):
+
+        if len(self.myprofiles)==0:
+            self.xmin = 0
+            self.ymin = 0
+            self.xmax = 0
+            self.ymax = 0
+            return
+
         if update:
             for idx,vect in self.myprofiles.items():
                 vect['cs'].find_minmax(only_firstlast = True)
 
-        self.xmin=min(vect['cs'].xmin for idx,vect in self.myprofiles.items())
-        self.ymin=min(vect['cs'].ymin for idx,vect in self.myprofiles.items())
-        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())
+        self.xmin = min(vect['cs'].xmin for idx,vect in self.myprofiles.items())
+        self.ymin = min(vect['cs'].ymin for idx,vect in self.myprofiles.items())
+        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, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """ Plotting cross-sections """
@@ -2548,7 +2561,8 @@ class Interpolator():
 
     """
 
-    def __init__(self,vec1:vector,vec2:vector,supports:list,ds=1.) -> None:
+    def __init__(self, vec1:vector, vec2:vector,
+                 supports:list[vector], ds=1.) -> None:
 
         self.interpolants=[]
 
@@ -2637,11 +2651,13 @@ class Interpolator():
             i1=myls.intersection(s1)
             if i1.geom_type=='MultiPoint':
                 i1=i1.geoms[0]
+                logging.debug('MultiPoint -- use first point or debug')
 
             #section aval
             i2=myls.intersection(s2)
             if i2.geom_type=='MultiPoint':
                 i2=i2.geoms[0]
+                logging.debug('MultiPoint -- use first point or debug')
 
             #Les distances, sur les sections, sont calculées en projetant l'intersection du vecteur support et des sections
             sect1[k]=s1.project(i1)
@@ -2731,7 +2747,7 @@ class Interpolator():
             #     a=1
 
             for curalong in range(nbi+1):
-                print(str(curalong))
+                logging.debug(str(curalong))
 
                 #interpolation 3D sur les 2 supports
                 l1 = cursupl.interpolate(sloc,True,True)
@@ -3039,6 +3055,7 @@ class Interpolators():
         """
 
         self.mybanks = [curv for curzone in banks.myzones for curv in curzone.myvectors]
+
         cs.set_zones()
         self.mycs = cs.myzones
 
@@ -3048,26 +3065,36 @@ class Interpolators():
         zonecs = self.mycs.myzones[0]
 
         if zonecs.myvectors[0].up is not None:
-
+            # Les sections ont été triées sur base d'un vecteur support
+            # On les traite dans l'ordre du tri
             cs1:profile
             cs1=cs.get_upstream()['cs']
 
             while cs1.down is not cs1:
                 cs2=cs1.down
 
-                print('{} - {}'.format(cs1.myname,cs2.myname))
+                logging.info('{} - {}'.format(cs1.myname,cs2.myname))
 
                 myinterp=Interpolator(cs1,cs2,self.mybanks,ds)
-                self.myinterp.append(myinterp)
+
+                if len(myinterp.interpolants)>0:
+                    self.myinterp.append(myinterp)
+                else:
+                    logging.error('No interpolation found between {} and {}'.format(cs1.myname,cs2.myname))
+
                 cs1=cs2
         else:
+            # Les sections n'ont pas été triées --> on les traite dans l'ordre
             for i in range(zonecs.nbvectors-1):
                 cs1=zonecs.myvectors[i]
                 cs2=zonecs.myvectors[i+1]
 
-                print('{} - {}'.format(cs1.myname,cs2.myname))
+                logging.info('{} - {}'.format(cs1.myname,cs2.myname))
                 myinterp=Interpolator(cs1,cs2,self.mybanks,ds)
-                self.myinterp.append(myinterp)
+                if len(myinterp.interpolants)>0:
+                    self.myinterp.append(myinterp)
+                else:
+                    logging.error('No interpolation found between {} and {}'.format(cs1.myname,cs2.myname))
 
         self.add_interpolators(cs.myzones.parent)