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

wolfhece/apps/version.py

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

wolfhece/wolf_array.py

@@ -1779,6 +1779,12 @@ class Ops_Array(wx.Frame):
         self.MoveSelection.SetToolTip(_("Store the current selection in an indexed list -- useful for some interpolation methods"))
         bSizer16_1.Add(self.MoveSelection, 0, wx.EXPAND)
 
+        self.ReselectMemory = wx.Button(self.selection, wx.ID_ANY,
+                                        _("Reselect from..."), wx.DefaultPosition,
+                                        wx.DefaultSize, 0)
+        self.ReselectMemory.SetToolTip(_("Reselect the nodes from an indexed list"))
+        bSizer16_1.Add(self.ReselectMemory, 0, wx.EXPAND)
+
         self.ResetSelection = wx.Button(self.selection, wx.ID_ANY,
                                         _("Reset"), wx.DefaultPosition,
                                         wx.DefaultSize, 0)
@@ -2040,6 +2046,7 @@ class Ops_Array(wx.Frame):
         self.LaunchSelection.Bind(wx.EVT_BUTTON, self.OnLaunchSelect)
         self.AllSelection.Bind(wx.EVT_BUTTON, self.OnAllSelect)
         self.MoveSelection.Bind(wx.EVT_BUTTON, self.OnMoveSelect)
+        self.ReselectMemory.Bind(wx.EVT_BUTTON, self.OnReselectMemory)
         self.ResetSelection.Bind(wx.EVT_BUTTON, self.OnResetSelect)
         self.ResetAllSelection.Bind(wx.EVT_BUTTON, self.OnResetAllSelect)
         self.to_clipboard_str.Bind(wx.EVT_BUTTON, self.OnToClipboardStr)
@@ -2237,18 +2244,44 @@ class Ops_Array(wx.Frame):
         self.parentarray.myops.nbselect.SetLabelText('All')
         self.parentarray.myops.nbselect2.SetLabelText('All')
 
+    def OnReselectMemory(self, event):
+        """
+        Reselect from memory
+        """
+
+        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"""
 
         dlg = wx.TextEntryDialog(self, 'Choose id', 'id?')
         ret = dlg.ShowModal()
+
+        if ret == wx.ID_CANCEL:
+            logging.info('Cancel transfer')
+            dlg.Destroy()
+            return
+        
         idtxt = dlg.GetValue()
+        dlg.Destroy()
 
-        dlg = wx.ColourDialog(self)
-        ret = dlg.ShowModal()
-        color = dlg.GetColourData()
+        if self.parentarray.SelectionData is not None:
+            if self.parentarray.SelectionData.nb > 0:
+                dlg = wx.ColourDialog(self)
+                ret = dlg.ShowModal()
+                if ret == wx.ID_OK:
+                    color = dlg.GetColourData()
+                    color = color.GetColour().Get()
+                    dlg.Destroy()
+                else:
+                    logging.info('Cancel transfer')
+                    dlg.Destroy()
+                    return
+            else:
+                color = (20,20,20,255)
 
-        self.parentarray.SelectionData.move_selectionto(idtxt, color.GetColour())
+        self.parentarray.SelectionData.move_selectionto(idtxt, color)
 
     def OnContractSelection(self, event):
         """ Contract selection """
@@ -3215,6 +3248,39 @@ class SelectionData():
             else:
                 logging.warning(_('Cannot open the clipboard'))
 
+    def reselect_from_memory(self, idx:list[str] = None):
+        """
+        Reselect a stored selection
+
+        :param idx: id/key of the selection
+        """
+
+        if idx is None:
+            keys = list(self.selections.keys())
+            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  
+                
+                if len(idx) == 1 and idx[0] == len(keys):
+                    idx = keys
+                elif len(idx) in idx:
+                    idx = keys
+                else:                
+                    idx = [keys[i] for i in idx]
+
+        for curidx in idx:
+            if curidx in self.selections:
+                self.myselection += self.selections[curidx]['select']
+            else:
+                logging.error(_('Selection {} does not exist').format(idx))
+
+            self.update_nb_nodes_selection()
+            self.parent.reset_plot()
 
     def move_selectionto(self, idx:str, color:list[float], resetplot:bool=True):
         """

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

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

@@ -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=Oze4IYwE19LnxERNi48duYdp3qLXENg8p3_f5KuC1ho,393076
+wolfhece/wolf_array.py,sha256=4D2fj4-Zaqe-IBRB-X4rhjAuHNlnYl9mT15KJeeyl50,395523
 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=T9oL1EY3HMV5ZVLUeJEU1FuT__QAQ0iSx8HOFn7mc4Y,388
+wolfhece/apps/version.py,sha256=xL8JIrHIqANzTmqWx_eqnA9DTXZoDlLxaaofqhuey1I,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.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,,
+wolfhece-2.1.75.dist-info/METADATA,sha256=90OU0iX7noC8qKik5I2b-UqAjkalAUEMy8qdKctQovo,2570
+wolfhece-2.1.75.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+wolfhece-2.1.75.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.75.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.75.dist-info/RECORD,,