wolfhece 2.1.64__py3-none-any.whl → 2.1.66__py3-none-any.whl

wolfhece/PyDraw.py

@@ -7518,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()
@@ -8528,7 +8533,8 @@ 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 double clicks': _('Drawing : center the view on the clicked point -- future zoom will be centered on the point'),
+                     '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'),
@@ -8537,8 +8543,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'),
@@ -8575,6 +8579,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'),
 
@@ -8609,7 +8614,12 @@ class WolfMapViewer(wx.Frame):
             sizer.Add(multiline, 1, wx.EXPAND)
 
             frame.SetSizer(sizer)
-            frame.SetIcon(self.GetIcon())
+
+            icon = wx.Icon()
+            icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
+            icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+            frame.SetIcon(icon)
+
             frame.SetAutoLayout(True)
             frame.Layout()
 

wolfhece/PyVertexvectors.py

@@ -887,16 +887,10 @@ if :\n \
 
         self.myprops.SetTitle(_('Vector properties - {}'.format(self.parent.myname)))
 
-        if self.parent.get_mapviewer() is not None:
-            self.myprops.SetIcon(self.parent.get_mapviewer().GetIcon())
-        else:
-            try:
-                icon = wx.Icon()
-                icon_path = Path(__file__).parent / "apps/wolf_logo.bmp"
-                icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
-                self.myprops.SetIcon(icon)
-            except Exception as e:
-                logging.warning('Problem with icon for properties window : {}'.format(e))
+        icon = wx.Icon()
+        icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
+        icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+        self.myprops.SetIcon(icon)
 
         self.myprops.Center()
         self.myprops.Raise()
@@ -4882,8 +4876,10 @@ class Zones(wx.Frame, Element_To_Draw):
 
             self.SetSizer(box)
 
-            if self.get_mapviewer() is not None:
-                self.SetIcon(self.get_mapviewer().GetIcon())
+            icon = wx.Icon()
+            icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
+            icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+            self.SetIcon(icon)
 
             if self.idx == '':
                 if self.parent is not None:

wolfhece/apps/version.py

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

wolfhece/wolf_array.py

@@ -1251,7 +1251,7 @@ class NewArray(wx.Dialog):
 
         glsizer.Insert(0, gSizer1)
 
