wolfhece 2.0.30__py3-none-any.whl → 2.0.32__py3-none-any.whl

wolfhece/PyCrosssections.py

@@ -1732,6 +1732,7 @@ class crosssections(Element_To_Draw):
             else:
                 self.dirlaz=''
                 self.gridlaz =None
+
         elif isinstance(dirlaz,xyz_laz_grids):
             self.gridlaz = dirlaz
             self.dirlaz = 'instance xyz_laz_grids'
@@ -1870,7 +1871,7 @@ class crosssections(Element_To_Draw):
                 tmpzones=myfile
             elif isinstance(myfile, str):
                 self.filename=myfile
-                tmpzones=Zones(myfile)
+                tmpzones=Zones(myfile, find_minmax=False)
 
             curzone:zone
             curvec:vector
@@ -2484,7 +2485,7 @@ class crosssections(Element_To_Draw):
     def find_minmax(self, update:bool=False):
         if update:
             for idx,vect in self.myprofiles.items():
-                vect['cs'].find_minmax()
+                vect['cs'].find_minmax(only_firstlast = True)
 
         self.xmin=min(vect['cs'].xmin for idx,vect in self.myprofiles.items())
         self.ymin=min(vect['cs'].ymin for idx,vect in self.myprofiles.items())

wolfhece/PyDraw.py

@@ -59,7 +59,7 @@ from .PyCrosssections import crosssections, profile, Interpolator, Interpolators
 from .GraphNotebook import PlotNotebook
 from .lazviewer.laz_viewer import myviewer, read_laz, clip_data_xyz, xyz_laz_grids, choices_laz_colormap, Classification_LAZ
 from . import Lidar2002
-from .picc import Picc_data
+from .picc import Picc_data, Cadaster_data
 
 try:
     from .hydrometry_hece.kiwis_hece import hydrometry_hece as hydrometry
@@ -213,6 +213,7 @@ class WolfMapViewer(wx.Frame):
         self.menubar = wx.MenuBar()
 
         self.menuwolf2d = None
+        self.menu2d_cache_setup = None
         self.menuparticlesystem = None
         self.menu2dGPU = None
         self.timer_ps = None
@@ -659,9 +660,10 @@ class WolfMapViewer(wx.Frame):
     def menu_2dgpu(self):
 
         if self.menuwolf2d is not None:
-            self.menu2d_cache_setup = self.menuwolf2d.Append(wx.ID_ANY, _("Setup cache..."), _("Set up cache for 2D GPU model"))
-            self.menu2d_cache_reset = self.menuwolf2d.Append(wx.ID_ANY, _("Clear cache..."), _("Clear cache for 2D GPU model"))
-            self.menu2d_show_tiles = self.menuwolf2d.Append(wx.ID_ANY, _("Show tiles..."), _("Show a grid of tiles for 2D GPU model"))
+            if self.menu2d_cache_setup  is None:
+                self.menu2d_cache_setup = self.menuwolf2d.Append(wx.ID_ANY, _("Setup cache..."), _("Set up cache for 2D GPU model"))
+                self.menu2d_cache_reset = self.menuwolf2d.Append(wx.ID_ANY, _("Clear cache..."), _("Clear cache for 2D GPU model"))
+                self.menu2d_show_tiles = self.menuwolf2d.Append(wx.ID_ANY, _("Show tiles..."), _("Show a grid of tiles for 2D GPU model"))
 
 
     def menu_particlesystem(self):
@@ -3182,7 +3184,7 @@ class WolfMapViewer(wx.Frame):
                 logging.warning(_('No active 2D result !'))
                 return
 
-            dlg = wx.SingleChoiceDialog(None, _('Choose the unknown to plot'), _('Unknown'), [_('Water depth'), ['Water level'], ['Head']])
+            dlg = wx.SingleChoiceDialog(None, _('Choose the unknown to plot'), _('Unknown'), [_('Water depth'), _('Water level'), _('Head')])
 
             ret = dlg.ShowModal()
             if ret == wx.ID_CANCEL:
@@ -4106,7 +4108,7 @@ class WolfMapViewer(wx.Frame):
                 obj: WolfArray
 
                 if obj.filename == '':
-                    filterArray = "bin (*.bin)|*.bin|all (*.*)|*.*"
+                    filterArray = "bin (*.bin)|*.bin|Geotif (*.tif)|*.tif|Numpy (*.npy)|*.npy|all (*.*)|*.*"
                     fdlg = wx.FileDialog(self, "Choose file", wildcard=filterArray, style=wx.FD_SAVE)
                     fdlg.ShowModal()
                     if fdlg.ShowModal() == wx.ID_OK:
@@ -4267,7 +4269,7 @@ class WolfMapViewer(wx.Frame):
             for obj in self.iterator_over_objects(draw_type.ARRAYS):
                 obj: WolfArray
 
-                filterArray = "bin (*.bin)|*.bin|all (*.*)|*.*"
+                filterArray = "bin (*.bin)|*.bin|Geotif (*.tif)|*.tif|Numpy (*.npy)|all (*.*)|*.*"
                 fdlg = wx.FileDialog(self, "Choose file name for Array : " + obj.idx, wildcard=filterArray,
                                         style=wx.FD_SAVE)
                 ret = fdlg.ShowModal()
@@ -4665,6 +4667,8 @@ class WolfMapViewer(wx.Frame):
                 file = wx.DirDialog(self, "Choose directory containing GPU results")
             elif which.lower() == 'bridges':
                 file = wx.DirDialog(self, "Choose directory containing bridges")
+            elif which.lower() == 'weirs':
+                file = wx.DirDialog(self, "Choose directory containing weirs")
             elif which.lower() in ['vector', 'tiles', 'tilescomp']:
                 file = wx.FileDialog(self, "Choose file", wildcard=filterVector)
             elif which.lower() == 'cloud':
@@ -5648,7 +5652,7 @@ class WolfMapViewer(wx.Frame):
 
             if self.selected_object is not None:
                 if type(self.selected_object) is WolfArray or type(self.selected_object) is WolfArray_Sim2D:
