wolfhece 2.1.11__py3-none-any.whl → 2.1.13__py3-none-any.whl

wolfhece/PyDraw.py

@@ -1168,6 +1168,76 @@ class WolfMapViewer(wx.Frame):
         elif itemlabel ==_("Create video..."):
             if self.active_res2d is not None:
                 self.create_video()
+                
+        elif itemlabel == _("Setup cache..."):
+
+            if self.active_res2d is None:
+                logging.warning(_('No active 2D result !'))
+                return
+
+            dlg = wx.MessageDialog(None, _('Cache only water depth results ?'), style=wx.YES_NO)
+            ret = dlg.ShowModal()
+            if ret == wx.ID_NO:
+                only_h = False
+            else:
+                only_h = True
+            dlg.Destroy()
+
+            dlg = wx.MessageDialog(None, _('Cache all results ?'), style=wx.YES_NO)
+            ret = dlg.ShowModal()
+            if ret == wx.ID_NO:
+
+                dlg_start = wx.SingleChoiceDialog(None, _('Choosing the start index'),
+                                                  _('Choices'),
+                                                  [str(cur) for cur in range(1,self.active_res2d.get_nbresults()+1)])
+                ret = dlg_start.ShowModal()
+                if ret == wx.ID_CANCEL:
+                    dlg_start.Destroy()
+                    return
+
+                start_idx = int(dlg_start.GetStringSelection())
+                dlg_start.Destroy()
+
+                dlg_end   = wx.SingleChoiceDialog(None, _('Choosing the end index'),
+                                                  _('Choices'),
+                                                  [str(cur) for cur in range(start_idx + 1,self.active_res2d.get_nbresults()+1)])
+
+                ret = dlg_end.ShowModal()
+                if ret == wx.ID_CANCEL:
+                    dlg_end.Destroy()
+                    return
+
+                dlg_end.Destroy()
+
+                end_idx = int(dlg_end.GetStringSelection())
+
+                logging.info(_('Caching from {} to {} - Be patient !').format(start_idx, end_idx))
+                self.active_res2d.setup_cache(start_idx = start_idx-1, end_idx = end_idx-1, only_h=only_h)
+                logging.info(_('Caching done !'))
+            else:
+                logging.info(_('Caching all results - Be patient !'))
+                self.active_res2d.setup_cache(only_h=only_h)
+                logging.info(_('Caching done !'))
+
+            dlg.Destroy()
+
+        elif itemlabel == _("Clear cache..."):
+
+            if self.active_res2d is None:
+                logging.warning(_('No active 2D result !'))
+                return
+
+            self.active_res2d.clear_cache()
+            logging.info(_('Cache cleared !'))
+
+        elif itemlabel == _("Show tiles..."):
+
+            if self.active_res2d is None:
+                logging.warning(_('No active 2D result !'))
+                return
+
+            self.active_res2d.show_tiles()
+
 
     def menu_2dgpu(self):
 
@@ -2094,8 +2164,8 @@ class WolfMapViewer(wx.Frame):
             return
 
         if fn=='':
-            dlg = wx.FileDialog(patent   = None,
-                                messaghe = _('Choose file name'),
+            dlg = wx.FileDialog(parent   = None,
+                                message  = _('Choose file name'),
                                 wildcard = 'AVI video file (*.avi)|*.avi',
                                 style    = wx.FD_SAVE)
             ret = dlg.ShowModal()
@@ -2175,6 +2245,12 @@ class WolfMapViewer(wx.Frame):
             interval = int(dlg.GetValue())
             dlg.Destroy()
 
+        self.read_one_result(start_step)
+
+        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)):
 
             image = Image.frombytes('RGB', fig.canvas.get_width_height(),fig.canvas.tostring_rgb())
@@ -2189,6 +2265,11 @@ class WolfMapViewer(wx.Frame):
                                    ax=ax[0],
                                    title=_('Current time {:0>8} s'.format(el_time)))
 
