wolfhece 2.2.37__py3-none-any.whl → 2.2.39__py3-none-any.whl

wolfhece/PandasGrid.py

@@ -4,8 +4,69 @@ import pandas as pd
 import numpy as np
 import matplotlib.pyplot as plt
 
+class DictGrid(wx.Dialog):
+
+    def __init__(self, parent, id, data: dict[dict]):
+
+        super().__init__(parent, title=f"Edit: {id}", size=(600, 400))
+
+        self.data = data
+
+        vbox = wx.BoxSizer(wx.VERTICAL)
+
+        # Create the grid
+        self.grid = wx.grid.Grid(self)
+
+        first_elem = next(iter(data.values()))
+        self.grid.CreateGrid(len(data)+1, len(list(first_elem.keys()))+1)
+
+        # Set column labels
+        for col, colname in enumerate(first_elem.keys()):
+            self.grid.SetColLabelValue(col+1, str(colname))
+
+        # Fill grid and make cells read-only
+        for row, vals in data.items():
+            for col, colname in enumerate(first_elem.keys()):
+                val = str(vals[colname])
+                self.grid.SetCellValue(row+1, col+1, val)
+                # self.grid.SetReadOnly(row, col, True)
+
+        vbox.Add(self.grid, 1, wx.EXPAND | wx.ALL, 10)
+
+        # Add a button to show histogram
+        sizer_buttons = wx.BoxSizer(wx.HORIZONTAL)
+        self._ok_button = wx.Button(self, label="OK")
+        self._cancel_button = wx.Button(self, label="Cancel")
+        sizer_buttons.Add(self._ok_button, 0, wx.ALIGN_CENTER | wx.BOTTOM, 10)
+        sizer_buttons.Add(self._cancel_button, 0, wx.ALIGN_CENTER | wx.BOTTOM, 10)
+
+        self._ok_button.Bind(wx.EVT_BUTTON, self.OnOk)
+        self._cancel_button.Bind(wx.EVT_BUTTON, self.Close)
+
+        vbox.Add(sizer_buttons, 0, wx.ALIGN_CENTER | wx.BOTTOM, 10)
+        self.SetSizer(vbox)
+
+    def get_dict(self):
+        """ Return the data as a dictionary. """
+        new_data = {}
+        for row in range(1, self.grid.GetNumberRows()):
+            new_data[row] = {}
+            for col in range(1, self.grid.GetNumberCols()):
+                colname = self.grid.GetColLabelValue(col)
+                new_data[row][colname] = self.grid.GetCellValue(row, col)
+        return new_data
+
+    def OnOk(self, event):
+        """ Handle the OK button click. """
+        # Here you can implement logic to save changes if needed
+        # For now, we just close the dialog
+        self.Hide()
+
+    def Close(self, event=None):
+        """ Close the dialog. """
+        self.Destroy()
 class PandasGrid(wx.Dialog):
-    
+
     def __init__(self, parent, id, df: pd.DataFrame):
         super().__init__(parent, title=f"DataFrame characteristics: {id}", size=(600, 400))
 

wolfhece/PyCrosssections.py

@@ -155,6 +155,10 @@ class profile(vector):
         #  - bankleft_vertex, bankright_vertex, bed_vertex qui retournent un vertex quel que soit le format de stockage
         #  - bankleft_s3D, bankright_s3D, bed_s3D qui retournent la position curvi 3D quel que soit le format de stockage
         #  - bankleft_sz, bankright_sz, bed_sz qui retournent un couple (s,z) quel que soit le format de stockage
+
+
+
+
         self._bankleft=None
         self._bankright=None
         self._bed=None
@@ -392,6 +396,20 @@ class profile(vector):
         s = ls2d.project(Point(curvert.x, curvert.y))
         return s, curvert.z
 
+    @property
+    def bankleft_down_sz(self):
+        ls2d = self.asshapely_ls()
+        curvert = self.bankleft_down_vertex
+        s = ls2d.project(Point(curvert.x, curvert.y))
+        return s, curvert.z
+
+    @property
+    def bankright_down_sz(self):
+        ls2d = self.asshapely_ls()
+        curvert = self.bankright_down_vertex
+        s = ls2d.project(Point(curvert.x, curvert.y))
+        return s, curvert.z
+
     def verif(self):
 
         self.update_lengths()