-                    filterArray = "bin (*.bin)|*.bin|tif (*.tif)|*.tif|all (*.*)|*.*"
+                    filterArray = "bin (*.bin)|*.bin|Geotif (*.tif)|*.tif|Numpy (*.npy)|*.npy|all (*.*)|*.*"
                     fdlg = wx.FileDialog(self, "Choose file name for Array : " + self.selected_object.idx, wildcard=filterArray,
                                          style=wx.FD_SAVE)
                     ret = fdlg.ShowModal()
@@ -5689,7 +5693,7 @@ class WolfMapViewer(wx.Frame):
         elif text == _('Properties'):
 
             myobj = self.selected_object
-            if type(myobj) in [WolfArray, WolfArray_Sim2D, WolfArrayMB, WolfArrayMNAP, Zones, Wolfresults_2D, wolfres2DGPU, Particle_system, Picc_data]:
+            if type(myobj) in [WolfArray, WolfArray_Sim2D, WolfArrayMB, WolfArrayMNAP, Zones, Wolfresults_2D, wolfres2DGPU, Particle_system, Picc_data, Cadaster_data]:
                 myobj.show_properties()
 
         elif text == _('Boundary conditions'):
@@ -6215,7 +6219,7 @@ class WolfMapViewer(wx.Frame):
             if ctrl:
                 myobj.show_properties()
 
-        elif type(myobj) == Picc_data:
+        elif type(myobj) in [Picc_data, Cadaster_data]:
             if ctrl:
                 myobj.show_properties()
 
@@ -6751,6 +6755,8 @@ class WolfMapViewer(wx.Frame):
                 if r == wx.ID_YES:
                     self.active_vector.close_force()
 
+                self.active_vector.parentzone.plot(prep = True)
+
             elif self.action == 'modify vertices':
 
                 # end of vertices modification
@@ -6891,8 +6897,10 @@ class WolfMapViewer(wx.Frame):
                      '1,2...9': _('Arrays : transfer the selection to the dictionary'),
                      'i': _('Arrays : 2D interpolation based on the selection on the current matrix'),
                      'CTRL+C': _('Arrays : Set copy source and current selection to clipboard as string'),
+                     'CTRL+X': _('Arrays : Crop the active array using the active vector and make a copy'),
                      'CTRL+V': _('Arrays : paste selected values'),
                      'CTRL+ALT+C or ALTGr+C': _('Arrays : Set copy source and current selection to clipboard as script'),
+                     'CTRL+ALT+X or ALTGr+X': _('Arrays : Crop the active array using the active vector without masking the values outside the vector'),
                      'CTRL+ALT+V or ALTGr+V': _('Arrays : paste selection to active array'),
 
                      'p or P': _('Cross sections : Pick a profile/cross section'),
@@ -7083,6 +7091,20 @@ class WolfMapViewer(wx.Frame):
                     self.active_res2d.update_zoom_2(1./1.1)
                     self.Refresh()
 
+            elif key == ord('X'):
+                # Create a new array from the active array and the active vector
+                # Node outside the vector are set to NullValue
+                if self.active_array is not None and self.active_vector is not None:
+
+                    bbox = self.active_vector.get_bounds_xx_yy()
+                    newarray = self.active_array.crop_array(bbox)
+
+                    if not altdown:
+                        newarray.mask_outsidepoly(self.active_vector)
+
+                    self.add_object('array', newobj = newarray, id = self.active_array.idx + '_crop')
+
+
             elif key == ord('Q'):
                 # If Ctrl-Q is hit, then we must *not* handle it
                 # because it is tied to the Ctrl-Q accelerator
@@ -7192,14 +7214,18 @@ class WolfMapViewer(wx.Frame):
                     elif len(cursel) > 0:
                         self.active_array.mngselection.myselection = cursel.copy()
                         self.active_array.mngselection.update_nb_nodes_sections()
+
                 else:
                     logging.info(_('Copy selection values'))
                     if cursel == 'all':
                         self.active_array.paste_all(fromarray)
+
                     elif len(cursel) > 0:
                         z = fromarray.mngselection.get_values_sel()
                         self.active_array.set_values_sel(cursel, z)
 
+                self.Refresh()
+
         else:
             if key == wx.WXK_DELETE:
                 self.removeobj()

wolfhece/PyGui.py

@@ -29,7 +29,7 @@ from .RatingCurve import SPWMIGaugingStations,SPWDCENNGaugingStations
 from .hydrology.Catchment import Catchment
 from .hydrology.forcedexchanges import forced_exchanges
 from .PyParams import Wolf_Param
-from .picc import Picc_data
+from .picc import Picc_data, Cadaster_data
 
 # FIXME : Is it necessary to override wx.Frame ? WolfMapManager is a wx.Frame.
 #         Is it sufficient to run a wx.App ?
@@ -152,7 +152,8 @@ class MapManager(GenMapManager):
             makedirs(dir_hydro, exist_ok=True)
 
         self.SPWhydrometry=hydrometry(dir=dir_hydro)
-        self.picc = Picc_data(data_dir=Path(r'data/PICC'))
+        self.picc = Picc_data(data_dir=Path(r'data/PICC'), mapviewer=self.mapviewer)
+        self.cadaster = Cadaster_data(data_dir=Path(r'data/Cadaster'), mapviewer=self.mapviewer)
 
         self.mapviewer.add_object(which='other',
                                   newobj=self.SPWhydrometry,
@@ -164,6 +165,11 @@ class MapManager(GenMapManager):
                                   ToCheck=False,
                                   id='PICC data')
 
+        self.mapviewer.add_object(which='other',
+                                  newobj=self.cadaster,
+                                  ToCheck=False,
+                                  id='Cadaster data')
+
 class GPU2DModel(GenMapManager):
 
     mydir:str

wolfhece/PyVertexvectors.py

@@ -602,6 +602,7 @@ class vectorproperties:
             self.parent.textimage=None
 
         try:
+            self.parent.parentzone.prep_listogl()
             self.parent.parentzone.parent.mapviewer.Refresh()
         except:
             pass
@@ -639,7 +640,7 @@ class vectorproperties:
         self.myprops.addparam('Draw','Closed',False,'Logical','',whichdict='Default')
         self.myprops.addparam('Draw','Filled',False,'Logical','',whichdict='Default')
         self.myprops.addparam('Draw','Transparent',False,'Logical','',whichdict='Default')
