wolfhece 2.2.24__py3-none-any.whl → 2.2.25__py3-none-any.whl

wolfhece/PyVertex.py

@@ -36,7 +36,6 @@ from .drawing_obj import Element_To_Draw
 from .textpillow import Text_Image, Text_Infos, Font_Priority
 from .wolf_texture import Text_Image_Texture
 
-
 def getRGBfromI(rgbint:int):
     """ Convert integer to RGB """
 
@@ -731,6 +730,20 @@ class cloud_vertices(Element_To_Draw):
                 curval = curline.split(sep)
                 nbcols = len(curval)
 
+                if not header:
+                    try:
+                        x = float(curval[0])
+                        y = float(curval[1])
+                        z = 0.
+                        if nbcols > 2:
+                            z = float(curval[2])
+                    except ValueError as e:
+                        logging.error(_('Error converting first row to float as "header" is set to False.'))
+                        logging.error(_('Check your input file : ')+fname)
+                        logging.info(_('Using the first row as header.'))
+                        header = True
+                        headers = curhead.split(sep)
+
             if nbcols < 2:
                 logging.warning(_('Not enough values on one line -- Retry !!'))
                 return

wolfhece/PyVertexvectors.py

@@ -1799,7 +1799,7 @@ class vector:
 
         myls = self.asshapely_ls()
 
-        mypar = myls.parallel_offset(distance=abs(distance),side=side,join_style=JOIN_STYLE.round)
+        mypar = myls.parallel_offset(distance=abs(distance), side=side, join_style=JOIN_STYLE.round)
 
         if mypar.geom_type=='MultiLineString':
             return None
@@ -1810,7 +1810,7 @@ class vector:
             #     #On souhaite garder une même orientation pour les vecteurs
             #     mypar = substring(mypar, 1., 0., normalized=True)
 
-            newvec = vector(name='par'+str(distance), parentzone=self.parentzone)
+            newvec = vector(name='par' + str(distance) +'_'+ self.myname, parentzone= self.parentzone)
 
             for x,y in mypar.coords:
                 xy = Point(x,y)
@@ -4133,8 +4133,8 @@ class zone:
         if mypl is None or mypr is None:
             return
 
-        self.add_vector(mypl,0)
-        self.add_vector(mypr,2)
+        self.add_vector(mypl, 0)
+        self.add_vector(mypr, 2)
 
     def create_multibin(self, nb:int = None, nb2:int = 0) -> Triangulation:
         """
@@ -7468,6 +7468,15 @@ class Zones(wx.Frame, Element_To_Draw):
             if self.verify_activevec():
                 return
 
+            if self.active_zone.nbvectors > 1:
+                dlg = wx.MessageDialog(None, _('You already have more than one vector in the active zone. This action will conserve only the active vector.\nDo you want to continue?'), _('Warning'), style=wx.YES_NO | wx.ICON_WARNING)
+                ret = dlg.ShowModal()
+                if ret == wx.ID_NO:
+                    dlg.Destroy()
+                    return
+                logging.warning(_('You already have more than one vector in the active zone. This action will conserve only the active vector and you want it.'))
+                dlg.Destroy()
+
             self.mapviewer.start_action('dynamic parallel', _('Dynamic parallel'))
 
             firstvert=wolfvertex(0.,0.)

wolfhece/apps/version.py

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

wolfhece/pypolygons_scen.py

@@ -445,6 +445,8 @@ class Polygons_Analyze(Zones):
                     return float(obj)
                 elif isinstance(obj, np.ndarray):
                     return obj.tolist()
+                elif isinstance(obj, tuple):
+                    return [list(lst1) for lst1 in obj]
                 elif obj == Wolfresults_2D:
                     return 'CPU'
                 elif obj == wolfres2DGPU:
@@ -919,7 +921,8 @@ class Polygons_Analyze(Zones):
                  operator:operators=operators.MEDIAN,
                  options:dict=None,
                  label=True,
-                 show=False):
+                 show=False,
+                 which_sim:str=None):
         """ Plot the values of the river polygons
 
         :param figax: tuple (fig, ax) for the plot
@@ -929,6 +932,8 @@ class Polygons_Analyze(Zones):
         :param options: options for the plot
         :param label: show the labels or not
         :param show: show the plot or not
+        :param which_sim: simulation to plot (if None, all simulations are plotted)
+        :return: tuple (fig, ax) of the plot
         """
 
         if figax is None:
@@ -1022,9 +1027,9 @@ class Polygons_Analyze(Zones):
         figax=(fig,ax)
         self.plot_unk(figax, stored_values_unk.WATERLEVEL, which_group, operator, options={'color':'blue', 'linewidth':2}, label=True, show=False)
 
-        ax.set_ylabel(_('Water leval [mDNG]'))
+        ax.set_ylabel(_('Water surface elevation [mDNG]'))
         ax.set_xlabel(_('Abscissa from upstream [m]'))
-        fig.suptitle(self.myname + ' -- ' +_('Water surface profile'))
+        fig.suptitle(self.myname + ' -- ' +_('Water surface elevation'))
 
         if show:
             fig.show()
@@ -1055,10 +1060,10 @@ class Polygons_Analyze(Zones):
         return fig,ax
 
     def plot_stage(self,
-                       figax=None,
-                       which_group=None,
-                       operator:operators=operators.MEDIAN,
-                       show=False):
+                   figax=None,
+                   which_group=None,
+                   operator:operators=operators.MEDIAN,
+                   show=False):
         """ Plot the water stage /water level
 
         :param figax: tuple (fig, ax) for the plot