wolfhece 2.1.76__py3-none-any.whl → 2.1.77__py3-none-any.whl

wolfhece/PyDraw.py

@@ -8809,8 +8809,8 @@ class WolfMapViewer(wx.Frame):
                      'R': _('Arrays : reset the selection and the associated dictionnary'),
 
                      '1,2...9': _('Arrays : transfer the selection to the associated dictionary - key 1 to 9'),
-                     '>, <' : _('Arrays : dilate/erode the selection'),
-                     'CTRL+>, CTRL+<': _('Arrays : dilate/erode the selection unselecting the values inside the contour'),
+                     '>, <' : _('Arrays : dilate/erode the selection - cross-shaped neighbours'),
+                     'CTRL+>, CTRL+<': _('Arrays : dilate/erode the selection unselecting the values inside the contour - cross-shaped neighbours'),
 
                      'i': _('Arrays : 2D interpolation based on the selection on the current matrix'),
                      'CTRL+C': _('Arrays : Set copy source and current selection to clipboard as string'),
@@ -8937,10 +8937,12 @@ class WolfMapViewer(wx.Frame):
                 if self.active_array is not None:
                     if self.active_array.SelectionData is not None:
                         self.active_array.SelectionData.dilate_contour_selection(1)
+                        self.active_array.reset_plot()
             elif key == 60 and not shiftdown: #'<'
                 if self.active_array is not None:
                     if self.active_array.SelectionData is not None:
                         self.active_array.SelectionData.erode_contour_selection()
+                        self.active_array.reset_plot()
 
             elif key == wx.WXK_F2 and shiftdown:
 
@@ -9212,10 +9214,12 @@ class WolfMapViewer(wx.Frame):
                 if self.active_array is not None:
                     if self.active_array.SelectionData is not None:
                         self.active_array.SelectionData.dilate_selection(1)
+                        self.active_array.reset_plot()
             elif key == 60 and not shiftdown: #'<'
                 if self.active_array is not None:
                     if self.active_array.SelectionData is not None:
                         self.active_array.SelectionData.erode_selection(1)
+                        self.active_array.reset_plot()
 
             elif key == wx.WXK_ESCAPE:
 

wolfhece/apps/version.py

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

wolfhece/wolf_array.py

@@ -1807,7 +1807,7 @@ class Ops_Array(wx.Frame):
                                       wx.DefaultSize, 0)
         self.AllSelection.SetToolTip(_("Select all nodes in one click - store 'All' in the selection list"))
         bSizer16_1.Add(self.AllSelection, 1, wx.EXPAND)
-        
+
         memory_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.MoveSelection = wx.Button(self.selection, wx.ID_ANY,
                                        _("Move selection to..."), wx.DefaultPosition,
@@ -1828,7 +1828,7 @@ class Ops_Array(wx.Frame):
                                         _("Reset"), wx.DefaultPosition,
                                         wx.DefaultSize, 0)
         self.ResetSelection.SetToolTip(_("Reset the current selection list (keyboard shortcut r)"))
-        
+
         self.ResetAllSelection = wx.Button(self.selection, wx.ID_ANY,
                                            _("Reset All"), wx.DefaultPosition,
                                            wx.DefaultSize, 0)
@@ -1903,7 +1903,7 @@ class Ops_Array(wx.Frame):
 
         self._erode_dilate_structure = wx.ComboBox(self.selection, wx.ID_ANY, _("Cross"), wx.DefaultPosition, wx.DefaultSize,
                                                     ["Cross", "Square"], wx.CB_READONLY)
-        self._erode_dilate_structure.SetToolTip(_("Structuring element for the erode/dilate operation"))
+        self._erode_dilate_structure.SetToolTip(_("Structuring shape for the erode/dilate operation -- Cross-shaped is the 4 nearest nodes, Square-shaped is the 8 nearest nodes"))
         erode_dilate_options.Add(self._erode_dilate_structure, 1, wx.EXPAND)
 
         erode_dilate_sizer.Add(erode_dilate_options, 1, wx.EXPAND)
@@ -2319,7 +2319,7 @@ class Ops_Array(wx.Frame):
 
         if self.parentarray.mngselection is not None:
             self.parentarray.mngselection.reselect_from_memory()
-    
+
     def OnMoveSelect(self, event):
         """Transfert de la sélection courante dans un dictionnaire"""
 
@@ -2330,7 +2330,7 @@ class Ops_Array(wx.Frame):
             logging.info('Cancel transfer')
             dlg.Destroy()
             return
-        
+
         idtxt = dlg.GetValue()
         dlg.Destroy()
 
@@ -2364,7 +2364,7 @@ class Ops_Array(wx.Frame):
 
         self.parentarray.SelectionData.erode_selection(nb, usemask, structure)
         self.refresh_array()