+        for curmodel in self.iterator_over_objects(draw_type.RES2D):
+            curmodel: Wolfresults_2D
+            curmodel.step_interval_results = 1
+
+
     def get_canvas_as_image(self) -> Image.Image:
         """
         Récupère la fenêtre OpenGL sous forme d'image
@@ -4008,8 +4089,15 @@ class WolfMapViewer(wx.Frame):
             elif unknown == _('Head'):
                 unknown = 'head'
 
-            fig, ax = self.active_res2d.plot_h(self.active_res2d.SelectionData.myselection,
-                                               unknown, toshow=True)
+            figax = None
+            for curblock in self.active_res2d.myblocks.values():
+                if curblock.SelectionData.nb > 0:
+
+                    figax = self.active_res2d.plot_h(curblock.SelectionData.myselection,
+                                                   unknown, toshow=False, figax=figax)
+            if figax is not None:   
+                fig, ax = figax
+                fig.show()
 
         elif itemlabel == _("Plot stats unknown (inside active vector)..."):
 
@@ -4379,75 +4467,6 @@ class WolfMapViewer(wx.Frame):
         #     if self.active_res2d is not None:
         #         self.create_video()
 
-        elif itemlabel == _("Setup cache..."):
-
-            if self.active_res2d is None:
-                logging.warning(_('No active 2D result !'))
-                return
-
-            dlg = wx.MessageDialog(None, _('Cache only water depth results ?'), style=wx.YES_NO)
-            ret = dlg.ShowModal()
-            if ret == wx.ID_NO:
-                only_h = False
-            else:
-                only_h = True
-            dlg.Destroy()
-
-            dlg = wx.MessageDialog(None, _('Cache all results ?'), style=wx.YES_NO)
-            ret = dlg.ShowModal()
-            if ret == wx.ID_NO:
-
-                dlg_start = wx.SingleChoiceDialog(None, _('Choosing the start index'),
-                                                  _('Choices'),
-                                                  [str(cur) for cur in range(1,self.active_res2d.get_nbresults()+1)])
-                ret = dlg_start.ShowModal()
-                if ret == wx.ID_CANCEL:
-                    dlg_start.Destroy()
-                    return
-
-                start_idx = int(dlg_start.GetStringSelection())
-                dlg_start.Destroy()
-
-                dlg_end   = wx.SingleChoiceDialog(None, _('Choosing the end index'),
-                                                  _('Choices'),
-                                                  [str(cur) for cur in range(start_idx + 1,self.active_res2d.get_nbresults()+1)])
-
-                ret = dlg_end.ShowModal()
-                if ret == wx.ID_CANCEL:
-                    dlg_end.Destroy()
-                    return
-
-                dlg_end.Destroy()
-
-                end_idx = int(dlg_end.GetStringSelection())
-
-                logging.info(_('Caching from {} to {} - Be patient !').format(start_idx, end_idx))
-                self.active_res2d.setup_cache(start_idx = start_idx-1, end_idx = end_idx-1, only_h=only_h)
-                logging.info(_('Caching done !'))
-            else:
-                logging.info(_('Caching all results - Be patient !'))
-                self.active_res2d.setup_cache(only_h=only_h)
-                logging.info(_('Caching done !'))
-
-            dlg.Destroy()
-
-        elif itemlabel == _("Clear cache..."):
-
-            if self.active_res2d is None:
-                logging.warning(_('No active 2D result !'))
-                return
-
-            self.active_res2d.clear_cache()
-            logging.info(_('Cache cleared !'))
-
-        elif itemlabel == _("Show tiles..."):
-
-            if self.active_res2d is None:
-                logging.warning(_('No active 2D result !'))
-                return
-
-            self.active_res2d.show_tiles()
-
         elif itemlabel == _("Manage banks..."):
             if self.active_vector is None:
                 msg = _('Active vector is None\nPlease activate the one desired')

wolfhece/PyGui.py

@@ -34,22 +34,28 @@ from .CpGrid import CpGrid
 GEOM_GROUP_NAME = _('Block geometry')
 MAGN_GROUP_NAME = _('Magnetic grid')
 
-# FIXME : Is it necessary to override wx.Frame ? WolfMapManager is a wx.Frame.
-#         Is it sufficient to run a wx.App ?
 class GenMapManager(wx.Frame):
-    mapviewer:WolfMapViewer
-    wx_exists:bool
+    """
+    Default class for a Wolf Map Manager.
+
+    Will be overriden by the specific classes MapManager, GPU2DModel, HydrologyModel, Wolf2DModel.
+
+    It is not suitable for direct use.
+
+    """
 
     def __init__(self, *args, **kw):
         # `args` and `kwargs` represent parameters
         # that have to be passed to `wx.Frame.__init__`
 
-        self.mapviewer = None
-        self.wx_exists = wx.App.Get() is not None # test if wx App is running
+        self.mapviewer:WolfMapViewer = None
+        self.wx_exists:bool = wx.App.Get() is not None # test if wx App is running
         self.mylogs=None
 
         if self.wx_exists:
 
+            super().__init__(parent = None)
+
             if len(args) == 0:
                 # FIXME This is hackish. the parent parameter should be passed explicitely.
                 # I do it this way to not have to recheck the whole project
@@ -73,14 +79,13 @@ class GenMapManager(wx.Frame):
                 # Don't pollute the call to wf.Frame.__init__
                 kw.pop(SPLASH_PARAM, None)
 
-            super().__init__(*args)
+            # super().__init__(*args)
             self.mylogs = create_wxlogwindow(_('Informations'))
 
 
-    def setup_mapviewer(self, title, wolfparent):
-        """
-        Setup of a WolfMapViewer
-        """
+    def setup_mapviewer(self, title:str, wolfparent):
+        """ Setup of a WolfMapViewer """
+
         self.mapviewer = WolfMapViewer(None,
                                        title=title,
                                        wolfparent= wolfparent,
@@ -88,60 +93,15 @@ class GenMapManager(wx.Frame):
         self.mapviewer.add_grid()
         self.mapviewer.add_WMS()
 
-    def get_mapviewer(self):
-        # Retourne une instance WolfMapViewer
+    def get_mapviewer(self) -> WolfMapViewer:
+        """ Retourne une instance WolfMapViewer """
+
         return self.mapviewer
 
-    def get_configuration(self):
-        return self._configuration
+    def get_configuration(self) -> WolfConfiguration:
+        """ Retourne la configuration de Wolf """
 
-    # def add_grid(self, tomapviewer:WolfMapViewer=None):
-    #     """ Add a grid to the mapviewer """
-    #     mygrid=Grid(1000.)
-
-    #     if tomapviewer is None:
-    #         tomapviewer = self.mapviewer
-    #     tomapviewer.add_object('vector',newobj=mygrid,ToCheck=False,id='Grid')
-
-    # def add_WMS(self, tomapviewer:WolfMapViewer=None):
-    #     """ Add WMS layers to the mapviewer """
-    #     if tomapviewer is None:
-    #         tomapviewer = self.mapviewer
-
-    #     xmin=0
-    #     xmax=0
-    #     ymin=0
-    #     ymax=0
-    #     orthos={'IMAGERIE':{'1971':'ORTHO_1971','1994-2000':'ORTHO_1994_2000',
-    #                     '2006-2007':'ORTHO_2006_2007',
-    #                     '2009-2010':'ORTHO_2009_2010',
-    #                     '2012-2013':'ORTHO_2012_2013',
-    #                     '2015':'ORTHO_2015','2016':'ORTHO_2016','2017':'ORTHO_2017',
-    #                     '2018':'ORTHO_2018','2019':'ORTHO_2019','2020':'ORTHO_2020',
-    #                     '2021':'ORTHO_2021'}}
-    #     for idx,(k,item) in enumerate(orthos.items()):
-    #         for kdx,(m,subitem) in enumerate(item.items()):
-    #             tomapviewer.add_object(which='wmsback',
-    #                                         newobj=imagetexture('PPNC',m,k,subitem,
-    #                                                             tomapviewer,xmin,xmax,ymin,ymax,-99999,1024),
-    #                                         ToCheck=False,id='PPNC '+m)
-
-    #     tomapviewer.add_object(which='wmsback',
-    #                               newobj=imagetexture('PPNC','Orthos France','OI.OrthoimageCoverage.HR','',
-    #                                                   tomapviewer,xmin,xmax,ymin,ymax,-99999,1024,France=True,epsg='EPSG:27563'),
-    #                                       ToCheck=False,id='Orthos France')
-
-    #     forelist={'EAU':{'Aqualim':'RES_LIMNI_DGARNE','Alea':'ALEA_INOND','Lidaxes':'LIDAXES','Juillet 2021':'ZONES_INONDEES','Juillet 2021 IDW':'ZONES_INONDEES$IDW'},
-    #                 'LIMITES':{'Secteurs Statistiques':'LIMITES_QS_STATBEL'},
-    #                 'INSPIRE':{'Limites administratives':'AU_wms'},
-    #                 'PLAN_REGLEMENT':{'Plan Percellaire':'CADMAP_2021_PARCELLES'}}
-
-    #     for idx,(k,item) in enumerate(forelist.items()):
-    #         for kdx,(m,subitem) in enumerate(item.items()):
-    #             tomapviewer.add_object(which='wmsfore',
-    #                         newobj=imagetexture('PPNC',m,k,subitem,
-    #                         tomapviewer,xmin,xmax,ymin,ymax,-99999,1024),
-    #                         ToCheck=False,id=m)
+        return self._configuration
 
 class MapManager(GenMapManager):
     def __init__(self,*args, **kw):
@@ -155,11 +115,6 @@ class MapManager(GenMapManager):
 
         self.setup_mapviewer(title = 'Wolf - main data manager', wolfparent=self)
 
-        try:
-            self.mylogs.GetFrame().SetIcon(icon)
-        except:
-            logging.error("No icon for the log window")
-
         try:
             self.mapviewer.mytooltip.SetIcon(icon)
         except:
@@ -170,7 +125,14 @@ class MapManager(GenMapManager):
         except:
             logging.error("No icon for the mapviewer window")
 
-        # dir_hydro = join(getcwd(),'data\\hydrometry')
+        if self.wx_exists:
+            try:
+                self.mylogs.GetFrame().SetIcon(icon)
+            except:
+                logging.error("No icon for the log window")
+
+
+        # Set directory for hydrometry data, relative to the current file
         dir_hydro = Path(__file__).parent / "data/hydrometry"
         if not exists(dir_hydro):
             makedirs(dir_hydro, exist_ok=True)
@@ -241,19 +203,6 @@ class GPU2DModel(GenMapManager):
                                   id='res1',
                                   ToCheck=False)
 
-        """self.files_results_array={}
-        self.files_results_array['H']=[]
-        idx=101
-        while path.exists(self.mydir+'//out'+str(idx)+'r.bin'):
-            self.files_results_array['H'].append(['out'+str(idx)+'r.bin','step '+str(idx)])
-            idx+=1
-
-        for curfile in self.files_results_array['H']:
-            curext=curfile[0]
-            curidx=curfile[1]
-            self.allviews.add_object(which='array',filename=self.mydir+'//'+curext,id=curidx,ToCheck=False)
-        """
-
         self.mapviewer.findminmax(True)
         self.mapviewer.Autoscale(False)
 
@@ -1840,6 +1789,14 @@ class Wolf2DModel(GenMapManager):
         if dlg.ShowModal() == wx.ID_OK:
             try:
                 dx, dy = dlg.GetValue().split(',')
+
+                try:
+                    floatdx = float(dx)
+                    floatdy = float(dy)
+                except:
+                    logging.error(_('Invalid fine resolution'))
+                    return
+
                 self.sim.set_mesh_fine_size(float(dx), float(dy))
                 self._show_glob_properties()
             except:

wolfhece/Results2DGPU.py

@@ -237,6 +237,10 @@ class wolfres2DGPU(Wolfresults_2D):
                     try:
                         curblock.top.dx = params["parameters"]["dx"]
                         curblock.top.dy = params["parameters"]["dy"]
+
+                        curblock.dx = curblock.top.dx
+                        curblock.dy = curblock.top.dy
+
                     except:
                         logging.error(_('No spatial resolution (dx,dy) in parameters.json -- Results will not be shown in viewer'))
                         return -1
@@ -244,6 +248,10 @@ class wolfres2DGPU(Wolfresults_2D):
                     try:
                         curblock.top.origx = params["parameters"]["base_coord_x"]
                         curblock.top.origy = params["parameters"]["base_coord_y"]
+
+                        curblock.origx = curblock.top.origx
+                        curblock.origy = curblock.top.origy
+                        
                     except:
                         logging.error(_('No spatial position (base_coord_x,base_coord_y) in parameters.json -- Results will not be spatially based'))
                         return -2
@@ -406,12 +414,12 @@ class wolfres2DGPU(Wolfresults_2D):
         self.current_result = self._sanitize_result_step(self.current_result)
         self.read_oneresult(self.current_result)
 
-    def read_next(self):
-        """
-        Lecture du pas suivant
-        """
-        self.current_result+=1
-        self._update_result_view()
+    # def read_next(self):
+    #     """
+    #     Lecture du pas suivant
+    #     """
+    #     self.current_result+= self._step_interval
+    #     self._update_result_view()
 
     def get_times_steps(self, nb:int = None):
         """
@@ -441,12 +449,12 @@ class wolfres2DGPU(Wolfresults_2D):
             else:
                 return self.times, self.timesteps
 
-    def read_previous(self):
-        """
-        Lecture du pas suivant
-        """
-        self.current_result -= 1
-        self._update_result_view()
+    # def read_previous(self):
+    #     """
+    #     Lecture du pas suivant
+    #     """
+    #     self.current_result -= self._step_interval
+    #     self._update_result_view()
 
     def get_cached_h(self, idx):
         """ Return cached water depth according to WOLF convention """

