wolfhece 2.1.0__py3-none-any.whl → 2.1.2__py3-none-any.whl

wolfhece/GraphProfile.py

@@ -547,7 +547,7 @@ class PlotCSAll(ProfilePanel):
             self.mapviewer.set_active_vector(self.mycs)    #To avoid visual confusions, we set the profile as the active vector in wolfhece.pydraw
             self.mycs.color_active_profile(plot_opengl= True)        #we thicken and color the profile in red.
             size = 200
-            self.mapviewer.zoomon_active_profile(size=size)    #We zoom on the profile in the gui.
+            self.mapviewer.zoom_on_active_profile(size=size)    #We zoom on the profile in the gui.
             self.mapviewer.Paint()                             #We take the visual information in the GUI necessary for a screen shot.
             self.mapviewer.display_canvasogl(fig= fig, ax = ax3) #We return a clear screen shot of the wolfpy GUI as a matplolib graph (ax).
         else:

wolfhece/PyDraw.py

@@ -108,6 +108,108 @@ class draw_type(Enum):
     WMSFORE = 'wms-foreground'
     TILES = 'tiles'
 
+
+class DragdropFileTarget(wx.FileDropTarget):
+    def __init__(self, window:"WolfMapViewer"):
+        wx.FileDropTarget.__init__(self)
+        self.window = window
+
+    def OnDropFiles(self, x, y, filenames):
+
+        def test_if_array(filename):
+
+            ext = Path(filename).suffix
+
+            if ext.lower() in ['.bin', '.npy', '.hbin', '.qxin','.qybin', '.top',
+                               '.kbin', '.epsbin', '.tif', '.frot', '.topini_fine']:
+                return True
+            else:
+                return False
+
+        def test_if_arrayMB(filename):
+
+            ext = Path(filename).suffix
+
+            if ext.lower() in ['.hbinb', '.qxbinb','.qybinb', '.kbinb',
+                               '.epsbinb', '.topini', '.frotini']:
+                return True
+            else:
+                return False
+
+        def test_if_vector(filename):
+            ext = Path(filename).suffix
+
+            if ext.lower() in ['.vec', '.vecz', '.shp', '.dxf']:
+                return True
+            else:
+                return False
+
+        def test_if_cloud(filename):
+            ext = Path(filename).suffix
+
+            if ext.lower() in ['.xyz']:
+                return True
+            else:
+                return False
+
+        for name in filenames:
+
+            if Path(name).is_dir():
+                for file in scandir(name):
+                    if file.is_file():
+                        self.OnDropFiles(x, y, [file.path])
+                continue
+
+            if test_if_array(name):
+                ids = self.window.get_list_keys(draw_type.ARRAYS)
+                id = Path(name).stem
+                while id in ids:
+                    id = id + '_1'
+
+                try:
+                    newobj = WolfArray(fname=name)
+                    self.window.add_object('array', newobj = newobj, id  = id)
+                except:
+                    logging.error(_('Error while loading array : ') + name)
+
+            elif test_if_arrayMB(name):
+                ids = self.window.get_list_keys(draw_type.ARRAYS)
+                id = Path(name).stem
+                while id in ids:
+                    id = id + '_1'
+
+                try:
+                    newobj = WolfArrayMB(fname=name)
+                    self.window.add_object('array', newobj = newobj, id  = id)
+                except:
+                    logging.error(_('Error while loading array : ') + name)
+
+            elif test_if_vector(name):
+                ids = self.window.get_list_keys(draw_type.VECTORS)
+                id = Path(name).stem
+                while id in ids:
+                    id = id + '_1'
+
+                try:
+                    newobj = Zones(filename=name)
+                    self.window.add_object('vector', newobj = newobj, id  = id)
+                except:
+                    logging.error(_('Error while loading vector : ') + name)
+
+            elif test_if_cloud(name):
+                ids = self.window.get_list_keys(draw_type.CLOUD)
+                id = Path(name).stem
+                while id in ids:
+                    id = id + '_1'
+
+                try:
+                    newobj = cloud_vertices(fname=name)
+                    self.window.add_object('cloud', newobj = newobj, id  = id)
+                except:
+                    logging.error(_('Error while loading cloud : ') + name)
+
+        return True
+
 class WolfMapViewer(wx.Frame):
     """
     Fenêtre de visualisation de données WOLF grâce aux WxWidgets
@@ -228,6 +330,9 @@ class WolfMapViewer(wx.Frame):
         self.treewidth = treewidth
         super(WolfMapViewer, self).__init__(wxparent, title=title, size=(w + self.treewidth, h))
 
+        self._dragdrop = DragdropFileTarget(self)
+        self.SetDropTarget(self._dragdrop)
+
         # Gestion des menus
         self.popupmenu = wx.Menu()
         self.popupmenu.Bind(wx.EVT_MENU, self.OnPopupItemSelected)
@@ -328,30 +433,40 @@ class WolfMapViewer(wx.Frame):
         self.filemenu.AppendSeparator()
         addscan = self.filemenu.Append(wx.ID_FILE5, _('Recursive scan...'), _('Add recursively'))
 
-        self.toolsmenu = wx.Menu()
-        self.link_cs_zones = self.toolsmenu.Append(wx.ID_ANY, _("Link cross sections to active zones"),
+        # Tools
+        # ----------------
+
+        self.tools_menu = wx.Menu()
+
+        self.menu_contour_from_arrays = self.tools_menu.Append(wx.ID_ANY, _("Create contour from checked arrays..."), _("Create contour"))
+
+        # Cross sections
+        # ----------------
+
+        self.cs_menu = wx.Menu()
+        self.link_cs_zones = self.cs_menu.Append(wx.ID_ANY, _("Link cross sections to active zones"),
                                                    _("Link cross section"))
-        self.sortalong = self.toolsmenu.Append(ID_SORTALONG, _("Sort along..."),
+        self.sortalong = self.cs_menu.Append(ID_SORTALONG, _("Sort along..."),
                                                _("Sort cross sections along support vector"))
-        self.select_cs = self.toolsmenu.Append(ID_SELECTCS, _("Pick one cross section"), _("Select cross section"),
+        self.select_cs = self.cs_menu.Append(ID_SELECTCS, _("Pick one cross section"), _("Select cross section"),
                                                kind=wx.ITEM_CHECK)
-        self.menumanagebanks = self.toolsmenu.Append(wx.ID_ANY, _("Manage banks..."), _("Manage banks"))
-        self.menucreatenewbanks = self.toolsmenu.Append(wx.ID_ANY, _("Create banks from vertices..."),
+        self.menumanagebanks = self.cs_menu.Append(wx.ID_ANY, _("Manage banks..."), _("Manage banks"))
+        self.menucreatenewbanks = self.cs_menu.Append(wx.ID_ANY, _("Create banks from vertices..."),
                                                         _("Manage banks"))
-        self.renamecs = self.toolsmenu.Append(wx.ID_ANY, _("Rename cross sections..."), _("Rename"))
-        self.menutrianglecs = self.toolsmenu.Append(wx.ID_ANY, _("Triangulate cross sections..."), _("Triangulate"))
-        self.menuexportgltfonebyone = self.toolsmenu.Append(wx.ID_ANY, _("Export cross sections to gltf..."),
+        self.renamecs = self.cs_menu.Append(wx.ID_ANY, _("Rename cross sections..."), _("Rename"))
+        self.menutrianglecs = self.cs_menu.Append(wx.ID_ANY, _("Triangulate cross sections..."), _("Triangulate"))
+        self.menuexportgltfonebyone = self.cs_menu.Append(wx.ID_ANY, _("Export cross sections to gltf..."),
                                                             _("Export gltf"))
-        self.menupontgltfonebyone = self.toolsmenu.Append(wx.ID_ANY, _("Create bridge and export gltf..."),
+        self.menupontgltfonebyone = self.cs_menu.Append(wx.ID_ANY, _("Create bridge and export gltf..."),
                                                           _("Bridge gltf"))
         # self.menuimport3dfaces_from_DXF = self.toolsmenu.Append(wx.ID_ANY, _("Import triangulation..."), _("DXF"))
-        self.menuinteractptri = self.toolsmenu.Append(wx.ID_ANY, _("Interpolate on active triangulation..."), _("InterpolateTri"))
-        self.menucomparecloud = self.toolsmenu.Append(wx.ID_ANY, _("Compare cloud to array..."), _("Comparison"))
-        self.menucomparetri = self.toolsmenu.Append(wx.ID_ANY, _("Compare triangles to array..."), _("Comparison"))
+        self.menuinteractptri = self.cs_menu.Append(wx.ID_ANY, _("Interpolate on active triangulation..."), _("InterpolateTri"))
+        self.menucomparecloud = self.cs_menu.Append(wx.ID_ANY, _("Compare cloud to array..."), _("Comparison"))
+        self.menucomparetri = self.cs_menu.Append(wx.ID_ANY, _("Compare triangles to array..."), _("Comparison"))
 
         #Profile plots
         #The action for plotting cross section's profile is initialised.
-        self.plot_cs = self.toolsmenu.Append(ID_PLOTCS, _("Plot cross section"),_("Plot cross section"),kind=wx.ITEM_CHECK)
+        self.plot_cs = self.cs_menu.Append(ID_PLOTCS, _("Plot cross section"),_("Plot cross section"),kind=wx.ITEM_CHECK)
 
         self.menuviewerinterpcs = None
         self.menuinterpcs = None
@@ -455,7 +570,8 @@ class WolfMapViewer(wx.Frame):
         # ajout du menu pour les données LAZ
         self.menu_laz()
 
-        self.menubar.Append(self.toolsmenu, _('&Cross sections'))
+        self.menubar.Append(self.tools_menu, _('&Tools'))
+        self.menubar.Append(self.cs_menu, _('&Cross sections'))
 
         self.menubar.Append(self.minmaxmenu, _('&Colormap'))
         self.menubar.Append(self.analyzemenu, _('&Analyze'))
@@ -465,6 +581,8 @@ class WolfMapViewer(wx.Frame):
 
         # Ajout du conteneur OpenGL
         self.canvas = GLCanvas(self)
+        self.canvas.SetDropTarget(self._dragdrop)
+
         self.context = GLContext(self.canvas)
         self.mybackisloaded = False
         self.myfrontisloaded = False
@@ -1615,10 +1733,10 @@ class WolfMapViewer(wx.Frame):
         self.add_object('vector', newobj=self.myinterp.myzones, ToCheck=False, id='Interp_mesh')
 
         if self.menuviewerinterpcs is None:
-            self.menuviewerinterpcs = self.toolsmenu.Append(wx.ID_ANY, _("New cloud Viewer..."),
+            self.menuviewerinterpcs = self.cs_menu.Append(wx.ID_ANY, _("New cloud Viewer..."),
                                                             _("Cloud viewer Interpolate"))
         if self.menuinterpcs is None:
-            self.menuinterpcs = self.toolsmenu.Append(wx.ID_ANY, _("Interpolate on active array..."), _("Interpolate"))
+            self.menuinterpcs = self.cs_menu.Append(wx.ID_ANY, _("Interpolate on active array..."), _("Interpolate"))
 
     def interpolate_cloud(self):
         """
