wolfhece 2.1.68__py3-none-any.whl → 2.1.70__py3-none-any.whl

wolfhece/Model1D.py

@@ -1317,15 +1317,12 @@ class Creator_1D:
             - Id : zone index
             - The discretization step is chosen by the user.
 
-        .. notes:: The procedure is the following:
-            From the 3 vectors of the zone, the center vector is discretized
-            based on the discretization step provided by the user (1 length unit by default).
-            The number of points is calculated as the length of the center vector divided by the discretization step.
-            the number of points selected is the smallest integer greater than the division result.
-            The newpoints  are then projected on the left and right vectors.
-            The distance between the left and right vectors is then calculated,
-            and plotted as a function of the distance along the center vector, after a postprocessing check using
-            subtrings and vectors.
+        .. note:: The procedure is the following:
+                - From the 3 vectors of the zone, the center vector is discretized based on the discretization step provided by the user (1 length unit by default).
+                - The number of points is calculated as the length of the center vector divided by the discretization step.
+                - The number of points selected is the smallest integer greater than the division result.
+                - The newpoints  are then projected on the left and right vectors.
+                - The distance between the left and right vectors is then calculated, and plotted as a function of the distance along the center vector, after a postprocessing check using subtrings and vectors.
 
         :param zones: `Zones` object containing the vectors,
         :type zones: Zones
@@ -1338,8 +1335,7 @@ class Creator_1D:
         :param ticks_spacing: Discretization of the x axis, defaults to 1000
         :type ticks_spacing: int, optional
 
-        .. notes::
-            FIXME Should be an option in GUI and check whether the substring step is necessary.
+        .. note:: FIXME Should be an option in GUI and check whether the substring step is necessary.
 
         .. todo:: 1) FIXME Add detailed information (legends, title, an so on) to the plot.
         .. todo:: 2) FIXME Think about a test for this method. could it be used in GUI?
@@ -3087,8 +3083,7 @@ class Creator_1D:
         :param directory: Directory path, defaults to ''
         :type directory: str, optional
 
-        .. notes::
-            FIXME delete from_steady  arguments wherever it's still implemented in this module.
+        .. note:: FIXME delete from_steady  arguments wherever it's still implemented in this module.
         """
 
         if directory == '':

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)
 
@@ -9564,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:
@@ -9862,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 """
 
@@ -9975,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:
@@ -9998,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:

wolfhece/PyParams.py

@@ -598,13 +598,13 @@ class Wolf_Param(wx.Frame):
         else:
             self.prop = pg.PropertyGridManager(self,
                 style = pg.PG_BOLD_MODIFIED|pg.PG_SPLITTER_AUTO_CENTER|
-                # Include toolbar.
-                pg.PG_TOOLBAR if toolbar else 0 |
                 # Include description box.
                 pg.PG_DESCRIPTION |
                 pg.PG_TOOLTIPS |
                 # Plus defaults.
-                pg.PGMAN_DEFAULT_STYLE
+                pg.PGMAN_DEFAULT_STYLE |
+                # Include toolbar.
+                pg.PG_TOOLBAR if toolbar else 0
             )
 
         self.prop.Bind(pg.EVT_PG_DOUBLE_CLICK,self.OnDblClick)
@@ -628,15 +628,11 @@ class Wolf_Param(wx.Frame):
         self.sizer.Fit(self)
 
         self.SetSize(0,0,w,h)
+        # self.prop.SetDescBoxHeight(80)
 
         #affichage de la page
         self.Show(toShow)
 
-    def mask_toolbar(self):
-        """ Mask the toolbar """
-
-        self.prop.SetSt
-
     def _set_only_prop(self, wxparent):
         """ Set only the property grid """
 

wolfhece/PyVertexvectors.py

@@ -759,15 +759,12 @@ class vectorproperties:
         """
 
         if self.myprops is None:
-            self.myprops=Wolf_Param(title='Vector Properties', w=500, h=800, to_read=False)
+            self.myprops=Wolf_Param(title='Vector Properties', w= 500, h= 800, to_read= False, ontop= False)
             self.myprops.show_in_active_if_default = True
             self.myprops._callbackdestroy = self.destroyprop
             self.myprops._callback=self.fill_property
 
             self.myprops.hide_selected_buttons() # only 'Apply' button
-            # self.myprops.saveme.Disable()
-            # self.myprops.loadme.Disable()
-            # self.myprops.reloadme.Disable()
 
         self.myprops.addparam('Draw','Color',(0,0,0),'Color','Drawing color',whichdict='Default')
         self.myprops.addparam('Draw','Width',1,'Integer','Drawing width',whichdict='Default')
@@ -1678,6 +1675,7 @@ class vector:
 
             glPolygonMode(GL_FRONT_AND_BACK,GL_LINE)
             glDisable(GL_BLEND)
+            glLineWidth(1.0)
 
     def plot_legend(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """
@@ -2537,13 +2535,15 @@ class zone:
         curvect:vector
         nb_treated = 0
         i=0
-
+        idx_vect = 0
         while nb_treated < self.nbvectors:
-            curvect = self.get_vector(lines[i])
+            curvect = self.myvectors[idx_vect]
+            assert curvect.myname == lines[i], _('Vector name mismatch')
             i+=1
             ret = curvect.myprop.load_extra(lines[i:])
             i+=ret
             nb_treated += 1
+            idx_vect += 1
 
         return i
 
@@ -3951,7 +3951,8 @@ class Zones(wx.Frame, Element_To_Draw):
                  mapviewer=None,
                  need_for_wx: bool = False,
                  bbox:Polygon = None,
-                 find_minmax:bool = True) -> None:
+                 find_minmax:bool = True,
+                 shared:bool = False) -> None:
         """
         Objet de gestion et d'affichage d'informations vectorielles
 
@@ -3968,6 +3969,7 @@ class Zones(wx.Frame, Element_To_Draw):
         :param need_for_wx: si True --> permet l'affichage de la structure via WX car une app WX existe et est en cours d'exécution
         :param bbox: bounding box
         :param find_minmax: si True --> recherche des valeurs min et max
+        :param shared: si True --> les vecteurs sont partagés entre plusieurs autres objets --> pas de préparation de la liste OGL
 
         wx_exists : si True --> permet l'affichage de la structure via WX car une app WX existe et est en cours d'exécution
 
@@ -3986,6 +3988,7 @@ class Zones(wx.Frame, Element_To_Draw):
         self._myprops = None # common properties of all zones
 
         self.loaded=True
+        self.shared = shared # shared betwwen several WolfArray, wolfresults2d...
 
         self.active_vector:vector = None
         self.active_zone:zone = None
@@ -4072,20 +4075,39 @@ class Zones(wx.Frame, Element_To_Draw):
                     try:
                         nblines = len(lines)
                         i=0
+                        idx_zone = 0
                         while i<nblines:
-                            curzone = self.get_zone(lines[i])
+                            curzone = self.myzones[idx_zone]
+                            assert curzone.myname == lines[i], _('Error while reading extra properties of {}'.format(self.filename))
                             i+=1
                             ret = curzone.load_extra(lines[i:])
                             i+=ret
+                            idx_zone += 1
                     except:
                         logging.warning(_('Error while reading extra properties of {}'.format(self.filename)))
 
             if find_minmax:
                 self.find_minmax(True)
 
-        if plotted and self.has_OGLContext:
+        if plotted and self.has_OGLContext and not self.shared:
             self.prep_listogl()
 
+    def force_unique_zone_name(self):
+        """
+        Check if all zones have a unique id
+
+        If not, the id will be set to the index of the zone in the list
+        """
+
+        names = [curzone.myname for curzone in self.myzones]
+        unique_names = set(names)
+
+        if len(unique_names) != len(names):
+            for idx, curzone in enumerate(self.myzones):
+                if names.count(curzone.myname)>1:
+                    curzone.myname += '_'+str(idx)
+
+
     @property
     def nbzones(self):
         return len(self.myzones)
@@ -4996,6 +5018,10 @@ class Zones(wx.Frame, Element_To_Draw):
         curv  = self.active_vector
         n_rows = self.xls.GetNumberRows()
 
+        if n_rows < 2:
+            logging.warning(_('You need at least 2 points to interpolate the XY coordinates from the SZ coordinates'))
+            return
+
         # Getting the 2 first XY coordinates
         X =[]
         Y = []
@@ -6038,9 +6064,19 @@ class Zones(wx.Frame, Element_To_Draw):
                 return
 
             actzone =self.active_zone
-            actzone.myvectors.pop(int(actzone.myvectors.index(self.active_vector)))
-            self.fill_structure()
-            self.find_minmax(True)
+
+            if actzone.nbvectors==0:
+                return
+
+            idx = int(actzone.myvectors.index(self.active_vector))
+            if idx >= 0 and idx < actzone.nbvectors:
+                actzone.myvectors.pop(idx)
+
+                if actzone.nbvectors==0:
+                    self.Activate_vector(None)
+
+                self.fill_structure()
+                self.find_minmax(True)
 
     def OnClickup_vector(self, event:wx.MouseEvent):
         """Remonte le vecteur actif dans la liste de la zone"""
@@ -6217,7 +6253,13 @@ class Zones(wx.Frame, Element_To_Draw):
 
             if self.active_vector is None:
                 logging.info(_('Active vector is now set to None'))
+                self.labelactvect.SetLabel('None')
                 self.xls.ClearGrid()
+                if self.parent is not None:
+                    try:
+                        self.parent.Active_vector(self.active_vector)
+                    except:
+                        raise Warning(_('Not supported in the current parent -- see PyVertexVectors in Activate_vector function'))
                 return
 
             self.xls_active_vector()
@@ -6249,6 +6291,7 @@ class Zones(wx.Frame, Element_To_Draw):
 
             if self.active_zone is None:
                 logging.info(_('Active zone is now set to None'))
+                self.labelactzone.SetLabel('None')
                 self.xls.ClearGrid()
                 return
 

wolfhece/apps/version.py

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

wolfhece/hydrometry/kiwis.py

@@ -554,7 +554,9 @@ class hydrometry():
             return self.realstations.iloc[index[0]]
 
     def get_timeseries_group(self, rfw:Literal['rain','waterdepth','flowrate'], time:Literal['5min','5or10min','1h','1d','1m']):
-        """Obtention des stations pour le groupe souhaité
+        """Obtention des stations pour le groupe souhaité.
+
+        Temps retourné en UTC
 
         :param rfw: type de groupe - rain, flowrate, waterdepth
         :param time: type de série - 5min, 5or10min, 1h, 1d, 1m

wolfhece/wolf_array.py

@@ -46,9 +46,14 @@ from os.path import dirname,basename,join
 import logging
 from typing import Literal
 from copy import deepcopy
-from osgeo import gdal
 from enum import Enum
 
+try:
+    from osgeo import gdal
+except ImportError as e:
+    print(e)
+    raise Exception(_('Error importing GDAL library'))
+
 try:
     from .Coordinates_operations import reproject_and_resample_raster
 except ImportError as e:
@@ -1458,7 +1463,14 @@ class Ops_Array(wx.Frame):
 
     def get_linked_arrays(self):
         """ Pour compatibilité avec la gestion de vecteur et WolfMapViewer """
-        return {self.parentarray.idx: self.parentarray}
+        if self.is_shared:
+            comp, diff = self._get_comp_elts_diff()
+            ret = {}
+            for elt in comp + diff:
+                ret[elt.idx] = elt
+            return ret
+        else:
+            return {self.parentarray.idx: self.parentarray}
 
     def set_GUI(self):
         """Set the wx GUI"""
@@ -1628,7 +1640,7 @@ class Ops_Array(wx.Frame):
 
             self.interp2D = wx.Button(self.Interpolation, wx.ID_ANY, _("2D Interpolation on selection"), wx.DefaultPosition,
                                     wx.DefaultSize, 0)
-            self.interp2D.SetToolTip(_('Spatial interpolation based on nodes stored in named groups. \n The interpolation apply only on the current selection.'))
+            self.interp2D.SetToolTip(_('Spatial interpolation based on nodes stored in the named groups. \n The interpolation apply only on the current selection.'))
             gSizer1.Add(self.interp2D, 0, wx.EXPAND)
             self.interp2D.Bind(wx.EVT_BUTTON, self.interpolation2D)
 
@@ -2042,7 +2054,19 @@ class Ops_Array(wx.Frame):
     def interpolation2D(self, event: wx.MouseEvent):
         """ calling Interpolation 2D """
 
-        self.parentarray.interpolation2D()
+        keys = list(self.parentarray.SelectionData.selections.keys())
+        keys = [k for k in keys if len(self.parentarray.SelectionData.selections[k]) >0]
+
+        if len(keys) > 0:
+            if len(keys) == 1:
+                self.parentarray.interpolation2D(keys[0])
+            else:
+                with wx.SingleChoiceDialog(self, 'Choose the selection to interpolate', 'Selections', keys) as dlg:
+                    if dlg.ShowModal() == wx.ID_OK:
+                        selection = dlg.GetStringSelection()
+                        self.parentarray.interpolation2D(selection)
+
+                    dlg.Destroy()
 
     def Unmaskall(self, event: wx.MouseEvent):
         """