-        self.myprops.addparam('Draw','Alpha',0,'Integer','Transparent intensity',whichdict='Default')
+        self.myprops.addparam('Draw','Alpha',0,'Integer','Transparency intensity (255 is opaque)',whichdict='Default')
         self.myprops.addparam('Draw','Flash',False,'Logical','',whichdict='Default')
 
         self.myprops.addparam('Legend','Visible',False,'Logical','',whichdict='Default')
@@ -1258,15 +1259,24 @@ class vector:
 
         return self.myvertices[indexmp]
 
-    def find_minmax(self):
+    def find_minmax(self, only_firstlast:bool=False):
         """
         Recherche l'extension spatiale du vecteur
+
+        :param only_firstlast: si True, on ne recherche que les coordonnées du premier et du dernier vertex
         """
         if len(self.myvertices)>0:
-            self.xmin=min(vert.x for vert in self.myvertices)
-            self.ymin=min(vert.y for vert in self.myvertices)
-            self.xmax=max(vert.x for vert in self.myvertices)
-            self.ymax=max(vert.y for vert in self.myvertices)
+
+            if only_firstlast:
+                self.xmin=min(self.myvertices[0].x, self.myvertices[-1].x)
+                self.ymin=min(self.myvertices[0].y, self.myvertices[-1].y)
+                self.xmax=max(self.myvertices[0].x, self.myvertices[-1].x)
+                self.ymax=max(self.myvertices[0].y, self.myvertices[-1].y)
+            else:
+                self.xmin=min(vert.x for vert in self.myvertices)
+                self.ymin=min(vert.y for vert in self.myvertices)
+                self.xmax=max(vert.x for vert in self.myvertices)
+                self.ymax=max(vert.y for vert in self.myvertices)
 
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """
@@ -1937,10 +1947,17 @@ class zone:
             tmp_nbvectors=int(lines[1])
             self.myvectors=[]
             curstart=2
+
+            if tmp_nbvectors>1000:
+                logging.info(_('Many vectors in zone -- {} -- Be patient !').format(tmp_nbvectors))
+
             for i in range(tmp_nbvectors):
                 curvec=vector(lines[curstart:],parentzone=self,is2D=is2D)
                 curstart+=curvec._nblines()
                 self.myvectors.append(curvec)
+                if tmp_nbvectors>1000:
+                    if i%100==0:
+                        logging.info(_('{} vectors read').format(i))
 
         if name!='' and self.myname=='':
             self.myname=name
@@ -2109,13 +2126,16 @@ class zone:
 
         return nb
 
-    def find_minmax(self,update=False):
+    def find_minmax(self, update=False, only_firstlast:bool=False):
         """
         Recherche de l'emprise spatiale de toute la zone
+
+        :param update: True = mise à jour des valeurs ; False = utilisation des valeurs déjà calculées
+        :param only_firstlast: True = recherche uniquement sur les premiers et derniers points de chaque vecteur
         """
         if update:
             for vect in self.myvectors:
-                vect.find_minmax()
+                vect.find_minmax(only_firstlast=only_firstlast)
 
         if self.nbvectors==0:
             self.xmin=-99999.
@@ -2140,6 +2160,12 @@ class zone:
                 self.ymin=minsy[0]
                 self.ymax=maxsy[0]
 
+    def prep_listogl(self):
+        """
+        Préparation des listes OpenGL pour augmenter la vitesse d'affichage
+        """
+        self.plot(prep = True)
+
     def plot(self, prep:bool=False):
         """
         Graphique OpenGL
@@ -3313,10 +3339,24 @@ class Zones(wx.Frame, Element_To_Draw):
                  plotted: bool = True,
                  mapviewer=None,
                  need_for_wx: bool = False,
-                 bbox:Polygon = None) -> None:
-        """
-        parent : soit une instance 'WolfMapViewer', soit une instance 'Ops_Array'
-        --> est utile pour transférer la propriété 'active_vector' et obtenir diverses informations ou lancer des actions
+                 bbox:Polygon = None,
+                 find_minmax:bool = True) -> None:
+        """
+        Objet de gestion et d'affichage d'informations vectorielles
+
+        :param filename: nom du fichier à lire
+        :param ox: origine X
+        :param oy: origine Y
+        :param tx: Translation selon X
+        :param ty: Translation selon Y
+        :param parent: objet parent -- soit une instance 'WolfMapViewer', soit une instance 'Ops_Array' --> est utile pour transférer la propriété 'active_vector' et obtenir diverses informations ou lancer des actions
+        :param is2D: si True --> les vecteurs sont en 2D
+        :param idx: identifiant
+        :param plotted: si True --> les vecteurs sont prêts à être affichés
+        :param mapviewer: instance WolfMapViewer
+        :param need_for_wx: si True --> permet l'affichage de la structure via WX car une app WX existe et est en cours d'exécution
+        :param bbox: bounding box
+        :param find_minmax: si True --> recherche des valeurs min et max
 
         wx_exists : si True --> permet l'affichage de la structure via WX car une app WX existe et est en cours d'exécution
 
@@ -3377,6 +3417,9 @@ class Zones(wx.Frame, Element_To_Draw):
             elif self.filename.endswith('.shp'):
                 self.is2D=False
                 self.import_shapefile(self.filename, bbox=bbox)
+            elif self.filename.endswith('.gpkg'):
+                self.is2D=False
+                self.import_gpkg(self.filename, bbox=bbox)
             elif Path(filename).is_dir() and self.filename.endswith('.gdb'):
                 self.is2D=False
                 self.import_gdb(self.filename, bbox=bbox)
@@ -3403,7 +3446,11 @@ class Zones(wx.Frame, Element_To_Draw):
                     self.myzones.append(curzone)
                     curstart+=curzone._nblines()
 
-            self.find_minmax(True)
+            if find_minmax:
+                self.find_minmax(True)
+
+        if plotted:
+            self.prep_listogl()
 
     @property
     def nbzones(self):
@@ -3449,6 +3496,9 @@ class Zones(wx.Frame, Element_To_Draw):
 
             content = gpd.read_file(fn, bbox=bbox, layer=curlayer)
 
