wolfhece 2.1.67__py3-none-any.whl → 2.1.69__py3-none-any.whl

wolfhece/PyDraw.py

@@ -369,7 +369,7 @@ class WolfMapViewer(wx.Frame):
         self.popupmenu = wx.Menu()
         self.popupmenu.Bind(wx.EVT_MENU, self.OnPopupItemSelected)
 
-        for text in [_('Save'), _('Save as'), _('Rename'), _('Duplicate'), _('Up'), _('Down'), _('Properties')]:
+        for text in [_('Save'), _('Save as'), _('Rename'), _('Duplicate'), _('Delete'), _('Up'), _('Down'), _('Properties')]:
             item = self.popupmenu.Append(-1, text)
 
         self.menubar = wx.MenuBar()
@@ -590,7 +590,9 @@ class WolfMapViewer(wx.Frame):
         self.active_particle_system = None
         self.active_viewer3d = None
         self.active_landmap:PlansTerrier = None
+        self.active_tile = None
         self.selected_treeitem = None
+        self.selected_object = None
 
         curtool = self.tools[ID_SORTALONG] = {}
         curtool['menu'] = self.sortalong
@@ -634,8 +636,7 @@ class WolfMapViewer(wx.Frame):
 
         # ajout d'une liste en arbre des objets
         self.treelist = TreeListCtrl(self, style= wx.dataview.TL_CHECKBOX | wx.LC_EDIT_LABELS | wx.TR_FULL_ROW_HIGHLIGHT)
-        self._lbl_selecteditem = StaticText(self, style=wx.ALIGN_CENTER_HORIZONTAL)
-        self.selected_object = None
+        self._lbl_selecteditem = StaticText(self, style=wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL)
 
         self.root = self.treelist.GetRootItem()
         self.treelist.AppendColumn(_('Objects to plot'))
@@ -2621,13 +2622,8 @@ class WolfMapViewer(wx.Frame):
         # self.canvas.Bind(wx.EVT_CONTEXT_MENU, self.OnShowPopup)
         self.canvas.Bind(wx.EVT_PAINT, self.OnPaint)
 
-        self.treelist.Bind(wx.EVT_CHAR_HOOK, self.OnHotKey)
-        self.treelist.Bind(dataview.EVT_TREELIST_SELECTION_CHANGED,self.onselectitem)
         self.canvas.Bind(wx.EVT_CHAR_HOOK, self.OnHotKey)
 
-        # self.treelist.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
-        # self.canvas.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
-
         self.canvas.Bind(wx.EVT_BUTTON, self.OnButton)
         self.canvas.Bind(wx.EVT_RIGHT_DCLICK, self.OnRDClick)
         self.canvas.Bind(wx.EVT_LEFT_DCLICK, self.OnLDClick)
@@ -2640,8 +2636,10 @@ class WolfMapViewer(wx.Frame):
         self.canvas.Bind(wx.EVT_MOUSEWHEEL, self.OnButton)
 
         self.treelist.Bind(dataview.EVT_TREELIST_ITEM_CHECKED, self.OnCheckItem)
-        self.treelist.Bind(dataview.EVT_TREELIST_ITEM_ACTIVATED, self.OnActivateTreeElem)
+        self.treelist.Bind(dataview.EVT_TREELIST_ITEM_ACTIVATED, self.OnActivateTreeElem)        
         self.treelist.Bind(dataview.EVT_TREELIST_ITEM_CONTEXT_MENU, self.OntreeRight)
+        self.treelist.Bind(wx.EVT_CHAR_HOOK, self.OnHotKey)
+        self.treelist.Bind(dataview.EVT_TREELIST_SELECTION_CHANGED,self.OnSelectItem)
         # dispo dans wxpython 4.1 self.Bind(wx.EVT_GESTURE_ZOOM,self.OnZoomGesture)
 
         self.Centre()
@@ -4448,24 +4446,30 @@ class WolfMapViewer(wx.Frame):
         elif itemlabel == _('Shortcuts'):
             # show shortcuts in log
             self.print_shortcuts(True)
+            autoscale = False
 
         elif itemlabel == _('Show logs/informations'):
             self.check_logging()
+            autoscale = False
 
         elif itemlabel == _('Show values'):
             self.check_tooltip()
+            autoscale = False
 
         elif itemlabel == _('About'):
             #print About Frame
             self.print_About()