@@ -842,7 +860,7 @@ class profile(vector):
             curvert = wolfvertex(xy[i,0],xy[i,1],sz[i,1])
             self.add_vertex(curvert)
 
-    def get_sz_banksbed(self, cumul=True, force:bool=False) -> tuple[float, float, float, float, float, float]:
+    def get_sz_banksbed(self, cumul=True, force:bool=False) -> tuple[float, float, float, float, float, float, float, float, float, float]:
         """
         Retourne les positions des points de référence  mais avec la coordonnée curvi 2D
          - (sleft, sbed, sright, zleft, zbed, zright)
@@ -893,16 +911,46 @@ class profile(vector):
             sbed=-99999.
             zbed=-99999.
 
+        if self.bankleft_down is not None:
+            if cumul:
+                sbankleft_down, zbankleft_down = self.bankleft_down_sz
+            else:
+                curvert = self.bankleft_down_vertex
+                x2 = curvert.x
+                y2 = curvert.y
+                sbankleft_down = math.sqrt((x2-x1)**2.+(y2-y1)**2.)
+                zbankleft_down=curvert.z
+        else:
+            sbankleft_down=-99999.
+            zbankleft_down=-99999.
+
+        if self.bankright_down is not None:
+            if cumul:
+                sbankright_down, zbankright_down = self.bankright_down_sz
+            else:
+                curvert = self.bankright_down_vertex
+                x2 = curvert.x
+                y2 = curvert.y
+                sbankright_down = math.sqrt((x2-x1)**2.+(y2-y1)**2.)
+                zbankright_down=curvert.z
+        else:
+            sbankright_down=-99999.
+            zbankright_down=-99999.
+
         if self.add_sdatum:
             sleft+=self.sdatum
             sbed+=self.sdatum
             sright+=self.sdatum
+            sbankleft_down+=self.sdatum
+            sbankright_down+=self.sdatum
         if self.add_zdatum:
             zleft+=self.zdatum
             zbed+=self.zdatum
             zright+=self.zdatum
+            zbankleft_down+=self.zdatum
+            zbankright_down+=self.zdatum
 
-        return sleft,sbed,sright,zleft,zbed,zright
+        return sleft,sbed,sright,zleft,zbed,zright, sbankleft_down, sbankright_down, zbankleft_down, zbankright_down
 
     def get_s3d_banksbed(self, force:bool=False)-> tuple[float, float, float]:
         """
@@ -1010,7 +1058,7 @@ class profile(vector):
         # plot
         x,y=self.get_sz()
 
-        sl,sb,sr,yl,yb,yr = self.get_sz_banksbed()
+        sl,sb,sr,yl,yb,yr, sld, srd, yld, yrd = self.get_sz_banksbed()
 
         if centerx >0. and sb!=-99999.:
             decal = centerx-sb
@@ -1041,12 +1089,16 @@ class profile(vector):
             ax.plot(sb,yb,'ob',alpha=alpha)
         if sr != -99999.:
             ax.plot(sr,yr,'og',alpha=alpha)
+        if sld != -99999.:
+            ax.plot(sld,yld,'*r',alpha=alpha)
+        if srd != -99999.:
+            ax.plot(srd,yrd,'*g',alpha=alpha)
 
     def plot_cs(self, fwl=None, show=False, forceaspect=True, fig:Figure=None, ax:Axes=None, plotlaz=True, clear=True, linked_arrays:dict={}):
         # plot
         x,y=self.get_sz()
 
-        sl,sb,sr,yl,yb,yr = self.get_sz_banksbed()
+        sl,sb,sr,yl,yb,yr, sld, srd, yld, yrd = self.get_sz_banksbed()
 
         xmin=x[0]
         xmax=x[-1]
@@ -1094,6 +1146,10 @@ class profile(vector):
             ax.plot(sb,yb,'ob')
         if sr != -99999.:
             ax.plot(sr,yr,'og')
