wolfhece 2.2.34__py3-none-any.whl → 2.2.35__py3-none-any.whl

wolfhece/PyDraw.py

@@ -88,7 +88,7 @@ try:
     from .lazviewer.laz_viewer import myviewer, read_laz, clip_data_xyz, xyz_laz_grids, choices_laz_colormap, Classification_LAZ, Wolf_LAZ_Data, viewer as viewerlaz
     from . import Lidar2002
     from .picc import Picc_data, Cadaster_data
-    from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier, Ouvrages, Particularites, Enquetes
+    from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier, Ouvrages, Particularites, Enquetes, Profils
     from .math_parser.calculator import Calculator
     from .wintab.wintab import Wintab
     from .images_tiles import ImagesTiles
@@ -2905,6 +2905,7 @@ class WolfMapViewer(wx.Frame):
         if len(glob_vrt) == 0:
             file_vrt = r'tmp.vrt'
             create_vrt(dirdata, fout=file_vrt)
+            glob_vrt = file_vrt
         else:
             glob_vrt = glob_vrt[0]
 
@@ -10406,7 +10407,7 @@ class WolfMapViewer(wx.Frame):
         filterCloud = "xyz (*.xyz)|*.xyz|dxf (*.dxf)|*.dxf|text (*.txt)|*.txt|shp (*.shp)|*.shp|all (*.*)|*.*"
         filterlaz = "laz (*.laz)|*.laz|las (*.las)|*.las|Numpy (*.npz)|*.npz|all (*.*)|*.*"
         filtertri = "tri (*.tri)|*.tri|text (*.txt)|*.txt|dxf (*.dxf)|*.dxf|gltf (*.gltf)|*.gltf|gltf binary (*.glb)|*.glb|*.*'all (*.*)|*.*"
-        filterCs = "vecz WOLF (*.vecz)|*.vecz|txt 2022 (*.txt)|*.txt|WOLF (*.sxy)|*.sxy|text 2000 (*.txt)|*.txt|all (*.*)|*.*"
+        filterCs = "vecz WOLF (*.vecz)|*.vecz|txt 2022 (*.txt)|*.txt|WOLF (*.sxy)|*.sxy|text 2000 (*.txt)|*.txt|xlsx 2025 (*.xlsx)|*.xlsx|all (*.*)|*.*"
         filterimage = "Geotif (*.tif)|*.tif|all (*.*)|*.*"
 
         if filename == '' and newobj is None:
@@ -10950,8 +10951,13 @@ class WolfMapViewer(wx.Frame):
                         newobj = crosssections(filename, format='vecz', dirlaz=dirlaz, mapviewer=self)
                     elif curfilter == 2:  # sxy
                         newobj = crosssections(filename, format='sxy', dirlaz=dirlaz, mapviewer=self)
-                    else:  # txt 2000
+                    elif curfilter == 3:  # txt 2000
                         newobj = crosssections(filename, format='2000', dirlaz=dirlaz, mapviewer=self)
+                    elif curfilter == 4:  # xlsx
+                        newobj = crosssections(filename, format='2025_xlsx', dirlaz=dirlaz, mapviewer=self)
+                    else:
+                        newobj = crosssections(filename, format='2000', dirlaz=dirlaz, mapviewer=self)
+
                     del wait
             self.myvectors.append(newobj)
             newobj.mapviewer = self
@@ -11754,7 +11760,7 @@ class WolfMapViewer(wx.Frame):
                         self.selected_object.saveas(fdlg.GetPath())
                     fdlg.Destroy()
 
-                elif type(self.selected_object) in [PictureCollection, Particularites, Enquetes, Ouvrages]:
+                elif type(self.selected_object) in [PictureCollection, Particularites, Enquetes, Ouvrages, Profils]:
                     filterArray = "vec (*.vec)|*.vec|vecz (*.vecz)|*.vecz"
                     fdlg = wx.FileDialog(self, "Choose file name for Collection :" + self.selected_object.idx, wildcard=filterArray,
                                          style=wx.FD_SAVE)
@@ -12326,6 +12332,13 @@ class WolfMapViewer(wx.Frame):
                         else:
                             logging.warning(_('Enquetes collection not initialized'))
 
+                    elif isinstance(curobj, Profils):
+                        if curobj.initialized:
+                            self.menu_pictcollection()
+                            logging.info(_('Profils collection initialized'))
+                        else:
+                            logging.warning(_('Profils collection not initialized'))
+
                 except Exception as ex:
                     wx.LogMessage(str(ex))
                     wx.MessageBox(str(ex), _("Error"), wx.ICON_ERROR)
@@ -13197,7 +13210,7 @@ class WolfMapViewer(wx.Frame):
         elif isinstance(myobj, PlansTerrier):
             self.active_landmap = myobj
 