+            autoscale = False
 
         elif itemlabel == _('Check for updates'):
             # check for new version
 
             self.check_for_updates()
+            autoscale = False
 
         elif itemlabel == _("Integrate Q along active vector..."):
             """ Integrate Q along active vector """
+            autoscale = False
 
             if self.active_vector is None:
                 logging.warning(_('No active vector !'))
@@ -4479,6 +4483,7 @@ class WolfMapViewer(wx.Frame):
 
         elif itemlabel == _("Integrate Q along active zone..."):
             """ Integrate Q along active zone """
+            autoscale = False
 
             if self.active_zone is None:
                 logging.warning(_('No active zone !'))
@@ -4491,6 +4496,7 @@ class WolfMapViewer(wx.Frame):
             self.active_res2d.plot_q(self.active_zone.myvectors, ['border'] * self.active_zone.nbvectors, toshow=True)
 
         elif itemlabel == _("Plot stats unknown (selected nodes)..."):
+            autoscale = False
 
             if self.active_res2d is None:
                 logging.warning(_('No active 2D result !'))
@@ -4524,6 +4530,7 @@ class WolfMapViewer(wx.Frame):
                 fig.show()
 
         elif itemlabel == _("Plot stats unknown (inside active vector)..."):
+            autoscale = False
 
             if self.active_res2d is None:
                 logging.warning(_('No active 2D result !'))
@@ -4553,6 +4560,7 @@ class WolfMapViewer(wx.Frame):
             fig, ax = self.active_res2d.plot_h(self.active_vector, unknown, toshow=True)
 
         elif itemlabel == _("Plot stats unknown (inside active zone)..."):
+            autoscale = False
 
             if self.active_res2d is None:
                 logging.warning(_('No active 2D result !'))
@@ -4589,6 +4597,7 @@ class WolfMapViewer(wx.Frame):
 
         elif itemlabel == _("Plot active vector..."):
             """ Plot data along active vector """
+            autoscale = False
 
             if self.active_vector is None:
                 logging.warning(_('No active vector !'))
@@ -4634,6 +4643,18 @@ class WolfMapViewer(wx.Frame):
 
             linkedarrays = self.get_linked_arrays()
 
+            with wx.MultiChoiceDialog(None, _('Choose the arrays to plot'), _('Arrays'), [curarray for curarray in list(linkedarrays.keys())]) as dlg:
+                if dlg.ShowModal() == wx.ID_CANCEL:
+                    dlg.Destroy()
+                    return
+
+                selected = dlg.GetSelections()
+                keys = list(linkedarrays.keys())
+                selected = [keys[cur] for cur in selected]
+                dlg.Destroy()
+
+            linkedarrays = {curkey:curval for curkey, curval in linkedarrays.items() if curkey in selected}
+
             self.active_vector.plot_linked(fig, ax, linkedarrays)
 
             if add_cloud:
@@ -4650,36 +4671,45 @@ class WolfMapViewer(wx.Frame):
                 fig.canvas.flush_events()
 
         elif itemlabel == _("Export arrays as Geotif..."):
+            autoscale = False
 
             self.export_results_as('geotiff')
 
         elif itemlabel == _("Export arrays as Shapefile..."):
+            autoscale = False
 
             self.export_results_as('shape')
 
         elif itemlabel == _("Compute and apply unique colormap on all..."):
+            autoscale = False
 
             self.uniquecolormap()
 
         elif itemlabel == _("Load and apply unique colormap on all..."):
+            autoscale = False
 
             self.uniquecolormap(True)
 
         elif itemlabel == _("Force uniform in parts on all..."):
+            autoscale = False
             self.uniforminparts_all(True)
 
         elif itemlabel == _("Force linear interpolation on all..."):
+            autoscale = False
             self.uniforminparts_all(False)
 
         elif itemlabel == _("Load and apply mask (nap)..."):
+            autoscale = False
 
             self.loadnap_and_apply()
 
         elif itemlabel == _("Filter inundation arrays..."):
+            autoscale = False
 
             self.filter_inundation()
 
         elif itemlabel == _("Plot active polygons..."):
+            autoscale = False
 
             if self.active_zone is None:
                 logging.warning(_('No active zone ! -- please select a zone containing polygons !'))