@@ -3023,6 +3141,113 @@ class WolfMapViewer(wx.Frame):
                     if cur is not self:
                         cur.update()
 
+    def zoom_on_id(self, id:str, draw_type:draw_type = draw_type.ARRAYS, forceupdate=True, canvas_height=1024):
+        """
+        Zoom on id
+
+        :param id: id of the object to zoom on
+        :param drawtype: type of object to zoom on - Different types elements can have the same id
+
+        """
+
+        if draw_type not in [draw_type.ARRAYS, draw_type.VECTORS]:
+            logging.warning(_('Draw type must be either ARRAYS or VECTORS'))
+            return
+
+        obj = self.get_obj_from_id(id, draw_type)
+
+        if obj is None:
+            logging.warning(_('No object found with id {} and drawtype {}'.format(id, draw_type)))
+            return
+
+        if draw_type == draw_type.ARRAYS:
+            self.zoom_on_array(obj, forceupdate=forceupdate, canvas_height=canvas_height)
+        elif draw_type == draw_type.VECTORS:
+            self.zoom_on_vector(obj, forceupdate=forceupdate, canvas_height=canvas_height)
+
+    def zoom_on_array(self, array:WolfArray, forceupdate=True, canvas_height=1024):
+        """ Zoom on array """
+
+        if array.xmin == -99999:
+            array.find_minmax()
+
+        bounds = array.get_bounds()
+
+        center = [(bounds[0][1] + bounds[0][0]) / 2., (bounds[1][1] + bounds[1][0]) / 2.]
+        width  = bounds[0][1] - bounds[0][0]
+        height = bounds[1][1] - bounds[1][0]
+
+        self.zoom_on({'center':center, 'width':width, 'height':height}, forceupdate=forceupdate, canvas_height=canvas_height)
+
+    def zoom_on_vector(self, vector:vector, forceupdate=True, canvas_height=1024):
+        """ Zoom on vector """
+
+        if vector.xmin == -99999:
+            vector.find_minmax()
+
+        bounds = vector.get_bounds_xx_yy()
+
+        center = [(bounds[0][1] + bounds[0][0]) / 2., (bounds[1][1] + bounds[1][0]) / 2.]
+        width  = bounds[0][1] - bounds[0][0]
+        height = bounds[1][1] - bounds[1][0]
+
+        self.zoom_on({'center':center, 'width':width, 'height':height}, forceupdate=forceupdate, canvas_height=canvas_height)
+
+    def create_Zones_from_arrays(self, arrays:list[WolfArray], id:str = None, add_legend:bool=True) -> Zones:
+        """
+        Create a Zones instance from list of WolfArrays
+
+        One zone per array.
+
+        One vector per zone with the masked contour.
+
+        :param arrays: list of WolfArrays
+        :param id: id of the Zones instance
+        :param add_legend: add legend to the vector -- centroid of the contour
+
+        """
+
+        # création de l'instance de Zones
+        new_zones = Zones(idx = 'contour' if id is None else id.lower(), mapviewer=self)
+
+        for curarray in arrays:
+
+            if isinstance(curarray, WolfArray):
+
+                curarray.nullify_border(1)
+
+                new_zone = zone(name = curarray.idx)
+                new_zones.add_zone(new_zone, forceparent=True)
+
+                sux, sux, curvect, interior = curarray.suxsuy_contour()
+                new_zone.add_vector(curvect, forceparent=True)
+
+                curvect.set_legend_to_centroid(curarray.idx)
+                curvect.myprop.width = 2
+
+                rectvect = vector(name = 'rect_boundary')
+                new_zone.add_vector(rectvect, forceparent=True)
+
+                bounds = curarray.get_bounds()
+
+                rectvect.add_vertex(wolfvertex(bounds[0][0], bounds[1][0]))
+                rectvect.add_vertex(wolfvertex(bounds[0][1], bounds[1][0]))
+                rectvect.add_vertex(wolfvertex(bounds[0][1], bounds[1][1]))
+                rectvect.add_vertex(wolfvertex(bounds[0][0], bounds[1][1]))
+                rectvect.close_force()
+
+                rectvect.myprop.color = getIfromRGB([255,0,0])
+                rectvect.myprop.width = 2
+
+                logging.info(_('{} treated'.format(curarray.idx)))
+            else:
+                logging.warning(_('All elements in the list must be of type WolfArray'))
+
+        new_zones.find_minmax(update=True)
+
+        return new_zones
+
+
     def zoom_on(self, zoom_dict = None, width = 500, height = 500, center = None, xll = None, yll = None, forceupdate=True, canvas_height=1024):
         """
         Zoom on a specific area
@@ -3102,7 +3327,7 @@ class WolfMapViewer(wx.Frame):
                     if cur is not self:
                         cur.update()
 
-    def zoomon_active_profile(self, size:float=500., forceupdate:bool=True):
+    def zoom_on_active_profile(self, size:float=500., forceupdate:bool=True):
         """ Zoom on active profile """
 
         curvec = self.active_profile
@@ -4280,6 +4505,12 @@ class WolfMapViewer(wx.Frame):
         elif itemlabel==_("Compare triangles to array..."):
             self.compare_tri2array()
 
+        elif itemlabel ==  _("Create contour from checked arrays..."):
+
+            # Create contour from checked arrays and add it to the list of objects
+            newzones = self.create_Zones_from_arrays(self.get_list_objects(draw_type.ARRAYS, checked_state=True))
+            self.add_object('vector', newobj=newzones, ToCheck=True, id='Contours from arrays')
+
         elif itemlabel == _("Create bridge and export gltf..."):
 
             if self.active_cs is None:
@@ -5873,6 +6104,7 @@ class WolfMapViewer(wx.Frame):
 
     def get_obj_from_treeitem(self, treeitem):
         """ Find the object associated with treeitem """
+
         return self.treelist.GetItemData(treeitem)
 
     def getobj_from_id(self, id: str):
@@ -5887,6 +6119,24 @@ class WolfMapViewer(wx.Frame):
                 except:
                     return None
 
+    def get_obj_from_id(self, id: str, drawtype: draw_type):
+        """ Find the object associated with id in a specifid drawtype
+
+        If you want to search in all drawtypes, use getobj_from_id instead.
+
+        :param id: str : id of the object
+        :param drawtype: draw_type : type of object to search
+
+        """
+
+        keys = self.get_list_keys(draw_type, checked_state=None)
+        if id.lower() in keys:
+            try:
+                idx = keys.index(id.lower())
+                return self.get_list_objects(draw_type, checked_state=None)[idx]
+            except:
+                return None
+
     def _get_list(self, drawing_type:draw_type):
         """ return the list of objects of type drawing_type """
 
@@ -6610,7 +6860,7 @@ class WolfMapViewer(wx.Frame):
 
             #on met le profil en rouge et plus épais
             self.active_profile.color_active_profile()
-            self.zoomon_active_profile()
+            self.zoom_on_active_profile()
 
             self.Paint()
 
@@ -8564,6 +8814,8 @@ class WolfMapViewer(wx.Frame):
         return [cur.idx for cur in self.mywmsfore]
 
     def check_id(self, id=str, gridsize = 100.):
+        """ Check an element from its id """
+
         curobj = self.getobj_from_id(id)
 
         if curobj is None:
@@ -8579,6 +8831,8 @@ class WolfMapViewer(wx.Frame):
             curobj.creategrid(gridsize, self.xmin, self.ymin, self.xmax, self.ymax)
 
     def uncheck_id(self, id=str, unload=True, forceresetOGL=True, askquestion=False):
+        """ Uncheck an element from its id """
+
         curobj = self.getobj_from_id(id)
 
         if curobj is None:
@@ -8594,6 +8848,12 @@ class WolfMapViewer(wx.Frame):
         self.treelist.CheckItem(curitem, False)
 
     def get_current_zoom(self):
+        """
+        Get the current zoom
+
+        :return: dict with keys 'center', 'xmin', 'xmax', 'ymin', 'ymax', 'width', 'height'
+
+        """
 
         return {'center': (self.mousex, self.mousey),
                 'xmin' :  self.xmin,
@@ -8604,12 +8864,15 @@ class WolfMapViewer(wx.Frame):
                 'height' : self.ymax-self.ymin}
 
     def save_current_zoom(self, filepath):
+        """ Save the current zoom in a json file """
 
         zoom = self.get_current_zoom()
         with open(filepath, 'w') as fp:
             json.dump(zoom, fp)
 
     def read_current_zoom(self, filepath):
+        """ Read the current zoom from a json file """
+
         if exists(filepath):
             with open(filepath, 'r') as fp:
                 zoom = json.load(fp)

wolfhece/PyVertex.py

@@ -27,14 +27,18 @@ from .textpillow import Text_Image, Text_Infos, Font_Priority
 from .wolf_texture import Text_Image_Texture
 
 
-def getRGBfromI(rgbint):
+def getRGBfromI(rgbint:int):
+    """ Convert integer to RGB """
+
     blue = rgbint & 255
     green = (rgbint >> 8) & 255
     red = (rgbint >> 16) & 255
     return red, green, blue
 
 
-def getIfromRGB(rgb):
+def getIfromRGB(rgb:Union[list, tuple]):
+    """ Convert RGB to integer """
+
     red = int(rgb[0])
     green = int(rgb[1])
     blue = int(rgb[2])

wolfhece/PyVertexvectors.py

@@ -887,6 +887,7 @@ if :\n \
                 return 'SanSerif'
             else:
                 return 'Arial'
+
 class vector:
     """
     Objet de gestion d'informations vectorielles
