wolfhece 2.1.56__py3-none-any.whl → 2.1.58__py3-none-any.whl

wolfhece/PyDraw.py

@@ -586,6 +586,7 @@ class WolfMapViewer(wx.Frame):
         self.helpmenu = wx.Menu()
         self.helpmenu.Append(wx.ID_ANY, _('Shortcuts'), _('Shortcuts'))
         self.helpmenu.Append(wx.ID_ANY, _('About'), _('About'))
+        self.helpmenu.Append(wx.ID_ANY, _('Check for updates'), _('Update?'))
 
         self.menubar.Append(self.helpmenu, _('&Help'))
 
@@ -652,9 +653,11 @@ class WolfMapViewer(wx.Frame):
         # self.treelist.SetPosition((0,0))
 
         # fenêtre ToolTip
-        self.mytooltip = Wolf_Param(self, "Values", to_read=False, withbuttons=False)
+        self.mytooltip = Wolf_Param(self, _("Data/Results"), to_read=False, withbuttons=False, toolbar=False)
         self.mytooltip.SetSize(300, 400)
+        self.mytooltip.prop.SetDescBoxHeight(20) # Hauteur de la zone de description
         self.mytooltip.Show(False)
+        self._oldpos_tooltip = None
 
         #Notebooks
         self.notebookcs = None
@@ -4410,6 +4413,11 @@ class WolfMapViewer(wx.Frame):
             #print About Frame
             self.print_About()
 
+        elif itemlabel == _('Check for updates'):
+            # check for new version
+
+            self.check_for_updates()
+
         elif itemlabel == _("Integrate Q along active vector..."):
             """ Integrate Q along active vector """
 
@@ -7808,24 +7816,25 @@ class WolfMapViewer(wx.Frame):
 
         self.mytooltip.myparams.clear()
 
+
         curgroup = 'Position'
         self.mytooltip.myparams[curgroup] = {}
 
-        curpar = 'Pixel'
+        curpar = _('Pixel (col,row)')
         self.mytooltip.add_param(groupname = curgroup,
                                  name = curpar,
                                  value = '(' + str(pos[0]) + ' ; ' + str(pos[1]) + ')',
                                  type = Type_Param.String,
                                  comment = '')
 
-        curpar = 'Coordinate X'
+        curpar = _('Coordinate X [m]')
         self.mytooltip.add_param(groupname = curgroup,
                                  name = curpar,
                                  value = '{:3f}'.format(x),
                                  type = Type_Param.String,
                                  comment = '')
 
-        curpar = 'Coordinate Y'
+        curpar = _('Coordinate Y [m]')
         self.mytooltip.add_param(groupname = curgroup,
                                  name = curpar,
                                  value = '{:3f}'.format(y),
@@ -8130,14 +8139,48 @@ class WolfMapViewer(wx.Frame):
         self._update_mytooltip()
 
         if e.ControlDown():
-            self.mytooltip.SetWindowStyle(wx.STAY_ON_TOP)
+            if self._oldpos_tooltip is None:
+                # Store the position of the tooltip
+                # Useful to restore it after CTRL is released
+                self._oldpos_tooltip = self.mytooltip.GetPosition()
+
+            self.mytooltip.SetWindowStyle(wx.STAY_ON_TOP) # Just on top, without Title bar
             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.IsMaximized():
+                # Frame is maximized -> tooltip must be on the Screen
+                self.mytooltip.SetWindowStyle(wx.STAY_ON_TOP)
+            else:
+
+                if self._oldpos_tooltip is None:
+                    # No old position stored -> tooltip does not move
+                    pos_tooltip = self.mytooltip.GetPosition()
+                else:
+                    # Restore the position of the tooltip
+                    pos_tooltip = self._oldpos_tooltip
+
+                # Reset the old position, so when CTRL is pressed again, the memory will be updated
+                self._oldpos_tooltip = None
+
+                if shiftdown or (pos_tooltip[0] == 0 and pos_tooltip[1] == 0):
+                    # SHIFT is pressed or tooltip is at the top right corner of the Frame
+                    # or it is the first time the tooltip is displayed
+                    posframe[0] += width
+                    posframe[1] -= 50
+                    self.mytooltip.position(posframe)
+                    w, h = self.mytooltip.GetSize()
+                    self.mytooltip.SetSize((w, height))
+
+                else:
+                    # Force the position
+                    self.mytooltip.SetPosition(pos_tooltip)
+
+                self.mytooltip.SetIcon(self.GetIcon()) # update icon
+                self.mytooltip.SetWindowStyle(wx.DEFAULT_FRAME_STYLE | wx.STAY_ON_TOP) # on top, with Title bar
 
         self.mytooltip.Show(True)
 
@@ -8351,6 +8394,26 @@ class WolfMapViewer(wx.Frame):
         dlg.ShowModal()
         dlg.Destroy()
 
+    def check_for_updates(self):
+        """ Check for updates """
+        from .apps.version import WolfVersion
+        import pkg_resources
+
+        current_version = str(WolfVersion())
+        package_name = "wolfhece"
+
+        try:
+            available_version = pkg_resources.get_distribution(package_name).version
+            if available_version > current_version:
+                with wx.MessageDialog(None, _("A new version is available: {}").format(available_version), _("Update"), wx.OK | wx.ICON_INFORMATION) as dlg:
+                    dlg.ShowModal()
+            else:
+                with wx.MessageDialog(None, _("You have the latest version."), _("Update"), wx.OK | wx.ICON_INFORMATION) as dlg:
+                    dlg.ShowModal()
+
+        except pkg_resources.DistributionNotFound:
+            print("Package not found on PyPI.")
+
     def print_shortcuts(self, inframe:bool = None):
         """ Print the list of shortcuts into logging """
 
@@ -8418,10 +8481,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 +8509,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 +8543,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 +8562,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 +8879,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/PyParams.py

@@ -282,7 +282,8 @@ class Wolf_Param(wx.Frame):
                  DestroyAtClosing:bool = True,
                  toShow:bool = True,
                  init_GUI:bool = True,
-                 force_even_if_same_default:bool = False):
+                 force_even_if_same_default:bool = False,
+                 toolbar:bool = True):
         """
         Initialisation
 
@@ -325,7 +326,13 @@ class Wolf_Param(wx.Frame):
         self.sizer = None
 
         if self.wx_exists and init_GUI:
-            self._set_gui(parent,title,w,h,ontop,to_read,withbuttons,DestroyAtClosing,toShow)
+            self._set_gui(parent,
+                          title, w, h,
+                          ontop, to_read,
+                          withbuttons,
+                          DestroyAtClosing,
+                          toShow,
+                          toolbar=toolbar)
 
     @property
     def has_prop(self) -> bool:
@@ -512,7 +519,8 @@ class Wolf_Param(wx.Frame):
                 withbuttons:bool = True,
                 DestroyAtClosing:bool = True,
                 toShow:bool = True,
-                full_style = False):
+                full_style = False,
+                toolbar:bool = True):
         """
         Set the GUI if wxPython is running
 
@@ -573,7 +581,7 @@ class Wolf_Param(wx.Frame):
                 self.prop = pg.PropertyGridManager(self,
                     style = pg.PG_BOLD_MODIFIED|pg.PG_SPLITTER_AUTO_CENTER|
                     # Include toolbar.
-                    pg.PG_TOOLBAR |
+                    pg.PG_TOOLBAR if toolbar else 0 |
                     # Include description box.
                     pg.PG_DESCRIPTION |
                     pg.PG_TOOLTIPS |
@@ -591,7 +599,7 @@ class Wolf_Param(wx.Frame):
             self.prop = pg.PropertyGridManager(self,
                 style = pg.PG_BOLD_MODIFIED|pg.PG_SPLITTER_AUTO_CENTER|
                 # Include toolbar.
-                pg.PG_TOOLBAR |
+                pg.PG_TOOLBAR if toolbar else 0 |
                 # Include description box.
                 pg.PG_DESCRIPTION |
                 pg.PG_TOOLTIPS |
@@ -624,6 +632,11 @@ class Wolf_Param(wx.Frame):
         #affichage de la page
         self.Show(toShow)
 
+    def mask_toolbar(self):
+        """ Mask the toolbar """
+
+        self.prop.SetSt
+
     def _set_only_prop(self, wxparent):
         """ Set only the property grid """
 

wolfhece/apps/version.py

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

wolfhece/scenario/config_manager.py

@@ -1238,7 +1238,7 @@ class UI_Manager_2D_GPU():
         """
 
         # frame creation
-        self._frame = wx.Frame(None, wx.ID_ANY, _('Scenario WOLF2D_GPU'), size=(800,800))
+        self._frame = wx.Frame(self._parent.get_mapviewer(), wx.ID_ANY, _('Scenario WOLF2D_GPU'), size=(800,800))
 
         # sizers creation -- frame's structure
         sizer_updown = wx.BoxSizer(wx.VERTICAL)
@@ -1378,6 +1378,9 @@ class UI_Manager_2D_GPU():
         # link sizer to frame
         self._frame.SetSizer(sizer_updown)
 
+        if self._parent.get_mapviewer() is not None:
+            self._frame.SetIcon(self._parent.get_mapviewer().GetIcon())
+
         # Layout
         self._frame.Layout()
 

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

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

@@ -7,12 +7,12 @@ 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=ZJoYLDrz5_jSMwLfdE0wjWa3eBmdmHOsZbrgxMPcbSU,407046
 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
-wolfhece/PyParams.py,sha256=wwgmP-_7wiiPLTcyX8a5jR6FyC1D2c4oBPc1VWQqtSA,97383
+wolfhece/PyParams.py,sha256=Zxf3baM4TFNapcDqgrtM4IZ4vwCGVd3penwgwWUtG40,97775
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=MtZVjIWIi62QX_oqNosb56xPgjhOGVeGz-XsD82tsNg,40614
@@ -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=0lp2iLnoPUFxdKcw_jzmegskBPc16FjVo0YHgsdgPpQ,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
@@ -260,7 +260,7 @@ wolfhece/report/reporting.py,sha256=JUEXovx_S4jpYkJEBU0AC-1Qw2OkkWyV3VAp6iOfSHc,
 wolfhece/report/wolf_report.png,sha256=NoSV58LSwb-oxCcZScRiJno-kxDwRdm_bK-fiMsKJdA,592485
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/scenario/check_scenario.py,sha256=w7_SST4n_uec-MUBK36gbJzz2KC8qT_bVJ_VNyp7cMo,4917
-wolfhece/scenario/config_manager.py,sha256=UzInaAtxmTLqUaXAHg17iLcUZRGTrPPLsj2D9kBs6wI,85468
+wolfhece/scenario/config_manager.py,sha256=aZLfOdKCGva2lXVDAVQrn4nd9ONXHQ_ZNDcUcEIbkCo,85621
 wolfhece/scenario/imposebc_void.py,sha256=PqA_99hKcaqK5zsK6IRIc5Exgg3WVpgWU8xpwNL49zQ,5571
 wolfhece/scenario/update_void.py,sha256=ay8C_FxfXN627Hx46waaAO6F3ovYmOCTxseUumKAY7c,7474
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
@@ -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.58.dist-info/METADATA,sha256=otlu_91hkUtPzxtyi71YB3WkoTgL4Lf-YaMPAGm9LBM,2541
+wolfhece-2.1.58.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.58.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.58.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.58.dist-info/RECORD,,