@@ -4755,143 +4785,8 @@ class WolfMapViewer(wx.Frame):
             ax.legend()
             fig.show()
 
-        # elif itemlabel == _("Change current view"):
-
-        #     # Change view for results
-
-        #     autoscale = False
-        #     choices = [cur.value for cur in views_2D]
-        #     dlg = wx.SingleChoiceDialog(None, _("Pick a view"), "Choices", choices)
-        #     ret = dlg.ShowModal()
-        #     if ret == wx.ID_CANCEL:
-        #         dlg.Destroy()
-        #         return
-
-        #     method = dlg.GetStringSelection()
-
-        #     method = list(views_2D)[choices.index(method)]
-
-        #     dlg.Destroy()
-
-        #     diamsize = None
-        #     if method == views_2D.SHIELDS_NUMBER :
-
-        #         if self.active_res2d is not None:
-        #             sediment_diam = self.active_res2d.sediment_diameter
-        #             sediment_density = self.active_res2d.sediment_density
-        #         elif self.compare_results is not None:
-        #             sediment_diam = 0.001
-        #             sediment_density = 2.650
-        #         else:
-        #             logging.warning(_('No active 2D result or comparison !'))
-        #             return
-
-        #         dlg = wx.TextEntryDialog(None,_("Diameter grain size [m] ?"), value = str(sediment_diam))
-        #         ret = dlg.ShowModal()
-        #         if ret == wx.ID_CANCEL:
-        #             dlg.Destroy()
-        #             return
-        #         try:
-        #             diamsize = float(dlg.GetValue())
-        #         except:
-        #             dlg.Destroy()
-        #             logging.warning(_("Bad value -- Rety"))
-        #             return
-
-        #         dlg = wx.TextEntryDialog(None,_("Density grain [-] ?"), value = str(sediment_density))
-        #         ret = dlg.ShowModal()
-        #         if ret == wx.ID_CANCEL:
-        #             dlg.Destroy()
-        #             return
-        #         try:
-        #             density = float(dlg.GetValue())
-        #         except:
-        #             dlg.Destroy()
-        #             logging.warning(_("Bad value -- Rety"))
-        #             return
-
-        #     if len(self.myres2D)>1:
-
-        #         dlg = wx.MessageDialog(None, _('Apply to all results?'), style=wx.YES_NO)
-        #         ret = dlg.ShowModal()
-        #         if ret == wx.ID_NO:
-        #             if diamsize is not None:
-        #                 self.active_res2d.sediment_diameter = diamsize
-        #                 self.active_res2d.sediment_density = density
-        #                 self.active_res2d.load_default_colormap('shields_cst')
-
-        #             self.active_res2d.set_currentview(method, force_wx = True, force_updatepal = True)
-        #         else:
-        #             for curarray in self.iterator_over_objects(draw_type.RES2D):
-        #                 curarray:Wolfresults_2D
-        #                 if diamsize is not None:
-        #                     curarray.sediment_diameter = diamsize
-        #                     curarray.sediment_density  = density
-        #                     curarray.load_default_colormap('shields_cst')
-
-        #                 curarray.set_currentview(method, force_wx = True, force_updatepal = True)
-
-        #     else:
-        #         if self.active_res2d is not None:
-        #             if diamsize is not None:
-        #                 self.active_res2d.sediment_diameter = diamsize
-        #                 self.active_res2d.sediment_density = density
-        #                 self.active_res2d.load_default_colormap('shields_cst')
-        #             self.active_res2d.set_currentview(method, force_wx = True, force_updatepal = True)
-
-        #     if self.compare_results is not None:
-        #         # update compare results
-        #         if diamsize is not None:
-        #             self.compare_results.set_shields_param(diamsize, density)
-        #         self.compare_results.update_type_result(method)
-
-        # elif itemlabel == _("Read last result"):
-
-        #     self.read_last_result()
-
-        # elif itemlabel == _("Filter independent"):
-
-        #     self.menu_filter_independent.IsChecked = not self.menu_filter_independent.IsChecked
-
-        #     for curmodel in self.iterator_over_objects(draw_type.RES2D):
-        #         curmodel: Wolfresults_2D
-        #         curmodel.to_filter_independent = not self.menu_filter_independent.IsChecked
-
-        # elif itemlabel == _("Set epsilon water depth"):
-
-        #     dlg = wx.TextEntryDialog(self, _('Enter an epsilon [m]'),value='0.0')
-
-        #     ret = dlg.ShowModal()
-
-        #     if ret == wx.ID_CANCEL:
-        #         dlg.Destroy()
-        #         return
-
-        #     try:
-        #         neweps = float(dlg.GetValue())
-        #         dlg.Destroy()
-        #     except:
-        #         logging.error(_('Bad value -- retry !'))
-        #         dlg.Destroy()
-        #         return
-
-        #     for curmodel in self.iterator_over_objects(draw_type.RES2D):
-        #         curmodel: Wolfresults_2D
-        #         curmodel.epsilon = neweps
-        #         curmodel._epsilon_default = neweps
-        #         curmodel.read_oneresult(curmodel.current_result)
-        #         curmodel.set_currentview()
-
-        # elif itemlabel == _("Manage boundary conditions..."):
-
-        #     if self.active_res2d is not None:
-        #         self.active_res2d.myparams.editing_bc(self.myres2D)
-
-        # elif itemlabel ==_("Create video..."):
-        #     if self.active_res2d is not None:
-        #         self.create_video()
-
         elif itemlabel == _("Manage banks..."):