-        self.m_staticText9 = wx.StaticText(self, wx.ID_ANY, u"dX", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.m_staticText9 = wx.StaticText(self, wx.ID_ANY, u"dX [m]", wx.DefaultPosition, wx.DefaultSize, 0)
         self.m_staticText9.Wrap(-1)
 
         gSizer1.Add(self.m_staticText9, 0, wx.ALL, 5)
@@ -1259,7 +1259,7 @@ class NewArray(wx.Dialog):
         self.dx = wx.TextCtrl(self, wx.ID_ANY, u"1", wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER)
         gSizer1.Add(self.dx, 0, wx.ALL, 5)
 
-        self.m_staticText10 = wx.StaticText(self, wx.ID_ANY, u"dY", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.m_staticText10 = wx.StaticText(self, wx.ID_ANY, u"dY [m]", wx.DefaultPosition, wx.DefaultSize, 0)
         self.m_staticText10.Wrap(-1)
 
         gSizer1.Add(self.m_staticText10, 0, wx.ALL, 5)
@@ -1267,7 +1267,7 @@ class NewArray(wx.Dialog):
         self.dy = wx.TextCtrl(self, wx.ID_ANY, u"1", wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER)
         gSizer1.Add(self.dy, 0, wx.ALL, 5)
 
-        self.m_staticText11 = wx.StaticText(self, wx.ID_ANY, u"NbX", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.m_staticText11 = wx.StaticText(self, wx.ID_ANY, u"NbX [-]", wx.DefaultPosition, wx.DefaultSize, 0)
         self.m_staticText11.Wrap(-1)
 
         gSizer1.Add(self.m_staticText11, 0, wx.ALL, 5)
@@ -1275,7 +1275,7 @@ class NewArray(wx.Dialog):
         self.nbx = wx.TextCtrl(self, wx.ID_ANY, u"1", wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER)
         gSizer1.Add(self.nbx, 0, wx.ALL, 5)
 
-        self.m_staticText12 = wx.StaticText(self, wx.ID_ANY, u"NbY", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.m_staticText12 = wx.StaticText(self, wx.ID_ANY, u"NbY [-]", wx.DefaultPosition, wx.DefaultSize, 0)
         self.m_staticText12.Wrap(-1)
 
         gSizer1.Add(self.m_staticText12, 0, wx.ALL, 5)
@@ -1283,7 +1283,7 @@ class NewArray(wx.Dialog):
         self.nby = wx.TextCtrl(self, wx.ID_ANY, u"1", wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER)
         gSizer1.Add(self.nby, 0, wx.ALL, 5)
 
-        self.m_staticText13 = wx.StaticText(self, wx.ID_ANY, u"OrigX", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.m_staticText13 = wx.StaticText(self, wx.ID_ANY, u"Origin X [m]", wx.DefaultPosition, wx.DefaultSize, 0)
         self.m_staticText13.Wrap(-1)
 
         gSizer1.Add(self.m_staticText13, 0, wx.ALL, 5)
@@ -1291,7 +1291,7 @@ class NewArray(wx.Dialog):
         self.ox = wx.TextCtrl(self, wx.ID_ANY, u"0", wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER)
         gSizer1.Add(self.ox, 0, wx.ALL, 5)
 
-        self.m_staticText14 = wx.StaticText(self, wx.ID_ANY, u"OrigY", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.m_staticText14 = wx.StaticText(self, wx.ID_ANY, u"Origin Y [m]", wx.DefaultPosition, wx.DefaultSize, 0)
         self.m_staticText14.Wrap(-1)
 
         gSizer1.Add(self.m_staticText14, 0, wx.ALL, 5)
@@ -2007,6 +2007,11 @@ class Ops_Array(wx.Frame):
         self.histoupdatezoom.Bind(wx.EVT_BUTTON, self.OnClickHistoUpdate)
         self.histoupdateerase.Bind(wx.EVT_BUTTON, self.OnClickHistoUpdate)
 
+        icon = wx.Icon()
+        icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
+        icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+        self.SetIcon(icon)
+
     def OnBlockSelect(self, event):
         """ Select block """
 
@@ -3049,13 +3054,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 +3065,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
@@ -4485,6 +4492,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             assert self.wx_exists, _('Array creation required a running wx App to display the UI')
             # Dialog for the creation of a new array
             new = NewArray(None)
+
             ret = new.ShowModal()
             if ret == wx.ID_CANCEL:
                 return
@@ -4655,9 +4663,6 @@ class WolfArray(Element_To_Draw, header_wolf):
         if self.wx_exists and self.myops is not None:
             self.myops.SetTitle(_('Operations on array: ') + self.idx)
 
-            if self.mapviewer is not None:
-                self.myops.SetIcon(self.mapviewer.GetIcon())
-
             self.myops.Show()
 
             self.myops.Center()

{wolfhece-2.1.64.dist-info → wolfhece-2.1.66.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.64
+Version: 2.1.66
 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.64.dist-info → wolfhece-2.1.66.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=2yGtt-_3Ufjnk6UxtBpTakAzmPftwG14z78u6MO_3dQ,409306
+wolfhece/PyDraw.py,sha256=pvvPOhMs1JxyYzEBPwBm7w5oP-0smiZly0pU4mv7LJY,409909
 wolfhece/PyGui.py,sha256=oBIBpgBQRR_XXucKE5-RFrtqKj0DRg9VlUCRo8Mzalc,105009
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -16,7 +16,7 @@ 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
-wolfhece/PyVertexvectors.py,sha256=mZlu2IeCQH-VdDQrw_fYbns3NQ_qdfbb3ndqzfjC_nI,237049
+wolfhece/PyVertexvectors.py,sha256=6rUVRMbar-2s59DrbnGncUOj5dR5ovMYxi8LXLd9PzA,236833
 wolfhece/PyWMS.py,sha256=fyyzm2HFwq8aRwVYHKiBatcZOeKnFi6DWhv4nfscySQ,4602
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -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=Zb93bxUx5JJ8Mq7jQWBMMRAJLsgSjeX5EIA31aJJ8LI,376066
 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=8BNTLmLU9-Zp2xRizBpUJsJqqJyTCrg70H6M9f8r7Qw,388
+wolfhece/apps/version.py,sha256=O8ZZomRXgXIg3ep7c52RJmvZUQl3rFlDBMhUIg4HaA4,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.64.dist-info/METADATA,sha256=d8dI7ZH5M2kfhZFyr6O71sA6hPjeG9Sy_jhhYzjLG_o,2570
-wolfhece-2.1.64.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.64.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.64.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.64.dist-info/RECORD,,
+wolfhece-2.1.66.dist-info/METADATA,sha256=0sC8b4E0or7Irtp909AReOyaA-51BqdzyVnXFochOoo,2570
+wolfhece-2.1.66.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.66.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.66.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.66.dist-info/RECORD,,