wolfhece 2.1.5__py3-none-any.whl → 2.1.7__py3-none-any.whl

wolfhece/PyDraw.py

@@ -933,7 +933,7 @@ class WolfMapViewer(wx.Frame):
                 dlg.Destroy()
 
 
-            dlg = wx.FileDialog(self, _("Choose the output file"), wildcard="Geotif (*.tif)|*.tif|all (*.*)|*.*", style=wx.FD_SAVE, defaultDir=def_outdrir)
+            dlg = wx.FileDialog(self, _("Choose the output file"), wildcard="Geotif (*.tif)|*.tif|all (*.*)|*.*", style=wx.FD_SAVE, defaultDir=str(def_outdrir))
             if dlg.ShowModal() == wx.ID_CANCEL:
                 dlg.Destroy()
                 return
@@ -6492,9 +6492,11 @@ class WolfMapViewer(wx.Frame):
                         elif idx == 4:
                             curtype = WOLF_ARRAY_FULL_INTEGER8 #np.int8
 
-                        newarray = WolfArray(srcheader=self.selected_object.get_header(), whichtype=curtype)
+                        newarray = WolfArray(srcheader=self.selected_object.get_header(), whichtype=curtype, nullvalue=self.selected_object.nullvalue)
 
                         newarray.allocate_ressources()
+                        asnewtype = self.selected_object.array.data.astype(newarray.dtype)
+                        newarray.array.data[:,:] = asnewtype[:,:]
                         newarray.copy_mask(self.selected_object, forcenullvalue=True, link=False)
                     else:
                         newarray = WolfArray(mold=self.selected_object)
@@ -8168,8 +8170,21 @@ class WolfMapViewer(wx.Frame):
                 self.copyfrom = self.active_array
                 self.mimicme_copyfrom()  # force le recopiage de copyfrom dans les autres matrices liées
 
+                if len(self.active_array.SelectionData.myselection) > 5000:
+                    dlg = wx.MessageDialog(self, _('The selection is large, copy to clipboard may be slow ! -- Continue?'), style=wx.OK | wx.CANCEL)
+                    ret = dlg.ShowModal()
+
+                    if ret == wx.ID_CANCEL:
+                        logging.info(_('Copy to clipboard cancelled -- But source array is well defined !'))
+                        dlg.Destroy()
+                        return
+
+                    dlg.Destroy()
+
                 self.active_array.SelectionData.copy_to_clipboard()
 
