wolfhece 2.1.19__py3-none-any.whl → 2.1.21__py3-none-any.whl

wolfhece/PyDraw.py

@@ -62,6 +62,7 @@ from .lazviewer.laz_viewer import myviewer, read_laz, clip_data_xyz, xyz_laz_gri
 from . import Lidar2002
 from .picc import Picc_data, Cadaster_data
 from .wolf_zi_db import ZI_Databse_Elt, PlansTerrier
+from .math_parser.calculator import Calculator
 
 # try:
 #     from .hydrometry_hece.kiwis_hece import hydrometry_hece as hydrometry
@@ -445,6 +446,8 @@ class WolfMapViewer(wx.Frame):
         self.tools_menu = wx.Menu()
 
         self.menu_contour_from_arrays = self.tools_menu.Append(wx.ID_ANY, _("Create contour from checked arrays..."), _("Create contour"))
+        self.menu_calculator = self.tools_menu.Append(wx.ID_ANY, _("Calculator..."), _("Calculator"))
+        self.calculator = None
 
         # Cross sections
         # ----------------
@@ -4645,6 +4648,13 @@ class WolfMapViewer(wx.Frame):
             newzones = self.create_Zones_from_arrays(self.get_list_objects(draw_type.ARRAYS, checked_state=True))
             self.add_object('vector', newobj=newzones, ToCheck=True, id='Contours from arrays')
 
+        elif itemlabel == _("Calculator..."):
+
+            if self.calculator is None:
+                self.calculator = Calculator(mapviewer = self)
+            else:
+                self.calculator.Show()
+
         elif itemlabel == _("Create bridge and export gltf..."):
 
             if self.active_cs is None:

wolfhece/PyVertexvectors.py

@@ -6,7 +6,8 @@ from wx.dataview import *
 from wx.core import BoxSizer, FlexGridSizer, TreeItemId
 from OpenGL.GL  import *
 from shapely.geometry import LineString, MultiLineString,Point,MultiPoint,Polygon,JOIN_STYLE, MultiPolygon
-from shapely.ops import nearest_points,substring, split
+from shapely.ops import nearest_points,substring, split, polygonize
+from shapely import delaunay_triangles
 import pygltflib
 from scipy.interpolate import interp1d
 import matplotlib.pyplot as plt
@@ -1508,25 +1509,32 @@ class vector:
         If the vector has no interior, the list contains the whole vector as a polygon
         """
 
-        if self.has_interior:
-            not_in_use = [curvert for curvert in self.myvertices if not curvert.in_use]
+        if self.myprop.filled:
+            return [self.myvertices]
 
-            alls = []
-            new_poly = []
-            for curvert in self.myvertices:
-                if curvert in not_in_use:
-                    alls.append(new_poly)
-                    new_poly = []
-                    new_poly.append(curvert)
-                else:
-                    new_poly.append(curvert)
+        else:
+            if self.has_interior:
+                # not_in_use = [curvert for curvert in self.myvertices if not curvert.in_use]
 
-            if self.myprop.closed and (self.myvertices[0].x != self.myvertices[-1].x or self.myvertices[0].y != self.myvertices[-1].y):
-                alls[0].append(self.myvertices[0])
+                alls = []
 
-            return alls
-        else:
-            return [self.myvertices]
+                new_poly = []
+                alls.append(new_poly)
+
+                for curvert in self.myvertices:
+                    if curvert.in_use:
+                        new_poly.append(curvert)
+                    else:
+                        new_poly = []
+                        alls.append(new_poly)
+                        new_poly.append(curvert)
+
+                if self.myprop.closed and (self.myvertices[0].x != self.myvertices[-1].x or self.myvertices[0].y != self.myvertices[-1].y):
+                    alls[0].append(self.myvertices[0])
+
+                return alls
+            else:
+                return [self.myvertices]
 
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """
@@ -1556,26 +1564,54 @@ class vector:
             else:
                 glColor3ub(int(rgb[0]),int(rgb[1]),int(rgb[2]))
 
-            all_polys = self.get_subpolygons()
+            if self.myprop.filled:
 
-            for curpoly in all_polys:
+                import triangle
+                
+                ls = self.asshapely_pol()
+                
+                if False:
+
+                    #FIXME : Shapely have not constrained Delaunay triangulation -- using Delaunay from Wolf Fortran instead
+                    ls = ls.segmentize(.1)
+                    delaunay = delaunay_triangles(ls)
+
+                    for curpol in delaunay.geoms:
+                        if ls.contains(curpol.centroid):
+                            glBegin(GL_POLYGON)
+                            for curvert in curpol.exterior.coords:
+                                glVertex2d(curvert[0],curvert[1])
+                            glEnd()
+                        else:
+                            logging.debug(_('Polygon not in Polygon'))
 