@@ -1050,6 +1051,9 @@ class vector:
         """
         Return tuple with :
           - (lower-left corner), (upper-right corner)
+
+        If you want [[xmin,xmax],[ymin,ymax]], use get_bounds_xx_yy() instead.
+
         """
         if grid is None:
             return ((self.xmin, self.ymin), (self.xmax, self.ymax))
@@ -1065,6 +1069,9 @@ class vector:
         """
         Return tuple with :
           - (xmin,xmax), (ymin, ymax)
+
+        If you want [[lower-left corner],[upper-right corner]], use get_bounds() instead.
+
         """
         if grid is None:
             return ((self.xmin, self.xmax), (self.ymin, self.ymax))
@@ -1098,6 +1105,7 @@ class vector:
         """
         Mise en évidence
         """
+
         self._oldcolor = self.myprop.color
         self._oldwidth = self.myprop.color
 
@@ -1108,6 +1116,7 @@ class vector:
         """
         Mise en retrait
         """
+
         try:
             self.myprop.color = self._oldcolor
             self.myprop.width = self._oldwidth
@@ -2384,8 +2393,13 @@ class zone:
     def add_vector(self, addedvect:vector, index=-99999, forceparent=False):
         """
         Ajout d'une instance 'vector'
-        Le compteur est incrémenté
+
+        :param addedvect: instance 'vector' à ajouter
+        :param index: position d'insertion
+        :param forceparent: True = forcer le parent à être la zone dans lequel le vecteur est ajouté
+
         """