wolfhece/apps/version.py

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

wolfhece/hydrology/Catchment.py

@@ -194,7 +194,7 @@ class Catchment:
         # self.topo_wolf_array = WolfArray(self.workingDir + "Characteristic_maps/Drainage_basin.b")
         # self.topo_wolf_array = WolfArray(self.workingDir + "Characteristic_maps/Drainage_basin.b2")
         self.time_wolf_array = WolfArray(os.path.join(self.workingDir,"Characteristic_maps/Drainage_basin.time"))
-        self.charact_watrshd = Watershed(self.workingDir)
+        self.charact_watrshd = Watershed(self.workingDir, dir_mnt_subpixels=self.paramsInput[('Sub-pixeling', 'Directory')])
         self.set_eff_outlet_coord()
 
         # time array:
@@ -1416,10 +1416,10 @@ class Catchment:
             endFileName = "rain.hyeto"
             for element in self.hyetoDict['Ordered To Nb']:
                 nbToRead = self.hyetoDict['Ordered To Nb'][element]
-                fileName = os.path.join(beginFileName, nbToRead, endFileName)
+                fileName = os.path.join(beginFileName, nbToRead+ endFileName)
                 isOk, fileName = check_path(fileName, applyCWD=True)
                 if isOk<0:
-                    print("WARNING: could not find any dbf file! ")
+                    # print("WARNING: could not find any dbf file! ")
                     time_mod.sleep(.5)
                     return
                 [time, rain] = self.get_hyeto(fileName)