+            autoscale = False
             if self.active_vector is None:
                 msg = _('Active vector is None\nPlease activate the one desired')
                 msg += _('\n')
@@ -4902,11 +4797,13 @@ class WolfMapViewer(wx.Frame):
             self.managebanks()
 
         elif itemlabel == _("Create banks from vertices..."):
+            autoscale = False
 
             self.active_cs.create_zone_from_banksbed()
             self.active_cs.linked_zones.showstructure()
 
         elif itemlabel == _("Link cross sections to active zones"):
+            autoscale = False
 
             if self.active_cs is None:
                 msg = _('Active cross sections is None\nPlease activate the one desired')
@@ -4924,8 +4821,8 @@ class WolfMapViewer(wx.Frame):
 
             self.active_cs.link_external_zones(self.active_zones)
 
-
         elif itemlabel == _("Rename cross sections..."):
+            autoscale = False
 
             dlg = wx.TextEntryDialog(None, _('Which starting point?'))
             ret = dlg.ShowModal()
@@ -4941,21 +4838,26 @@ class WolfMapViewer(wx.Frame):
         #     self.import_3dfaces()
 
         elif itemlabel == _("Interpolate on active triangulation..."):
+            autoscale = False
             self.interpolate_triangulation()
 
         elif itemlabel==_("Compare cloud to array..."):
+            autoscale = False
             self.compare_cloud2array()
 
         elif itemlabel==_("Compare triangles to array..."):
+            autoscale = False
             self.compare_tri2array()
 
         elif itemlabel ==  _("Create contour from checked arrays..."):
+            autoscale = False
 
             # 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 == _("Calculator..."):
+            autoscale = False
 
             if self.calculator is None:
                 self.calculator = Calculator(mapviewer = self)
@@ -4963,6 +4865,7 @@ class WolfMapViewer(wx.Frame):
                 self.calculator.Show()
 
         elif itemlabel == _("Create bridge and export gltf..."):
+            autoscale = False
 
             if self.active_cs is None:
                 msg = _('Active cross sections is None\nPlease activate the one desired')
@@ -4974,6 +4877,7 @@ class WolfMapViewer(wx.Frame):
             self.start_action('bridge gltf', _('Create bridge and export gltf...'))
 
         elif itemlabel == _("Export cross sections to gltf..."):
+            autoscale = False
 
             if self.active_cs is None:
                 msg = _('Active cross sections is None\nPlease activate the one desired')
@@ -5003,17 +4907,21 @@ class WolfMapViewer(wx.Frame):
             self.active_cs.export_gltf(zmin, fn)
 
         elif itemlabel == _("New cloud Viewer..."):
+            autoscale = False
             if self.myinterp is not None:
                 self.myinterp.viewer_interpolator()
 
         elif itemlabel == _("Interpolate on active array..."):
+            autoscale = False
             if self.myinterp is not None:
                 self.interpolate_cs()
 
         elif itemlabel == _("Interpolate active cloud on active array..."):
+            autoscale = False
             self.interpolate_cloud()
 
         elif itemlabel == _('Save project'):