@@ -2408,6 +2432,72 @@ class Ops_Array(wx.Frame):
         except Exception as e:
             logging.error('Error in hide_properties : %s' % e)
 
+    @property
+    def is_shared(self):
+        """ Check if the vector manager is shared """
+
+        if self.mapviewer is not None:
+            if self.mapviewer.linked:
+                if not self.mapviewer.linkedList is None:
+                    comp = None
+                    for curviewer in self.mapviewer.linkedList:
+                        if curviewer.compare_results is not None:
+                            comp = curviewer.compare_results
+                            break
+
+                    if comp is not None:
+                        elts = comp.elements
+                        diff = comp.diff
+                        if self.parentarray in elts or self.parentarray in diff and self.mapviewer.link_shareopsvect:
+                            return True
+
+        return False
+
+    def _get_comp_elts_diff(self):
+        """ Get the elements and the differences of the linked arrays """
+
+        if self.mapviewer is not None:
+            if self.mapviewer.linked:
+                if not self.mapviewer.linkedList is None:
+                    comp = None
+                    for curviewer in self.mapviewer.linkedList:
+                        if curviewer.compare_results is not None:
+                            comp = curviewer.compare_results
+                            break
+
+                    if comp is not None:
+                        return comp.elements, comp.diff
+
+        return [], []
+
+    def _link_zones(self):
+        """ Link the same vector manager to all the linked arrays """
+
+        if self.mapviewer is not None:
+            if self.mapviewer.linked:
+                if not self.mapviewer.linkedList is None:
+                    comp = None
+                    for curviewer in self.mapviewer.linkedList:
+                        if curviewer.compare_results is not None:
+                            comp = curviewer.compare_results
+                            break
+
+                    if comp is not None:
+                        elts = comp.elements
+                        for curelt in elts:
+                            if self.parentarray is not curelt:
+                                curelt.myops.myzones = self.myzones
+                                curelt.myops.fnsave = self.fnsave
+
+                        diff = comp.diff
+                        for curelt in diff:
+                            if self.parentarray is not curelt:
+                                curelt.myops.myzones = self.myzones
+                                curelt.myops.fnsave = self.fnsave
+
+                for curviewer in self.mapviewer.linkedList:
+                    curviewer.Refresh()
+
     def OnLoadvec(self, event:wx.MouseEvent):
         """ Load vector file """
 