@@ -1856,7 +1856,7 @@ class Catchment:
             directory = self.paramsInput.get_param("Measuring stations SPW", "Directory")
             isOk, directory = check_path(directory, self.workingDir)
             if isOk<0:
-                print("ERROR : measuring station data path not present! ")
+                logging.error(_("ERROR : measuring station data path not present! "))
             fileName = os.path.join(directory, self.paramsInput.get_param("Measuring stations SPW", "Filename")) 
 
 
@@ -1869,7 +1869,7 @@ class Catchment:
                 for raw in data_reader:
                     list_data.append(raw)
         else:
-            print("ERROR : measuring station data file not present! ")
+            logging.error(_("ERROR : measuring station data file not present! "))
             return
 
         # Building dictionnary

wolfhece/hydrology/PyWatershed.py

@@ -1185,10 +1185,13 @@ class Watershed:
                  computecorr:bool=False,
                  plotstats:bool=False,
                  plotriversystem=False,
+                 dir_mnt_subpixels:str=None,
                  *args, **kwargs):
 
         logging.info(_('Read files...'))
+
         self.dir=os.path.normpath(dir)
+        self.dir_mnt_subpixels = dir_mnt_subpixels if dir_mnt_subpixels is not None else self.dir
 
         self.subs_array   = WolfArray(self.dir+'\\Characteristic_maps\\Drainage_basin.sub')
 