+            autoscale = False
             filterProject = "proj (*.proj)|*.proj|param (*.param)|*.param|all (*.*)|*.*"
             file = wx.FileDialog(self, "Name your file", wildcard=filterProject, style=wx.FD_SAVE)
             if file.ShowModal() == wx.ID_CANCEL:
@@ -5196,7 +5104,7 @@ class WolfMapViewer(wx.Frame):
 
             # Comparaison de deux résultats ou de deux matrices
 
-            self.compare_results = Compare_Arrays_Results(self, True, True)
+            self.compare_results = Compare_Arrays_Results(self, share_cmap_array= True, share_cmap_diff= True)
 
             add_elt = True
             while add_elt:
@@ -5338,19 +5246,26 @@ class WolfMapViewer(wx.Frame):
             self.add_object('array', newobj=newarray)
 
         elif itemlabel == _('Create view...'):
+            autoscale = False
+
             # Création d'une nouvelle vue
             newview = WolfViews(mapviewer=self)
             self.add_object('array', newobj=newarray)
 
         elif itemlabel==_('Create Wolf2D manager ...'):
+            autoscale = False
+
             from .mesh2d.config_manager import config_manager_2D
             newmanager = config_manager_2D(mapviewer=self)
 
         elif itemlabel==_('Create scenarios manager ...'):
+            autoscale = False
+
             from .scenario.config_manager import Config_Manager_2D_GPU
             newmanager = Config_Manager_2D_GPU(mapviewer=self)
 
         elif itemlabel == _('Create acceptability manager...'):
+            autoscale = False
 
             from .acceptability.acceptability_gui import AcceptabilityGui
             newmanager = AcceptabilityGui()
@@ -5358,6 +5273,7 @@ class WolfMapViewer(wx.Frame):
             newmanager.Show()
 
         elif itemlabel==_('Create BC manager Wolf2D...'):
+            autoscale = False
 
             if self.active_array is not None:
 
@@ -5390,21 +5306,27 @@ class WolfMapViewer(wx.Frame):
                 self.active_bc = self.mybc[-1]
 
         elif itemlabel == _('Create Wolf1D...'):
+            autoscale = False
             self.frame_create1Dfrom2D = GuiNotebook1D(mapviewer= self)
             logging.info(_(f'New window available - Wolf1D.'))
 
         elif id == wx.ID_FILE7:
+            autoscale = False
             # Création de nouveaux vecteurs
             newzones = Zones(parent=self)
             self.add_object('vector', newobj=newzones)
         elif id == wx.ID_FILE8:
+            autoscale = False
             # Création d'un nouveau nuage de point
             newcloud = cloud_vertices()
             self.add_object('cloud', newobj=newcloud)
         elif id in self.tools.keys():
             # gestion des actions
             self.ManageActions(id)
+            autoscale = False
+
         elif id == wx.ID_SAVE:
+            autoscale = False
 
             for obj in self.iterator_over_objects(draw_type.ARRAYS):
                 obj: WolfArray
@@ -5432,7 +5354,7 @@ class WolfMapViewer(wx.Frame):
             self.copy_canvasogl()
 
         elif itemlabel == _('Export...'):
-
+            autoscale = False
             curarray: WolfArray
             curvec: vector
 
@@ -5480,7 +5402,7 @@ class WolfMapViewer(wx.Frame):
                 del wait
 
         elif itemlabel == _('Import...'):
-
+            autoscale = False
             curarray: WolfArray
 
             msg = ''
@@ -5534,7 +5456,7 @@ class WolfMapViewer(wx.Frame):
                 del wait
 
         elif itemlabel == _('Compare...'):
-
+            autoscale = False
             msg = ''
             if self.active_array is None:
                 msg += _('Active array is None\n')
@@ -5567,7 +5489,7 @@ class WolfMapViewer(wx.Frame):
             self.update_blender_sculpting()
 
         elif id == wx.ID_SAVEAS:
-
+            autoscale = False
             for obj in self.iterator_over_objects(draw_type.ARRAYS):
                 obj: WolfArray
 
@@ -5938,14 +5860,21 @@ class WolfMapViewer(wx.Frame):
             band.ComputeStatistics(True)
             k+=1
 
-    def get_linked_arrays(self) -> dict:
+    def get_linked_arrays(self, linked:bool = True) -> dict:
+        """ Get all arrays in the viewer and linked viewers """
+
         linkedarrays = {}
 