+            if len(content)>1000:
+                logging.warning(_('Layer {} contains more than 1000 elements -- it may take a while to import'.format(curlayer)))
+
             for idx, row in content.iterrows():
                 if 'NAME' in row.keys():
                     name = row['NAME']
@@ -3465,6 +3515,54 @@ class Zones(wx.Frame, Element_To_Draw):
                 newzone = zone(name=name, parent = self, fromshapely = poly)
                 self.add_zone(newzone)
 
+                if len(content)>1000:
+                    if idx%100==0:
+                        logging.info(_('Imported {} elements'.format(idx)))
+
+    def import_gpkg(self, fn:str, bbox:Polygon = None):
+        """ Import gdb by using geopandas and Fiona"""
+
+        import fiona
+
+        layers = fiona.listlayers(fn)
+
+        if self.wx_exists:
+            dlg = wx.MultiChoiceDialog(None, _('Choose the layers to import'), _('Choose the layers'), layers)
+
+            if dlg.ShowModal() == wx.ID_OK:
+                layers = [layers[i] for i in dlg.GetSelections()]
+            else:
+                return
+
+        for curlayer in layers:
+
+            content = gpd.read_file(fn, bbox=bbox, layer=curlayer)
+
+            if len(content)>1000:
+                logging.warning(_('Layer {} contains more than 1000 elements -- it may take a while to import'.format(curlayer)))
+
+            for idx, row in content.iterrows():
+                if 'NAME' in row.keys():
+                    name = row['NAME']
+                elif 'MAJ_NIV3T' in row.keys():
+                    # WALOUS
+                    name = row['MAJ_NIV3T']
+                elif 'NATUR_DESC' in row.keys():
+                    name = row['NATUR_DESC']
+                elif 'Type' in row.keys():
+                    name = row['Type']
+                else:
+                    name = str(idx)
+
+                poly = row['geometry']
+
+                newzone = zone(name=name, parent = self, fromshapely = poly)
+                self.add_zone(newzone)
+
+                if len(content)>1000:
+                    if idx%100==0:
+                        logging.info(_('Imported {} elements'.format(idx)))
+
     def set_mapviewer(self):
         """ Recherche d'une instance WolfMapViewer depuis le parent """
         from .PyDraw import WolfMapViewer
@@ -3480,6 +3578,36 @@ class Zones(wx.Frame, Element_To_Draw):
 
             assert isinstance(self.mapviewer, WolfMapViewer), _('Bad mapviewer -- verify your code or bad parent')
 
+    def colorize_data(self, colors:dict[str:list[int]]) -> None:
+        """
+        Colorize zones based on a dictionary of colors
+
+        Zone's name must be the key of the dictionary
+
+        """
+
+        std_color = getIfromRGB([10, 10, 10])
+
+        for curzone in self.myzones:
+            if curzone.myname in colors:
+                curcolor = getIfromRGB(colors[curzone.myname])
+            else:
+                curcolor = std_color
+
+            for curvect in curzone.myvectors:
+                curvect.myprop.color = curcolor
+                curvect.myprop.alpha = 180
+                curvect.myprop.transparent = True
+                curvect.myprop.filled = True
+
+    def set_width(self, width:int) -> None:
+        """ Change with of all vectors in all zones """
+        for curzone in self.myzones:
+            for curvect in curzone.myvectors:
+                curvect.myprop.width = width
+
+        self.prep_listogl()
+
     def get_zone(self,keyzone:Union[int, str])->zone:
         """
         Retrouve la zone sur base de son nom ou de sa position
@@ -3646,7 +3774,7 @@ class Zones(wx.Frame, Element_To_Draw):
         Préparation des listes OpenGL pour augmenter la vitesse d'affichage
         """
         for curzone in self.myzones:
-            curzone.plot(True)
+            curzone.prep_listogl()
 
     def check_plot(self):
         """
@@ -3704,15 +3832,16 @@ class Zones(wx.Frame, Element_To_Draw):
         if forceparent:
             addedzone.parent = self
 
-    def find_minmax(self,update=False):
+    def find_minmax(self, update=False, only_firstlast:bool=False):
         """
         Trouve les bornes des vertices pour toutes les zones et tous les vecteurs
 
-        update : si True, force la MAJ des minmax dans chaque zone; si False, compile les minmax déjà présents
+        :param update : si True, force la MAJ des minmax dans chaque zone; si False, compile les minmax déjà présents
+        :param only_firstlast : si True, ne prend en compte que le premier et le dernier vertex de chaque vecteur
         """
         if update:
             for zone in self.myzones:
-                zone.find_minmax(update)
+                zone.find_minmax(update, only_firstlast)
 
         if len(self.myzones)>0:
 
@@ -4249,6 +4378,7 @@ class Zones(wx.Frame, Element_To_Draw):
             self.mapviewer.start_action('capture vertices', _('Capture vertices'))
             firstvert=wolfvertex(0.,0.)
             self.active_vector.add_vertex(firstvert)
+            self.active_vector.parentzone.reset_listogl()
             self.mapviewer.mimicme()
 
     def OnReverse(self, event:wx.MouseEvent):
@@ -4575,6 +4705,7 @@ class Zones(wx.Frame, Element_To_Draw):
             if ret==wx.ID_YES:
 
                 self.mapviwer.add_object('triangulation',newobj=mytri)
+                self.mapviewer.Refresh()
 
             dlg.Destroy()
 
@@ -4596,7 +4727,9 @@ class Zones(wx.Frame, Element_To_Draw):
                 return
 
             mytri = myzone.createmultibin()
+
             self.mapviewer.add_object('triangulation',newobj=mytri)
+            self.mapviewer.Refresh()
 
     def Oncreatemultibin_project(self, event:wx.MouseEvent):
         """
@@ -4618,6 +4751,7 @@ class Zones(wx.Frame, Element_To_Draw):
 
             mytri = myzone.createmultibin_proj()
             self.mapviewer.add_object('triangulation',newobj=mytri)