@@ -1625,21 +1628,26 @@ class Watershed:
         Recherche des altitudes dans un mnt plus dense
         """
         demsubs = {}
-        file_10m = os.path.join(self.dir,'mnt10m.bin')
+
+        file_10m = os.path.join(self.dir_mnt_subpixels,'mnt10m.bin')
         isOk, file_10m = check_path(file_10m, prefix=self.dir)
         if isOk>=0:
             dem_10m=WolfArray(file_10m)
             demsubs["dem_10m"] = dem_10m
+        else:
+            logging.warning(_('No 10m DEM found'))
 
-        file_20m = os.path.join(self.dir,'mnt20m.bin')
+        file_20m = os.path.join(self.dir_mnt_subpixels,'mnt20m.bin')
         isOk, file_20m = check_path(file_20m, prefix=self.dir)
         if isOk>=0:
             dem_20m=WolfArray(file_20m)
             demsubs["dem_20m"] = dem_20m
-
+        else:
+            logging.warning(_('No 20m DEM found'))
 
         # demsubs={'dem_10m':dem_10m,'dem_20m':dem_20m}
         if len(demsubs)==0:
+            logging.info(_('No subpixel DEM found'))
             return
 
         curnode:Node_Watershed

wolfhece/hydrology/SubBasin.py

@@ -248,7 +248,7 @@ class SubBasin:
                 file_exists = os.path.exists(fileName)
                 if(not(file_exists)):
                     typeOfFileName = 'simul_net_trans_rain.txt'
-                    fileName = workingDir + subBasinName + typeOfFileName
+                    fileName = join(workingDir, subBasinName + typeOfFileName)
                     file_exists = os.path.exists(fileName)
                     if(file_exists):
                         print("ERROR : the file simul_net_trans_rain.txt is not used yet in this version! Please check version of the code before 05/11/2021 !")

wolfhece/mesh2d/wolf2dprev.py

@@ -8457,6 +8457,10 @@ class blocks_file():
     def add_block(self, contour:zone, dx:float, dy:float):
         """Add a block to the list of blocks"""
 
+        if contour is None:
+            logging.error(_('No contour zone available for block creation - Create a contour first'))
+            return
+
         new_block = block_description(self, idx = self.nb_blocks+1)
         new_block.setup(contour, dx, dy)
         self.my_blocks.append(new_block)

wolfhece/models/blue.pal

@@ -1,9 +1,9 @@
 2
 0.0
-0
-0
-255
-10.
-0
-0
-255
+126
+241
+254
+2.0
+2
+2
+198

wolfhece/wolfresults_2D.py

@@ -1434,7 +1434,7 @@ class OneWolfResult:
         self._sedimentdensity = 2.65
         self._force_update_shields = True # Force la MAJ du Shields si le diametre ou la densité change
 
-        self.mngselection = SelectionData(self.current)
+        # self.mngselection = SelectionData(self.current)
 
     @property
     def SelectionData(self) -> SelectionDataMB:
@@ -1716,6 +1716,9 @@ class OneWolfResult:
         self._current.idx = self.idx
         self._current.nullvalue = nullvalue
 
+        self.mngselection = SelectionData(self._current)
+
+
     @property
     def min_field_size(self):
         return self._min_field_size
@@ -2008,7 +2011,10 @@ class Wolfresults_2D(Element_To_Draw):
         self._epsilon_default = self.epsilon
 
         self.loaded=True
+        
         self.current_result = -1
+        self._step_interval = 1
+
         self.mypal = wolfpalette(None,'Colors')
         self.mypal.default16()
         self.mypal.automatic = True
@@ -2308,6 +2314,14 @@ class Wolfresults_2D(Element_To_Draw):
 
         return x>=xmin and x<=xmax and y>=ymin and y<=ymax
 
+    @property
+    def step_interval_results(self):
+        return self._step_interval
+    
+    @step_interval_results.setter
+    def step_interval_results(self, value:int):
+        self._step_interval = value
+
     @property
     def nullvalue(self):
         """ Get nullvalue from the first block """
@@ -2875,7 +2889,7 @@ class Wolfresults_2D(Element_To_Draw):
         Lecture du pas suivant
         """
 