-        for locarray in self.iterator_over_objects(draw_type.ARRAYS):
-            linkedarrays[locarray.idx] = locarray
+        if self.linked and linked:
+            all_dicts = [curviewer.get_linked_arrays(linked = False) for curviewer in self.linkedList]
+            for curdict in all_dicts:
+                linkedarrays.update(curdict)
+        else:
+            for locarray in self.iterator_over_objects(draw_type.ARRAYS):
+                linkedarrays[locarray.idx] = locarray
 
-        for locarray in self.iterator_over_objects(draw_type.RES2D):
-            linkedarrays[locarray.idx] = locarray
+            for locarray in self.iterator_over_objects(draw_type.RES2D):
+                linkedarrays[locarray.idx] = locarray
 
         return linkedarrays
 
@@ -6798,7 +6727,6 @@ class WolfMapViewer(wx.Frame):
             yield obj
 
     def gettreeitem(self, obj):
-
         """ Find the tree item associated with obj """
 
         up = self.treelist.GetFirstItem()
@@ -6811,7 +6739,6 @@ class WolfMapViewer(wx.Frame):
         return up
 
     def removeobj(self):
-
         """Remove selected item from general tree"""
 
         if self.selected_treeitem is None:
@@ -6822,7 +6749,6 @@ class WolfMapViewer(wx.Frame):
         self.removeobj_from_id(id)
 
     def removeobj_from_id(self, id:str):
-
         """ Remove object from id """
 
         myobj = self.getobj_from_id(id)
@@ -6835,8 +6761,44 @@ class WolfMapViewer(wx.Frame):
 
             myobj.hide_properties()
 
-    def upobj(self):
+            if myobj is self.active_array:
+                self.active_array = None
+                self.set_label_selecteditem('')
+            elif myobj is self.active_res2d:
+                self.active_res2d = None
+                self.set_label_selecteditem('')
+            elif myobj is self.active_tri:
+                self.active_tri = None
+                self.set_label_selecteditem('')
+            elif myobj is self.active_particle_system:
+                self.active_particle_system = None
+                self.set_label_selecteditem('')
+            elif myobj is self.active_cloud:
+                self.active_cloud = None
+                self.set_label_selecteditem('')
+            elif myobj is self.active_cs:
+                self.active_cs = None
+                self.set_label_selecteditem('')
+            elif myobj is self.active_tile:
+                self.active_tile = None
+                self.set_label_selecteditem('')
+            elif myobj is self.active_bc:
+                self.active_bc = None
+                self.set_label_selecteditem('')
+            elif myobj is self.active_vector:
+                self.active_vector = None
+                self.set_label_selecteditem('')
+            elif myobj is self.active_view:
+                self.active_view = None
+                self.set_label_selecteditem('')
+            elif myobj is self.active_zone:
+                self.active_zone = None
+                self.set_label_selecteditem('')
+            elif myobj is self.active_zones:
+                self.active_zones = None
+                self.set_label_selecteditem('')
 
+    def upobj(self):
         """Up selected item into general tree"""
 
         if self.selected_treeitem is None:
@@ -6887,7 +6849,6 @@ class WolfMapViewer(wx.Frame):
                         curlist.insert(idx-1,myobj)
 
     def downobj(self):
-
         """Down selected item into general tree"""
 
         if self.selected_treeitem is None:
@@ -6938,6 +6899,8 @@ class WolfMapViewer(wx.Frame):
         self.PopupMenu(self.popupmenu, pos)
 
     def OnPopupItemSelected(self, event):
+        """ Action to do when an item is selected in the popup menu """
+
         item = self.popupmenu.FindItemById(event.GetId())
         text = item.ItemLabel
 
@@ -6953,23 +6916,32 @@ class WolfMapViewer(wx.Frame):
                     self.selected_object.save()
         elif text==_('Up'):
             self.upobj()
+        
         elif text == _('Down'):
             self.downobj()
-        elif text == _('Rename'):
 
+        elif text == _('Delete'):
+            self.removeobj()
+
+        elif text == _('Rename'):
             #Modification du nom de l'objet sélectionné
             if self.selected_object is not None:
                 #récupération de l'id courant
                 label = self.selected_object.idx
                 dlg = wx.TextEntryDialog(self, message=_('Chose a new label :'), value=label)
                 ret=dlg.ShowModal()
