wolfhece 2.1.73__py3-none-any.whl → 2.1.74__py3-none-any.whl

wolfhece/PyDraw.py

@@ -8677,6 +8677,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'),
 
                      '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'),
@@ -8799,6 +8801,13 @@ class WolfMapViewer(wx.Frame):
                 else:
                     logging.info(_('Please activate a simulation before search a specific result'))
 
+            elif key == 60 and shiftdown: #'>'
+                if self.active_array is not None:
+                    self.active_array.dilate_contour_selection(1)
+            elif key == 60 and not shiftdown: #'<'
+                if self.active_array is not None:
+                    self.active_array.erode_contour_selection()
+
             elif key == wx.WXK_F2 and shiftdown:
 
                 if self.active_res2d is not None:
@@ -9065,6 +9074,13 @@ class WolfMapViewer(wx.Frame):
             if key == wx.WXK_DELETE:
                 self.removeobj()
 
+            elif key == 60 and shiftdown: #'>'
+                if self.active_array is not None:
+                    self.active_array.dilate_selection(1)
+            elif key == 60 and not shiftdown: #'<'
+                if self.active_array is not None:
+                    self.active_array.erode_selection(1)
+
             elif key == wx.WXK_ESCAPE:
 
                 logging.info(_('Escape key pressed -- Set all active objects and "action" to None'))

wolfhece/apps/version.py

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

wolfhece/wolf_array.py

@@ -1736,6 +1736,9 @@ class Ops_Array(wx.Frame):
         bSizer21 = wx.BoxSizer(wx.HORIZONTAL)
 
         bSizer16 = wx.BoxSizer(wx.VERTICAL)
+        bSizer16_1 = wx.BoxSizer(wx.VERTICAL)
+        bSizer16_2 = wx.BoxSizer(wx.VERTICAL)
+        bSizer16_3 = wx.BoxSizer(wx.VERTICAL)
 
         selectmethodChoices = [_("by clicks"), _("inside active vector"), _("inside active zone"),
                                _("inside temporary vector"), _("along active vector"), _("along active zone"),
@@ -1763,28 +1766,30 @@ class Ops_Array(wx.Frame):
         self.LaunchSelection.SetFont(font)
 
         bSizer16.Add(self.LaunchSelection, 0, wx.EXPAND)
+
         self.AllSelection = wx.Button(self.selection, wx.ID_ANY,
                                       _("Select all nodes"), wx.DefaultPosition,
                                       wx.DefaultSize, 0)
         self.AllSelection.SetToolTip(_("Select all nodes in one click - store 'All' in the selection list"))
-        bSizer16.Add(self.AllSelection, 0, wx.EXPAND)
+        bSizer16_1.Add(self.AllSelection, 0, wx.EXPAND)
+        
         self.MoveSelection = wx.Button(self.selection, wx.ID_ANY,
                                        _("Move current selection to..."), wx.DefaultPosition,
                                        wx.DefaultSize, 0)
         self.MoveSelection.SetToolTip(_("Store the current selection in an indexed list -- useful for some interpolation methods"))
-        bSizer16.Add(self.MoveSelection, 0, wx.EXPAND)
+        bSizer16_1.Add(self.MoveSelection, 0, wx.EXPAND)
+
         self.ResetSelection = wx.Button(self.selection, wx.ID_ANY,
                                         _("Reset"), wx.DefaultPosition,
                                         wx.DefaultSize, 0)
         self.ResetSelection.SetToolTip(_("Reset the current selection list (keyboard shortcut r)"))
-
-        bSizer16.Add(self.ResetSelection, 0, wx.EXPAND)
+        bSizer16_1.Add(self.ResetSelection, 0, wx.EXPAND)
 
         self.ResetAllSelection = wx.Button(self.selection, wx.ID_ANY,
                                            _("Reset All"), wx.DefaultPosition,
                                            wx.DefaultSize, 0)
         self.ResetAllSelection.SetToolTip(_("Reset the current selection list and the indexed lists (keyboard shortcut R)"))
-        bSizer16.Add(self.ResetAllSelection, 0, wx.EXPAND)
+        bSizer16_1.Add(self.ResetAllSelection, 0, wx.EXPAND)
 
         self.to_clipboard_str = wx.Button(self.selection, wx.ID_ANY, _("To clipboard (str)"), wx.DefaultPosition,
                                             wx.DefaultSize, 0)
@@ -1794,8 +1799,45 @@ class Ops_Array(wx.Frame):
                                             wx.DefaultSize, 0)
         self.to_clipboard_script.SetToolTip(_("Copy the current selection to the clipboard as a script"))
 
-        bSizer16.Add(self.to_clipboard_str, 0, wx.EXPAND)
-        bSizer16.Add(self.to_clipboard_script, 0, wx.EXPAND)
+        bSizer16_2.Add(self.to_clipboard_str, 0, wx.EXPAND, 2)
+        bSizer16_2.Add(self.to_clipboard_script, 0, wx.EXPAND, 2)
+
+        erode_dilate_sizer = wx.BoxSizer(wx.VERTICAL)
+        self.expand_selection = wx.Button(self.selection, wx.ID_ANY, _("Expand/Dilate selection"), wx.DefaultPosition,
+                                            wx.DefaultSize, 0)
+        self.expand_selection.SetToolTip(_("Expand the current selection to the nearest nodes"))
+
+        self.contract_selection = wx.Button(self.selection, wx.ID_ANY, _("Contract/Erode selection"), wx.DefaultPosition,
+                                            wx.DefaultSize, 0)
+        self.contract_selection.SetToolTip(_("Contract the current selection to the nearest nodes"))
+
+        self.expand_unselect_interior = wx.Button(self.selection, wx.ID_ANY, _("Expand/Dilate contour"), wx.DefaultPosition,
+                                            wx.DefaultSize, 0)
+        self.expand_unselect_interior.SetToolTip(_("Expand the contour of the current selection and unselect the interior nodes"))
+
+        self.unselect_interior = wx.Button(self.selection, wx.ID_ANY, _("Unselect interior"), wx.DefaultPosition,
+                                            wx.DefaultSize, 0)
+        self.unselect_interior.SetToolTip(_("Conserve the contour of the current selection and unselect the interior nodes"))
+
+        erode_dilate_sizer.Add(self.expand_selection, 0, wx.EXPAND)
+        erode_dilate_sizer.Add(self.contract_selection, 0, wx.EXPAND)
+        erode_dilate_sizer.Add(self.expand_unselect_interior, 0, wx.EXPAND)
+        erode_dilate_sizer.Add(self.unselect_interior, 0, wx.EXPAND)
+
+        erode_dilate_options = wx.BoxSizer(wx.HORIZONTAL)
+        self._label_passes = wx.StaticText(self.selection, wx.ID_ANY, _("Passes"), wx.DefaultPosition, wx.DefaultSize, 0)
+        self._erode_dilate_value = wx.TextCtrl(self.selection, wx.ID_ANY, u"1", wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER)
+        self._erode_dilate_value.SetToolTip(_("Number of passes for the erode/dilate operation"))
+        
+        erode_dilate_options.Add(self._label_passes, 0, wx.EXPAND)
+        erode_dilate_options.Add(self._erode_dilate_value, 0, wx.EXPAND)
+
+        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"))
+        erode_dilate_options.Add(self._erode_dilate_structure, 1, wx.EXPAND)
+
+        erode_dilate_sizer.Add(erode_dilate_options, 0, wx.EXPAND)
 
         # MultiBlocks
         # ----------------
@@ -1821,7 +1863,9 @@ class Ops_Array(wx.Frame):
 
             # bSizer16.Add(self._open_block, 0, wx.EXPAND)
 
-
+        bSizer16_1.Add(erode_dilate_sizer, 1, wx.EXPAND, 5)
+        bSizer16.Add(bSizer16_1, 1, wx.EXPAND, 5)
+        bSizer16.Add(bSizer16_2, 1, wx.EXPAND, 5)
         bSizer21.Add(bSizer16, 1, wx.EXPAND, 5)
 
         # VECTORS Manager
@@ -2024,6 +2068,11 @@ class Ops_Array(wx.Frame):
         self.histoupdatezoom.Bind(wx.EVT_BUTTON, self.OnClickHistoUpdate)
         self.histoupdateerase.Bind(wx.EVT_BUTTON, self.OnClickHistoUpdate)
 
+        self.contract_selection.Bind(wx.EVT_BUTTON, self.OnContractSelection)
+        self.expand_selection.Bind(wx.EVT_BUTTON, self.OnExpandSelection)
+        self.expand_unselect_interior.Bind(wx.EVT_BUTTON, self.OnExpandUnselectInterior)
+        self.unselect_interior.Bind(wx.EVT_BUTTON, self.OnUnselectInterior)
+
         icon = wx.Icon()
         icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
         icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
@@ -2201,6 +2250,48 @@ class Ops_Array(wx.Frame):
 
         self.parentarray.SelectionData.move_selectionto(idtxt, color.GetColour())
 
+    def OnContractSelection(self, event):
+        """ Contract selection """
+
+        nb = int(self._erode_dilate_value.GetValue())
+        if self._erode_dilate_structure.GetValue() == 'Cross':
+            structure = np.array([[0, 1, 0], [1, 1, 1], [0, 1, 0]])
+        else:
+            structure = np.ones((3, 3))
+
+        usemask = self.selectrestricttomask.GetValue()
+
+        self.parentarray.erode_selection(nb, usemask = usemask, structure = structure)
+    
+    def OnExpandSelection(self, event):
+        """ Expand selection """
+        nb = int(self._erode_dilate_value.GetValue())
+        if self._erode_dilate_structure.GetValue() == 'Cross':
+            structure = np.array([[0, 1, 0], [1, 1, 1], [0, 1, 0]])
+        else:
+            structure = np.ones((3, 3))
+
+        usemask = self.selectrestricttomask.GetValue()
+
+        self.parentarray.dilate_selection(nb, usemask, structure)
+
+    def OnExpandUnselectInterior(self, event):
+        """ Expand contour """
+
+        nb = int(self._erode_dilate_value.GetValue())
+        if self._erode_dilate_structure.GetValue() == 'Cross':
+            structure = np.array([[0, 1, 0], [1, 1, 1], [0, 1, 0]])
+        else:
+            structure = np.ones((3, 3))
+
+        usemask = self.selectrestricttomask.GetValue()
+
+        self.parentarray.dilate_contour_selection(nb, usemask, structure)
+
+    def OnUnselectInterior(self, event):
+        """ Contract contour """
+        self.parentarray.erode_contour_selection()
+
     def reset_selection(self):
         """
         Reset of current selection
@@ -4610,6 +4701,55 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self.add_ops_sel() # Ajout d'un gestionnaire de sélection et d'opérations
 
+    def erode_selection(self, nbiter:int= 1, usemask:bool = True, structure:np.ndarray = np.ones((3,3))):
+        """ Erode the selection """
+
+        if self.SelectionData is not None:
+            if self.SelectionData.nb > 0:
+                self.SelectionData.erode_selection(nbiter, usemask, structure)
+                self.SelectionData.update_nb_nodes_selection()
+                self.reset_plot()
+            else:
+                logging.info('No selection to contract/erode')
+    
+    def dilate_selection(self, nbiter:int= 1, usemask:bool = True, structure:np.ndarray = np.ones((3,3))):
+        """ Dilate the selection """
+
+        if self.SelectionData is not None:
+            if self.SelectionData.nb > 0:
+                self.SelectionData.dilate_selection(nbiter, usemask, structure)
+                self.SelectionData.update_nb_nodes_selection()
+                self.reset_plot()
+            else:
+                logging.info('No selection to dilate')
+
+    def dilate_contour_selection(self, nbiter:int= 1, usemask:bool = True, structure:np.ndarray = np.ones((3,3))):
+        """ Dilate the contour of the selection """
+
+        if self.SelectionData is not None:
+            if self.SelectionData.nb > 0:
+                oldsel = self.SelectionData.myselection.copy()
+                self.SelectionData.dilate_selection(nbiter, usemask, structure)
+                newsel = self.SelectionData.myselection.copy()
+                self.SelectionData.myselection = [cur for cur in newsel if cur not in oldsel]
+                self.SelectionData.update_nb_nodes_selection()
+                self.reset_plot()
+            else:
+                logging.info('No selection to expand/dilate')
+
+    def erode_contour_selection(self):
+        """ Erode the contour of the selection """
+        if self.SelectionData is not None:
+            if self.SelectionData.nb > 0:
+                oldselect = self.SelectionData.myselection.copy()
+                self.SelectionData.erode_selection(1)
+                newselect = self.SelectionData.myselection.copy()
+                self.SelectionData.myselection = [cur for cur in oldselect if cur not in newselect]
+                self.SelectionData.update_nb_nodes_selection()
+                self.reset_plot()
+            else:
+                logging.info('No selection to contract/erode')
+
     def set_opacity(self, alpha:float):
         """ Set the transparency of the array """
 

{wolfhece-2.1.73.dist-info → wolfhece-2.1.74.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.73
+Version: 2.1.74
 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.73.dist-info → wolfhece-2.1.74.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=CADHhvy_Pe9EY56-99U7xYTMIUUPfxc2uVseJxd2fQ8,415540
+wolfhece/PyDraw.py,sha256=nud0raPc9AYDLgA3dYNOaOXQCWzLzCicxmxp7VihYtQ,416394
 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=NV1pGcGsXXGIVSjFBsfpenvmBUSTkjPWbgZ2vbWuELA,385914
+wolfhece/wolf_array.py,sha256=Oze4IYwE19LnxERNi48duYdp3qLXENg8p3_f5KuC1ho,393076
 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=K5FlL3HX_hFeMskXGwFzxy4hM7Wn_1EOyEO590JGKvc,388
+wolfhece/apps/version.py,sha256=T9oL1EY3HMV5ZVLUeJEU1FuT__QAQ0iSx8HOFn7mc4Y,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.73.dist-info/METADATA,sha256=ic8qSOuRT0LzlneOYjg45t_qPWzkKrlbqaFMnUp_En8,2570
-wolfhece-2.1.73.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-wolfhece-2.1.73.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.73.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.73.dist-info/RECORD,,
+wolfhece-2.1.74.dist-info/METADATA,sha256=7aW4jIl11xOINRkPpa0QcgwbJNb_2AE0CRq8JJ3wy9o,2570
+wolfhece-2.1.74.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+wolfhece-2.1.74.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.74.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.74.dist-info/RECORD,,