+        if sld != -99999.:
+            ax.plot(sld,yld,'*r')
+        if srd != -99999.:
+            ax.plot(srd,yrd,'*g')
 
         ax.set_title(self.myname)
         ax.set_xlabel(_('Distance [m]'))
@@ -1392,7 +1448,7 @@ class profile(vector):
                 idsimul = [cursimul[0] for cursimul in simuls]
                 zsimul  = [cursimul[3] for cursimul in simuls]
 
-        sl,sb,sr,zl,zb,zr = self.get_sz_banksbed()
+        sl,sb,sr,zl,zb,zr, sld, srd, zld, zrd = self.get_sz_banksbed()
         x,y = self.get_sz()
 
         if fwl is None:
@@ -1538,6 +1594,10 @@ class profile(vector):
             myax1.plot(sb,zb,_('ob'), label= _('River bed'))
         if sr != -99999.:
             myax1.plot(sr,zr,_('og'), label= _('Right bank'))
+        if sld != -99999.:
+            myax1.plot(sld,zld,_('*r'), label= _('Left bank down'))
+        if srd != -99999.:
+            myax1.plot(srd,zrd,_('*g'), label= _('Right bank down'))
 
         #Available simulations
         if zsimul is not None:
@@ -1614,7 +1674,7 @@ class profile(vector):
                 idsimul= [cursimul[0] for cursimul in simuls]
 
 
-        sl,sb,sr,zl,zb,zr = self.get_sz_banksbed()
+        sl,sb,sr,zl,zb,zr, sld, srd, zld, zrd = self.get_sz_banksbed()
         x,y = self.get_sz()
 
         if fwl is None:
@@ -1710,7 +1770,7 @@ class profile(vector):
         - fwq: for water discharge.
 
         """
-        sl,sb,sr,zl,zb,zr = self.get_sz_banksbed()
+        sl,sb,sr,zl,zb,zr, sld, srd, zld, zrd = self.get_sz_banksbed()
         x,y = self.get_sz()
 
         if fwl is None:
@@ -1894,7 +1954,7 @@ class crosssections(Element_To_Draw):
         self.sorted = {}
         self.plotted = False
 
-        if isinstance(lines, pd.DataFrame):
+        if isinstance(lines, pd.DataFrame): # Format is '2025_xlsx'
 
             self.format='2025_xlsx'
 
@@ -1919,6 +1979,13 @@ class crosssections(Element_To_Draw):
                 curdict = self.myprofiles[name] = {}
                 curdict['index'] = index
                 curdict['cs'] = profile(name=name, parent=self)
+
+                curdict['left'] = None
+                curdict['bed'] = None
+                curdict['right'] = None
+                curdict['left_down'] = None
+                curdict['right_down'] = None
+
                 cursect:profile
                 cursect = curdict['cs']
 
@@ -1968,6 +2035,7 @@ class crosssections(Element_To_Draw):
                             logging.debug(name)
 
         elif len(lines)>0:
+
             if format=='2000':
                 self.format='2000'
                 lines.pop(0)
@@ -1987,6 +2055,12 @@ class crosssections(Element_To_Draw):
                         cursect:profile
                         cursect=curdict['cs']
 
+                        curdict['left'] = None
+                        curdict['bed'] = None
+                        curdict['right'] = None
+                        curdict['left_down'] = None
+                        curdict['right_down'] = None
+
                     x=float(vals[1])
                     y=float(vals[2])
                     type=vals[3]
@@ -2044,6 +2118,11 @@ class crosssections(Element_To_Draw):
                         curdict['cs']=profile(name=name,parent=self)
                         cursect:profile
                         cursect=curdict['cs']
+                        curdict['left'] = None
+                        curdict['bed'] = None
+                        curdict['right'] = None
+                        curdict['left_down'] = None
+                        curdict['right_down'] = None
 
                     x=float(vals[xpos].replace(',','.'))
                     y=float(vals[ypos].replace(',','.'))
@@ -2131,6 +2210,11 @@ class crosssections(Element_To_Draw):
                     curdict['cs']=profile(name=name,parent=self)
                     cursect:profile
                     cursect=curdict['cs']
+                    curdict['left'] = None
+                    curdict['bed'] = None
+                    curdict['right'] = None
+                    curdict['left_down'] = None
+                    curdict['right_down'] = None
 
                     cursect.zdatum = zdatum
                     cursect.add_zdatum = add_zdatum
@@ -2543,9 +2627,10 @@ class crosssections(Element_To_Draw):
 
             for curprof in self.myprofiles.keys():
                 curdict=self.myprofiles[curprof]
-                curprof=curdict['cs']
-                self.myzone.add_vector(curprof)
-                curprof.parentzone=self.myzone
+                curvec=curdict['cs']
+                curvec:vector
+                if curvec.used:
+                    self.myzone.add_vector(curvec, forceparent=True)
 
             if self.plotted:
                 self._prep_listogl()  #FIXME : Does not work in the context of a 1D model
@@ -2613,13 +2698,15 @@ class crosssections(Element_To_Draw):
 
         self.set_zones(True)
 
-    def saveas(self,filename=None):
+    def saveas(self,filename:str | Path = None):
         """ Save the cross-sections to a file in the specified format. """
 
         self.forcesuper=False
 
         if filename is not None:
-            self.filename = filename
+            self.filename = str(filename)
+
+        assert isinstance(self.filename, str), _('Filename must be a string.')
 
         if self.filename is None:
             logging.error(_('No Filename -- Retry !'))
@@ -2633,22 +2720,22 @@ class crosssections(Element_To_Draw):
 
             with open(self.filename,'w') as f:
                 f.write("Profile\tx\ty\tBerge\tz\n")
-                for idx,curvect in self.myprofiles.items():
-                    curprof=curvect['cs']
+                for idx,locdict in self.myprofiles.items():
+                    curprof=locdict['cs']
                     curprof.save(f)
 
         elif self.format=='2025_xlsx':
             # For the 2025_xlsx format, we need to save the data using pandas
             data = []
-            for idx, curvect in self.myprofiles.items():
-                curprof = curvect['cs']
+            for idx, locdict in self.myprofiles.items():
+                curprof = locdict['cs']
                 for vertex in curprof.myvertices:
                     data.append({
                         'Num': idx,
                         'X': vertex.x,
                         'Y': vertex.y,
-                        'Z': vertex.z,
-                        'Code': curprof.get_label(vertex)
+                        'Z': vertex.z * 1000.,  # Convert to mm
+                        'Code': self.get_label(locdict, vertex)
                     })
 
             df = pd.DataFrame(data)
@@ -2690,6 +2777,43 @@ class crosssections(Element_To_Draw):
                                     rbs=cursect.get_s_from_xy(cursect.bankright),
                                     rbz=cursect.bankright.z))
 
+    def get_label(self, profile_dict:dict, vertex:wolfvertex):
+        """ Get the label for a vertex based on its type.
+
+        :param profile_dict: Dictionary containing the profile information.
+        :type profile_dict: dict
+        :param vertex: The vertex for which to get the label.
+        :type vertex: wolfvertex
+        :return: The label for the vertex.
+        :rtype: str
+        """
+        try:
+            if profile_dict['left'] is not None:
+                if vertex.is_like(profile_dict['left']):
+                    return 'HBG'
+
+            if profile_dict['bed'] is not None:
+                if vertex.is_like(profile_dict['bed']):
+                    return 'THA'
+
+            if profile_dict['right'] is not None:
+                if vertex.is_like(profile_dict['right']):
+                    return 'HBD'
+
+            if profile_dict['left_down'] is not None:
+                if vertex.is_like(profile_dict['left_down']):
+                    return 'BBG'
+
+            if profile_dict['right_down'] is not None:
+                if vertex.is_like(profile_dict['right_down']):
+                    return 'BBD'
+
+            return ''
+        except:
+            logging.error(_('Error in get_label for vertex: {v}').format(v=vertex))
+            logging.info(_('Please report this bug to Pierre Archambeau.'))
+            return ''
+
     def verif_bed(self):
         """Verification de l'existence du point lit mineur sinon attribution de l'altitude minimale"""
 
@@ -3237,7 +3361,7 @@ class Interpolator():
 
         return nbpts,points
 
-    def export_gltf(self,points=None,triangles=None):
+    def export_gltf(self, points=None, triangles=None, fn:str | Path = None):
 
         if points is None and triangles is None:
             points,triangles= self.get_triangles()
@@ -3297,14 +3421,22 @@ class Interpolator():
         )
         gltf.set_binary_blob(triangles_binary_blob + points_binary_blob)
 
-        dlg=wx.FileDialog(None,_('Choose filename'),wildcard='binary gltf2 (*.glb)|*.glb|gltf2 (*.gltf)|*.gltf|All (*.*)|*.*',style=wx.FD_SAVE)
-        ret=dlg.ShowModal()
-        if ret==wx.ID_CANCEL:
-            dlg.Destroy()
-            return
-
-        fn=dlg.GetPath()
-        dlg.Destroy()
+        if fn is not None:
+            if isinstance(fn, str):
+                fn = Path(fn)
+        else:
+            try:
+                dlg=wx.FileDialog(None,_('Choose filename'),wildcard='binary gltf2 (*.glb)|*.glb|gltf2 (*.gltf)|*.gltf|All (*.*)|*.*',style=wx.FD_SAVE)
+                ret=dlg.ShowModal()
+                if ret==wx.ID_CANCEL:
+                    dlg.Destroy()
+                    return
+
+                fn=dlg.GetPath()
+                dlg.Destroy()
+            except:
+                logging.error(_('Wx FileDialog error. Is wx running ?'))
+                return
 
         gltf.save(fn)
 
@@ -3334,6 +3466,9 @@ class Interpolators():
         :param cs: objet 'crosssections' contenant les sections en travers --> voir PyCrosssections
         """
 