-    
+
     def OnExpandSelection(self, event):
         """ Expand selection """
         nb = int(self._erode_dilate_value.GetValue())
@@ -2448,7 +2448,7 @@ class Ops_Array(wx.Frame):
         """
 
         self.parentarray.SelectionData.load_selection()
-    
+
     def OnToClipboardStr(self, event):
         """
         Copy the current selection to the clipboard as a string
@@ -3261,7 +3261,7 @@ class SelectionData():
             if str(which) in self.selections:
                 all_memories = False
                 curlist = self.selections[str(which)]['select']
-                txt = 'Selection {}\n'.format(which) 
+                txt = 'Selection {}\n'.format(which)
                 txt += 'Color : {}\n'.format(self.selections[str(which)]['color'])
                 txt += 'X\tY\n'
             else:
@@ -3286,7 +3286,7 @@ class SelectionData():
         if all_memories:
             for key, cur in self.selections.items():
                 txt += self.get_string(key)
-        
+
         return txt
 
     def get_script(self, which:int = None) -> str:
@@ -3350,20 +3350,23 @@ class SelectionData():
 
         if idx is None:
             keys = list(self.selections.keys())
+
+            keys = [cur for cur in keys if len(self.selections[cur]['select']) > 0]
+
             with wx.MultiChoiceDialog(None, "Choose the memory to reselect", "Choices", keys+['All']) as dlg:
                 ret = dlg.ShowModal()
                 if ret == wx.ID_CANCEL:
                     return
-            
+
                 idx = dlg.GetSelections()
                 if len(idx) == 0:
-                    return  
-                
+                    return
+
                 if len(idx) == 1 and idx[0] == len(keys):
                     idx = keys
                 elif len(idx) in idx:
                     idx = keys
-                else:                
+                else:
                     idx = [keys[i] for i in idx]
 
         for curidx in idx:
@@ -3674,7 +3677,7 @@ class SelectionData():
         ij = np.vstack([ij[:, 0], ij[:, 1]]).T
         xy = self.parent.ij2xy_np(ij)
 
-        self.myselection = xy.tolist()
+        self.myselection = [(cur[0], cur[1]) for cur in xy]
 
         self.update_nb_nodes_selection()
 
@@ -3716,7 +3719,7 @@ class SelectionData():
         ij = np.vstack([ij[:, 0], ij[:, 1]]).T
         xy = self.parent.ij2xy_np(ij)
 
-        self.myselection = xy.tolist()
+        self.myselection = [(cur[0], cur[1]) for cur in xy]
 
         self.update_nb_nodes_selection()
 
@@ -4574,7 +4577,7 @@ class SelectionDataMB(SelectionData):
     def get_string(self, which:str = None) -> str:
 
         logging.error(_('Not yet implemented for Multi-Blocks'))
-    
+
     def save_selection(self, filename:str=None, which:str = None):
 
         logging.error(_('Not yet implemented for Multi-Blocks'))

{wolfhece-2.1.76.dist-info → wolfhece-2.1.77.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.76
+Version: 2.1.77
 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.76.dist-info → wolfhece-2.1.77.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 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=VPe_MTPd6_gjyRL627yEWnE6RbL9t-EQmEDLa1t1dVM,421909
+wolfhece/PyDraw.py,sha256=fvTs3NyeMjMr6AHbYwqJ7uSoD3uSMzddWQmMUjvc9zA,422185
 wolfhece/PyGui.py,sha256=oBIBpgBQRR_XXucKE5-RFrtqKj0DRg9VlUCRo8Mzalc,105009
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -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=Rj_N7yg4OqwLRAWwDBl0VwwpXLzP0hPwhTRcwB3P5yA,400860
+wolfhece/wolf_array.py,sha256=4TL_yL2wKb22nyhxuBcXtMMRrJzOpfa_9LCefxOnzCw,400971
 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=mJE6gMQ0LXmVC2n9qC4xJHXz1aj3sU-1ej5zEwZ8K4E,388
+wolfhece/apps/version.py,sha256=klzSAX95Q2bylp5-HILfWTktL1FcaIOCdg-3qeadBo8,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
@@ -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.76.dist-info/METADATA,sha256=MjRjAJdHj-X5rrJuDTOU25orlRrGES6yus46PEGqQQw,2570
-wolfhece-2.1.76.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-wolfhece-2.1.76.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.76.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.76.dist-info/RECORD,,
+wolfhece-2.1.77.dist-info/METADATA,sha256=glI0wL4UaFiyCz0Yu9jjXkCcKoGl4jHP0wiwXHX0Vls,2570
+wolfhece-2.1.77.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+wolfhece-2.1.77.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.77.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.77.dist-info/RECORD,,