wolfhece 2.1.112__py3-none-any.whl → 2.1.114__py3-none-any.whl

wolfhece/PyDraw.py

@@ -6760,7 +6760,7 @@ class WolfMapViewer(wx.Frame):
 
             # Création d'une nouvelle vue
             newview = WolfViews(mapviewer=self)
-            self.add_object('array', newobj=newarray)
+            self.add_object('views', newobj=newview)
 
         elif itemlabel==_('Create Wolf2D manager ...'):
             autoscale = False

wolfhece/PyVertexvectors.py

@@ -1091,7 +1091,8 @@ class vector:
     mytree:TreeListCtrl
     myitem:TreeItemId
 
-    def __init__(self, lines:list=[], is2D=True, name='NoName', parentzone:"zone"=None, fromshapely=None) -> None:
+    def __init__(self, lines:list=[], is2D=True, name='NoName',
+                 parentzone:"zone"=None, fromshapely=None, fromnumpy:np.ndarray = None) -> None:
         """
 
         :param lines: utile pour lecture de fichier
@@ -1102,8 +1103,8 @@ class vector:
         """
 
         self.myname=''
-        self.is2D = is2D
-        self.closed=False
+        self.is2D = is2D  # Force a 2D interpretation of the vertices, even if a z coordinate is present.
+        self.closed=False # True if the vector is a polygon. !! The last vertex is not necessarily the same as the first one. In this case, some routines will add a virtual segment at the end. !!
 
         self.mytree = None
 
@@ -1172,6 +1173,9 @@ class vector:
         if fromshapely is not None:
             self.import_shapelyobj(fromshapely)
 
+        if fromnumpy is not None:
+            self.add_vertices_from_array(fromnumpy)
+
     def set_cache(self):
         """ Set the cache for the vertices """
 
@@ -1723,7 +1727,7 @@ class vector:
 
         if is_open:
             self.add_vertex(self.myvertices[0])
-            self.closed=True
+        self.closed=True
 
     def _nblines(self):
         """
@@ -2991,6 +2995,45 @@ class vector:
 
         return cloud_inside, cloud_outside
 
+
+    def check_if_closed(self) -> bool:
+        """
+        Check if the vector is closed
+        """
+
+        return not self.check_if_open()
+
+
+    def check_if_open(self) -> bool:
+        """ Check if the vector is open """
+
+        is_open = not((self.myvertices[-1] is self.myvertices[0]) or \
+            (self.myvertices[-1].x==self.myvertices[0].x and \
+             self.myvertices[-1].y==self.myvertices[0].y))
+
+        if not self.is2D :
+            is_open = is_open or self.myvertices[-1].z!=self.myvertices[0].z
+
+        self.closed = not is_open
+
+        return is_open
+
+    @property
+    def surface(self):
+        """
+        Compute the surface of the vector
+        """
+
+        if self.closed:
+            return self.asshapely_pol().area
+        else:
+            return 0.
+
+    @property
+    def area(self):
+        """ Alias for surface """
+        return self.surface
+
 class zone:
     """
     Objet de gestion d'informations vectorielles
@@ -3072,6 +3115,11 @@ class zone:
             # Object can be created from a shapely object
             self.import_shapelyobj(fromshapely)
 
+    @property
+    def area(self):
+        """ Compute the area of the zone """
+        return sum([curvec.surface for curvec in self.myvectors])
+
     def set_cache(self):
         """
         Set the cache for the zone and all its vectors
@@ -3436,6 +3484,11 @@ class zone:
 
         inside : True = le point est contenu ; False = le point le plus proche
         """
+
+        if self.nbvectors==0:
+            logging.warning(_('No vector in zone -- {}').format(self.myname))
+            return
+
         curvect:vector
         self.selected_vectors.clear()