-        elif isinstance(myobj, Particularites | Enquetes | Ouvrages):
+        elif isinstance(myobj, Particularites | Enquetes | Ouvrages | Profils):
             self.active_picturecollection = myobj
 
         elif type(myobj) == hydrometry_wolfgui:
@@ -13974,6 +13987,7 @@ class WolfMapViewer(wx.Frame):
 
             if 'select by tmp vector' in locaction or 'select by vector' in locaction:
                 inside_under = 'inside' in self.action
+                outside_under = 'outside' in self.action
 
                 self.end_action(_('End of vector selection'))
 
@@ -13982,6 +13996,9 @@ class WolfMapViewer(wx.Frame):
                 if inside_under:
                     self.active_vector.close_force()
                     self.active_array.SelectionData.select_insidepoly(self.active_vector)
+                elif outside_under:
+                    self.active_vector.close_force()
+                    self.active_array.SelectionData.select_outsidepoly(self.active_vector)
                 else:
                     self.active_array.SelectionData.select_underpoly(self.active_vector)
 
@@ -14774,7 +14791,7 @@ class WolfMapViewer(wx.Frame):
                         self.active_array.SelectionData.myselection = 'all'
                     elif len(cursel) > 0:
                         self.active_array.SelectionData.myselection = cursel.copy()
-                        self.active_array.SelectionData.update_nb_nodes_selection()
+                        # self.active_array.SelectionData.update_nb_nodes_selection()
 
                 else:
                     logging.info(_('Paste selection values'))
@@ -15570,7 +15587,7 @@ class WolfMapViewer(wx.Frame):
                     ymin = min(locothers.ymin, ymin)
                     ymax = max(locothers.ymax, ymax)
                     k += 1
-            elif type(locothers) in [Particularites, Enquetes, Ouvrages]:
+            elif type(locothers) in [Particularites, Enquetes, Ouvrages, Profils]:
                 if locothers.initialized:
                     xmin = min(locothers.xmin, xmin)
                     xmax = max(locothers.xmax, xmax)

wolfhece/PyGui.py

@@ -70,7 +70,7 @@ try:
     from .hydrology.forcedexchanges import forced_exchanges
     from .PyParams import Wolf_Param
     from .picc import Picc_data, Cadaster_data
-    from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier, Ouvrages, Enquetes, Particularites
+    from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier, Ouvrages, Enquetes, Particularites, Profils
     from .CpGrid import CpGrid
     from .mesh2d.gpu_2d import Sim_2D_GPU
     from .mesh2d.wolf2dprev import prev_sim2D
@@ -245,6 +245,8 @@ class MapManager(GenMapManager):
                 logging.info("MapManager - Enquetes created")
                 self.particularites = Particularites(mapviewer=self.mapviewer, parent = self.mapviewer, idx='Features', plotted=True)
                 logging.info("MapManager - Particularites created")
+                self.profils        = Profils(mapviewer=self.mapviewer, parent = self.mapviewer, idx='CrossSections', plotted=True)
+                logging.info("MapManager - PlansTerrier created")
 
                 self.mapviewer.add_object(which='other',
                                         newobj=self.ouvragesponts,
@@ -262,6 +264,12 @@ class MapManager(GenMapManager):
                                         newobj=self.particularites,
                                         ToCheck=False,
                                         id=_('Pictures "features"'))
+
+                self.mapviewer.add_object(which='other',
+                                            newobj=self.profils,
+                                            ToCheck=False,
+                                            id='Pictures "Cross sections"')
+
         except:
             logging.warning("Can't load some data (hydrometry, picc, cadaster, landmaps) -- Please check the data directories and/or report the issue")
 

wolfhece/PyVertexvectors.py

@@ -2789,7 +2789,7 @@ class vector:
 
         return pts
 
-    def split(self,ds, new=True):
+    def split(self, ds, new=True):
         """
         Création d'un nouveau vecteur sur base du découpage d'un autre et d'un pas spatial à respecter
         Le nouveau vecteur contient tous les points de l'ancien et des nouveaux sur base d'un découpage 3D

wolfhece/__init__.py

@@ -32,6 +32,7 @@ def ensure_ntv2grid_exists():
     files = ['be_ign_bd72lb72_etrs89lb08.tif', 'be_ign_hBG18.tif', 'be_ign_README.txt']
 
     pyproj_datadir = Path(pyproj.datadir.get_data_dir())
+    os.environ["PROJ_DATA"] = pyproj.datadir.get_data_dir()  # set the PROJ_DATA environment variable to pyproj data directory
 
     for file in files:
         if not (pyproj_datadir / file).exists():

wolfhece/analyze_poly.py

@@ -231,7 +231,7 @@ class Array_analysis_onepolygon():
 
         import plotly.express as px
 
-        fig = px.histogram(self.values('Values'), x='Values',
+        fig = px.histogram(self.values('Values'), x=self._polygon.myname,
                            nbins=bins, title='Values distribution',
                            histnorm='probability density')
 

wolfhece/apps/version.py

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