-                newlab = dlg.GetValue()
-                dlg.Destroy()
 
-                #MAJ de l'id dans l'objet
-                self.selected_object.idx = newlab
-                #MAJ de l'arbre
-                self.treelist.SetItemText(self.selected_treeitem, newlab)
+                if ret == wx.ID_OK:
+                    newlab = dlg.GetValue()
+                    #MAJ de l'id dans l'objet
+                    self.selected_object.idx = newlab
+                    #MAJ de l'arbre
+                    self.treelist.SetItemText(self.selected_treeitem, newlab)
+
+                    if self.get_label_selecteditem() == _("Active : ") + label:
+                        self.set_label_selecteditem(_("Active : ") + newlab)
+        
+                dlg.Destroy()
 
         elif text ==  _('Duplicate'):
 
@@ -6979,6 +6951,11 @@ class WolfMapViewer(wx.Frame):
                 label = self.selected_object.idx + '_copy'
                 dlg = wx.TextEntryDialog(self, message=_('Chose a label for the copy:'), value=label)
                 ret=dlg.ShowModal()
+
+                if ret != wx.ID_OK:
+                    dlg.Destroy()
+                    return
+                
                 newlab = dlg.GetValue()
                 dlg.Destroy()
 
@@ -7150,6 +7127,8 @@ class WolfMapViewer(wx.Frame):
 
 
     def OnClose(self, event):
+        """ Close the application """
+
         nb = 0
         if self.linked:
             if self.linkedList is not None:
@@ -7172,24 +7151,31 @@ class WolfMapViewer(wx.Frame):
                     return
         self.Destroy()
 
-    def onselectitem(self,event):
-        myitem = event.GetItem()
+    def OnSelectItem(self, event):
+        """ Select the item in the tree list """
 
-        self.selected_treeitem = myitem
+        ctrl = wx.GetKeyState(wx.WXK_CONTROL)
+        alt = wx.GetKeyState(wx.WXK_ALT)
+
+        myitem = event.GetItem()
 
         nameitem = self.treelist.GetItemText(myitem).lower()
         curobj = self.getobj_from_id(nameitem)
+        myobj = self.treelist.GetItemData(myitem)
 
-        if isinstance(curobj, PlansTerrier):
-            self.active_landmap = curobj
+        assert curobj is myobj, 'curobj is not myobj'
 
-        elif isinstance(curobj, Zones):
-            self.active_zones = curobj
+        self.treelist.SetToolTip(self.treelist.GetItemText(myitem))
 
+        myparent = self.treelist.GetItemParent(myitem)
+        check = self.treelist.GetCheckedState(myitem)
+        nameparent = self.treelist.GetItemText(myparent).lower()
 
-        self.treelist.SetToolTip(self.treelist.GetItemText(myitem))
+        self.selected_object = curobj
+        self.selected_treeitem = myitem
 
     def OnCheckItem(self, event:TreeListEvent):
+        """ Check the item in the tree list """
 
         myitem = event.GetItem()
         myparent = self.treelist.GetItemParent(myitem)
@@ -7750,6 +7736,10 @@ class WolfMapViewer(wx.Frame):
         """ Set the label of the selected item in the tree list """
         self._lbl_selecteditem.SetLabel(nameitem)
 
+    def get_label_selecteditem(self):
+        """ Get the label of the selected item in the tree list """
+        return self._lbl_selecteditem.GetLabel()
+
     def OnActivateTreeElem(self, e): #:dataview.TreeListEvent ):
         """ Activate the selected item in the tree list """
         curzones: Zones
@@ -7769,13 +7759,18 @@ class WolfMapViewer(wx.Frame):
 
         myobj = self.treelist.GetItemData(myitem)
         self.selected_object = myobj
-        self.set_label_selecteditem(nameitem)
+        self.set_label_selecteditem(_('Active : ') + nameitem)
 
         #FIXME : To generalize using draw_type
         if type(myobj) == Zones:
+            self.active_zones = myobj
+
             if ctrl:
                 myobj.show_properties()
 
+        elif isinstance(myobj, PlansTerrier):
+            self.active_landmap = myobj
+
         elif type(myobj) == hydrometry_wolfgui:
             if ctrl:
                 myobj.show_properties()
