wolfhece 2.1.56__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/apps/version.py

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

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

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

@@ -7,7 +7,7 @@ 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/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
@@ -72,7 +72,7 @@ wolfhece/apps/check_install.py,sha256=SG024u18G7VRLKynbp7DKD1jImtHwuWwN4bJWHm-YH
 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=jKmjHt6it_fDnxBWS6UidqNaqpxUEweKKiTeeY5HE80,388
+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
@@ -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.56.dist-info/METADATA,sha256=22ItLzx1EFDuQSjhn9gTL3WdS68Hq1rRch6O93ZtOAg,2541
-wolfhece-2.1.56.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.56.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.56.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.56.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,,