+
         if index==-99999 or index >self.nbvectors:
             self.myvectors.append(addedvect)
         else:
@@ -2489,8 +2503,13 @@ class zone:
             if self.idgllist!=-99999:
                 glCallList(self.idgllist)
             else:
+                self.has_legend = False
+                self.has_image  = False
+
                 for curvect in self.myvectors:
                     curvect.plot()
+                    self.has_legend |= curvect.myprop.legendvisible
+                    self.has_image  |= curvect.myprop.imagevisible
 
         if self.has_legend:
             for curvect in self.myvectors:
@@ -4421,6 +4440,7 @@ class Zones(wx.Frame, Element_To_Draw):
             boxright.Add(self.capturevertices,0,wx.EXPAND)
             boxright.Add(self.dynapar,0,wx.EXPAND)
             boxright.Add(self.createapar,0,wx.EXPAND)
+            boxright.Add(self.reverseorder,0,wx.EXPAND)
             boxright.Add(self.modifyvertices,0,wx.EXPAND)
             boxright.Add(self.insertvertices,0,wx.EXPAND)
             boxright.Add(self.splitvertices,0,wx.EXPAND)
@@ -4722,8 +4742,56 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         Remplissage de la structure wx
         """
+
+        def store_tree_state(tree:TreeListCtrl):
+
+            expended_items = []
+            root = tree.GetRootItem()
+
+            if root is None:
+                return
+
+            def traverse_and_store(item):
+                if not item.IsOk():
+                    return
+                if tree.IsExpanded(item):
+                    expended_items.append(tree.GetItemData(item))
+
+                child = tree.GetFirstChild(item)
+                while child.IsOk():
+                    traverse_and_store(child)
+                    child = tree.GetNextItem(child)
+
+            traverse_and_store(root)
+
+            return expended_items
+
+        def restore_tree_state(tree:TreeListCtrl, expended_items):
+
+            root = tree.GetRootItem()
+
+            if root is None:
+                return
+
+            def traverse_and_restore(item):
+                if not item.IsOk():
+                    return
+
+                if tree.GetItemData(item) in expended_items:
+                    tree.Expand(item)
+
+                child = tree.GetFirstChild(item)
+                while child.IsOk():
+                    traverse_and_restore(child)
+                    child = tree.GetNextItem(child)
+
+            traverse_and_restore(root)
+
         if self.wx_exists:
             if self.xls is not None:
+
+                expanded = store_tree_state(self.treelist)
+
                 self.treelist.DeleteAllItems()
 
                 root = self.treelist.GetRootItem()
@@ -4735,6 +4803,8 @@ class Zones(wx.Frame, Element_To_Draw):
 
                 self.treelist.Expand(mynode)
 
+                restore_tree_state(self.treelist, expanded)
+
     def expand_tree(self, objzone=None):
         """
         Développe la structure pour un objet spécifique stocké dans la self.treelist