+            self.mapviewer.Refresh()
 
     def save_images_fromvec(self, dir=''):
         """

wolfhece/apps/version.py

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

wolfhece/picc.py

@@ -27,14 +27,15 @@ class Picc_data(Element_To_Draw):
         super().__init__(idx = idx, plotted = plotted, mapviewer = mapviewer, need_for_wx= need_for_wx)
 
         self.data_dir = data_dir
-        self._filename_vector = 'PICC_Vesdre.shp'
+        self._filename_vector = 'Wallonie.gdb' #'PICC_Vesdre.shp'
         self._filename_points = 'PICC_Vesdre_points.shp'
         self.zones = None
         self.cloud = None
+        self._colors = {'Habitation': [255, 0, 0], 'Annexe': [0, 255, 0], 'Culture, sport ou loisir': [0, 0, 255], 'Autre': [10, 10, 10]}
 
         return None
 
-    def read_data(self, data_dir:Path = None, bbox:Union[Polygon, list[float]] = None) -> None:
+    def read_data(self, data_dir:Path = None, bbox:Union[Polygon, list[float]] = None, colorize:bool = True) -> None:
         """
         Read data from PICC directory
 
@@ -45,16 +46,16 @@ class Picc_data(Element_To_Draw):
         if data_dir is None:
             data_dir = self.data_dir
 
-#        piccfile = data_dir / self._filename
-        piccfile = data_dir / 'Wallonie.gdb'
-        if piccfile.exists():
-            self.zones = Zones(data_dir / self._filename_vector, bbox = bbox)
+        datafile = data_dir / self._filename_vector
+
+        if datafile.exists():
+            self.zones = Zones(data_dir / self._filename_vector, bbox = bbox, mapviewer=self.mapviewer)
             self.zones.prep_listogl()
         else:
-            logging.error(_('File not found : {}').format(piccfile))
+            logging.error(_('File not found : {}').format(datafile))
 
             if self.mapviewer is not None:
-                dlg = wx.SingleChoiceDialog(None, _('Would you like to select a PICC file or a GDB database ?'), _('PICC data file'), ['PICC file', 'GDB database'], wx.CHOICEDLG_STYLE)
+                dlg = wx.SingleChoiceDialog(None, _('Would you like to select a PICC file or a GDB database ?'), _('Choose data source'), ['Shape file/GPKG', 'GDB database'], wx.CHOICEDLG_STYLE)
                 ret = dlg.ShowModal()
 
                 if ret == wx.ID_CANCEL:
@@ -63,8 +64,9 @@ class Picc_data(Element_To_Draw):
                 choice = dlg.GetStringSelection()
                 dlg.Destroy()
 
-                if choice == 'PICC file':
-                    with wx.FileDialog(None, _('Select a PICC file'), wildcard="Shapefile (*.shp)|*.shp", style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST) as fileDialog:
+                if choice == 'Shape file/GPKG':
+                    with wx.FileDialog(None, _('Select a file'), wildcard="Shapefile (*.shp)|*.shp|Gpkg (*.gpkg)|*.gpkg", style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST) as fileDialog:
+
                         if fileDialog.ShowModal() == wx.ID_CANCEL:
                             return
 
@@ -73,7 +75,7 @@ class Picc_data(Element_To_Draw):
                         try:
                             self.data_dir = Path(pathname).parent
                             self._filename_vector = Path(pathname).name
-                            self.zones = Zones(pathname, bbox = bbox)
+                            self.zones = Zones(pathname, bbox = bbox, mapviewer=self.mapviewer)
                             self.zones.prep_listogl()
                         except:
                             logging.error(_('File not found : {}').format(pathname))
@@ -88,7 +90,7 @@ class Picc_data(Element_To_Draw):
                         try:
                             self.data_dir = Path(pathname)
                             self._filename_vector = ''
-                            self.zones = Zones(self.data_dir, bbox = bbox)
+                            self.zones = Zones(self.data_dir, bbox = bbox, mapviewer=self.mapviewer)
                             self.zones.prep_listogl()
 
                         except:
@@ -101,7 +103,13 @@ class Picc_data(Element_To_Draw):
             self.cloud.myprop.width = 3
             self.cloud.myprop.color = getIfromRGB([0, 0, 255])
         else:
-            logging.error(_('File not found : {}').format(pointfile))
+            logging.error(_('Point file not found : {}').format(pointfile))
+
+        if self.zones is not None:
+            if colorize:
+                self.zones.colorize_data(self._colors)
+                self.zones.prep_listogl()
+
 
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """ Plot data in OpenGL context
@@ -158,3 +166,25 @@ class Picc_data(Element_To_Draw):
             self.cloud.show_properties()
         else:
             logging.warning(_('No cloud properties to show !'))
+
+class Cadaster_data(Picc_data):
+    """ Read and show cadaster data """
+
+    def __init__(self,
+                 idx:str = '',
+                 plotted:bool = True,
+                 mapviewer = None,
+                 need_for_wx:bool = False,
+                 data_dir:Path = Path(r'./data/Cadastre'),
+                 bbox:Union[Polygon, list[float]] = None) -> None:
+
+        super().__init__(idx = idx, plotted = plotted, mapviewer = mapviewer, need_for_wx= need_for_wx, data_dir = data_dir, bbox = bbox)
+
+        self._filename_vector = 'Cadastre.shp'
+        self._filename_points = ''
+
+    def read_data(self, data_dir: Path = None, bbox:Union[Polygon, List[float]] = None, colorize: bool = True) -> None:
+
+        super().read_data(data_dir, bbox, colorize=False)
+        if self.zones is not None:
+            self.zones.set_width(3)

wolfhece/scenario/config_manager.py

@@ -70,6 +70,7 @@ WOLF_BC       = 'Wolf boundary conditions'
 OTHER_SCRIPTS = 'Other scripts'
 IS_SIMUL      = 'is_simul'
 IS_SCENARIO   = 'is_scenario'
+IS_RESULTS    = 'is_results'
 HAS_RESULTS   = 'has_results'
 MISSING       = 'missing'
 SUBDIRS       = 'subdirs'
@@ -300,7 +301,10 @@ class Config_Manager_2D_GPU:
         for key, curdict in self._flat_configs:
             if GPU_2D_file_extensions.NPY.value in curdict.keys():
                 if len(curdict[GPU_2D_file_extensions.NPY.value])>0:
-                    all_numpy += curdict[GPU_2D_file_extensions.NPY.value]
+                    if not curdict[IS_RESULTS]:
+                        all_numpy += curdict[GPU_2D_file_extensions.NPY.value]
+                    else:
+                        logging.warning(_('Numpy files in simulation directory -- Ignored !'))
 
         return all_numpy
 
@@ -334,22 +338,36 @@ class Config_Manager_2D_GPU:
         """
         Check consistency of all files
 
