wolfhece 2.2.29__py3-none-any.whl → 2.2.31__py3-none-any.whl

wolfhece/PyCrosssections.py

@@ -1759,8 +1759,9 @@ class crosssections(Element_To_Draw):
                 f=open(myfile,'r')
                 lines=f.read().splitlines()
                 f.close()
-            else:
-                lines=[]
+        # For other formats (e.g.  vecz)
+        else:
+            lines=[]
 
         self.myprofiles={}
         self.mygenprofiles={}
@@ -1880,36 +1881,6 @@ class crosssections(Element_To_Draw):
                             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=curvec.myname,parent=self)
-                    cursect:profile
-                    cursect=curdict['cs']
-
-                    cursect.myvertices = curvec.myvertices
-
             elif format=='sxy':
                 self.format='sxy'
                 nbpotsect = int(lines[0])
@@ -1982,6 +1953,38 @@ class crosssections(Element_To_Draw):
                         cursect.bankright=wolfvertex(rbs,rbz)
                         curdict['right']=cursect.bankright
 
+        # To make a distinction between cases for vecz
+        elif len(lines)==0:
+            if 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
+
         self.verif_bed()
         self.find_minmax(True)
         self.init_cloud()
@@ -2506,7 +2509,7 @@ class crosssections(Element_To_Draw):
             self.xmax = 0
             self.ymax = 0
             return
-
+        
         if update:
             for idx,vect in self.myprofiles.items():
                 vect['cs'].find_minmax(only_firstlast = True)

wolfhece/PyDraw.py

@@ -4208,6 +4208,15 @@ class WolfMapViewer(wx.Frame):
         else:
             return config[ConfigurationKeys.ACTIVE_VECTOR_COLOR]
 
+    @property
+    def active_vector_square_size(self) -> list[int]:
+        """ Return the active vector square size from configs """
+        config = self.get_configuration()
+        if config is None:
+            return 0
+        else:
+            return config[ConfigurationKeys.ACTIVE_VECTOR_SIZE_SQUARE]
+
     @property
     def default_dem(self) -> Path:
         """ Return the default DEM file from configs """
@@ -15081,8 +15090,10 @@ class WolfMapViewer(wx.Frame):
                     old = self.active_vector.myprop.color
                     self.active_vector.myprop.color = getIfromRGB(self.active_vector_color)
                     self.active_vector.plot()
-                    self.active_vector._plot_square_at_vertices()
+                    self.active_vector._plot_square_at_vertices(size = self.active_vector_square_size)
                     self.active_vector.myprop.color = old
+                else:
+                    self.active_vector._plot_square_at_vertices(size = self.active_vector_square_size)
 
                 if self.active_vector.myprop.plot_indices:
                     self.active_vector._plot_all_indices(sx = self.sx, sy=self.sy,
@@ -15328,6 +15339,7 @@ class WolfMapViewer(wx.Frame):
                 self.Active_zone(vect.parentzone)
 
         self.mimicme()
+        self.Paint()
 
     def Active_zone(self, zone: zone):
         """ Active une zone et son parent si existant """