@@ -5617,17 +5687,54 @@ class Zones(wx.Frame, Element_To_Draw):
             else:
                 myitemdata.unuse()
 
+    def _callback_destroy_props(self):
+
+        self.myprops = None
+
+    def _callback_prop(self):
+
+        if self._myprops is None:
+            logging.warning(_('No properties available'))
+            return
+
+        for curzone in self.myzones:
+            for curvec in curzone.myvectors:
+                curvec.myprop.fill_property(self._myprops, updateOGL = False)
+
+        if self.mapviewer is not None:
+            self.prep_listogl()
+            self.mapviewer.Refresh()
+
+
+    def _edit_all_properties(self):
+        """ Show properties of the zone --> will be applied to all vectors int he zone """
+
+        locvec = vector()
+        locvec.myprop.show()
+
+        self._myprops = locvec.myprop.myprops
+
+        self._myprops[('Legend','X')] = 99999.
+        self._myprops[('Legend','Y')] = 99999.
+        self._myprops[('Legend','Text')] = _('Not used')
+        self._myprops.Populate()
+        self._myprops.set_callbacks(self._callback_prop, self._callback_destroy_props)
+
+
     def OnRDown(self, event:TreeListEvent):
         """
         Affiche les propriétés du vecteur courant
         Clicl-droit
         """
         if self.wx_exists:
-            if self.verify_activevec() and self.verify_activezone():
-                return
+            if self.active_zone is None and self.active_zone is None:
 
-            if isinstance(self.last_active, vector):
+                logging.info(_('You will edit the properties of the entire instance (all zones and all vectors)'))
+                self._edit_all_properties()
+
+            elif isinstance(self.last_active, vector):
                 self.active_vector.myprop.show()
+
             elif isinstance(self.last_active, zone):
                 self.active_zone.show_properties()
 
@@ -5643,6 +5750,9 @@ class Zones(wx.Frame, Element_To_Draw):
                 self.Activate_vector(myitemdata)
             elif isinstance(myitemdata,zone):
                 self.Activate_zone(myitemdata)
+            else:
+                self.Activate_vector(None)
+                self.Activate_zone(None)
 
             self.last_active = myitemdata
 
@@ -5654,6 +5764,12 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         if self.wx_exists:
             self.active_vector = object
+
+            if self.active_vector is None:
+                logging.info(_('Active vector is now set to None'))
+                self.xls.ClearGrid()
+                return
+
             self.xls_active_vector()
 
             if object.parentzone is not None:
@@ -5679,6 +5795,12 @@ class Zones(wx.Frame, Element_To_Draw):
         """
         if self.wx_exists:
             self.active_zone = object
+
+            if self.active_zone is None:
+                logging.info(_('Active zone is now set to None'))
+                self.xls.ClearGrid()
+                return
+
             if object.active_vector is not None:
                 self.active_vector = object.active_vector
             elif object.nbvectors>0:

wolfhece/apps/version.py

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

wolfhece/mesh2d/wolf2dprev.py

@@ -11449,10 +11449,11 @@ class prev_sim2D():
         Alias de myparam.add_weak_bc_y
         """
 