@@ -2421,18 +2511,15 @@ class Ops_Array(wx.Frame):
 
         self.fnsave = dlg.GetPath()
         dlg.Destroy()
-        self.myzones = Zones(self.fnsave, parent=self)
+
+        self.myzones = Zones(self.fnsave, parent= self, shared= self.is_shared)
 
         # Link the same vector manager to all the linked arrays
-        #FIXME : only works if the active_array is the good one
         if self.mapviewer is not None:
             if self.mapviewer.linked:
-                if not self.mapviewer.linkedList is None:
-                    for curViewer in self.mapviewer.linkedList:
-                        if curViewer.link_shareopsvect:
-                            curViewer.active_array.myops.myzones = self.myzones
-                            curViewer.active_array.myops.fnsave = self.fnsave
-            self.mapviewer.Refresh()
+                self._link_zones()
+            else:
+                self.mapviewer.Refresh()
 
     def OnSaveasvec(self, event:wx.MouseEvent):
         """ Save vector file """

{wolfhece-2.1.68.dist-info → wolfhece-2.1.70.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.68
+Version: 2.1.70
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.68.dist-info → wolfhece-2.1.70.dist-info}/RECORD

@@ -4,19 +4,19 @@ wolfhece/GraphNotebook.py,sha256=2TR8qjEwpMtl34QWgYNVe_PgTnuwhUxT5f9Y2zrmN2U,282
 wolfhece/GraphProfile.py,sha256=OCgJo0YFFBI6H1z-5egJsOOoWF_iziiza0-bbPejNMc,69656
 wolfhece/Lidar2002.py,sha256=bX-nIzdpjD7rOfEgJpTeaW6rIdAXwDp_z4YTM9CgANY,6068
 wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