@@ -8204,7 +8199,7 @@ class WolfMapViewer(wx.Frame):
 
             if self.IsMaximized():
                 # Frame is maximized -> tooltip must be on the Screen
-                self.mytooltip.SetWindowStyle(wx.STAY_ON_TOP)
+                self.mytooltip.SetWindowStyle(wx.STAY_ON_TOP | wx.DEFAULT_FRAME_STYLE)
             else:
 
                 if self._oldpos_tooltip is None:
@@ -8230,8 +8225,8 @@ class WolfMapViewer(wx.Frame):
                     # Force the position
                     self.mytooltip.SetPosition(pos_tooltip)
 
-                self.mytooltip.SetIcon(self.GetIcon()) # update icon
-                self.mytooltip.SetWindowStyle(wx.DEFAULT_FRAME_STYLE | wx.STAY_ON_TOP) # on top, with Title bar
+                # self.mytooltip.SetIcon(self.GetIcon()) # update icon
+                self.mytooltip.SetWindowStyle(wx.DEFAULT_FRAME_STYLE) # | wx.STAY_ON_TOP) # on top, with Title bar
 
         # self.mytooltip.Show(True)
 
@@ -8500,8 +8495,8 @@ class WolfMapViewer(wx.Frame):
         #     \n \
         #     !! ACTIONs !!\n \
         #     N : sélection noeud par noeud de la matrice courante\n \
-        #     b, B : sélection par vecteur de la matrice courante - zone intérieure\n \
-        #     v, V : sélection par vecteur de la matrice courante - trace du vecteur\n \
+        #     b, B : sélection par vecteur de la matrice courante - trace du vecteur\n \
+        #     v, V : sélection par vecteur de la matrice courante - zone intérieure\n \
         #     r : reset de la sélection de la matrice courante\n \
         #     R : reset de toutes les sélections de la matrice courante\n \
         #     P : sélection de la section transversale par click souris\n \
@@ -8558,8 +8553,9 @@ class WolfMapViewer(wx.Frame):
                      'F11': _('Arrays : select by criteria'),
                      'F12': _('Arrays : operations'),
                      'n or N': _('Arrays : node-by-node selection'),
-                     'b or B': _('Arrays : temporary/active vector selection - inside polygon'),
-                     'v or V': _('Arrays : temporary/active vector selection - along polyline'),
+
+                     'b or B': _('Arrays : temporary/active vector selection - along polyline'),
+                     'v or V': _('Arrays : temporary/active vector selection - inside polygon'),
 
                      'r': _('Arrays : reset the selection'),
                      'R': _('Arrays : reset the selection and the associated dictionnary'),
@@ -9563,8 +9559,10 @@ class WolfMapViewer(wx.Frame):
                         curFrame.setbounds()
 
                         if curFrame.link_shareopsvect:
-                            curFrame.Active_vector(self.active_vector)
-                            curFrame.active_array.myops.Active_vector(self.active_vector, False)
+                            if curFrame.active_vector is not self.active_vector:
+                                curFrame.Active_vector(self.active_vector)
+                            if curFrame.active_array.myops.active_vector is not self.active_vector:
+                                curFrame.active_array.myops.Active_vector(self.active_vector, False)
                             curFrame.action = self.action
 
                 for curFrame in self.linkedList:
@@ -9861,6 +9859,7 @@ class Compare_Arrays_Results():
             elif self.type == Comp_Type.ARRAYS_MB:
                 self.elements = [WolfArrayMB(cur[1], plotted=False, idx = cur[1].name + '_' + str(idx)) for idx, cur in enumerate(self.paths)]
 
+
     def set_diff(self):
         """ Set the differential between the elements and the first one, which is the reference """
 
@@ -9974,6 +9973,8 @@ class Compare_Arrays_Results():
 
         if self.share_cmap_array:
             for curelt in elts[1:]:
+                curelt.mypal.automatic = False
+                curelt.myops.palauto.SetValue(0)
                 ref.add_crosslinked_array(curelt)
                 ref.share_palette()
         else:
@@ -9997,6 +9998,8 @@ class Compare_Arrays_Results():
 
         if self.share_cmap_diff:
             for curelt in self.diff[1:]:
+                curelt.mypal.automatic = False
+                curelt.myops.palauto.SetValue(0)
                 diff.add_crosslinked_array(curelt)
                 diff.share_palette()
         else: