wolfhece 2.1.55__py3-none-any.whl → 2.1.57__py3-none-any.whl

wolfhece/PyDraw.py

@@ -8134,10 +8134,17 @@ class WolfMapViewer(wx.Frame):
             ttsize = self.mytooltip.GetSize()
             self.mytooltip.position(pos + posframe + (ttsize[0] / 2. + 15, 15))
         else:
+
             self.mytooltip.SetWindowStyle(wx.DEFAULT_FRAME_STYLE)
             width, height = self.GetSize()
-            posframe[0] += width
-            self.mytooltip.position(posframe)
+
+            if self.IsFullScreen():
+                posframe[0] += width - self.mytooltip.GetSize()[0] - 10
+            else:
+                if shiftdown:
+                    posframe[0] += width
+                    posframe[1] -= 50
+                    self.mytooltip.position(posframe)
 
         self.mytooltip.Show(True)
 
@@ -8418,10 +8425,19 @@ class WolfMapViewer(wx.Frame):
                      'CTRL+Shift+F4': _('Particle system : choose the step based on time'),
                      'SPACE': _('Particle system : pause/resume animation'),
 
+                     'Left Click and move': _('Drawing : translate the view'),
+                     'Mouse wheel click and move': _('Drawing : translate the view'),
+                     'Mouse wheel': _('Drawing : zoom in/out - centered on the middle of the canvas'),
+                     'Mouse wheel + Space Bar': _('Drawing : zoom in/out - centered on the mouse position'),
+                     'z, Z': _('Drawing : zoom out/in - centered on the middle of the canvas'),
+                     'Touchpad 2 fingers': _('Drawing : zoom in/out - centered on the middle of the canvas'),
+                     'CTRL + z': _('Drawing : Autoscale only on active array'),
+                     'CTRL + Z': _('Drawing : Autoscale only on active vector'),
+
+                     'Arrow keys': _('Drawing : lateral movements'),
+
                      'F5': _('Drawing : autoscale'),
                      'F7': _('Drawing : refresh'),
-                     'Z': _('Drawing : zoom in'),
-                     'z': _('Drawing : zoom out'),
                      'Arrows': _('Drawing : lateral movements'),
                      'c or C': _('Drawing : copy canvas to Clipboard wo axes'),
                      'CTRL+C': _('Drawing : copy canvas to Clipboard as Matplotlib image'),
@@ -8437,9 +8453,12 @@ class WolfMapViewer(wx.Frame):
                      'n or N': _('Arrays : node-by-node selection'),
                      'b or B': _('Arrays : temporary vector selection'),
                      'v or V': _('Arrays : activated vector selection - inner zone'),
+
                      'r': _('Arrays : reset the selection'),
-                     'R': _('Arrays : reset all selections'),
-                     '1,2...9': _('Arrays : transfer the selection to the dictionary'),
+                     'R': _('Arrays : reset the selection and the associated dictionnary'),
+
+                     '1,2...9': _('Arrays : transfer the selection to the associated dictionary - key 1 to 9'),
+
                      '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'),
                      'CTRL+X': _('Arrays : Crop the active array using the active vector and make a copy'),
@@ -8468,7 +8487,7 @@ class WolfMapViewer(wx.Frame):
                 txt += curgroup + '\n'
                 for curkey, curval in shortcuts.items():
                     if curgroup in curval:
-                        txt += '\t' + curkey + ' : ' + curval + '\n'
+                        txt += '\t' + curkey + ' : ' + curval.split(':')[1] + '\n'
                 txt += '\n'
             return txt
 
@@ -8487,7 +8506,7 @@ class WolfMapViewer(wx.Frame):
             sizer.Add(multiline, 1, wx.EXPAND)
 
             frame.SetSizer(sizer)
-
+            frame.SetIcon(self.GetIcon())
             frame.SetAutoLayout(True)
             frame.Layout()
 
@@ -8804,6 +8823,19 @@ class WolfMapViewer(wx.Frame):
 
                 logging.info(_('Selection/Values pasted'))
 
+            elif key == ord('Z'):
+
+                if ctrldown:
+                    if shiftdown:
+                        if self.active_vector is not None:
+                            self.zoom_on_vector(self.active_vector, canvas_height= self.canvas.GetSize()[1])
+                        else:
+                            logging.warning(_('No active vector to zoom on !'))
+                    else:
+                        if self.active_array is not None:
+                            self.zoom_on_array(self.active_array, canvas_height= self.canvas.GetSize()[1])
+                        else:
+                            logging.warning(_('No active array to zoom on !'))
         else:
             if key == wx.WXK_DELETE:
                 self.removeobj()

wolfhece/PyGui.py

@@ -150,7 +150,7 @@ class MapManager(GenMapManager):
 
         icon = wx.Icon()
 
-        icon_path = Path(__file__).parent / "apps/wolf_logo.bmp"
+        icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
 
         icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
 

wolfhece/apps/ManageParams.py

@@ -8,6 +8,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 import wx
 
 from ..PyTranslate import _

wolfhece/apps/Optimisation_hydro.py

@@ -8,6 +8,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 import wx
 
 from ..PyTranslate import _

wolfhece/apps/curvedigitizer.py

@@ -8,6 +8,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 from ..PyTranslate import _
 
 import wx

wolfhece/apps/isocurrent.py

@@ -9,6 +9,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 from ..PyTranslate import _
 
 

wolfhece/apps/version.py

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

wolfhece/apps/wolf.py

@@ -11,6 +11,10 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 import wx
 from ..PyTranslate import _
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 def main():
     ex = wx.App()
 

wolfhece/apps/wolf2D.py

@@ -10,6 +10,10 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 
 import wx
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 def main():
     ex = wx.App()
 

wolfhece/apps/wolfcompare2Darrays.py

@@ -8,6 +8,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 #import des modules
 from os import path
 import sys

wolfhece/apps/wolfhydro.py

@@ -8,6 +8,10 @@ This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
+import ctypes
+myappid = 'wolf_hece_uliege' # arbitrary string
+ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
 import wx
 
 from ..PyTranslate import _

wolfhece/wolf_array.py

@@ -2443,6 +2443,7 @@ class Ops_Array(wx.Frame):
         if self.mapviewer is not None:
             self.mapviewer.start_action('select node by node', _('Please click on the desired nodes...'))
             self.mapviewer.active_array = self.parentarray
+            self.mapviewer.set_label_selecteditem(self.parentarray.idx)
 
     def select_zone_inside_manager(self):
         """
@@ -2485,6 +2486,7 @@ class Ops_Array(wx.Frame):
 
             self.mapviewer.start_action('select by vector inside', _('Please draw a polygon...'))
             self.mapviewer.active_array = self.parentarray
+            self.mapviewer.set_label_selecteditem(self.parentarray.idx)
             self.Active_vector(vect)
 
             firstvert = wolfvertex(0., 0.)
@@ -2523,6 +2525,7 @@ class Ops_Array(wx.Frame):
 
             self.mapviewer.start_action('select by vector along', _('Please draw a polyline...'))
             self.mapviewer.active_array = self.parentarray
+            self.mapviewer.set_label_selecteditem(self.parentarray.idx)
             self.Active_vector(vect)
 
             firstvert = wolfvertex(0., 0.)
@@ -2538,6 +2541,7 @@ class Ops_Array(wx.Frame):
             self.vectmp.reset()
             self.Active_vector(self.vectmp)
             self.mapviewer.active_array = self.parentarray
+            self.mapviewer.set_label_selecteditem(self.parentarray.idx)
 
             firstvert = wolfvertex(0., 0.)
             self.vectmp.add_vertex(firstvert)
@@ -2552,6 +2556,7 @@ class Ops_Array(wx.Frame):
             self.vectmp.reset()
             self.Active_vector(self.vectmp)
             self.mapviewer.active_array = self.parentarray
+            self.mapviewer.set_label_selecteditem(self.parentarray.idx)
 
             firstvert = wolfvertex(0., 0.)
             self.vectmp.add_vertex(firstvert)

{wolfhece-2.1.55.dist-info → wolfhece-2.1.57.dist-info}/METADATA

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

@@ -7,8 +7,8 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=uL1DJVmDI2xVSE7H6n3icn3QbsPtTHeg8E-6wkDloKw,476914
 wolfhece/PyConfig.py,sha256=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=Ib7Rix3QAjR9X0o1E-80_91QsKhWtxmnR2QA89WIPQU,402676
-wolfhece/PyGui.py,sha256=aRWv9tBpRl7sKEd2gHWj8Bss0ZOKbGlUYIehWHFm8WY,105008
+wolfhece/PyDraw.py,sha256=42kZbude0BSlpMfLPtcsUeYeCqzMj8AXVb5VuCHTK68,404422
+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
@@ -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=Yg3iX0hPXkdJTuwu6rXlRee2w6hL595_4RZWCUrFWKc,374869
+wolfhece/wolf_array.py,sha256=rHuPaSRTsTxQll8luqk5fdnAWRrEh73e30rdxjxA2Ls,375234
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
@@ -62,22 +62,25 @@ wolfhece/acceptability/acceptability.py,sha256=rk2NMGNx5uZADMZKA-CsGm612vtcse1DN
 wolfhece/acceptability/acceptability_gui.py,sha256=xyZt0u1DH2afsg04f50tk3QZkXNOgkGE99ZwaM_BaFI,12298
 wolfhece/acceptability/cli.py,sha256=WVyEtse0vh6PSCBNhT7x6wwdJI9D5iy5H-AkWov-vxs,7386
 wolfhece/acceptability/func.py,sha256=ZtBtxGGvWddrw0s4SU0y7DcU9K4kWxjQv1dB5zPki4s,61476
-wolfhece/apps/ManageParams.py,sha256=Y8QySTiqqYNvu3Q-5EuYGVqxGlKnBZwxTewXd6Ur1Tk,610
-wolfhece/apps/Optimisation_hydro.py,sha256=mfadJxYbRrQYmhIsB5Dled-6ZPnPNgBoxF-Q1JXL4yA,672
+wolfhece/apps/ManageParams.py,sha256=9okXHGHKEayA9iKTnv8jsVYCP2up5kr6hDaKO_fMCaQ,748
+wolfhece/apps/Optimisation_hydro.py,sha256=ySIaVsFNEx4PaHFLlT2QW9BiwChVcTNd2TBnW1aICsI,810
 wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,104622
 wolfhece/apps/WolfPython2.png,sha256=VMPV-M-3BCOg8zOJss8bXwPmzRYZy8Fo-XtnVYNgbaw,618073
 wolfhece/apps/WolfPython3.png,sha256=3G84zx14HnlB9YXMY4VUAO7IB3eu7JFvi4Kpmc_4zBE,403298
 wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
 wolfhece/apps/check_install.py,sha256=SG024u18G7VRLKynbp7DKD1jImtHwuWwN4bJWHm-YHE,1271
-wolfhece/apps/curvedigitizer.py,sha256=_hRR2PWow7PU7rTHIbc6ykZ08tCXcK9uy7RFrb4EKkE,5196
-wolfhece/apps/isocurrent.py,sha256=MuwTodHxdc6PrqNpphR2ntYf1NLL2n9klTPndGrOHDQ,4109
+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=POD15Cc2AZYe1VXE08EaduFN-zrnSaxN6wGC-H49Xoo,388
-wolfhece/apps/wolf.py,sha256=mM6Tyi4DlKQILmO49cDUCip9fYVy-hLXkY3YhZgIeUQ,591
-wolfhece/apps/wolf2D.py,sha256=yPQGee7fsegoQ8GfWKrWEjX1Az_ApL-UWlBiqPvaIyY,565
+wolfhece/apps/version.py,sha256=_LHTN6KB7_RiP0O4AhyTlsUdSaJH41BhhjQ7nNU0TWs,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
-wolfhece/apps/wolfcompare2Darrays.py,sha256=MQ7of28V-TZa9kMMy8NFijbRNaBVJa6R8PNoXwXQK7A,4041
-wolfhece/apps/wolfhydro.py,sha256=MlVQ8vJkpaFynOWl5MX93Jpl_FYmsu78Xb0Gm6oNsRo,679
+wolfhece/apps/wolf_logo2.bmp,sha256=pCJFVDn_-rHru6fumazVNM4BqAaobM0Xg0zI0DFWMSQ,5830
+wolfhece/apps/wolf_logo3.bmp,sha256=AxRvS_uc2MJn_ksMExPhFEDJ0_PmlR3xU13gzfc28xk,5830
+wolfhece/apps/wolf_logo4.bmp,sha256=N6d_NZ3V2M-qtSdTM0LP3PhU2TtltB_UNW6Z2WiLrvM,5830
+wolfhece/apps/wolfcompare2Darrays.py,sha256=AfEJjku_oSWWqyCIDOqId0quZrS_NpTIFN4fHcVDWb4,4179
+wolfhece/apps/wolfhydro.py,sha256=EsXTtXhnsQV1j-tiFYcyfMrJpjFv1MrWiftwODdi_8I,817
 wolfhece/bernoulli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/bernoulli/chamber.py,sha256=ZWNjTAmTaH8u8J00n8uEib7dy84mUfHWN43805W_Qsw,2354
 wolfhece/bernoulli/fluids.py,sha256=-mPv3EtCcIEfvTI7oSELtOjUFiKhKANu8w96NnUnrvU,464
@@ -280,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.55.dist-info/METADATA,sha256=RauQP3GnJ5Y_HTZ_79bVAZVYSVulNhDpEsPp1dPVLHc,2541
-wolfhece-2.1.55.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.55.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.55.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.55.dist-info/RECORD,,
+wolfhece-2.1.57.dist-info/METADATA,sha256=DslVY-yNMyENi7ZMy3_8ZLIWIFU2Eua2Jdw4Z9eGEjg,2541
+wolfhece-2.1.57.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.57.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.57.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.57.dist-info/RECORD,,