+        self.points = None
+        self.triangles = None
+
         self.mybanks = [curv for curzone in banks.myzones for curv in curzone.myvectors]
 
         cs.set_zones()
@@ -3364,7 +3499,7 @@ class Interpolators():
 
                 cs1=cs2
         else:
-            # Les sections n'ont pas été triées --> on les traite dans l'ordre
+            # Les sections n'ont pas été triées --> on les traite dans l'ordre d'énumération
             for i in range(zonecs.nbvectors-1):
                 cs1=zonecs.myvectors[i]
                 cs2=zonecs.myvectors[i+1]
@@ -3403,7 +3538,17 @@ class Interpolators():
             triangles.append(tr+decal)
             decal+=nbpts
 
-        curinterp.export_gltf(np.concatenate(points),np.concatenate(triangles))
+
+        self.points, self.triangles = np.concatenate(points), np.concatenate(triangles)
+
+    def export_gltf(self, fn:str | Path = None):
+        """ Export the interpolated sections as a glTF file. """
+        if self.points is None or self.triangles is None:
+            logging.error('No points or triangles available for export.')
+            return
+
+        interp = Interpolator()
+        interp.export_gltf(points=self.points, triangles=self.triangles, fn=fn)
 
 
     def viewer_interpolator(self):
@@ -3416,16 +3561,22 @@ class Interpolators():
 
         myviewer(xyz,0)
 
-    def interp_on_array(self, myarray, method:Literal["nearest", "linear", "cubic"]):
-
-        xy=[]
-        z=[]
-        for curinterp in self.myinterp:
-            tmpxy,tmpz = curinterp.get_xy_z_for_griddata()
-            xy.append(tmpxy)
-            z.append(tmpz)
-
-        xy = np.concatenate(xy)
-        z = np.concatenate(z)
-
-        myarray.interpolate_on_cloud(xy,z,method)
+    def interp_on_array(self, myarray,
+                        method:Literal["nearest", "linear", "cubic"],
+                        use_cloud:bool = True):
+
+        if use_cloud:
+            xy=[]
+            z=[]
+            for curinterp in self.myinterp:
+                tmpxy,tmpz = curinterp.get_xy_z_for_griddata()
+                xy.append(tmpxy)
+                z.append(tmpz)
+
+            xy = np.concatenate(xy)
+            z = np.concatenate(z)
+            myarray.interpolate_on_cloud(xy,z,method)
+        else:
+            for interp in self.myinterp:
+                n, pts, tri = interp.get_triangles(forgltf=False)
+                myarray.interpolate_on_triangulation(pts, tri, interp_method= 'scipy')