-        self.current_result += 1
+        self.current_result += self._step_interval
         self._update_result_view()
 
     def _sanitize_result_step(self, which_step:int=-1):
@@ -3006,7 +3020,7 @@ class Wolfresults_2D(Element_To_Draw):
         """
 
         # if self.current_result > 0:
-        self.current_result -= 1
+        self.current_result -= self._step_interval
         self._update_result_view()
 
     def get_h_for_block(self, block: Union[int, str]) -> WolfArray:
@@ -4026,7 +4040,7 @@ class Wolfresults_2D(Element_To_Draw):
         if self.current_result==-1:
             self.read_oneresult(-1)
         else:
-            self.current_result+=1
+            self.current_result+= self._step_interval
             self.current_result = min(nb,self.current_result)
             self.read_oneresult(self.current_result)
 

{wolfhece-2.1.11.dist-info → wolfhece-2.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.11
+Version: 2.1.13
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: AGPL-v3 License
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.11.dist-info → wolfhece-2.1.13.dist-info}/RECORD

@@ -6,8 +6,8 @@ wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/Model1D.py,sha256=-cMz-ePSYzrKVVDidiDOz6cojEZ3y6u9gIb7RPwT6Y8,476593
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
 wolfhece/PyCrosssections.py,sha256=f4dNYRUGZKePruaaBiTcn5vlrw8TFTj9XwTDrdiF_uU,112450
-wolfhece/PyDraw.py,sha256=eYv0X1NFCWlgOgiRaIjW0SPlR_uVLdZhFpztY1jX6Lo,378408
-wolfhece/PyGui.py,sha256=VKE785z9XLIWNbxqpyEceLK_wtmPJyq6A_M_qX_94Lg,104772
+wolfhece/PyDraw.py,sha256=JA_tGLF5LbhAK3565bKR32pI-Nvg3nLbxRoQhRGuf1Y,379054
+wolfhece/PyGui.py,sha256=7p4ecrrODTggH8Oz4GTg4rWk6Z3vhYH4GNAE4TL3VY8,102058
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=Vl5RrBIC_a5-mZKUtBd5kG0mif946B7OtS3fnehkmOc,25012
@@ -21,7 +21,7 @@ wolfhece/RatingCurve.py,sha256=YSQvSvdMHE6hSlWVBF5Oe0-Fh3waNMpOdmcymaCCTis,21706
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=vbLxSWwHPsCAsR13KaG5WVmVn_cha7-6cF4zj7Diiz8,33593
 wolfhece/ReadDataDCENN.py,sha256=4OMDBgkZ_v7OWmVhyQ-reab7MPxGhFEDY2qS8yThhdM,1240
-wolfhece/Results2DGPU.py,sha256=kUgLZhUbqVVl-LNQX_GghmU70b0IQHoye3bpAy3hPno,20238
+wolfhece/Results2DGPU.py,sha256=pC7jHQhzSJPmGiboNNLG619yVYaOUT_O5_yhKMzslxA,20563
 wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/cli.py,sha256=rHxZGgs_R776VCWhs36pYFoiuiQycwgGTVOLK-JNzjE,1937
@@ -54,7 +54,7 @@ wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,1627
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
 wolfhece/wolf_vrt.py,sha256=un5CKzAUmzSsjLXK7YLnQEWz8FLoafXJs8oqUvS_-h0,10271
 wolfhece/wolf_zi_db.py,sha256=Ok0MxQYZMMLRJN1QY-HSplLhUzzb6gkXgBQ3ihhLQHk,12669
-wolfhece/wolfresults_2D.py,sha256=1OhARaLhP8-8mQfq5hrvt-9D-2eSRdJz7SYfaqSkvXg,159021
+wolfhece/wolfresults_2D.py,sha256=6VbONzD2lMFCnZ2-gyBk7pW9LcBmSWkZxiVLTMKVPIQ,159403
 wolfhece/xyz_file.py,sha256=aQOcTHkHRhXHxL_WxTHwzygp6e47San7SHSpxKQU0dw,5457
 wolfhece/apps/ManageParams.py,sha256=heg5L4fMn0ettR7Bad_Q680o_JWnTbe3WFkL_9IziAk,312
 wolfhece/apps/Optimisation_hydro.py,sha256=mHazBazTUGyxPbHPXhaQim8vqIeOOuKPjH0B48VWduA,374
@@ -66,7 +66,7 @@ wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9
 wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
 wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
 wolfhece/apps/splashscreen.py,sha256=LkEVMK0eCc84NeCWD3CGja7fuQ_k1PrZdyqD3GQk_8c,2118
-wolfhece/apps/version.py,sha256=Fuw7mSAwhcdvwy9io393QdDIABVap7dyLWElQFAPfyA,388
+wolfhece/apps/version.py,sha256=a9eiwDNszu93f8vdAjTr999YFaeZRJGnUP8ygnLdzJg,388
 wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
 wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -96,15 +96,15 @@ wolfhece/fonts/helvetica.ttf,sha256=X4Zd3zdUmuRGMLE6UB-BMIbirpdK3Ia5czfNnuSx5P8,
 wolfhece/fonts/sanserif.ttf,sha256=Nvv5eMgTl5-bWgV37B7E1-vZpAZPNJwjtJSzMNDrl9A,42696
 wolfhece/ftp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ftp/downloader.py,sha256=NANzxSzdcp25dFMYin5QA9UnFexNe6-W2AqqTzUE4f4,5223
-wolfhece/hydrology/Catchment.py,sha256=1ZrAPyXhy23ENbhSf9e2-D-Y-jNkof--L6R6B-BgHBo,135021
+wolfhece/hydrology/Catchment.py,sha256=j4ggD0FQn04s9thXYHB-HiOx3tkvTmwt8R5QSgwNDlE,135112
 wolfhece/hydrology/Comparison.py,sha256=vO9ogoZA8qzG57pg1AdHNL9HWgCCY8-5wqPyCgj1ucg,82209
 wolfhece/hydrology/Dumping.py,sha256=GKYvkKgCfJQT1XEF1ceh7evdhlpZRPcuf6VlBdH-TaM,2085
 wolfhece/hydrology/Optimisation.py,sha256=kpfR-krMRzANU96Mn4H2kroIuEmMWns8quEnLSFGB8E,138736
 wolfhece/hydrology/Outlet.py,sha256=fpetH2ZKnTKIBNuVclxrncc5OAxWUGI5_ed9gXh6fD4,10201
 wolfhece/hydrology/PostProcessHydrology.py,sha256=SiW5FIf8FeQL9ItWG8ODt612k5m59aogSLgpsXinr8I,6944
-wolfhece/hydrology/PyWatershed.py,sha256=K6yz8UquJi51v2nGqWmeo8qs82-QHoa2LYaxwoUBTxM,73914
+wolfhece/hydrology/PyWatershed.py,sha256=gSCEz7W38fnTNyjBYgiepUbZbluCDSGIpzTMNDVzXPc,74277
 wolfhece/hydrology/RetentionBasin.py,sha256=UZiHvygNEMfNdaK49CX3y8jzqwkThwwniS9ob1BTECs,71505
-wolfhece/hydrology/SubBasin.py,sha256=ZXEJwUDAsa6nGtdPVuzjEH3CCZu6V4fZhRCujWr1ACY,169749
+wolfhece/hydrology/SubBasin.py,sha256=4qpvPi41R9gmKDzyJA_S77k953w2FknnsP2ZSRZQstE,169754
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/hydrology/constant.py,sha256=nRn4IuQ1FZakQtS6z9IpVHeudMfU_7KQ66LCxY6NX4k,1227
 wolfhece/hydrology/cst_exchanges.py,sha256=u0Bs4SBOjgp6n6xuKusHvUCI0abeiEIUpBZRr11RExg,17569
@@ -217,9 +217,9 @@ wolfhece/mesh2d/bc_manager.py,sha256=OzN4NPlDniv9HsLTUQrJkBY6U_a3SkqNpvjIw0TcguI
 wolfhece/mesh2d/cell_tracker.py,sha256=AR-Bty-QnrY1ni8Lwak2kU2UWMAJSBCF2ugl2YpfsB4,8660
 wolfhece/mesh2d/config_manager.py,sha256=qQE5sPbHj9cNZe3uGk1pkuogsS28kJZNx3xybZ6CfCM,14438
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=cZrHvtfqqTWtUcWnUe9iy9ZY6lAWAJnDoVupV6H7Zw4,4710
-wolfhece/mesh2d/wolf2dprev.py,sha256=55kgOxPucmaFaOYdGVLkBP3ubbQbSe6AO34HTA8Rm-Y,491037
+wolfhece/mesh2d/wolf2dprev.py,sha256=Lbm-Qp4PVEEphOm3AHVwW9BiZQxrab40GYlABaK0-A4,491191
 wolfhece/models/HECE_169.pptx,sha256=OWJtsWz504A-REFaaxw8lwStHyQU2l7KEeiE7IZvtbk,3396930
-wolfhece/models/blue.pal,sha256=NnjJnjnYVdQkG54RyPXvo4Tl9ytB0cN7zpiHtj1N6bw,33
+wolfhece/models/blue.pal,sha256=s9-wEPzSiKMMHuKofUB2FPjmyO7HfGM2xWaUJwsKAY8,39
 wolfhece/models/diff16.pal,sha256=Pkp9kQ1GvmAKz3lgwohsw8eQySjVVKHbjhoWw-gZ6Nc,303
 wolfhece/models/diff3.pal,sha256=qk-yGgJr_FHdW7p7i93GFsH9ClT0dl5nqa9G1lLh7Z0,50
 wolfhece/models/red.pal,sha256=W6oeIjDCoGCsJDZPH2K4jfyfPmCMlH9rfRi4PTs-n28,33
@@ -267,8 +267,8 @@ wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,11
 wolfhece/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
-wolfhece-2.1.11.dist-info/METADATA,sha256=t5JBb0Xa4dIaVtZ4QeAX6tObK_nImiq6DW-1YeWnLOE,2282
-wolfhece-2.1.11.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-wolfhece-2.1.11.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.11.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.11.dist-info/RECORD,,
+wolfhece-2.1.13.dist-info/METADATA,sha256=DghX1BAmzBJLe8etnO3FCeT-LTKyab8jTTcZ5PUWhlw,2282
+wolfhece-2.1.13.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+wolfhece-2.1.13.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.13.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.13.dist-info/RECORD,,