+                logging.info(_('Values copied to clipboard'))
+
             elif key == ord('C') and ctrldown and altdown:
                 if self.active_array is None:
                     dlg = wx.MessageDialog(self,
@@ -8183,8 +8198,21 @@ class WolfMapViewer(wx.Frame):
                 self.copyfrom = self.active_array
                 self.mimicme_copyfrom()  # force le recopiage de copyfrom dans les autres matrices liées
 
+                if len(self.active_array.SelectionData.myselection) > 5000:
+                    dlg = wx.MessageDialog(self, _('The selection is large, copy to clipboard may be slow ! -- Continue?'), style=wx.OK | wx.CANCEL)
+                    ret = dlg.ShowModal()
+
+                    if ret == wx.ID_CANCEL:
+                        logging.info(_('Copy script to clipboard cancelled -- But source array is well defined !'))
+                        dlg.Destroy()
+                        return
+
+                    dlg.Destroy()
+
                 self.active_array.SelectionData.copy_to_clipboard(typestr='script')
 
+                logging.info(_('Selection copied to clipboard as script (Python)'))
+
             elif key == ord('V') and ctrldown:
                 # CTRL+V
                 # CTRL+ALT+V ou Alt Gr + V
@@ -8223,7 +8251,7 @@ class WolfMapViewer(wx.Frame):
                         self.active_array.SelectionData.update_nb_nodes_selection()
 
                 else:
-                    logging.info(_('Copy selection values'))
+                    logging.info(_('Paste selection values'))
                     if cursel == 'all':
                         self.active_array.paste_all(fromarray)
 
@@ -8233,6 +8261,8 @@ class WolfMapViewer(wx.Frame):
 
                 self.Refresh()
 
+                logging.info(_('Selection/Values pasted'))
+
         else:
             if key == wx.WXK_DELETE:
                 self.removeobj()

wolfhece/PyGui.py

@@ -147,7 +147,7 @@ class MapManager(GenMapManager):
     def __init__(self,*args, **kw):
         super().__init__(*args, **kw)
 
-        icon = wx.EmptyIcon()
+        icon = wx.Icon()
 
         icon_path = Path(__file__).parent / "apps/wolf_logo.bmp"
 

wolfhece/PyVertexvectors.py

@@ -1489,6 +1489,41 @@ class vector:
                 self.xmax=max(vert.x for vert in self.myvertices)
                 self.ymax=max(vert.y for vert in self.myvertices)
 
+    @property
+    def has_interior(self):
+        """ Return True if the vector has an interior """
+
+        not_in_use = [curvert for curvert in self.myvertices if not curvert.in_use]
+
+        return len(not_in_use) > 0
+
+    def get_subpolygons(self):
+        """
+        Return a list of polygons from the vector
+
+        If the vector has no interior, the list contains the whole vector as a polygon
+        """
+
+        if self.has_interior:
+            not_in_use = [curvert for curvert in self.myvertices if not curvert.in_use]
+
+            alls = []
+            new_poly = []
+            for curvert in self.myvertices:
+                if curvert in not_in_use:
+                    alls.append(new_poly)
+                    new_poly = []
+                    new_poly.append(curvert)
+                else:
+                    new_poly.append(curvert)
+
+            if self.myprop.closed and (self.myvertices[0].x != self.myvertices[-1].x or self.myvertices[0].y != self.myvertices[-1].y):
+                alls[0].append(self.myvertices[0])
+
+            return alls
+        else:
+            return [self.myvertices]
+
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """
         Plot OpenGL
@@ -1512,24 +1547,24 @@ class vector:
             glLineWidth(float(self.myprop.width))
             #glPointSize(float(self.myprop.width))
 
-            if self.myprop.filled:
-                glBegin(GL_POLYGON)
-            else:
-                glBegin(GL_LINE_STRIP)
-
             if self.myprop.transparent:
                 glColor4ub(int(rgb[0]),int(rgb[1]),int(rgb[2]),int(self.myprop.alpha))
             else:
                 glColor3ub(int(rgb[0]),int(rgb[1]),int(rgb[2]))
 
-            for curvertex in self.myvertices:
-                glVertex2d(curvertex.x, curvertex.y)
+            all_polys = self.get_subpolygons()
 
-            if self.myprop.closed and (self.myvertices[0].x != self.myvertices[-1].x or self.myvertices[0].y != self.myvertices[-1].y):
-                curvertex = self.myvertices[0]
-                glVertex2d(curvertex.x, curvertex.y)
+            for curpoly in all_polys:
+
+                if self.myprop.filled:
+                    glBegin(GL_POLYGON)
+                else:
+                    glBegin(GL_LINE_STRIP)
+
+                for curvertex in curpoly:
+                    glVertex2d(curvertex.x, curvertex.y)
 
-            glEnd()
+                glEnd()
 
             glPolygonMode(GL_FRONT_AND_BACK,GL_LINE)
             glDisable(GL_BLEND)
@@ -1609,6 +1644,8 @@ class vector:
         if self.mytree is not None:
             self.mytree.UncheckItem(self.myitem)
 
+        self.parentzone.reset_listogl()
+
     def use(self):
         """
         L'objet n'est plus à utiliser
@@ -1617,6 +1654,9 @@ class vector:
         if self.mytree is not None:
             self.mytree.CheckItem(self.myitem)
 
+
+        self.parentzone.reset_listogl()
+
     def fillgrid(self,gridto:CpGrid):
         """
         Remplissage d'un CpGrid
@@ -2571,6 +2611,8 @@ class zone:
         if self.mytree is not None:
             self.mytree.UncheckItem(self.myitem)
 
+        self.reset_listogl()
+
     def use(self):
         """
         A utiliser
@@ -2582,6 +2624,8 @@ class zone:
         if self.mytree is not None:
             self.mytree.CheckItem(self.myitem)
 
+        self.reset_listogl()
+
     def asshapely_ls(self):
         """
         Retroune la zone comme MultiLineString Shaely

wolfhece/Results2DGPU.py

@@ -162,13 +162,32 @@ class wolfres2DGPU(Wolfresults_2D):
         # is available to class's users.
 
 
+        self._result_store = None
+        self.setup_store(store)
+        # if store is None:
+        #     if (Path(fname) / "simul_gpu_results/nb_results.txt").exists():
+        #         self._result_store = ResultsStore(sim_path = Path(fname), mode='r')
+        #     else:
+        #         logging.warning(_("No results find in the directory, please check the path to the results directory (simul_gpu_results)"))
+        # else:
+        #     self._result_store = store
+
+        self._cache = None
+
+    def setup_store(self, store = None):
+        """
+        Setup results store
+        """
+
         if store is None:
-            self._result_store = ResultsStore(sim_path = Path(fname), mode='r')
+            if self._result_store is None:
+                if (Path(self.filename) / "nb_results.txt").exists():
+                    self._result_store = ResultsStore(sim_path = Path(self.filename), mode='r')
+                else:
+                    logging.warning(_("No results find in the directory, please check the path to the results directory (simul_gpu_results)"))
         else:
             self._result_store = store
 
-        self._cache = None
-
     def setup_cache(self, start_idx:int=0, end_idx:int = -1, only_h:bool = False):
         """
         Setup cache from start_idx result to end_idx result
@@ -322,6 +341,12 @@ class wolfres2DGPU(Wolfresults_2D):
 
         Lecture du fichier de tracking afin de permettre une mise à jour en cours de calcul
         """
+        if self._result_store is None:
+            self.setup_store()
+            if self._result_store is None:
+                logging.warning(_("No results store available"))
+                return
+
         self._result_store.reload()
         if force_update_timessteps:
             self.get_times_steps()
@@ -395,6 +420,13 @@ class wolfres2DGPU(Wolfresults_2D):
         :param nb : nombre de résultats à lire
 
         """
+
+        if self._result_store is None:
+            self.setup_store()
+            if self._result_store is None:
+                logging.warning(_("No results store available"))
+                return
+
         self.times = [time[ResultType.T.value] for time in self._result_store._sim_times]
         self.timesteps = [time[ResultType.STEP_NUM.value] for time in self._result_store._sim_times]
 

wolfhece/apps/version.py

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

wolfhece/multiprojects.py

@@ -175,6 +175,7 @@ class Wolf2D_Project(Project):
         """
         Lie les palettes d'un fichier projet et leur liaison potentielle avec les matrices
         """
+
         pals = self.get_group('palette')
         if pals is None:
             return
@@ -207,6 +208,7 @@ class Wolf2D_Project(Project):
         """
         Change le mode de vue dans une vue possible de "views_2D"
         """
+
         if which in views_2D:
             with ThreadPoolExecutor() as executor:
                 for cursim in self.mysims.values():
@@ -221,10 +223,11 @@ class Wolf2D_Project(Project):
          - chaque entrée est un dictionnaire dont la clé 'values' contient une liste pour chaque matrice du projet
          - chaque élément de liste est un tuple contenant toutes les valeurs utiles
         """
+
         self.poly = zonepoly
         self.poly_values = zonepoly.get_all_values_linked_polygon(self.get_simulations())
 
-    def get_values(self,which_type):
+    def get_values(self,which_type:Union[views_2D, Literal['i','j','block']]=None):
 
         if self.poly_values is None:
             raise Warning(_('Firstly call get_values_inside with a zone as argument -- Retry !'))
@@ -341,7 +344,10 @@ class MultiProjects():
     def get_simulations_list(self, which_project=None) -> list:
         """
         Return a python list of simulations
+
+        :param which_project: str or list of str -- key(s) of the project(s) to get simulations from
         """
+
         if which_project is None:
             allsims=[]
             for curproj in self.projects.values():
@@ -349,6 +355,15 @@ class MultiProjects():
                     allsims+=curproj.get_simulations()
             return allsims
 
+        elif isinstance(which_project, list):
+            allsims=[]
+            for curkey in which_project:
+                if curkey in self.projects.keys():
+                    curproj = self.projects[curkey]
+                    if isinstance(curproj, Wolf2D_Project):
+                        allsims+=curproj.get_simulations()
+            return allsims
+
         elif which_project in self.projects.keys():
             curproj = self.projects[which_project]
             if isinstance(curproj, Wolf2D_Project):
@@ -356,10 +371,13 @@ class MultiProjects():
 
         return None
 
-    def get_simulations_dict(self, which_project=None) -> dict:
+    def get_simulations_dict(self, which_project:Union[str, list[str]]=None) -> dict:
         """
         Return a python dict of simulations
+
+        :param which_project: str or list of str -- key(s) of the project(s) to get simulations from
         """
+
         if which_project is None:
             allsims={}
             for curkey, curproj in self.projects.items():
@@ -367,6 +385,15 @@ class MultiProjects():
                     allsims[curkey] = curproj.get_simulations()
             return allsims
 
+        elif isinstance(which_project, list):
+            allsims={}
+            for curkey in which_project:
+                if curkey in self.projects.keys():
+                    curproj = self.projects[curkey]
+                    if isinstance(curproj, Wolf2D_Project):
+                        allsims[curkey] = curproj.get_simulations()
+            return allsims
+
         elif which_project in self.projects.keys():
             curproj = self.projects[which_project]
             if isinstance(curproj, Wolf2D_Project):
@@ -374,7 +401,9 @@ class MultiProjects():
 
         return None
 
-    def set_currentview(self, which):
+    def set_currentview(self, which:views_2D):
+        """ Change le mode de vue dans une vue possible de 'views_2D' """
+
         for curproj in self.projects.values():
             if isinstance(curproj, Wolf2D_Project):
                 curproj.set_currentview(which)

wolfhece/pypolygons_scen.py

@@ -235,6 +235,8 @@ class Polygons_Analyze(Zones):
 
         self.myname = splitext(basename(myfile))[0]
 
+        self.linked = {}
+
         self.riverbed = self.get_zone(0).myvectors[1]
         self.riverbed.prepare_shapely()
 
@@ -247,23 +249,23 @@ class Polygons_Analyze(Zones):
         for vec in self.polygons_zone.myvectors:
             vec.myprop.used=False # cache les polygones pour ne pas surcharger l'affichage éventuel
 
-    def colorize(self):
-        """Colorisation des polygones pour l'interface graphique"""
-        self.centralpart.myprop.color = getIfromRGB((0,255,0))
-        self.upstream.myprop.color = getIfromRGB((255,0,0))
-        self.downstream.myprop.color = getIfromRGB((0,0,255))
+    # def colorize(self):
+    #     """Colorisation des polygones pour l'interface graphique"""
+    #     self.centralpart.myprop.color = getIfromRGB((0,255,0))
+    #     self.upstream.myprop.color = getIfromRGB((255,0,0))
+    #     self.downstream.myprop.color = getIfromRGB((0,0,255))
 
-    def highlighting(self, rgb=(255,0,0), linewidth=3):
-        """
-        Mise en évidence
-        """
-        self.centralpart.highlighting(rgb,linewidth)
+    # def highlighting(self, rgb=(255,0,0), linewidth=3):
+    #     """
+    #     Mise en évidence
+    #     """
+    #     self.centralpart.highlighting(rgb,linewidth)
 
-    def withdrawal(self):
-        """
-        Mise en retrait
-        """
-        self.centralpart.withdrawal()
+    # def withdrawal(self):
+    #     """
+    #     Mise en retrait
+    #     """
+    #     self.centralpart.withdrawal()
 
     def compute_distance(self, poly:LineString):
         """
@@ -274,7 +276,7 @@ class Polygons_Analyze(Zones):
             centery = np.sum(np.asarray([cur.y for cur in curvert.myvertices[:4]]))/4.
             self.polygons_curvi[curvert.myname] = poly.project(Point([centerx,centery]))
 
-    def find_values_inside_parts(self, linked_arrays):
+    def find_values_inside_parts(self, linked_arrays, force_reset = False):
         """
         Récupère les valeurs à l'intérieur :
          - des parties du pont (amont, centrale, aval)
@@ -290,8 +292,9 @@ class Polygons_Analyze(Zones):
         ***
 
         """
+        if force_reset:
+            self.linked={}
 
-        self.linked={}
         for curkey, curgroup in linked_arrays.items():
             self.linked[curkey] = [(curlink.idx, type(curlink)) for curlink in curgroup]
 
@@ -407,18 +410,23 @@ class Polygons_Analyze(Zones):
                 curdict = vals_ret[curkeypoly]={}
                 for curkey, curvals in curpoly.items():
                     if curvals is not None:
-                        if operator == operators.MEDIAN:
-                            curdict[curkey] = np.median(curvals)
-                        elif operator == operators.MIN:
-                            curdict[curkey] = np.min(curvals)
-                        elif operator == operators.MAX:
-                            curdict[curkey] = np.max(curvals)
-                        elif operator == operators.PERCENTILE95:
-                            curdict[curkey] = np.percentile(curvals,95)
-                        elif operator == operators.PERCENTILE5:
-                            curdict[curkey] = np.percentile(curvals,5)
-                        elif operator == operators.ALL:
-                            curdict[curkey] =  (np.median(curvals), np.min(curvals), np.max(curvals), np.percentile(curvals,95), np.percentile(curvals,5))
+                        try:
+                            if operator == operators.MEDIAN:
+                                curdict[curkey] = np.median(curvals)
+                            elif operator == operators.MIN:
+                                curdict[curkey] = np.min(curvals)
+                            elif operator == operators.MAX:
+                                curdict[curkey] = np.max(curvals)
+                            elif operator == operators.PERCENTILE95:
+                                curdict[curkey] = np.percentile(curvals,95)
+                            elif operator == operators.PERCENTILE5:
+                                curdict[curkey] = np.percentile(curvals,5)
+                            elif operator == operators.ALL:
+                                curdict[curkey] =  (np.median(curvals), np.min(curvals), np.max(curvals), np.percentile(curvals,95), np.percentile(curvals,5))
+                        except:
+                            logging.error(_('Error in extract_info for key {0}').format(curkey))
+                            curdict[curkey] = -1.
+
             return vals_ret
 
         vals = self.get_river_values(which_value, which_group)

wolfhece/scenario/config_manager.py

@@ -30,7 +30,7 @@ from ..PyHydrographs import Hydrograph
 from .update_void import Update_Sim
 from ..Results2DGPU import wolfres2DGPU
 from ..PyParams import Wolf_Param
-from ..PyVertexvectors import Zones, zone, vector, wolfvertex
+from ..PyVertexvectors import Zones, zone, vector, wolfvertex, getIfromRGB, getRGBfromI
 
 # WOLFGPU
 try:
@@ -621,10 +621,40 @@ class Config_Manager_2D_GPU:
 
         return tif_list
 
+    def check_nodata(self, from_path:Path):
+        """ Check nodata in a path """
+
+        curtree = self.get_tree(from_path)
+        curdicts = self.get_dicts(curtree)
+
+        # tous les fichiers tif -> list of lists
+        all_tif_bath = [self._select_tif_partname(curdict, 'bath') for curdict in curdicts]
+        all_tif_mann = [self._select_tif_partname(curdict, 'mann') for curdict in curdicts]
+        all_tif_infil = [self._select_tif_partname(curdict, 'infil') for curdict in curdicts]
+
+        # flatten list of lists
+        all_tif_bath = [curel for curlist in all_tif_bath if len(curlist)>0 for curel in curlist]
+        all_tif_mann = [curel for curlist in all_tif_mann if len(curlist)>0 for curel in curlist]
+        all_tif_infil = [curel for curlist in all_tif_infil if len(curlist)>0 for curel in curlist]
+
+        for cur_lst in [all_tif_bath, all_tif_mann, all_tif_infil]:
+            for cur_tif in cur_lst:
+                curarray:WolfArray = WolfArray(cur_tif)
+                if curarray.nullvalue != 99999.:
+                    curarray.nullvalue = 99999.
+                    curarray.set_nullvalue_in_mask()
+                    curarray.write_all()
+                    logging.warning(_('Bad nodata value for {} !'.format(cur_tif.name)))
+
 
     def create_vrt(self, from_path:Path):
         """ Create a vrt file from a path """
 
+        logging.info(_('Checking virtual files...'))
+
+        logging.info(_('Checking nodata values...'))
+        self.check_nodata(from_path)
+
         curtree = self.get_tree(from_path)
         curdicts = self.get_dicts(curtree)
 
@@ -658,20 +688,47 @@ class Config_Manager_2D_GPU:
         all_tif = [self._select_tif_partname(curdict, which) for curdict in curdicts]
 
         # création du fichier vect
-        new_zones = Zones(idx = from_path.name)
+        new_zones = Zones(idx = from_path.name, parent=self)
 
         for cur_list in all_tif:
             if len(cur_list)>0:
+
+                logging.info(_('Treating {} files...'.format(len(cur_list))))
+
                 for curtif in cur_list:
+
+                    logging.info(_('Start : {} file...'.format(curtif.name)))
+
                     new_zone = zone(name = curtif.name, parent = new_zones)
                     new_zones.add_zone(new_zone)
 
                     curarray = WolfArray(curtif)
                     sux, sux, curvect, interior = curarray.suxsuy_contour()
                     new_zone.add_vector(curvect, forceparent=True)
-                    curvect.myprop.legendtext = curtif.name
+                    curvect.set_legend_to_centroid(curtif.name)
+                    curvect.myprop.color = getIfromRGB((0, 0, 255))
+                    curvect.myprop.width = 3
+
+                    bounds = curarray.get_bounds()
+                    bounds_vec = vector(name='bounds')
+
+                    bounds_vec.add_vertex(wolfvertex(bounds[0][0], bounds[1][0]))
+                    bounds_vec.add_vertex(wolfvertex(bounds[0][1], bounds[1][0]))
+                    bounds_vec.add_vertex(wolfvertex(bounds[0][1], bounds[1][1]))
+                    bounds_vec.add_vertex(wolfvertex(bounds[0][0], bounds[1][1]))
+                    bounds_vec.close_force()
+
+                    bounds_vec.myprop.color = getIfromRGB((255, 0, 0))
+                    bounds_vec.myprop.width = 3
+
+                    new_zone.add_vector(bounds_vec, forceparent=True)
+
+                    logging.info(_('End : {} file...'.format(curtif.name)))
+
+        new_zones.find_minmax(update=True)
+        new_zones.saveas(str(from_path / (which +'_assembly.vecz')))
 
-        new_zones.saveas(from_path / (which +'_assembly.vec'))
+        logging.info(_(f'End of {which}_assembly.vecz creation !'))
 
         return new_zones
 
@@ -1049,6 +1106,10 @@ class Config_Manager_2D_GPU:
         # Execute the batch file in a separate process
         subprocess.Popen(str(batch), shell=True)
 
+    def get_mapviewer(self):
+        """ Get the mapviewer object """
+
+        return self.mapviewer
 
 
 class UI_Manager_2D_GPU():
@@ -1154,9 +1215,9 @@ class UI_Manager_2D_GPU():
         self._translate_vrt.Bind(wx.EVT_BUTTON,self.ontranslatevrt2tif)
         self._translate_vrt.SetToolTip(_('Translate .vrt files to .tif files\n\n - __bath_assembly.vrt -> __bathymetry.tif\n - __mann_assembly.vrt -> __manning.tif\n - __infil_assembly.vrt -> __infiltration.tif'))
 
-        self._create_vec = wx.Button(self._frame,label = _('Create .vec from current level'))
+        self._create_vec = wx.Button(self._frame,label = _('Search spatial coverage from current level'))
         self._create_vec.Bind(wx.EVT_BUTTON,self.oncreatevec)
-        self._create_vec.SetToolTip(_('Create a .vec file from all bathymetry and manning .tif files\nBe sure that all files are right named !\n\n - bathymetry must contain "bath"\n - manning must contain "mann"\n - infiltration must contain "infil"'))
+        self._create_vec.SetToolTip(_('Create a .vecz file (with contour and global bounds) from all bathymetry and manning .tif files\nBe sure that all files are right named !\n\n - bathymetry must contain "bath"\n - manning must contain "mann"\n - infiltration must contain "infil"'))
 
         self.checkconsistency = wx.Button(self._frame,label = _('Check consistency'))
         self.checkconsistency.Bind(wx.EVT_BUTTON,self.oncheck_consistency)
@@ -1321,7 +1382,18 @@ class UI_Manager_2D_GPU():
         mydata = self._treelist.GetItemData(self._selected_item)
 
         # création du fichier vrt
-        self._parent.create_vec(mydata['path'])
+        new_zones = self._parent.create_vec(mydata['path'])
+
+        dlg = wx.MessageDialog(None, _('Do you want to add the new zones to the map ?'), _('Warning'), wx.YES_NO)
+        ret = dlg.ShowModal()
+
+        if ret == wx.ID_YES:
+
+            new_zones.set_mapviewer()
+
+            self._parent.mapviewer.add_object('vector', newobj = new_zones, id=mydata['path'].name)
+
+        dlg.Destroy()
 
     def ontranslatevrt2tif(self,e:wx.MouseEvent):
         """ Traduction d'un fichier vrt en tif """

wolfhece/wolf_array.py

@@ -2041,6 +2041,14 @@ class Ops_Array(wx.Frame):
         pass
         self.parentarray.filter_zone()
 
+        dlg = wx.MessageDialog(None, _('Do you want to set null value in the masked data ?'), _('Masked data'), wx.YES_NO | wx.ICON_QUESTION)
+        ret = dlg.ShowModal()
+
+        if ret == wx.ID_YES:
+            self.parentarray.set_nullvalue_in_mask()
+
+        dlg.Destroy()
+
     def OnLabelling(self, event:wx.MouseEvent):
         """ Labelling of contiguous zones """
 
@@ -4351,6 +4359,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         labeled_array, num_features = label(labeled_array)
         # convertion en masked array
         labeled_array = ma.asarray(labeled_array)
+        labeled_array.mask = np.zeros(labeled_array.shape, dtype=bool)
         # application du masque
         labeled_array.mask[:,:] = self.array.mask[:,:]
 
@@ -7105,30 +7114,45 @@ class WolfArray(Element_To_Draw, header_wolf):
             translx += self.translx
             transly += self.transly
 
-        for i in range(self.nbx-1):
-            for j in range(self.nby-1):
-                x1 = float(i+1) * dx + translx
-                y1 = float(j+1) * dy + transly
-                if self.array.mask[i, j] ^ self.array.mask[i + 1, j]: # ^ == xor
+        # for i in range(self.nbx-1):
+        #     for j in range(self.nby-1):
+        #         x1 = float(i+1) * dx + translx
+        #         y1 = float(j+1) * dy + transly
+        #         if self.array.mask[i, j] ^ self.array.mask[i + 1, j]: # ^ == xor
+
+        #             # There's a vertical border between the cells (i,j) and
+        #             # (i+1,j).
+
+        #             # Remember vertical borders are (by convention) located
+        #             # on the left side of a cell.
+        #             # Moreover, (i,j) are counted in numpy coordinates
+        #             # (0-based) but the saved files follow Fortran convention
+        #             # (1-based), so we add +1 to both i,j before storing.
+
+        #             indicesX.append([i+2, j+1]) # +2, +1 pour être en accord avec le standard de numérotation Fortran
+        #             locls.append(LineString([[x1,y1-dy],[x1,y1]]))
 
-                    # There's a vertical border between the cells (i,j) and
-                    # (i+1,j).
+        #         if self.array.mask[i, j] ^ self.array.mask[i, j +1]:
+        #             # See vertical border's explanation above (and replace
+        #             # with horizontal).
 
-                    # Remember vertical borders are (by convention) located
-                    # on the left side of a cell.
-                    # Moreover, (i,j) are counted in numpy coordinates
-                    # (0-based) but the saved files follow Fortran convention
-                    # (1-based), so we add +1 to both i,j before storing.
+        #             indicesY.append([i+1,j+2]) # +1, +2 pour être en accord avec le standard de numérotation Fortran
+        #             locls.append(LineString([[x1-dx,y1],[x1,y1]]))
 
-                    indicesX.append([i+2, j+1]) # +2, +1 pour être en accord avec le standard de numérotation Fortran
-                    locls.append(LineString([[x1,y1-dy],[x1,y1]]))
+        horiz = np.where(self.array.mask[0:self.nbx-1,0:self.nby-1] ^ self.array.mask[1:self.nbx,0:self.nby-1])
+        vert  = np.where(self.array.mask[0:self.nbx-1,0:self.nby-1] ^ self.array.mask[0:self.nbx-1,1:self.nby])
 
-                if self.array.mask[i, j] ^ self.array.mask[i, j +1]:
-                    # See vertical border's explanation above (and replace
-                    # with horizontal).
+        for i,j in zip(horiz[0],horiz[1]):
+            x1 = float(i+1) * dx + translx
+            y1 = float(j+1) * dy + transly
+            indicesX.append([i+2, j+1])
+            locls.append(LineString([[x1,y1-dy],[x1,y1]]))
 
-                    indicesY.append([i+1,j+2]) # +1, +2 pour être en accord avec le standard de numérotation Fortran
-                    locls.append(LineString([[x1-dx,y1],[x1,y1]]))
+        for i,j in zip(vert[0],vert[1]):
+            x1 = float(i+1) * dx + translx
+            y1 = float(j+1) * dy + transly
+            indicesY.append([i+1, j+2])
+            locls.append(LineString([[x1-dx,y1],[x1,y1]]))
 
         if not locls:
             raise Exception(_("I can't detect any contour. Is this right ?"))
@@ -7172,7 +7196,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             contourgen = vector(name='external border')
             for x,y,z in xy:
                 contourgen.add_vertex(wolfvertex(x,y,z))
-                contourgen.myvertices[-1].in_use = z != 0. # the new vertex is related to a connection segment --> ignore for numerical precision in intersection operations/calculations
+                contourgen.myvertices[-1].in_use = z == 0. # the new vertex is related to a connection segment --> ignore for numerical precision in intersection operations/calculations
         else:
             contourgen = None
             err = _(f"Unsupported Shapely contour result: {contour.geom_type}")

wolfhece/wolf_vrt.py

@@ -107,6 +107,8 @@ def create_vrt_from_files_first_based(files:list[Path]=[], fout:Path='assembly.v
         ymin = geotr[3]+geotr[5]*float(nby)
         ymax = geotr[3]
 
+    locNoData = raster.GetRasterBand(1).GetNoDataValue()
+
     options = gdal.BuildVRTOptions(resolution='user',
                                    xRes=abs(geotr[1]),
                                    yRes=abs(geotr[5]),

{wolfhece-2.1.5.dist-info → wolfhece-2.1.7.dist-info}/METADATA

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

{wolfhece-2.1.5.dist-info → wolfhece-2.1.7.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=2pGgV1VwE-zfCiJnrPbJrjKfCG41ARhGTo_sF_kpd-s,376852
-wolfhece/PyGui.py,sha256=vyqeacfPXvMZJXBo5GLn1ZsygA8HhKBeZJR6UCWGVSg,104777
+wolfhece/PyDraw.py,sha256=WJDGhaD7N6udY5WUynS9f-26FQ6Uj0bJZFM2gxkzuWU,378354
+wolfhece/PyGui.py,sha256=VKE785z9XLIWNbxqpyEceLK_wtmPJyq6A_M_qX_94Lg,104772
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=_Nm2Lc4UxYlZgK8ifZDioG8a0at8oiteYC0x_4XugFc,24384
@@ -15,13 +15,13 @@ wolfhece/PyParams.py,sha256=361iy9b9zTjoPCj9gh8-OIo0TBW5laLG87AkWE6f_eg,96290
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=dHTjyYYTn0F_NWerlAOBKHV79RUzEEtMJMldQtVc1Cs,40092
-wolfhece/PyVertexvectors.py,sha256=Av1OqFrDtZUAXAjaTnoGGErzK4W9gJhVx0LxgULLcTA,222335
+wolfhece/PyVertexvectors.py,sha256=fp5iCndmybEJij-n_SUrv-Q_Zm3RYn2BwYvPiZuCUwk,223514
 wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
 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=nnocfThV6RIjWR_CeeOiUHDvL4GGItRtd9-G7oCGmkU,18936
+wolfhece/Results2DGPU.py,sha256=kUgLZhUbqVVl-LNQX_GghmU70b0IQHoye3bpAy3hPno,20238
 wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
 wolfhece/cli.py,sha256=rHxZGgs_R776VCWhs36pYFoiuiQycwgGTVOLK-JNzjE,1937
@@ -34,13 +34,13 @@ wolfhece/import_ascfiles.py,sha256=jg4urcLdSgFS1Knvh7AVGJqM44qc_uYDNrR568tMh-A,4
 wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
 wolfhece/irm_qdf.py,sha256=749SlAXiN1oXp5tfBJoPNJWxydQlY55K0qvIM5YexlM,15436
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
-wolfhece/multiprojects.py,sha256=AMwEQZqo1Twh6tSPP-4L29-Fa8cI9d6dWce7l88awws,14675
+wolfhece/multiprojects.py,sha256=DdObaugeNrd2I7rtWd6M5W0nVXN8KRVmcXLjMg9oqYs,15795
 wolfhece/picc.py,sha256=KKPNk1BEe7QBzo2icIsdsxUopJ1LXYTomfdfeG2gCeA,7419
 wolfhece/pyGui1D.py,sha256=pzLWXQ_w3Y_yI846w1GklFO9h5lWZOqiUzg1BUPkuRI,121616
 wolfhece/pybridges.py,sha256=HJ1BL1HC7UrgpQ-3jKXkqPFmc-TzToL28Uex2hjHk6c,57166
 wolfhece/pydike.py,sha256=G4jfSZaAHHr4VWEJqnXSvEswXvlOz1yhbhQ6uu3AqyM,1943
 wolfhece/pylogging.py,sha256=i9Zugx3t9dPc7nBwcP20L_R4_k_WawpAQsvbZU8l9Hg,4230
-wolfhece/pypolygons_scen.py,sha256=lrUty990vT1iiILiIuTY8pNStiaZOi2dXWJuL9C-4Ps,26211
+wolfhece/pypolygons_scen.py,sha256=BAo1tg8rJGkmKlEyTbb8gnofk-aPbrKunE2-0YWNaHQ,26581
 wolfhece/pyshields.py,sha256=YS6VVjjzoA-ZR6YRccqjMcW3McNqNLoQODC6TNNkmPw,22983
 wolfhece/pyviews.py,sha256=hYdyrEvWF48dGBDOLIwmC28C0L8I28U4ohXk9nltF94,9666
 wolfhece/pywalous.py,sha256=GRS5TKoVT0J-3PBqMdlyFRHrqkdYC-uHgDPcMjoDEZw,18674
@@ -48,11 +48,11 @@ wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
 wolfhece/test_Results2DGPU.py,sha256=NOJ_hFXrcLSQXS1dtsqXRQltqIZtDSHMz_EgAJ2_FHU,307
 wolfhece/textpillow.py,sha256=zEfLrKhfCDyMaVuQOUjHqz6MGKeQ4aewMxOsWi5-wKI,13832
 wolfhece/tools_mpl.py,sha256=q8Yc4aukPPiUcEzREvZRM_em67XqXaahdoaNt0DETfE,266
-wolfhece/wolf_array.py,sha256=8NEN6yAVDOlhc_fQlZeO6V3h9KgYCtZARCCTHq8F1c4,329867
+wolfhece/wolf_array.py,sha256=003bWiCVDjfkCGEDp1ZRZd4xVtufYuGiAK7sC9VJycY,330960
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
-wolfhece/wolf_vrt.py,sha256=yu_bWhw3yrZSc16zCf78vyiD_X93x126wwW3tWimaBk,10211
+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/xyz_file.py,sha256=aQOcTHkHRhXHxL_WxTHwzygp6e47San7SHSpxKQU0dw,5457
@@ -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=qThNbWPus4Eoal744IqgA9Y2OXgnS7Y9UIsQeVikGzc,387
+wolfhece/apps/version.py,sha256=QnnuNPQqjbCKaqce2cE43Ky9-bjQgDRUR3St4eC7HII,387
 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
@@ -243,7 +243,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=nFiCscEGHyz1YvjmZoKlYrfmW03-nLiDTDdRoeE6MUs,4619
-wolfhece/scenario/config_manager.py,sha256=cqAIZeBT52ixOUhBE3z7LRgtoQdt7rjEs3N81kmD9lU,74223
+wolfhece/scenario/config_manager.py,sha256=SValpikuNt_XaJXt8P7kAu6iN_N5YlohyL8ry3iT380,77389
 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
@@ -264,8 +264,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.5.dist-info/METADATA,sha256=kKeoABb_oeKVIscNeEIVN3yTgy83__gUhVILC8tSi90,2281
-wolfhece-2.1.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wolfhece-2.1.5.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.5.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.5.dist-info/RECORD,,
+wolfhece-2.1.7.dist-info/METADATA,sha256=tv3E_t--2aA71zEbF4xRjwE3klu3AAVpHUIzRBLFVH8,2281
+wolfhece-2.1.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wolfhece-2.1.7.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.7.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.7.dist-info/RECORD,,