-        All numpy files must have the same shape as the tif file in thr root directory
+        All numpy files must have the same shape as the tif file in the root directory
         All hydrographs must have the same number of columns
         """
 
+        logging.info(_('Checking consistency of all files except simulation results...\n'))
+
+        logging.info(_('NPY files...'))
         numpyfiles = self.get_all_numpy()
 
+        logging.info(_('Number of numpy files : {}'.format(len(numpyfiles))))
+
         log = ''
         for curnpy in numpyfiles:
-            arr = np.load(curnpy)
+
+            # test if the shape of the numpy file is the same as the tif file
+            # using memmap to avoid loading the whole array in memory -> faster
+            arr = np.lib.format.open_memmap(curnpy, mode='r')
+
             if arr.shape != (self._header.nbx, self._header.nby):
                 loclog = _('Bad shape for {} !'.format(curnpy))
                 log += loclog + '\n'
                 logging.warning(loclog)
 
+            del(arr)
+
+        logging.info(_('Hydrographs...'))
         hydro = self.get_hydrographs()
         nb = hydro[0].data.shape[1]
+
+        logging.info(_('Number of hydrographs : {}'.format(len(hydro))))
         for curhydro in hydro:
             if curhydro.data.shape[1] != nb:
                 loclog = _('Bad number of columns for {} !'.format(curhydro[0]._filename))
@@ -406,6 +424,9 @@ class Config_Manager_2D_GPU:
         # test if it is a scenario
         self._test_is_scenario(curdict)
 
+        # test if it is a results directory
+        self._test_is_results(curdict)
+
     def _recursive_find_files(self, wd:Path, curdict:dict):
         """ Recherche récursive des fichiers de simulation/scenario dans les répertoires dont la structure a été traduite en dictionnaire """
         if len(curdict.keys())>0:
@@ -428,6 +449,7 @@ class Config_Manager_2D_GPU:
 
         curdict[IS_SIMUL]    = False
         curdict[IS_SCENARIO] = False
+        curdict[IS_RESULTS]  = False
         curdict[HAS_RESULTS] = False
         curdict[MISSING]     = []
         curdict[SUBDIRS]     = []
@@ -454,14 +476,28 @@ class Config_Manager_2D_GPU:
             curdict['missing'].append(GPU_2D_file_extensions.NPY.value)
             ok = False
 
-        curdict['is_simul'] = ok
+        curdict[IS_SIMUL] = ok
 
     def _test_is_scenario(self, curdict:dict):
 
-        curdict['is_scenario'] = len(curdict[GPU_2D_file_extensions.TIF.value])>0 or \
+        curdict[IS_SCENARIO] = len(curdict[GPU_2D_file_extensions.TIF.value])>0 or \
                                  len(curdict[GPU_2D_file_extensions.TIFF.value])>0 or \
                                  len(curdict[GPU_2D_file_extensions.PY.value])>0
 
+    def _test_is_results(self, curdict:dict):
+        """ Teste si le répertoire contient des fichiers de résultats """
+
+        ok = False
+
+        # test du fichier 'metadata.json'
+        if GPU_2D_file_extensions.JSON.value in curdict.keys():
+            for curfile in curdict[GPU_2D_file_extensions.JSON.value]:
+                ok = curfile.name.lower() == 'metadata.json'
+                if ok:
+                    break
+
+        curdict[IS_RESULTS] = ok
+
     def find_files(self):
         """
         Recehrche des fichiers de simulation/scenario dans les répertoires dont la structure a été traduite en dictionnaire

wolfhece/wolf_array.py

@@ -3327,21 +3327,40 @@ class WolfArray(Element_To_Draw, header_wolf):
     myops: Ops_Array
 
     def __init__(self,
-                 fname=None,                        # filename/filepath - if provided, the file will be read on disk
-                 mold=None,                         # initialize from a copy a the mold object --> must be a WolArray
-                 masknull=True,                     # mask data based on the nullvalue
-                 crop=None,                         # crop data based on the spatial extent [[xmin, xmax],[ymin,ymax]]
-                 whichtype=WOLF_ARRAY_FULL_SINGLE,  # type of the numpy array (float32 as default)
-                 preload=True,                      # True = load data during initialization ; False = waits for the display to be required
-                 create=False,                      # True = create a new array from wxDialog
-                 mapviewer=None,                    # WolfMapViewer instance to display data
-                 nullvalue=0.,                      # null value used to mask data
-                 srcheader=None,                    # initialize dimension from header_wolf instance
-                 idx:str = '',                      # indentity --> required by the mapviewer
-                 plotted:bool = False,              # True = will be plotted if required by the mapviewer
-                 need_for_wx:bool = False,          # True = a wxApp is required (if no application is underway --> Error)
-                 mask_source:np.ndarray = None,     # mask to link to the data
+                 fname:str          = None,
+                 mold:"WolfArray"   = None,
+                 masknull:bool      = True,
+                 crop:list[list[float],list[float]]=None,
+                 whichtype          = WOLF_ARRAY_FULL_SINGLE,
+                 preload:bool       = True,
+                 create:bool        = False,
+                 mapviewer          = None,
+                 nullvalue:float    = 0.,
+                 srcheader:header_wolf  = None,
+                 idx:str            = '',
+                 plotted:bool       = False,
+                 need_for_wx:bool   = False,
+                 mask_source:np.ndarray = None,
                  ) -> None:
+        """
+
+        :param fname: filename/filepath - if provided, the file will be read on disk
+        :param mold: initialize from a copy a the mold object --> must be a WolArray
+        :param masknull: mask data based on the nullvalue
+        :param crop: crop data based on the spatial extent [[xmin, xmax],[ymin,ymax]]
+        :param whichtype: type of the numpy array (float32 as default)
+        :param preload: True = load data during initialization ; False = waits for the display to be required
+        :param create: True = create a new array from wxDialog
+        :param mapviewer: WolfMapViewer instance to display data
+        :param nullvalue: null value used to mask data
+        :param srcheader: initialize dimension from header_wolf instance
+        :param idx: indentity --> required by the mapviewer
+        :param plotted: True = will be plotted if required by the mapviewer
+        :param need_for_wx: True = a wxApp is required (if no application is underway --> Error)
+        :param mask_source: mask to link to the data
+
+        """
+
 
         Element_To_Draw.__init__(self, idx, plotted, mapviewer, need_for_wx)
         header_wolf.__init__(self)
@@ -3431,21 +3450,45 @@ class WolfArray(Element_To_Draw, header_wolf):
                 self.mask_data(self.nullvalue)
 
         elif mold is not None:
-            self.nbx = mold.nbx
-            self.nby = mold.nby
-            self.nbz = mold.nbz
-            self.dx = mold.dx
-            self.dy = mold.dy
-            self.dz = mold.dz
-            self.origx = mold.origx
-            self.origy = mold.origy
-            self.origz = mold.origz
-            self.translx = mold.translx
-            self.transly = mold.transly
-            self.translz = mold.translz
-            self.array = ma.copy(mold.array)
-            if idx=='':
-                self.idx = mold.idx
+            if self.cropini is None:
+                self.nbx = mold.nbx
+                self.nby = mold.nby
+                self.nbz = mold.nbz
+                self.dx = mold.dx
+                self.dy = mold.dy
+                self.dz = mold.dz
+                self.origx = mold.origx
+                self.origy = mold.origy
+                self.origz = mold.origz
+                self.translx = mold.translx
+                self.transly = mold.transly
+                self.translz = mold.translz
+                self.array = ma.copy(mold.array)
+                if idx=='':
+                    self.idx = mold.idx
+            else:
+                imin, jmin = mold.get_ij_from_xy(self.cropini[0][0], self.cropini[1][0])
+                imax, jmax = mold.get_ij_from_xy(self.cropini[0][1], self.cropini[1][1])
+
+                imin = int(imin)
+                jmin = int(jmin)
+                imax = int(imax)
+                jmax = int(jmax)
+
+                self.nbx = imax - imin
+                self.nby = jmax - jmin
+                self.dx  = mold.dx
+                self.dy  = mold.dy
+                self.origx, self.origy = mold.get_xy_from_ij(imin, jmin)
+                self.origx -= self.dx / 2.
+                self.origy -= self.dy / 2.
+                self.translx = mold.translx
+                self.transly = mold.transly
+
+                if idx=='':
+                    self.idx = mold.idx
+
+                self.array = ma.copy(mold.array[imin:imax, jmin:jmax])
 
         elif create:
             assert self.wx_exists, _('Array creation required a running wx App to display the UI')
@@ -3459,6 +3502,32 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self.add_ops_sel() # Ajout d'un gestionnaire de sélection et d'opérations
 
+    def crop_array(self, bbox:list[list[float],list[float]]) -> "WolfArray":
+        """ Crop the data based on the bounding box """
+        imin, jmin = self.get_ij_from_xy(bbox[0][0], bbox[1][0])
+        imax, jmax = self.get_ij_from_xy(bbox[0][1], bbox[1][1])
+
+        imin = int(imin)
+        jmin = int(jmin)
+        imax = int(imax)
+        jmax = int(jmax)
+
+        newheader = header_wolf()
+        newheader.nbx = imax-imin
+        newheader.nby = jmax-jmin
+        newheader.dx  = self.dx
+        newheader.dy  = self.dy
+        newheader.origx, newheader.origy = self.get_xy_from_ij(imin, jmin)
+        newheader.origx -= self.dx / 2.
+        newheader.origy -= self.dy / 2.
+        newheader.translx = self.translx
+        newheader.transly = self.transly
+
+        newarray = WolfArray(srcheader=newheader)
+
+        newarray.array[:,:] = self.array[imin:imax, jmin:jmax]
+
+        return newarray
 
     def get_centers(self, usenap:bool = True):
         """ Get the centers of the cells """
@@ -4951,7 +5020,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         myvect.find_minmax()
         mypointsij = self.get_ij_infootprint_vect(myvect)
         myvert = myvect.asnparray()
-        i,j =self.convert_xy2ij(myvert)
+        i,j =self.convert_xy2ij_np(myvert)
         path = mpltPath.Path(np.column_stack([i,j]))
         inside = path.contains_points(mypointsij)
 
@@ -5109,6 +5178,8 @@ class WolfArray(Element_To_Draw, header_wolf):
                         self.origy = float(params['parameters']["base_coord_y"])
 
                 self.nullvalue = 99999.
+            elif (locpath /'.txt').exists():
+                self.read_txt_header()
 
             self.mask_data(self.nullvalue)
             self.loaded = True
@@ -5135,6 +5206,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if self.filename.endswith('.tif'):
             self.export_geotif()
+        elif self.filename.endswith('.npy'):
+            np.save(self.filename, self.array.data)
+            self.write_txt_header()
         else:
             self.write_txt_header()
             self.write_array()

{wolfhece-2.0.30.dist-info → wolfhece-2.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.0.30
+Version: 2.0.32
 Author-email: Stéphane Champailler <stephane.champailler@uliege.be>, Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.0.30.dist-info → wolfhece-2.0.32.dist-info}/RECORD