+        lst = self.list_pot_bc_y()
+
         if len(lst) == 0:
             logging.warning('No potential BC found -- Test can not be performed -- I continue anyway')
         else:
-            lst = self.list_pot_bc_y()
             if i not in lst[0] or j not in lst[1]:
                 logging.error(f'Invalid indices ({i},{j}) - BC not added')
                 return

{wolfhece-2.1.0.dist-info → wolfhece-2.1.2.dist-info}/METADATA

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

{wolfhece-2.1.0.dist-info → wolfhece-2.1.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 wolfhece/CpGrid.py,sha256=ke4n1khTUoed2asJl1GR25PsEkI4TpiBDCo4u0aSo9M,10658
 wolfhece/GraphNotebook.py,sha256=oBn0LBBFDX5b9KO8VnyqA0nYzv4MmTnQNhmgMBPsG2w,27723
-wolfhece/GraphProfile.py,sha256=GU4dsjbY7WWvcwIaHY8mqafdfAKnTfqUlsBwmtD4_as,69436
+wolfhece/GraphProfile.py,sha256=YKwZ7xcZ-jcKUZdnkCA1IaKYsF2tDMsWLYAbg6JTgR4,69437
 wolfhece/Lidar2002.py,sha256=sXZ6p8_EKI5l8fJswIMAABT6dqHKVexU52Tjl1uuisU,5770
 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=SkPF3w7X-r0n8EHBNhB6HtCr76kMGf5ZZcpbs0BrTmA,367549
+wolfhece/PyDraw.py,sha256=IOw6MBqsBCgsgmlomqRpPPscb27lapkCx6_tfvnZFh0,376860
 wolfhece/PyGui.py,sha256=TTRvqRiZ0gTaxOfDTMVLFYQ56QvdDMS032fRXcXxvUs,104024
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
@@ -14,8 +14,8 @@ wolfhece/PyPalette.py,sha256=_Nm2Lc4UxYlZgK8ifZDioG8a0at8oiteYC0x_4XugFc,24384
 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=X8MjsM4wLkgCrZ94CQw6PzxigH0_0jr8enUy7uYO2_I,39993
-wolfhece/PyVertexvectors.py,sha256=DccCNN-6_gC_ocykV2DKcWEzKdG_ZXXOIIDp9BYfi7o,218663
+wolfhece/PyVertex.py,sha256=dHTjyYYTn0F_NWerlAOBKHV79RUzEEtMJMldQtVc1Cs,40092
+wolfhece/PyVertexvectors.py,sha256=Av1OqFrDtZUAXAjaTnoGGErzK4W9gJhVx0LxgULLcTA,222335
 wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
 wolfhece/RatingCurve.py,sha256=YSQvSvdMHE6hSlWVBF5Oe0-Fh3waNMpOdmcymaCCTis,21706
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -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=m9hMTqzhSUcTudApyNNjoAK9e2u5vgEkJVV79xmfM1s,2118
-wolfhece/apps/version.py,sha256=0MeamvB2goEEVvP6-zQV9wXDJs5IkNiRkC7xNVWzBtQ,387
+wolfhece/apps/version.py,sha256=8FWwKWXkTZJMeOYjVCu-NBqI7zTtYTAJV6YcWW87LJE,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
@@ -217,7 +217,7 @@ 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=Cz0hX7FMc0adY_L29l-pfa-kv5wO-9BPEVPL20rDyrY,491039
+wolfhece/mesh2d/wolf2dprev.py,sha256=55kgOxPucmaFaOYdGVLkBP3ubbQbSe6AO34HTA8Rm-Y,491037
 wolfhece/models/HECE_169.pptx,sha256=OWJtsWz504A-REFaaxw8lwStHyQU2l7KEeiE7IZvtbk,3396930
 wolfhece/models/blue.pal,sha256=NnjJnjnYVdQkG54RyPXvo4Tl9ytB0cN7zpiHtj1N6bw,33
 wolfhece/models/diff16.pal,sha256=Pkp9kQ1GvmAKz3lgwohsw8eQySjVVKHbjhoWw-gZ6Nc,303
@@ -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.0.dist-info/METADATA,sha256=38MZXcyMY5-cpEkQmA8qHKviR0lxMmwlcZBssNyCyOo,2281
-wolfhece-2.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wolfhece-2.1.0.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.0.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.0.dist-info/RECORD,,
+wolfhece-2.1.2.dist-info/METADATA,sha256=rIXLM3y8Jweh0AI8rdzYq-iDSgIdL7Y53wNqzzRfm-Q,2281
+wolfhece-2.1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wolfhece-2.1.2.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.2.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.2.dist-info/RECORD,,