wolfhece 2.2.39__py3-none-any.whl → 2.2.41__py3-none-any.whl

wolfhece/PyDraw.py

@@ -1219,6 +1219,221 @@ class Sim_Explorer(wx.Frame):
         self._step_num.Set([str(i) for i in self._all_times_steps[1]])
 
 
+class Sim_VideoCreation(wx.Dialog):
+
+    def __init__(self, parent, title, mapviewer:"WolfMapViewer", sim:Wolfresults_2D):
+        super(Sim_VideoCreation, self).__init__(parent, title=title, size=(350, 250), style = wx.DEFAULT_DIALOG_STYLE & ~ (wx.RESIZE_BORDER | wx.MAXIMIZE_BOX | wx.MINIMIZE_BOX | wx.CLOSE_BOX))
+
+        self.mapviewer = mapviewer
+        self.active_res2d:Wolfresults_2D = sim
+
+        self._framerate = 25
+        self._start_step = 1
+        self._end_step = self.active_res2d.get_nbresults()
+        self._interval = 1
+        self._fn = str(Path(self.active_res2d.filename).parent / f'{Path(self.active_res2d.filename).stem}.avi')
+
+        self._fontsize = 16
+        self._fontcolor = (255, 255, 255, 255)
+        self._timeposition = 'top-left' # 'top-right', 'bottom-left', 'bottom-right', 'top-center', 'bottom-center'
+
+        panel = wx.Panel(self)
+        vbox = wx.BoxSizer(wx.VERTICAL)
+
+        hbox1 = wx.BoxSizer(wx.HORIZONTAL)
+        st1 = wx.StaticText(panel, -1, _('File name'))
+        hbox1.Add(st1, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc1 = wx.TextCtrl(panel, -1, self._fn)
+        hbox1.Add(tc1,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox1,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc1 = tc1
+
+        # Add a button to choose the file name
+        btn_browse = wx.Button(panel, -1, _('Browse'))
+        hbox1.Add(btn_browse, 0, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.btn_browse = btn_browse
+        self.btn_browse.Bind(wx.EVT_BUTTON, self.OnBrowse)
+
+        hbox2 = wx.BoxSizer(wx.HORIZONTAL)
+        st2 = wx.StaticText(panel, -1, _('Frame rate [nb_images/second]'), style=wx.ALIGN_CENTER)
+        hbox2.Add(st2, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc2 = wx.TextCtrl(panel, -1, str(self._framerate))
+        hbox2.Add(tc2,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox2,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc2 = tc2
+
+        hbox3 = wx.BoxSizer(wx.HORIZONTAL)
+        st3 = wx.StaticText(panel, -1, _('First step'), style=wx.ALIGN_CENTER)
+        hbox3.Add(st3, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc3 = wx.TextCtrl(panel, -1, str(self._start_step))
+        hbox3.Add(tc3,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox3,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc3 = tc3
+
+        hbox4 = wx.BoxSizer(wx.HORIZONTAL)
+        st4 = wx.StaticText(panel, -1, _('Final step'), style=wx.ALIGN_CENTER)
+        hbox4.Add(st4, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc4 = wx.TextCtrl(panel, -1, str(self._end_step))
+        hbox4.Add(tc4,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox4,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc4 = tc4
+
+        hbox5 = wx.BoxSizer(wx.HORIZONTAL)
+        st5 = wx.StaticText(panel, -1, _('Interval'), style=wx.ALIGN_CENTER)
+        hbox5.Add(st5, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc5 = wx.TextCtrl(panel, -1, str(self._interval))
+        hbox5.Add(tc5,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox5,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc5 = tc5
+
+        hbox7 = wx.BoxSizer(wx.HORIZONTAL)
+        st7 = wx.StaticText(panel, -1, _("Font size (for time stamp)"), style=wx.ALIGN_CENTER)
+        hbox7.Add(st7, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc7 = wx.TextCtrl(panel, -1, str(self._fontsize))
+        hbox7.Add(tc7,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox7,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc7 = tc7
+
+        hbox8 = wx.BoxSizer(wx.HORIZONTAL)
+        st8 = wx.StaticText(panel, -1, _("Font color (R,G,B,A)"), style=wx.ALIGN_CENTER)
+        hbox8.Add(st8, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc8 = wx.ColourPickerCtrl(panel, -1, wx.Colour(*self._fontcolor))
+        hbox8.Add(tc8,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox8,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc8 = tc8
+
+        hbox9 = wx.BoxSizer(wx.HORIZONTAL)
+        st9 = wx.StaticText(panel, -1, _("Time position"), style=wx.ALIGN_CENTER)
+        hbox9.Add(st9, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        choices = ['top-left', 'top-right', 'bottom-left', 'bottom-right', 'top-center', 'bottom-center']
+        tc9 = wx.Choice(panel, -1, choices=choices)
+        hbox9.Add(tc9, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        vbox.Add(hbox9, 0, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        self.tc9 = tc9
+
+        hbox6 = wx.BoxSizer(wx.HORIZONTAL)
+        btn1 = wx.Button(panel, -1, _('Ok'))
+        hbox6.Add(btn1,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.btn1 = btn1
+
+        btn2 = wx.Button(panel, -1, _('Cancel'))
+        hbox6.Add(btn2,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.btn2 = btn2
+        vbox.Add(hbox6,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        panel.SetSizer(vbox)
+        vbox.Fit(self)
+
+        self.btn1.Bind(wx.EVT_BUTTON, self.OnOk)
+        self.btn2.Bind(wx.EVT_BUTTON, self.OnCancel)
+
+        # Add validation to the text controls
+        self.tc2.Bind(wx.EVT_TEXT, self.OnValidate)
+        self.tc3.Bind(wx.EVT_TEXT, self.OnValidate)
+        self.tc4.Bind(wx.EVT_TEXT, self.OnValidate)
+        self.tc5.Bind(wx.EVT_TEXT, self.OnValidate)
+        self.tc7.Bind(wx.EVT_TEXT, self.OnValidate)
+        self.tc8.Bind(wx.EVT_COLOURPICKER_CHANGED, self.OnValidate)
+        self.tc9.SetSelection(0)
+        self.tc9.Bind(wx.EVT_CHOICE, self.OnValidate)
+
+        icon = wx.Icon()
+        icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
+        icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+        self.SetIcon(icon)
+        self.CenterOnScreen()
+        self.Show()
+
+    def OnBrowse(self, event):
+        """ Browse a file name to save the video """
+        with wx.FileDialog(self, _("Save video file"), wildcard="MP4 files (*.mp4)|*.mp4|AVI files (*.avi)|*.avi|All files (*.*)|*.*",
+                           style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT) as fileDialog:
+            if fileDialog.ShowModal() == wx.ID_CANCEL:
+                return     # the user changed idea...
+
+            self._fn = fileDialog.GetPath()
+            self.tc1.SetValue(self._fn)
+
+    def get_values(self):
+        """ Return the values set in the dialog """
+        return self._fn, self._framerate, self._start_step, self._end_step, self._interval, self._fontsize, self._fontcolor, self._timeposition
+
+    def OnValidate(self, event):
+        """ Validate the text controls to be sure that the values are correct """
+        try:
+            framerate = int(self.tc2.GetValue())
+            if framerate <= 0:
+                framerate = 25
+                self.tc2.SetValue(str(framerate))
+            self._framerate = framerate
+        except:
+            self.tc2.SetValue(str(self._framerate))
+        try:
+            start_step = int(self.tc3.GetValue())
+            if start_step < 1:
+                start_step = 1
+                self.tc3.SetValue(str(start_step))
+            if start_step > self.active_res2d.get_nbresults():
+                start_step = self.active_res2d.get_nbresults()
+                self.tc3.SetValue(str(start_step))
+            self._start_step = start_step
+
+        except:
+            self.tc3.SetValue(str(self._start_step))
+        try:
+            end_step = int(self.tc4.GetValue())
+            if end_step < 1:
+                end_step = 1
+                self.tc4.SetValue(str(end_step))
+            if end_step > self.active_res2d.get_nbresults():
+                end_step = self.active_res2d.get_nbresults()
+                self.tc4.SetValue(str(end_step))
+            self._end_step = end_step
+        except:
+            self.tc4.SetValue(str(self._end_step))
+        try:
+            interval = int(self.tc5.GetValue())
+            if interval < 1:
+                interval = 1
+                self.tc5.SetValue(str(interval))
+            self._interval = interval
+        except:
+            self.tc5.SetValue(str(self._interval))
+
+        try:
+            fontsize = int(self.tc7.GetValue())
+            if fontsize < 1:
+                fontsize = 16
+                self.tc7.SetValue(str(fontsize))
+            self._fontsize = fontsize
+        except:
+            self.tc7.SetValue(str(self._fontsize))
+
+        try:
+            color = self.tc8.GetColour()
+            self._fontcolor = (color.Red(), color.Green(), color.Blue(), color.Alpha())
+        except:
+            self.tc8.SetColour(wx.Colour(*self._fontcolor))
+
+        try:
+            pos_idx = self.tc9.GetSelection()
+            choices = ['top-left', 'top-right', 'bottom-left', 'bottom-right', 'top-center', 'bottom-center']
+            if pos_idx < 0 or pos_idx >= len(choices):
+                pos_idx = 0
+                self.tc9.SetSelection(pos_idx)
+            self._timeposition = choices[pos_idx]
+        except:
+            self.tc9.SetSelection(0)
+
+    def OnOk(self, event):
+        """ Create the video file """
+        self.OnValidate(None)
+        self.EndModal(wx.ID_OK)
+
+    def OnCancel(self, event):
+        """ Cancel the video creation """
+        self.EndModal(wx.ID_CANCEL)
+
+
 class Drowning_Explorer(wx.Frame):
 
     def __init__(self, parent, title, mapviewer:any, sim:Drowning_victim_Viewer):
@@ -2530,7 +2745,7 @@ class WolfMapViewer(wx.Frame):
         self.InitUI()
 
         self._tmp_vector_distance = None  # distance computation the vector
-        self._distances = Zones(mapviewer=self, idx=_('Distances/Areas'))
+        self._distances = Zones(mapviewer=self, idx=_('Distances/Areas'), parent = self)
         self._distances.add_zone(zone(name='memory distances', parent=self._distances))  # distances memory
 
         self.menu_alaro_forecasts()
@@ -5370,112 +5585,98 @@ class WolfMapViewer(wx.Frame):
             logging.error(_('Please install opencv-python'))
             return
 
-        if fn=='':
-            dlg = wx.FileDialog(parent   = None,
-                                message  = _('Choose file name'),
-                                wildcard = 'AVI video file (*.avi)|*.avi',
-                                style    = wx.FD_SAVE)
-            ret = dlg.ShowModal()
-            if ret == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
-            fn = dlg.GetPath()
-            dlg.Destroy()
-
-        if not fn.endswith('.avi'):
-            fn+='.avi'
-
-        if framerate<1:
-            dlg = wx.NumberEntryDialog(None, _("Frame rate [nb_images/second]"), _('Frame rate'), _('Frame rate'), 24, 1, 100)
-
-            ret = dlg.ShowModal()
+        dlg = Sim_VideoCreation(None, title = _('Video creation'), sim= self.active_res2d, mapviewer=self)
 
-            if ret == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
-
-            framerate = int(dlg.GetValue())
+        ret = dlg.ShowModal()
+        if ret == wx.ID_CANCEL:
             dlg.Destroy()
+            return
 
+        fn, framerate, start_step, end_step, interval, fontsize, fontcolor, timeposition = dlg.get_values()
+        dlg.Destroy()
 
         times,steps = self.active_res2d.get_times_steps()
 
-        el_time = str(timedelta(seconds=int(times[self.active_res2d.current_result])))
-
-        fig:Figure
-        fig, ax = self.get_mpl_plot([self.mousex, self.mousey],
-                                    self.width,
-                                    self.height,
-                                    title=_('Current time {:0>8} s'.format(el_time)),
-                                    toshow=False)
-
-        video = cv2.VideoWriter(fn, cv2.VideoWriter_fourcc(*'XVID'), framerate, fig.canvas.get_width_height())
-
-        nb = self.active_res2d.get_nbresults()
-        cid = max(self.active_res2d.current_result,1)
-
-        self.active_res2d.mypal.automatic=False
-
-        if start_step==0:
-            dlg = wx.NumberEntryDialog(None, _("First step"), _('From'), _('from'), cid, 1, nb)
-
-            ret = dlg.ShowModal()
-
-            if ret == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
-
-            start_step = int(dlg.GetValue())
-            dlg.Destroy()
-
-        if end_step==0:
-            dlg = wx.NumberEntryDialog(None, _("Final step"), _('To'), _('To'), nb, 1, nb)
-
-            ret = dlg.ShowModal()
+        framesize = (int(self.canvaswidth), int(self.canvasheight))
+        video = cv2.VideoWriter(fn, cv2.VideoWriter_fourcc(*'XVID'), framerate, framesize)
 
-            if ret == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
-
-            end_step = int(dlg.GetValue())
-            dlg.Destroy()
-
-        if every==0:
-            dlg = wx.NumberEntryDialog(None, _("Interval"), _('Interval'), _('Interval'), 1, 1, end_step-start_step)
-
-            ret = dlg.ShowModal()
-
-            if ret == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
+        el_time = str(timedelta(seconds=int(times[self.active_res2d.current_result])))
 
-            interval = int(dlg.GetValue())
-            dlg.Destroy()
+        zones_time = Zones(mapviewer=self)
+        self.add_object('vector', newobj=zones_time, ToCheck=True, id='__VideoTime__')
+        zone_time = zone(name='Time')
+        vec_time = vector(name='Time')
+
+        zones_time.add_zone(zone_time, forceparent=True)
+        zone_time.add_vector(vec_time, forceparent=True)
+
+        if timeposition == 'top-center':
+            x = (self.xmax+self.xmin)/2.
+            y = self.ymax - 0.05*(self.ymax-self.ymin)
+        elif timeposition == 'bottom-center':
+            x = (self.xmax+self.xmin)/2.
+            y = self.ymin + 0.05*(self.ymax-self.ymin)
+        elif timeposition == 'top-left':
+            x = self.xmin + 0.15*(self.xmax-self.xmin)
+            y = self.ymax - 0.05*(self.ymax-self.ymin)
+        elif timeposition == 'bottom-left':
+            x = self.xmin + 0.15*(self.xmax-self.xmin)
+            y = self.ymin + 0.05*(self.ymax-self.ymin)
+        elif timeposition == 'top-right':
+            x = self.xmax - 0.15*(self.xmax-self.xmin)
+            y = self.ymax - 0.05*(self.ymax-self.ymin)
+        elif timeposition == 'bottom-right':
+            x = self.xmax - 0.15*(self.xmax-self.xmin)
+            y = self.ymin + 0.05*(self.ymax-self.ymin)
+        else:
+            x = (self.xmax+self.xmin)/2.
+            y = self.ymax - 0.05*(self.ymax-self.ymin)
 
-        self.read_one_result(start_step)
+        vec_time.add_vertex(wolfvertex(x,y))
+        vec_time.set_legend_position(x,y)
+        vec_time.set_legend_text('Time {:0>8} s'.format(el_time))
+        vec_time.set_legend_visible(True)
+        vec_time.myprop.legendfontsize = fontsize
+        vec_time.myprop.legendcolor = getIfromRGB(fontcolor)
 
         for curmodel in self.iterator_over_objects(draw_type.RES2D):
             curmodel: Wolfresults_2D
             curmodel.step_interval_results = interval
 
-        for idx in tqdm(range(start_step, end_step, interval)):
+        all_steps = range(0, int((end_step-start_step) // interval) + 1)
+
+        pgbar = wx.ProgressDialog(_('Video creation'),
+                                  _('Creating video...'),
+                                    maximum = len(all_steps),
+                                    parent = None,
+                                    style = wx.PD_APP_MODAL | wx.PD_ELAPSED_TIME | wx.PD_ESTIMATED_TIME | wx.PD_REMAINING_TIME)
+        pgbar.Show()
+
+        self.read_one_result(start_step-1)
+        for idx in tqdm(all_steps, desc=_('Creating video')):
 
-            image = Image.frombytes('RGB', fig.canvas.get_width_height(),fig.canvas.tostring_rgb())
+            image = self.get_canvas_as_image()
 
             video.write(cv2.cvtColor(np.asarray(image),cv2.COLOR_RGB2BGR))
 
             self.simul_next_step()
 
             el_time = str(timedelta(seconds=int(times[self.active_res2d.current_result])))
+            vec_time.set_legend_text('Time {:0>8} s'.format(el_time))
 
-            self.display_canvasogl(fig=fig,
-                                   ax=ax[0],
-                                   title=_('Current time {:0>8} s'.format(el_time)))
+            if not pgbar.WasCancelled():
+                pgbar.Update(idx)
+            else:
+                break
+
+        pgbar.Destroy()
+        video.release()
 
         for curmodel in self.iterator_over_objects(draw_type.RES2D):
             curmodel: Wolfresults_2D
             curmodel.step_interval_results = 1
 
+        self.removeobj_from_id('__VideoTime__')
 
     def get_canvas_as_image(self) -> Image.Image:
         """
@@ -5493,7 +5694,11 @@ class WolfMapViewer(wx.Frame):
 
             return myimage
 
-    def copy_canvasogl(self, mpl:bool= True, ds:float= 0., figsizes= [10.,10.], palette:wolfpalette = None):
+    def copy_canvasogl(self,
+                       mpl:bool= True,
+                       ds:float= 0.,
+                       figsizes= [10.,10.],
+                       palette:wolfpalette = None):
         """
         Generate image based on UI context and copy to the Clipboard
 
@@ -5811,7 +6016,7 @@ class WolfMapViewer(wx.Frame):
                 'Opengl setcurrent -- maybe a conflict with an existing opengl32.dll file - please rename the opengl32.dll in the libs directory and retry')
 
     def reporting(self, dir=''):
-        """ Firsdt attempr to create a reporting.
+        """ First attempt to create a reporting.
         !! Must be improved !!
         """
         if dir == '':
@@ -6940,6 +7145,14 @@ class WolfMapViewer(wx.Frame):
 
         """
 
+        msg = _('This function will force a null border of 1 cell on each array to avoid issues with the contouring algorithm')
+        dlg = wx.MessageDialog(None, msg, _('Warning'), wx.OK | wx.CANCEL | wx.ICON_WARNING)
+        result = dlg.ShowModal()
+        dlg.Destroy()
+        if result != wx.ID_OK:
+            logging.info(_('Operation cancelled by user'))
+            return None
+
         # création de l'instance de Zones
         new_zones = Zones(idx = 'contour' if id is None else id.lower(), mapviewer=self)
 
@@ -6948,6 +7161,7 @@ class WolfMapViewer(wx.Frame):
             if isinstance(curarray, WolfArray):
 
                 curarray.nullify_border(1)
+                curarray.reset_plot()
 
                 new_zone = zone(name = curarray.idx)
                 new_zones.add_zone(new_zone, forceparent=True)
@@ -8295,6 +8509,9 @@ class WolfMapViewer(wx.Frame):
     def read_one_result(self, which:int):
         """
         Lecture d'un résultat spécific pour les modèles ajoutés et plottés
+
+        :param which: result index (0-based) -- -1 for last result
+        0 = first result
         """
         self.currently_readresults = True
 
@@ -9597,7 +9814,7 @@ class WolfMapViewer(wx.Frame):
         elif itemlabel == _("Add distances to viewer..."):
 
             if self._distances is not None:
-                self.add_object('vector', newobj=self._distances, ToCheck=True, id='Distances')
+                self.add_object('vector', newobj=self._distances, ToCheck=True, id='Distances',)
 
         elif itemlabel == _("Create bridge and export gltf..."):
 

wolfhece/apps/version.py

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

wolfhece/eva/pyseries.py

@@ -1277,8 +1277,31 @@ class EVA_Serie:
             k+=1
 
 
-    def plot_classified_flowrate_curve(self, fig:Figure=None, ax:Axes=None, label='', textvalues=True, show=False) -> tuple[Figure,Axes]:
+    def plot_classified_flowrate_curve(self, fig:Figure=None, ax:Axes=None, label='', textvalues=True, show=False) -> tuple[Figure,Axes, dict]:
+        """
+        Plot classified flow rate curve.
+
+        Characteristics returned in dict are:
+            - DCE : Débit journalier dépassé en moyenne 355 jours par an
+            - DC10 : Débit journalier dépassé en moyenne 10 mois par an
+            - Q347 : Débit atteint ou dépassé, en moyenne, pendant 347 jours par an
+            - DM : Débit atteint ou dépassé, en moyenne, pendant 50% du temps - débit médian
+            - DCC : Débit journalier qui est dépassé 10 jours par an
+
+        Previous lines are keys of characteristics dict.
 
+        Each characteristic is a dict with:
+        - 'help' : explanation of characteristic
+        - 'x' : number of days with exceedance
+        - 'value' : discharge value
+
+        :param fig: Matplotlib figure
+        :param ax: Matplotlib axis
+        :param label: label for the curve
+        :param textvalues: if True, text of characteristics are added
+        :param show: if True, plt.show() is called
+        :return: fig, ax, resdict
+        """
         if ax is None:
             fig,ax = plt.subplots(1,1)
 

wolfhece/hydrometry/kiwis.py

@@ -1114,8 +1114,10 @@ class hydrometry():
             while curfrom<todate:
                 logging.info('Getting data from {0} to {1}'.format(curfrom, curend))
                 tmpts = self.timeseries(stationname, stationcode, dir = dir, fromdate= curfrom, todate= curend, ts_name= ts_name, ts_id= ts_id, timezone=timezone)
-                if len(tmpts)>0:
-                    locts.append(tmpts)
+
+                if isinstance(tmpts, pd.Series):
+                    if len(tmpts)>0:
+                        locts.append(tmpts)
 
                 curfrom = curend
                 curend = curfrom+timedelta(seconds=200000 * cursec)
@@ -1145,7 +1147,7 @@ class hydrometry():
                 df.index = pd.to_datetime(df.index,format="%Y-%m-%dT%H:%M:%S.%f%z")
 
             except Exception as e:
-                logging.error('Error in timeseries :', e)
+                logging.error('Error in timeseries ! - Check if the server is responding.')
                 return pd.DataFrame()
 
         return df.squeeze()

wolfhece/hydrometry/kiwis_gui.py

@@ -17,6 +17,7 @@ import matplotlib.pyplot as plt
 import pandas as pd
 from datetime import datetime as dt, timedelta
 import logging
+import numpy as np
 
 #Test de la présence de la fonction de traduction i18n "gettext" et définition le cas échéant pour ne pas créer d'erreur d'exécution
 import os
@@ -472,7 +473,7 @@ class hydrometry_gui(wx.Frame):
         for curdata, curname in zip(data,tsname):
             if curdata is not None:
                 if len(curdata)>1:
-                    if datumsizebv[0]!='':
+                    if datumsizebv[0]!='' and not np.isnan(datumsizebv[0]):
                         ax.step(curdata.index, curdata+float(datumsizebv[0]), where='post', label=curname)
                     else:
                         ax.step(curdata.index, curdata, where='post', label=curname)

wolfhece/lazviewer/laz_viewer.py

@@ -537,6 +537,9 @@ class xyz_laz_grids():
     """ Ensemble de grids """
 
     def __init__(self, dir_grids:str, create:bool=False) -> None:
+
+        dir_grids = str(dir_grids)
+
         self.grids:list[xyz_laz_grid] = []
         self.colors = Classification_LAZ()
         self.colors.init_2023()
@@ -747,7 +750,7 @@ class xyz_laz_grids():
 
         return figmpl
 
-    def create_from_laz(self, dir_laz:str, shape:str=None, ds:float = 50, force_format = np.float64):
+    def create_from_laz(self, dir_laz:Path, shape:str=None, ds:float = 50, force_format = np.float64):
 
         try:
             from ..PyVertexvectors import Zones

wolfhece/math_parser/calculator.py

@@ -142,7 +142,7 @@ class Calculator(wx.Frame):
                                                        checked_state=None)
 
                 for id_array in id_arrays:
-                    self._memory[id_array] = self._mapviewer.get_obj_from_id(id_array, drawtype=draw_type.ARRAYS)
+                    self._memory[id_array] = self._mapviewer.get_obj_from_id(id_array, drawing_type=draw_type.ARRAYS)
 
             if len(variables) > 0:
                 for var in variables:

wolfhece/pydownloader.py

@@ -19,6 +19,7 @@ from enum import Enum
 from typing import Union, Optional, List
 from collections import namedtuple
 import logging
+import urllib.parse
 
 class DownloadType(Enum):
     """ Enum to define the type of download. """
@@ -43,6 +44,9 @@ class DownloadFiles(Enum):
     CSVFILES = ('csv',)
     DXFFILES = ('dxf',)
     ZIPFILES = ('zip',)
+    LAZFILES = ('laz',)
+    LISTFILES = ('lst',)
+    LAZBIN = ('bin',)
 
 class DonwloadDirectories(Enum):
     """ Enum to define the directories for downloads. """
@@ -51,6 +55,10 @@ class DonwloadDirectories(Enum):
 
 GITLAB_EXAMPLE = 'https://gitlab.uliege.be/HECE/wolf_examples/-/raw/main'
 GITLAB_EXAMPLE_GPU = 'https://gitlab.uliege.be/HECE/wolfgpu_examples/-/raw/main'
+
+GITLAB_MODREC_DATA_VESDRE = 'https://gitlab.uliege.be/api/v4/projects/4933'
+GITLAB_MODREC_DATA_VESDRE_FILES = 'https://gitlab.uliege.be/api/v4/projects/4933/repository/files/'
+
 DATADIR = Path(__file__).parent / 'data' / 'downloads'
 
 def clean_url(url: str) -> str:
@@ -80,7 +88,12 @@ def clean_url(url: str) -> str:
         raise ValueError(f"Invalid URL: {url}. Must start with http://, https://, or ftp://")
     return cleaned_url.strip()
 
-def download_file(url: str, destination: Union[str, Path] = None, download_type: DownloadType = DownloadType.HTTP, load_from_cache:bool = True):
+def download_file(url: str,
+                  destination: Union[str, Path] = None,
+                  download_type: DownloadType = DownloadType.HTTP,
+                  load_from_cache:bool = True,
+                  token:str = None,
+                  file_type:DownloadType = None) -> Path:
     """ Download a file from the specified URL to the destination path.
 
     :param url: The URL of the file to download.
@@ -95,11 +108,13 @@ def download_file(url: str, destination: Union[str, Path] = None, download_type:
 
     url = str(url).strip()
     # Clean the URL
-    url = clean_url(url)
+    if file_type is None:
+        url = clean_url(url)
 
     if destination is None:
         try:
-            destination = DATADIR / Path(url).parent.name / Path(url).name
+            url_cleaned = url.replace('/raw?ref=main', '').replace('%2F', '/')
+            destination = DATADIR / Path(url_cleaned).parent.name / Path(url_cleaned).name
         except:
             destination = DATADIR / Path(url).name
     # create the directory if it does not exist
@@ -110,11 +125,19 @@ def download_file(url: str, destination: Union[str, Path] = None, download_type:
     if suffix.startswith('.'):
         suffix = suffix[1:]
 
-    # Find the download type based on the URL suffix
-    for file_type_enum in DownloadFiles:
-        if suffix in file_type_enum.value:
-            file_type = file_type_enum
-            break
+    if file_type is None:
+        # Find the download type based on the URL suffix
+        for file_type_enum in DownloadFiles:
+            if suffix in file_type_enum.value:
+
+                if suffix == 'bin' and '_xyz.bin' in url:
+                    # special case for LAZ bin files
+                    file_type_enum = DownloadFiles.LAZBIN
+
+                file_type = file_type_enum
+                break
+    else:
+        suffix = file_type.value[0]
 
     # Create a list of files to download based on the download type
     # by replacing suffix in the url with the appropriate file extensions
@@ -124,6 +147,7 @@ def download_file(url: str, destination: Union[str, Path] = None, download_type:
         if ext.startswith('.'):
             ext = ext[1:]
         to_download.append(url.replace(suffix, f'{ext}'))
+
         to_destination.append(destination.with_suffix(f'.{ext}'))
 
 
@@ -131,6 +155,15 @@ def download_file(url: str, destination: Union[str, Path] = None, download_type:
 
         for url, destination in zip(to_download, to_destination):
 
+            if token is not None:
+                # Requête HTTP avec le token
+                headers = {
+                    "PRIVATE-TOKEN": token
+                }
+            else:
+                headers = {}
+
+
             if load_from_cache and destination.exists():
                 logging.info(f"File {destination} already exists. Skipping download.")
                 continue
@@ -139,7 +172,7 @@ def download_file(url: str, destination: Union[str, Path] = None, download_type:
                 raise ValueError(f"Invalid URL: {url}. Must start with http:// or https://")
 
             try:
-                response = requests.get(url)
+                response = requests.get(url, headers=headers)
                 response.raise_for_status()
                 with open(destination, 'wb') as file:
                     file.write(response.content)
@@ -254,7 +287,134 @@ def toys_gpu_dataset(dir:str, dirweb:str = None, load_from_cache:bool = True):
 
     return download_gpu_simulation(f"{GITLAB_EXAMPLE_GPU}/{dirweb}", DATADIR / dir, load_from_cache=load_from_cache)
 
+def toys_laz_grid(dir:str, file:str, load_from_cache:bool = True):
+    """ Download toy LAZ or GRIDWOLF files from the WOLFHECE dataset.
+
+    :param dir: The directory where the file will be saved.
+    :param file: The name of the file to download.
+    :type dir: str
+    :type file: str
+    :return: The path to the downloaded directory.
+    """
+    url = f"{GITLAB_EXAMPLE}/{dir}/{file}"
+    destination = DATADIR / dir / file
+    lst = download_file(url, destination, load_from_cache=load_from_cache)
+
+    with open(lst, 'r') as f:
+        lines = f.read().splitlines()
+
+    for line in lines:
+        line = line.strip().replace('\\', '/')
+        if line:
+            url = f"{GITLAB_EXAMPLE}/{dir}/{line}"
+            destination = DATADIR / dir / line
+            download_file(url, destination, load_from_cache=load_from_cache)
+
+    return DATADIR / dir
+
+def laz_grid_from_url(url:str, dir:str, file:str, load_from_cache:bool = True):
+    """ Download toy LAZ or GRIDWOLF files from an external URL.
+
+    :param url: The base URL where the files are located.
+    :param dir: The directory where the file will be saved.
+    :param file: The name of the file to download.
+    :type url: str
+    :type dir: str
+    :type file: str
+    :return: The path to the downloaded directory.
+    """
+    url = f"{url}/{dir}/{file}"
+    destination = DATADIR / dir / file
+    lst = download_file(url, destination, load_from_cache=load_from_cache)
+
+    if not Path(lst).exists():
+        raise FileNotFoundError(f"The file {lst} does not exist. -- Check the URL and file name.")
+
+    with open(lst, 'r') as f:
+        lines = f.read().splitlines()
+
+    for line in lines:
+        line = line.strip().replace('\\', '/')
+        if line:
+            url = f"{GITLAB_EXAMPLE}/{dir}/{line}"
+            destination = DATADIR / dir / line
+            download_file(url, destination, load_from_cache=load_from_cache)
+
+    return DATADIR / dir
+
+def check_status(url:str, token:str = None) -> bool:
+    """ Check the status of a URL.
+
+    :param url: The URL to check.
+    :param token: The private token for authentication (if required).
+    :type url: str
+    :type token: str
+    :return: True if the URL is accessible, False otherwise.
+    :rtype: bool
+    """
+    url = str(url).strip()
+    url = clean_url(url)
+
+    if not url.startswith(('http://', 'https://')):
+        raise ValueError(f"Invalid URL: {url}. Must start with http:// or https://")
+
+    try:
+        if token is not None:
+            headers = {
+                "PRIVATE-TOKEN": token
+            }
+        else:
+            headers = {}
+
+        response = requests.head(url, headers=headers)
+        return response.status_code == 200
+    except requests.RequestException as e:
+        logging.error(f"Error checking URL {url}: {e}")
+        return False
+
+def download_modrec_vesdre_file(directory:str, filename:str,
+                                token:str = None, load_from_cache:bool = True,
+                                file_type:DownloadFiles = None) -> Path:
+
+    """ Download a file from the ModRec Vesdre dataset.
+
+    :param directory: The directory where the file is located (relative to the repository root).
+    :param filename: The name of the file to download.
+    :param token: The private token for authentication (if required).
+    :param load_from_cache: If True, will not download the file if it already exists.
+    :type directory: str
+    :type filename: str
+    :type token: str
+    :type load_from_cache: bool
+    :return: The path to the downloaded file.
+    :rtype: Path
+    """
+
+    # Find the download type based on the URL suffix
+    if file_type is None:
+        suffix = Path(filename).suffix.lower().replace('.', '')
+
+        for file_type_enum in DownloadFiles:
+            if suffix in file_type_enum.value:
+
+                if suffix == 'bin' and '_xyz.bin' in filename:
+                    # special case for LAZ bin files
+                    file_type_enum = DownloadFiles.LAZBIN
+
+                file_type = file_type_enum
+                break
+
+    file_path_encoded = urllib.parse.quote_plus(directory + '/' + filename)
+    url = f"{GITLAB_MODREC_DATA_VESDRE_FILES}{file_path_encoded}/raw?ref=main"
+    destination = DATADIR / 'Vesdre' / file_path_encoded.replace('%2F', '/')
+    return download_file(url, destination, token=token, load_from_cache=load_from_cache, file_type=file_type)
+
 if __name__ == "__main__":
+    token = '' # Add your GitLab private token here if needed
+    dir = 'LAZ_Vesdre/2023/grids_flt32/237500_145500'
+    file_path = "237500_145500_237500_145000_xyz.bin"
+    print(download_modrec_vesdre_file(dir, file_path, token=token, load_from_cache=False))
+
     # Example usage
     print(download_file(r'https:\\gitlab.uliege.be\HECE\wolf_examples\-\raw\main\Extract_part_array\extraction.vec'))
     print(download_file('https://gitlab.uliege.be/HECE/wolf_examples/-/raw/main/Extract_part_array/extraction.vec'))

wolfhece/scenario/config_manager.py

@@ -2500,7 +2500,15 @@ class UI_Manager_2D_GPU():
 
         pgbar = wx.ProgressDialog(_('Creating simulations ...'), _('Please wait ...'), maximum=len(hydro), parent=self._frame, style = wx.PD_APP_MODAL | wx.PD_AUTO_HIDE)
 
-        allsims = self._parent.create_simulation(Path(path), hydro, destroy_if_exists, preserve_ic, callback=pgbar.Update)
+        try:
+            allsims = self._parent.create_simulation(Path(path), hydro, destroy_if_exists, preserve_ic, callback=pgbar.Update)
+        except Exception as e:
+            logging.error(_('Error while creating simulations !'))
+            logging.error(str(e))
+            dlg = wx.MessageDialog(None, _('Error while creating simulations !\n\n{}'.format(str(e))), _('Error'), wx.OK | wx.ICON_ERROR)
+            dlg.ShowModal()
+            dlg.Destroy()
+            allsims = None
 
         pgbar.Destroy()
 

wolfhece/wolf_array.py

@@ -9235,7 +9235,13 @@ class WolfArray(Element_To_Draw, header_wolf):
             newArray.origz = self.origz
             newArray.translz = self.translz
 
-        if type(other) == float:
+        if type(other) in [float, int]:
+
+            if type(other) == int and self.wolftype in [WOLF_ARRAY_FULL_DOUBLE, WOLF_ARRAY_FULL_SINGLE]:
+                other = float(other)
+            elif type(other) == float and self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2, WOLF_ARRAY_FULL_INTEGER8, WOLF_ARRAY_FULL_UINTEGER8]:
+                other = int(other)
+
             if other != 0.:
                 newArray.array = np.ma.masked_array(self.array + other, self.array.mask, dtype=self.array.dtype)
         else:
@@ -9264,7 +9270,13 @@ class WolfArray(Element_To_Draw, header_wolf):
             newArray.origz = self.origz
             newArray.translz = self.translz
 
-        if type(other) == float:
+        if type(other) in [float, int]:
+
+            if type(other) == int and self.wolftype in [WOLF_ARRAY_FULL_DOUBLE, WOLF_ARRAY_FULL_SINGLE]:
+                other = float(other)
+            elif type(other) == float and self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2, WOLF_ARRAY_FULL_INTEGER8, WOLF_ARRAY_FULL_UINTEGER8]:
+                other = int(other)
+
             if other != 0.:
                 newArray.array = np.ma.masked_array(self.array * other, self.array.mask, dtype=self.array.dtype)
             else:
@@ -9296,7 +9308,13 @@ class WolfArray(Element_To_Draw, header_wolf):
             newArray.origz = self.origz
             newArray.translz = self.translz
 
-        if type(other) == float:
+        if type(other) in [float, int]:
+
+            if type(other) == int and self.wolftype in [WOLF_ARRAY_FULL_DOUBLE, WOLF_ARRAY_FULL_SINGLE]:
+                other = float(other)
+            elif type(other) == float and self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2, WOLF_ARRAY_FULL_INTEGER8, WOLF_ARRAY_FULL_UINTEGER8]:
+                other = int(other)
+
             if other != 0.:
                 newArray.array = np.ma.masked_array(self.array - other, self.array.mask, dtype=self.array.dtype)
         else:
@@ -9325,7 +9343,18 @@ class WolfArray(Element_To_Draw, header_wolf):
             newArray.origz = self.origz
             newArray.translz = self.translz
 
-        newArray.array = np.ma.masked_array(self.array ** other, self.array.mask, dtype=self.array.dtype)
+        if type(other) in [float, int]:
+
+            if type(other) == int and self.wolftype in [WOLF_ARRAY_FULL_DOUBLE, WOLF_ARRAY_FULL_SINGLE]:
+                other = float(other)
+            elif type(other) == float and self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2, WOLF_ARRAY_FULL_INTEGER8, WOLF_ARRAY_FULL_UINTEGER8]:
+                other = int(other)
+
+            newArray.array = np.ma.masked_array(self.array ** other, self.array.mask, dtype=self.array.dtype)
+        else:
+            logging.error(_('Power operator only implemented for scalars'))
+            newArray.array[:,:] = 0
+
         newArray.count()
 
         assert newArray.array.dtype == self.array.dtype, _('Bad dtype')
@@ -9350,9 +9379,17 @@ class WolfArray(Element_To_Draw, header_wolf):
             newArray.origz = self.origz
             newArray.translz = self.translz
 
-        if type(other) == float:
+        if type(other) in [float, int]:
+
+            if type(other) == int and self.wolftype in [WOLF_ARRAY_FULL_DOUBLE, WOLF_ARRAY_FULL_SINGLE]:
+                other = float(other)
+            elif type(other) == float and self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2, WOLF_ARRAY_FULL_INTEGER8, WOLF_ARRAY_FULL_UINTEGER8]:
+                other = int(other)
+
             if other != 0.:
                 newArray.array = np.ma.masked_array(self.array / other, self.array.mask, dtype=self.array.dtype)
+            else:
+                logging.error(_('Division by 0 -- Nothing to do !'))
         else:
             newArray.array = np.ma.masked_array(np.where(other == 0., 0., self.array / other.array), self.array.mask, dtype=self.array.dtype)
         newArray.count()

wolfhece/wolfresults_2D.py

@@ -5431,7 +5431,7 @@ class Wolfresults_2D(Element_To_Draw):
                     head[ij]= z[ij] + v[ij]**2./2/9.81
 
                     # Fill the time of arrival
-                    danger_map_matrix_toa[curblock].array[(danger_map_matrix_toa.array == DEFAULT_TOA) & (wd.array > hmin)] = cur_time
+                    danger_map_matrix_toa[curblock].array[(danger_map_matrix_toa.array == DEFAULT_TOA) & (wd.array > hmin) & (~wd.array.mask)] = cur_time
 
                     # Fill the time of maximum
                     #  Searching where wd > h_max
@@ -5466,7 +5466,7 @@ class Wolfresults_2D(Element_To_Draw):
                 head[ij]= z[ij] + v[ij]**2./2/9.81
 
                 # Fill the time of arrival
-                danger_map_matrix_toa.array[(danger_map_matrix_toa.array == DEFAULT_TOA) & (wd.array > hmin)] = cur_time
+                danger_map_matrix_toa.array[(danger_map_matrix_toa.array == DEFAULT_TOA) & (wd.array > hmin)  & (~wd.array.mask)] = cur_time
 
                 # Fill the time of maximum
                 #  Searching where wd > h_max
@@ -5616,7 +5616,7 @@ class Wolfresults_2D(Element_To_Draw):
                     danger_toa = danger_map_matrix_toa[i].array
                     res_toa = result[5][i].array
 
-                    ij = np.where((danger_toa.data == DEFAULT_TOA) & (res_toa.data > 0.))
+                    ij = np.where(((danger_toa.data == DEFAULT_TOA) & (res_toa.data > 0.) & (~res_toa.mask)) | (danger_toa.data > res_toa.data))
                     danger_toa.data[ij] = res_toa.data[ij]
                     danger_toa.mask[ij] = False
 
@@ -5657,7 +5657,7 @@ class Wolfresults_2D(Element_To_Draw):
                 danger_toa = danger_map_matrix_toa.array
                 res_toa = result[5].array
 
-                ij = np.where((danger_toa.data == DEFAULT_TOA) & (res_toa.data > 0.))
+                ij = np.where(((danger_toa.data == DEFAULT_TOA) & (res_toa.data > DEFAULT_TOA) & (~res_toa.mask)) | (danger_toa.data > res_toa.data))
                 danger_toa.data[ij] = res_toa.data[ij]
                 danger_toa.mask[ij] = False
 

{wolfhece-2.2.39.dist-info → wolfhece-2.2.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.39
+Version: 2.2.41
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.2.39.dist-info → wolfhece-2.2.41.dist-info}/RECORD

@@ -9,7 +9,7 @@ wolfhece/MulticriteriAnalysis.py,sha256=vGmkzYagZohNe0XjwGJ6VUXcDPjOt80lNFthXpzx
 wolfhece/PandasGrid.py,sha256=etfVhIHzja4Z1EUY6BcDOKX-w7V-Xou1yaf0NMqmclo,4599
 wolfhece/PyConfig.py,sha256=13DDWjJdohYHwn1uRVHB0s8Jcwq_b9pwcwbAr8NlZyc,19667
 wolfhece/PyCrosssections.py,sha256=6K9xhupnIVXzLdsLTPN9e1v0xck9BdWZd0-EgpWg9us,133277
-wolfhece/PyDraw.py,sha256=XjIi5yDcl56C5fFHQUFdJvyU7r8jJ9z7aRVPOZijQcI,727297
+wolfhece/PyDraw.py,sha256=d74OkFrQjN_41xk2jtlY53Pk2OgUD39gwUoOwmybKHU,737432
 wolfhece/PyGui.py,sha256=GpVRxNpR8WNDFyHnDvhtHFFsq_cZZlyVgSkFiS-ARYI,185342
 wolfhece/PyGuiHydrology.py,sha256=dmBlRO8AljsvCPH6eVt0l9ZLx7g5j7Ubl9Srk7ECwyA,34693
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
@@ -56,7 +56,7 @@ wolfhece/pyGui1D.py,sha256=9g7OS3YiKsqy--6y0cBD7x2gaqTTYFXWkxImpgnTA20,121937
 wolfhece/pyLandUseFlanders.py,sha256=4R4J4BgP1-W0sebnb-TBreStZx3DKOh1zYj_dg23Ac4,8657
 wolfhece/pybridges.py,sha256=bFAqjL4ColeJtwvyCPGQ8VllWoq1RbVWXxFrdfrvqm8,65954
 wolfhece/pydike.py,sha256=dRb6qGkqoTXjf107KcajcIk1F_FuMPaOZLSwixT3dgA,11196
-wolfhece/pydownloader.py,sha256=DvWkOWIaIg-qsyzyx-SwP0xc6epUZ-gv2khTJZN8d3U,10393
+wolfhece/pydownloader.py,sha256=jdyOpIZPGgHlo6MakklLHIqsTmDMrbDVeKchSpij_K4,16245
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=NWaNeK0RSUeOkgukeogK9FLmQiDjGZ9yhqs9208fojM,46237
 wolfhece/pyshields.py,sha256=KMtUO5kD0lisKnJD1NsDz-qaY5DpFcmS4O3WkXtUSmo,27898
@@ -67,13 +67,13 @@ wolfhece/textpillow.py,sha256=7hgfsLYAaE_rNKD-g8xsON8sdWvoV8vbqnGGxIayShE,14137
 wolfhece/tools2d_dll.py,sha256=TfvvmyZUqEZIH0uHwUCJf0bdmCks_AiidDt23Unsp5w,13550
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
 wolfhece/toolshydrology_dll.py,sha256=cIGyhxV8H5f7GXhDqAamM7uC0W0hQTou3eTkqZdnqBE,5656
-wolfhece/wolf_array.py,sha256=vhsxF79jcdK1tY1GFjCWx8YupC8D9r-C7nZ9Is2pMO4,574421
+wolfhece/wolf_array.py,sha256=T0E46C-hmjJCGp66eHhOGohT_Wo7Jhp0hU6S_EPXYg4,576614
 wolfhece/wolf_hist.py,sha256=fTEb60Q4TEwobdZsRU4CFXAId1eOKdWAqF8lnF1xEWc,3590
 wolfhece/wolf_texture.py,sha256=Pt1j_lX74p70Fj3y3qYxYMuN8gghVd8_ih1vFhTIdkA,23884
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
 wolfhece/wolf_vrt.py,sha256=wbxXVN7TL9zgdyF79S-4e3pje6wJEAgBEfF_Y8kkzxs,14271
 wolfhece/wolf_zi_db.py,sha256=kz1TofsPfuBQqwYEM32wZl4b-jqgAygorZSm2JnGJ_k,42450
-wolfhece/wolfresults_2D.py,sha256=0c3akPDFETE0Uq0JiZ0FZEx6Rxiy9JB5s9P6sDei0E0,245735
+wolfhece/wolfresults_2D.py,sha256=BTewbH0zX55iLLbY3KuHVMAOCsvif2FMvF1SQMJFgf0,245893
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
 wolfhece/acceptability/Parallels.py,sha256=2wVkfJYor4yl7VYiAZiGGTFwtAab2z66ZfRtBliVweE,4088
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -95,7 +95,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=EdGDN9NhudIiP7c3gVqj7dp4MWFB8ySizM_tpMnsgpE,3091
-wolfhece/apps/version.py,sha256=K0KiOex_hrmAhFyclrpkhVQPRpY51D6WWi2IXhErAlc,388
+wolfhece/apps/version.py,sha256=g5JvLHmxA33m1kAYqdyNA-LqHE0IxUtstI8t7gQzqQA,388
 wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -131,7 +131,7 @@ wolfhece/eva/bootstrap.py,sha256=Ys4xTDIvG_QtxCKWLYzb3_XAZU441jGX7fHIbd9Mvr0,840
 wolfhece/eva/hydrogramme_mono.py,sha256=uZFIgJJ-JogMFzt7D7OnyVaHvgxCQJPZz9W9FgnuthA,8138
 wolfhece/eva/joint_models.py,sha256=RqPLb0g775zJIe3X3nwaf1g1dqnEIUbJjPMae_J_nmM,5863
 wolfhece/eva/mixture_models.py,sha256=Eq9fU7GjbSLHqCE5mdkIC5oAJhv6aNxY9kwnqlcOmc8,16221
-wolfhece/eva/pyseries.py,sha256=Oz2QCPGrbebAwQL1Vl-kc4t1OkzS-pCuj5rZwDGEJ-I,118536
+wolfhece/eva/pyseries.py,sha256=iUTM31qZefT-iKRvMEmVfWXEZMr3_h0ypPqwFQ1Zm9E,119590
 wolfhece/fonts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/fonts/arial.ttf,sha256=lXZrWPfYabD6LPbm_rJsGyHN8mMfHFhj_JvSBtXG6O4,915212
 wolfhece/fonts/helvetica.ttf,sha256=X4Zd3zdUmuRGMLE6UB-BMIbirpdK3Ia5czfNnuSx5P8,317968
@@ -161,8 +161,8 @@ wolfhece/hydrology/read.py,sha256=H-sK4hU23snrZC3BDLUHJqUTUBwvQ48ZFgxE-6PxDYg,11
 wolfhece/hydrology/slope_manager.py,sha256=vlek0z8qcqB61eleiksyOe3QR1vpbtwfeowy6ms7_Fg,5580
 wolfhece/hydrology/wolfMap_treatment.py,sha256=eAxr24zJGwmDof1aZpcxewVvv_bWDvoO8t9Wwf99Mlo,10606
 wolfhece/hydrometry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/hydrometry/kiwis.py,sha256=rhfvRKlKEKIDiwnGfHnT5oDa-I-RHU2ikPqD25urdHw,65463
-wolfhece/hydrometry/kiwis_gui.py,sha256=s4xCsqkKvI1YcIZ4X2A7hV11zyJFI8Q_4i82jOO6_ys,25060
+wolfhece/hydrometry/kiwis.py,sha256=aXf9QpbDld2K3jWOYLVcGj5Y_GBs2wFCUv7HGVHTK3w,65557
+wolfhece/hydrometry/kiwis_gui.py,sha256=bXUfIRlP0Cmcoe-sw-0KaFLoAUfQ8yCVPBX-xLSfuBs,25113
 wolfhece/hydrometry/kiwis_wolfgui.py,sha256=GPa5YNp2V2ZlxYQjPiCXERgPuWB_zij4ec2yHpRvoFA,4027
 wolfhece/icons/folder_open.png,sha256=ykBlU2FtGcpjAu1YO4_eGlDg2svgs_IAs-4d5O2e3AM,2329
 wolfhece/icons/folder_plus.png,sha256=Z1Jcs87Z6pNcudxGDTNhC_hgolSSaXe6_fmQE_n-ero,1963
@@ -183,7 +183,7 @@ wolfhece/lagrangian/particles.py,sha256=sqp-_gfsIt8s3GNcI1eKaeOBMSo2C-wPrL7FpjkE
 wolfhece/lagrangian/velocity_field.py,sha256=oGVjNm98gEpawreFIrC1lDyC5bEhkk2CsyYAlF1Kq50,10574
 wolfhece/lazviewer/__init__.py,sha256=AmgfF1EhRVEfEZZI4qLIS8WbInvbDLL2dx-Mkd1pDE4,770
 wolfhece/lazviewer/_add_path.py,sha256=XgMEXRhFhx9-B1hUsP7Zr199zNljYwT5dGMYSB9jRa4,639
-wolfhece/lazviewer/laz_viewer.py,sha256=QECvVMSshgO4C7ulBTBcB4oPwLCU8WP8x6W026RWf5w,81621
+wolfhece/lazviewer/laz_viewer.py,sha256=NzJfOqN7yV-RAPrpxn8UgU0KplKf7jFpWpwrodX0WtU,81662
 wolfhece/lazviewer/libs/Qt5Core.dll,sha256=sTJ_ctYFY9KHMNytF-lzH_078zIvnKTjN-71FDkOWPw,4924928
 wolfhece/lazviewer/libs/Qt5Gui.dll,sha256=07BeaOeYByraGkKYeDiSDYLawHM8tyd55pVJlKbZ4Y0,5436416
 wolfhece/lazviewer/libs/Qt5Network.dll,sha256=U-9FiLE9LUKru8r8EQxTnwwlMpwS8JzUtenhkKTCox0,1038336
@@ -235,7 +235,7 @@ wolfhece/mar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mar/commontools.py,sha256=SiSxpv5BFYEBCEydsE4ZmBuot3KTy0UYMx2aa-4fbuQ,52549
 wolfhece/mar/interface_MAR_WOLF.py,sha256=MWeXaHLDT4Eo9jZOAvz013lmpgGYT1v9VUYGAgBgSRU,21454
 wolfhece/math_parser/__init__.py,sha256=Mi7YTrlJtcflyrRdZHHgE-uNPUFfOWmsf8FsOwKBRPI,27961
-wolfhece/math_parser/calculator.py,sha256=Avyx-ikIwsficqd-Q4erX6U0zGQ3cAWfADyq6_uHpB0,7493
+wolfhece/math_parser/calculator.py,sha256=NYPcNWMBhbnYTK3tqEnbn1vyAcyw_ogNDki1SN7Do_4,7497
 wolfhece/mesh2d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mesh2d/bc_manager.py,sha256=BmNT-M0uWe5--AhxiS4EWziHad4RL-D7wUySqXTICsY,54237
 wolfhece/mesh2d/cell_tracker.py,sha256=mPmnD5lEf3gLPuLqtAIo-Gp-ipAwQdPxzjWOGt0b7jM,8958
@@ -290,7 +290,7 @@ wolfhece/report/tools.py,sha256=ZA4PfHQXgvDtTnrSZh-oSwhQT_cQtb49LuZB8VI7nyI,9685
 wolfhece/report/wolf_report.png,sha256=NoSV58LSwb-oxCcZScRiJno-kxDwRdm_bK-fiMsKJdA,592485
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/scenario/check_scenario.py,sha256=d-LWa_FxmPxTSc_H1lDHwqLB6TCqj1IUrRJhatfPMMA,5623
-wolfhece/scenario/config_manager.py,sha256=qosuoNOVbBuDuBUjupX5MFygYG2YJyr2AFgxxFqqdLo,126593
+wolfhece/scenario/config_manager.py,sha256=K4KLL2ZFhlZl88uxFL4A4t_W6qan2zeBehlnjvi709w,126969
 wolfhece/scenario/imposebc_void.py,sha256=PqA_99hKcaqK5zsK6IRIc5Exgg3WVpgWU8xpwNL49zQ,5571
 wolfhece/scenario/update_void.py,sha256=Yb7TMIUx9Gzm9_6qRMJnF39Uqi17dIkMmscSXo2WaTs,10033
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -319,8 +319,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=u4C7CXe_bUyGKx7c_Bi0x9
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.2.39.dist-info/METADATA,sha256=PlUu_DvltuzTlOWhl76oPplEuXVSNZWszz1LIxnEPyQ,2785
-wolfhece-2.2.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.39.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.39.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.39.dist-info/RECORD,,
+wolfhece-2.2.41.dist-info/METADATA,sha256=r3CK5pZVkd6vWy34yNRUNSs-yzagEy7TbSM1vrGbG7c,2785
+wolfhece-2.2.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.41.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.41.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.41.dist-info/RECORD,,