@@ -5,9 +5,9 @@ wolfhece/Lidar2002.py,sha256=sXZ6p8_EKI5l8fJswIMAABT6dqHKVexU52Tjl1uuisU,5770
 wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/Model1D.py,sha256=jo2gE8VSzQZR6cQvldihbdCcf3C3XD1VR0bvBQsFe7Y,414892
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
-wolfhece/PyCrosssections.py,sha256=U4llg0EiCME6I7_YMpu_fNlfIifhbCEX0eUEFTT_Lxw,112237
-wolfhece/PyDraw.py,sha256=nfeiDxVBa8iOoNc1VlzcGPAXJ2zzB41OJRl_Wz8wb48,333216
-wolfhece/PyGui.py,sha256=jIGKhkaGoYImoejrG-DMDSJWsPZ2jD1O6SqxPPQuF1U,53349
+wolfhece/PyCrosssections.py,sha256=kdNv8dHKtp_gS1yj_QYvLUkvCwk82G1TMlneL6MDCjg,112279
+wolfhece/PyDraw.py,sha256=GpLLs-UU9s_BvUNtqfw2DGmF1FStcQUzlzU922dcTrk,334579
+wolfhece/PyGui.py,sha256=_Y7ZE6JRIh5oYsQ4y2IFBiGGq3yEVwB4Sey4xcjffaY,53702
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=nb9oPLZF-xx-yvOWvw2XVVmis6XTmYT2i7hvH3qPwAg,21932
@@ -15,7 +15,7 @@ wolfhece/PyParams.py,sha256=23g3xGG1EVDQEXshrZzAKBaZkTP7K3EB7vbWfpAGcEI,84639
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=cLSzuGIy3qLDyYQt5efBiR3IM1Tcz_jtTWwOcIbWFAM,39527
-wolfhece/PyVertexvectors.py,sha256=KiFCSB4RBq23NMg23d6QAP7lhUzPFjBm0YuMuL9C9_M,197872
+wolfhece/PyVertexvectors.py,sha256=oqTNFy52-m58-nmwLpW0aPcWKZdVBqGOHe_Z4XU3OQE,203401
 wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
 wolfhece/RatingCurve.py,sha256=YSQvSvdMHE6hSlWVBF5Oe0-Fh3waNMpOdmcymaCCTis,21706
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -35,7 +35,7 @@ wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
 wolfhece/irm_qdf.py,sha256=0nOU_usEZuWMwYOPV9qtZoWsQTn2x2DxOuk7VlYMkbo,15419
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/multiprojects.py,sha256=AMwEQZqo1Twh6tSPP-4L29-Fa8cI9d6dWce7l88awws,14675
-wolfhece/picc.py,sha256=xmR-9p02f34ZdwAvr5qPHwHMnYhEJrJd1CbXRcUvl34,6063
+wolfhece/picc.py,sha256=WAAOMSCSjH_Inm7RHOX7YMkA3TuJnSLNCqVQXpKhXFY,7350
 wolfhece/pyGui1D.py,sha256=7m8BpsdbxRVFc4bEkG4ctFG9TT4xIL8TuwBu9neA8jE,116516
 wolfhece/pybridges.py,sha256=HJ1BL1HC7UrgpQ-3jKXkqPFmc-TzToL28Uex2hjHk6c,57166
 wolfhece/pydike.py,sha256=G4jfSZaAHHr4VWEJqnXSvEswXvlOz1yhbhQ6uu3AqyM,1943
@@ -47,7 +47,7 @@ wolfhece/pywalous.py,sha256=jwp251AzGBc0VmMzOqA0IJiRRa6yQIfccRM8lVGszIY,4474
 wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
 wolfhece/textpillow.py,sha256=YJxF4JzPv3G1oqenJgWVYq3OPZx9iFtrmeIfvBwbJVU,8735
 wolfhece/tools_mpl.py,sha256=q8Yc4aukPPiUcEzREvZRM_em67XqXaahdoaNt0DETfE,266
-wolfhece/wolf_array.py,sha256=L6MfvpvLSbGSnqtp0eJnKR4e3FVoFxkUV93TqwoYTnM,283078
+wolfhece/wolf_array.py,sha256=zTrv6hofObnNpNDsPPPG0eoDGhwII0XbaUi9VZFcB7s,285509
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=quflEvi32lWSvOPa0aDCDl-8Jv-jGtLHbR2rdx67LsI,14883
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
@@ -64,7 +64,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=m9hMTqzhSUcTudApyNNjoAK9e2u5vgEkJVV79xmfM1s,2118
-wolfhece/apps/version.py,sha256=wEGvhwHiVCSP4L-bBALnK11CCuboU6ivMKhLtvjXq68,388
+wolfhece/apps/version.py,sha256=vT9pd_afsI6ey7hOlnBO0_Aek2ZYxkqtXeuREpTZs44,388
 wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
 wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
 wolfhece/apps/wolfcompare2Darrays.py,sha256=MucG5h4sU4jicDVCKohiCDUVUqx_RQ1qKrZKokpnxhQ,3743
@@ -231,7 +231,7 @@ wolfhece/rem/RasterViz.py,sha256=TDhWyMppcYBL71HfhpZuMgYKhz7faZg-MEOQJo_3Ivo,291
 wolfhece/rem/__init__.py,sha256=S2-J5uEGK_VaMFjRUYFIdSScJjZyuXH4RmMmnG3OG7I,19
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/scenario/check_scenario.py,sha256=Q0_jA3PYapcbCT881YojTwKoRi_RjZpevHXhtP9VoqE,4619
-wolfhece/scenario/config_manager.py,sha256=-vBkB8NYsa7YkWUQQYdgEfrQ02BpzvFQukHO9CEP4_c,61217
+wolfhece/scenario/config_manager.py,sha256=YTn1tSMxLCcHjAWotfzfj7_1E7SS53k7xdSl7TSyLmE,62575
 wolfhece/scenario/imposebc_void.py,sha256=pl7c99HQQMQT7i15fDlOOFYCdOtR5c_XIBOveOTOaLc,5273
 wolfhece/scenario/update_void.py,sha256=MmiDiwWHvuk0mpXOlMeB2ImY-d1Wi3Wfmg9hrDTAraE,7176
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -252,8 +252,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.0.30.dist-info/METADATA,sha256=jzUkYPCcya3ZFij67N9oQwb33EKwbdHinDZhp3iEBHc,2262
-wolfhece-2.0.30.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wolfhece-2.0.30.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.0.30.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.0.30.dist-info/RECORD,,
+wolfhece-2.0.32.dist-info/METADATA,sha256=HcLDc0Nb55f64UqgUm84CdYGLCGDIiVQIqOGz6X5fV8,2262
+wolfhece-2.0.32.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wolfhece-2.0.32.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.0.32.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.32.dist-info/RECORD,,