-wolfhece/Model1D.py,sha256=iy9slhUvP5gXOhsAwjFhX83Rb9pMIDarkUAj9reNRCw,477027
+wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=xn1yWjsNc5HOf9HAzLPlMG7YfB7xuO1dyIL7l0GePTE,411137
+wolfhece/PyDraw.py,sha256=qKdjRbAWIwDw5UqdiY8xJ0tlZE_2sgh7CQMwCT7nkpQ,411126
 wolfhece/PyGui.py,sha256=oBIBpgBQRR_XXucKE5-RFrtqKj0DRg9VlUCRo8Mzalc,105009
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
 wolfhece/PyPalette.py,sha256=3ehK6H2PvqSe0zICR1HyNs6KQokR1DmnAh4LwYnLIcU,28009
-wolfhece/PyParams.py,sha256=Zxf3baM4TFNapcDqgrtM4IZ4vwCGVd3penwgwWUtG40,97775
+wolfhece/PyParams.py,sha256=LGt9uBFRVeS0F_kObJw8bPkWFqYSzf5pUTscxVU5Mxo,97725
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=MtZVjIWIi62QX_oqNosb56xPgjhOGVeGz-XsD82tsNg,40614
-wolfhece/PyVertexvectors.py,sha256=6rUVRMbar-2s59DrbnGncUOj5dR5ovMYxi8LXLd9PzA,236833
+wolfhece/PyVertexvectors.py,sha256=z6MTKabo3cvIq-qKUjdHbgqeoHagbK6nBU_x-fFGG7A,238671
 wolfhece/PyWMS.py,sha256=fyyzm2HFwq8aRwVYHKiBatcZOeKnFi6DWhv4nfscySQ,4602
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -48,7 +48,7 @@ wolfhece/pywalous.py,sha256=yRaWJjKckXef1d9D5devP0yFHC9uc6kRV4G5x9PNq9k,18972
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=QmAcZNRMdGwqXRO3MsRMREYW_3ZdJ41i9gg4WMtAbLM,376746
+wolfhece/wolf_array.py,sha256=tJT0Hd--eWg23c01wZYUA494-6f1v7NZEvbvXLcT8M8,380039
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
@@ -72,7 +72,7 @@ wolfhece/apps/check_install.py,sha256=Xoi_d8MzKzNAy2xqEpERdsqgRPu0hbBWukI0WkIYzD
 wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefgmk,5334
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=9pKM_R-pqYp94pRjkkob738cc9PnIms77Dp-TKGaTB0,388
+wolfhece/apps/version.py,sha256=TLK8WpRHDziujrX3W7jQ4NRLffIcA4WHifPcuYSKkRM,388
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -126,7 +126,7 @@ wolfhece/hydrology/read.py,sha256=itMat6MMn4Y14C3SMU_9JMBtpXFjG4mLNMfXXd5U6Ns,93
 wolfhece/hydrology/slope_manager.py,sha256=vlek0z8qcqB61eleiksyOe3QR1vpbtwfeowy6ms7_Fg,5580
 wolfhece/hydrology/wolfMap_treatment.py,sha256=eAxr24zJGwmDof1aZpcxewVvv_bWDvoO8t9Wwf99Mlo,10606
 wolfhece/hydrometry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/hydrometry/kiwis.py,sha256=m3LGNxmB_ZY_ug-8BCM8jK_VqN6LtWRGpbPWtgRYFSE,46460
+wolfhece/hydrometry/kiwis.py,sha256=jW5ivM0h_wZ_jM6OWh994iwQtsCZdwmQsMA7TMnCxMg,46495
 wolfhece/hydrometry/kiwis_gui.py,sha256=lApsSeBMJNAR1yocggdoHwz_xe6M_oaZ_E13CfHAlQA,23124
 wolfhece/hydrometry/kiwis_wolfgui.py,sha256=GPa5YNp2V2ZlxYQjPiCXERgPuWB_zij4ec2yHpRvoFA,4027
 wolfhece/hydrometry/kiwispie.py,sha256=akOaV46WwzISVlCcPz_phjsBrI_rDACUzdELtjx-xNg,13498
@@ -283,8 +283,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.68.dist-info/METADATA,sha256=yFi2FGPJlzNBz_938XrVtCvrDzn2supoFh-NQY-fyLs,2570
-wolfhece-2.1.68.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.68.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.68.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.68.dist-info/RECORD,,
+wolfhece-2.1.70.dist-info/METADATA,sha256=X-FGlbXULKqEr5VJOxfzSt8-BUMb01SI7dx1wNvssWE,2570
+wolfhece-2.1.70.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+wolfhece-2.1.70.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.70.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.70.dist-info/RECORD,,

{wolfhece-2.1.68.dist-info → wolfhece-2.1.70.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (72.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any