wolfhece 2.1.63__py3-none-any.whl → 2.1.65__py3-none-any.whl

wolfhece/PyDraw.py

@@ -605,6 +605,8 @@ class WolfMapViewer(wx.Frame):
         # Help
         self.helpmenu = wx.Menu()
         self.helpmenu.Append(wx.ID_ANY, _('Shortcuts'), _('Shortcuts'))
+        self.helpmenu.Append(wx.ID_ANY, _('Show logs/informations'), _('Logs'))
+        self.helpmenu.Append(wx.ID_ANY, _('Show values'), _('Data/Values'))
         self.helpmenu.Append(wx.ID_ANY, _('About'), _('About'))
         self.helpmenu.Append(wx.ID_ANY, _('Check for updates'), _('Update?'))
 
@@ -673,10 +675,10 @@ class WolfMapViewer(wx.Frame):
         # self.treelist.SetPosition((0,0))
 
         # fenêtre ToolTip
-        self.mytooltip = Wolf_Param(self, _("Data/Results"), to_read=False, withbuttons=False, toolbar=False)
+        self.mytooltip = Wolf_Param(self, _("Data/Results"), to_read=False, withbuttons=False, toolbar=False, DestroyAtClosing=False)
         self.mytooltip.SetSize(300, 400)
         self.mytooltip.prop.SetDescBoxHeight(20) # Hauteur de la zone de description
-        self.mytooltip.Show(False)
+        self.mytooltip.Show(True)
         self._oldpos_tooltip = None
 
         #Notebooks
@@ -733,6 +735,24 @@ class WolfMapViewer(wx.Frame):
     def wxlogging(self, value):
         self._wxlogging = value
 
+    def check_logging(self):
+        """ Check if logging window is shown """
+
+        if self._wxlogging is None:
+            logging.info(_('No logging window'))
+            return
+
+        self._wxlogging.Show()
+
+    def check_tooltip(self):
+        """ Check if tooltip window is shown """
+
+        if self.mytooltip is None:
+            logging.info(_('No tooltip window'))
+            return
+
+        self.mytooltip.Show()
+
 
     def open_hydrological_model(self):
         """ Open a hydrological model """
@@ -4429,6 +4449,12 @@ class WolfMapViewer(wx.Frame):
             # show shortcuts in log
             self.print_shortcuts(True)
 
+        elif itemlabel == _('Show logs/informations'):
+            self.check_logging()
+
+        elif itemlabel == _('Show values'):
+            self.check_tooltip()
+
         elif itemlabel == _('About'):
             #print About Frame
             self.print_About()
@@ -7492,6 +7518,11 @@ class WolfMapViewer(wx.Frame):
                 curobj: WolfArray
                 curobj = self.active_array.SelectionData
 
+            if curobj.myselection == 'all':
+                logging.warning(_('All nodes are selected !!'))
+                logging.warning(_('Selecting node by node will force to reset the selection'))
+                logging.warning(_('and start from scratch'))
+
             curobj.add_node_to_selection(x, y)
             curobj.update_nb_nodes_selection()
             self.Paint()
@@ -8202,7 +8233,7 @@ class WolfMapViewer(wx.Frame):
                 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)
+        # self.mytooltip.Show(True)
 
     def Autoscale(self, update_backfore=True):
         """ Redimensionnement de la fenêtre pour afficher tous les objets """
@@ -8502,7 +8533,7 @@ 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'),
+                     'LMB 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'),
@@ -8511,8 +8542,6 @@ class WolfMapViewer(wx.Frame):
                      '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'),
                      'Arrows': _('Drawing : lateral movements'),
@@ -8549,6 +8578,7 @@ class WolfMapViewer(wx.Frame):
                      'f or F, CTRL+F': _('Zones : search for the polyline in the current zone or in all zones'),
 
                      'RETURN': _('Action : End the current action (see also right double-click -- OnRDClick)'),
+                     'Press and Hold CTRL': _('Action : Data Frame follows the mouse cursor'),
 
                      'DELETE': _('Tree : Remove item'),
 

wolfhece/apps/version.py

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

wolfhece/wolf_array.py

@@ -3049,13 +3049,6 @@ class SelectionData():
         # So, if we want to update the plot, we need to apply the flag on each selection (current ans stored)
         update_select = self.update_plot_selection
 
-        if self.myselection != 'all':
-            # plot current selection in RED if not 'all'
-            if len(self.myselection) > 0:
-                self.numlist_select = self._plot_selection(self.myselection,
-                                                           (1., 0., 0.),
-                                                           self.numlist_select)
-
         if len(self.selections) > 0:
             # plot stored selections
             for cur in self.selections.values():
@@ -3067,6 +3060,15 @@ class SelectionData():
                                                             float(col[2]) / 255.),
                                                            cur['idgllist'])
 
+
+        if self.myselection != 'all':
+            # plot current selection in RED if not 'all'
+            if len(self.myselection) > 0:
+                self.update_plot_selection = update_select
+                self.numlist_select = self._plot_selection(self.myselection,
+                                                           (1., 0., 0.),
+                                                           self.numlist_select)
+
     def _plot_selection(self, curlist:list[float], color:list[float], loclist:int=0):
         """
         Plot a selection

{wolfhece-2.1.63.dist-info → wolfhece-2.1.65.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.63
+Version: 2.1.65
 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.63.dist-info → wolfhece-2.1.65.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=hcQbGY8IUnVY-Kf_4l-bHkYxIry2z0WKqt15M3rrDfY,408502
+wolfhece/PyDraw.py,sha256=fUz1NhX5BHIBwOWeFOt5ubSQjVaL-E9uRkCM_84v9rA,409593
 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=igy6c79MXgrM5xxpOjx79f24qSdk40Rgag-vcw0eCKU,375881
+wolfhece/wolf_array.py,sha256=bMDlkb019_yIybYVX6UCAVaCddFRLyiWJxoKwBlJBco,375943
 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=S884W0AFFwHVDK4rOm8wy0J-K8Ne5INr1lVKsRKri6A,388
+wolfhece/apps/version.py,sha256=MSfXnG6D4mlxFKhJcFP7QlAfHWaScurZWwVBhbmAPBw,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.63.dist-info/METADATA,sha256=ApSF782MQeDeIKrxEhyuiZAYmL9UV2h5IQ96kHtB9rg,2570
-wolfhece-2.1.63.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.63.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.63.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.63.dist-info/RECORD,,
+wolfhece-2.1.65.dist-info/METADATA,sha256=SxpvAVmGTj271sGsiTyfCzK2NYSSX2swU4BnZMJNc40,2570
+wolfhece-2.1.65.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.65.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.65.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.65.dist-info/RECORD,,