-                if self.myprop.filled:
-                    glBegin(GL_POLYGON)
                 else:
+                    #En attendant de lier WOLF-Fortran, on utilise la triangulation contrainte de la librairie Triangle -- https://rufat.be/triangle/
+                    xx, yy = ls.exterior.xy
+                    geom = {'vertices' : np.array([xx,yy]).T, 'segments' : np.array([[i,i+1] for i in range(len(xx)-1)]+[[len(xx)-1,0]])}
+                    delaunay = triangle.triangulate(geom,'p')
+
+                    for curtri in delaunay['triangles']:
+                        glBegin(GL_POLYGON)
+                        for i in range(3):
+                            glVertex2d(delaunay['vertices'][curtri[i]][0],delaunay['vertices'][curtri[i]][1])
+                        glEnd()
+
+            else:
+                all_polys = self.get_subpolygons()
+
+                for curpoly in all_polys:
+
                     glBegin(GL_LINE_STRIP)
 
-                for curvertex in curpoly:
-                    glVertex2d(curvertex.x, curvertex.y)
+                    for curvertex in curpoly:
+                        glVertex2d(curvertex.x, curvertex.y)
 
-                glEnd()
+                    glEnd()
 
             glPolygonMode(GL_FRONT_AND_BACK,GL_LINE)
             glDisable(GL_BLEND)
 
-            # if self.myprop.legendvisible:
-            #     self.textimage.paint()
-
     def plot_legend(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """
         Plot OpenGL
@@ -1661,7 +1697,7 @@ class vector:
 
         self.parentzone.reset_listogl()
 
-    def fillgrid(self,gridto:CpGrid):
+    def fillgrid(self, gridto:CpGrid):
         """
         Remplissage d'un CpGrid
         """
@@ -1672,6 +1708,7 @@ class vector:
         gridto.SetColLabelValue(2,'Z')
         gridto.SetColLabelValue(3,'value')
         gridto.SetColLabelValue(4,'s curvi')
+        gridto.SetColLabelValue(5,'in use')
 
         nb=gridto.GetNumberRows()
         if len(self.myvertices)-nb>0:
@@ -1681,6 +1718,7 @@ class vector:
            gridto.SetCellValue(k,0,str(curv.x))
            gridto.SetCellValue(k,1,str(curv.y))
            gridto.SetCellValue(k,2,str(curv.z))
+           gridto.SetCellValue(k,5,'1' if curv.in_use else '0')
            k+=1
 
     def updatefromgrid(self,gridfrom:CpGrid):
@@ -1695,6 +1733,7 @@ class vector:
             x=gridfrom.GetCellValue(k,0)
             y=gridfrom.GetCellValue(k,1)
             z=gridfrom.GetCellValue(k,2)
+            inuse = gridfrom.GetCellValue(k,5)
             if z=='':
                 z=0.
             if x!='':
@@ -1702,6 +1741,7 @@ class vector:
                     self.myvertices[k].x=float(x)
                     self.myvertices[k].y=float(y)
                     self.myvertices[k].z=float(z)
+                    self.myvertices[k].in_use = inuse=='1'
                 else:
                     newvert=wolfvertex(float(x),float(y),float(z))
                     self.add_vertex(newvert)
@@ -1715,6 +1755,8 @@ class vector:
         if self.linestring is not None:
             self.prepare_shapely()
 
+        self.parentzone.reset_listogl()
+
     def get_s2d(self):
         """
         calcul et retour des positions curvilignes 2D
@@ -3842,7 +3884,7 @@ class Zones(wx.Frame, Element_To_Draw):
             self.set_mapviewer()
 
             try:
-                super(Zones, self).__init__(None, size=(300, 400))
+                super(Zones, self).__init__(None, size=(400, 400))
                 self.Bind(wx.EVT_CLOSE,self.OnClose) # on lie la procédure de fermeture de façon à juste masquer le Frame et non le détruire
             except:
                 raise Warning(_('Bad wx context -- see Zones.__init__'))
@@ -4405,7 +4447,7 @@ class Zones(wx.Frame, Element_To_Draw):
             boxupdownz = BoxSizer(orient=wx.VERTICAL)
 
             self.xls=CpGrid(self,-1,wx.WANTS_CHARS)
-            self.xls.CreateGrid(10,5)
+            self.xls.CreateGrid(10,6)
 
             self.addrows = wx.Button(self,label=_('Add rows'))
             self.addrows.SetToolTip(_("Add rows to the grid --> Useful for manually adding some points to a vector"))

wolfhece/apps/version.py

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