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

wolfhece/math_parser/calculator.py

@@ -10,14 +10,15 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 
 import wx
 import logging
+from pathlib import Path
 
 
 from . import Parser, Expression
 
 class Calculator(wx.Frame):
- 
+
     def __init__(self, mapviewer=None):
-        
+
         from ..PyDraw import WolfMapViewer, draw_type, WolfArray
 
         super(Calculator, self).__init__(None, title='Calculator', size=(500, 300))
@@ -38,18 +39,23 @@ class Calculator(wx.Frame):
         self._comment = wx.TextCtrl(self, style=wx.TE_RIGHT|wx.TE_RICH2|wx.TE_MULTILINE)
         self.memory   = wx.TextCtrl(self, style=wx.TE_RIGHT|wx.TE_RICH2|wx.TE_MULTILINE)
         self.btn_reset_memory = wx.Button(self, label='Reset Memory')
-        
+
         self.Bind(wx.EVT_BUTTON, lambda v: self.bt_press(v.EventObject.Label))
 
-        self._btns[-1][-2].SetDefault() 
+        self._btns[-1][-2].SetDefault()
 
         self.Bind(wx.EVT_CHAR_HOOK, self.char_press)
         self.btn_reset_memory.Bind(wx.EVT_BUTTON, lambda v: self._memory.clear())
-        
+
         self.SetSizer(self.pack([self._disp] + [self.pack(x) for x in self._btns] + [self.pack([self._comment, self.btn_reset_memory, self.memory])], orient=wx.VERTICAL))
 
         self._disp.SetFocus()
 
+        icon = wx.Icon()
+        icon_path = Path(__file__).parent.parent / "apps/wolf_logo2.bmp"
+        icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+        self.SetIcon(icon)
+
         self.Show()
 
     def pack(self, items, orient=wx.HORIZONTAL):
@@ -57,11 +63,11 @@ class Calculator(wx.Frame):
         sizer = wx.BoxSizer(orient)
         sizer.AddMany((i, 1, wx.EXPAND|wx.ALL, 0) for i in items)
         return sizer
-    
+
     @property
     def command(self) -> str:
-        return self._disp.Value  
-    
+        return self._disp.Value
+
     @command.setter
     def command(self, value):
         self._disp.Value = str(value)
@@ -70,16 +76,16 @@ class Calculator(wx.Frame):
     @property
     def comment(self) -> str:
         return self._comment.Value
-    
+
     @comment.setter
     def comment(self, value):
         self._comment.Value = str(value)
 
     def check_command(self) -> bool:
-        """ Check if the command is valid """        
-        
+        """ Check if the command is valid """
+
         from ..PyDraw import draw_type
-        
+
         if '\n' in self.command:
             self.evaluate_multilines()
             return False
@@ -94,7 +100,7 @@ class Calculator(wx.Frame):
             if self._mapviewer is not None:
                 id_arrays = self._mapviewer.get_list_keys(drawing_type=draw_type.ARRAYS,
                                                        checked_state=None)
-                
+
                 for id_array in id_arrays:
                     self._memory[id_array] = self._mapviewer.get_obj_from_id(id_array, drawtype=draw_type.ARRAYS)
 
@@ -124,27 +130,27 @@ class Calculator(wx.Frame):
     def evaluate(self, mem_last_command=True):
         """ Evaluate the command """
         from ..PyDraw import WolfArray, draw_type
-        
+
         if mem_last_command:
             self._last_command = self.command
 
         ret = self.check_command()
-        
+
         if ret:
             args = {var:self._memory[var] for var in self._parsed_command.variables()}
             res = self._parsed_command.evaluate(args)
 
             if isinstance(res, dict):
-                
+
                 comment = 'Storing\n'
-                
+
                 for key, value in res.items():
                     self._memory[key] = value
                     comment += f'{key} = {value}\n'
-                
+
                 self.comment = comment
                 self.command = ''
-            
+
             elif isinstance(res, str|int|float):
                 self.command = res
 
@@ -154,10 +160,10 @@ class Calculator(wx.Frame):
                 id = self.command
                 while id in ids:
                     id += '_'
-                
+
                 self._mapviewer.add_object('array', newobj=res, id = id)
                 self.command = ''
-                
+
             return res
 
     def char_press(self, e:wx.KeyEvent):
@@ -168,13 +174,13 @@ class Calculator(wx.Frame):
 
         unicodekey = e.GetUnicodeKey()
         key = e.GetKeyCode()
- 
+
         ctrl = e.ControlDown()
         alt  = e.AltDown()
         shift= e.ShiftDown()
 
         if unicodekey in egal_code:
-            if not shift : 
+            if not shift :
                 self.evaluate()
                 return
 
@@ -186,4 +192,3 @@ class Calculator(wx.Frame):
         elif key == '<': self.command =self._last_command
         elif key == '=': self.evaluate()
         else           : self._disp.Value += key
- 

wolfhece/pyviews.py

@@ -11,7 +11,8 @@ copying or distribution of this file, via any medium, is strictly prohibited.
 import logging
 
 from .drawing_obj import Element_To_Draw
-from .wolf_array import WolfArray, WolfArrayMB, VERSION_RGB, wolfpalette
+from .wolf_array import WolfArray, WolfArrayMB, VERSION_RGB
+from .PyPalette import wolfpalette
 from .PyParams import Wolf_Param, key_Param, Type_Param
 
 

wolfhece/wolf_array.py

@@ -2503,6 +2503,8 @@ class Ops_Array(wx.Frame):
             logging.warning(_('Please add points to vector or select another !'))
             return
 
+        logging.info(_('Select nodes inside the active polygon/vector...'))
+
         self._select_vector_inside_manager(self.active_vector)
         self.refresh_array()
 
@@ -2528,9 +2530,11 @@ class Ops_Array(wx.Frame):
         """ Select nodes along the active zone (manager) """
 
         if self.active_zone is None:
-            wx.MessageBox('Please select an active zone !')
+            logging.warning(_('Please activate a zone !'))
             return
 
+        logging.info(_('Select nodes along the active zone - all polylines...'))
+
         for curvec in self.active_zone.myvectors:
             self._select_vector_under_manager(curvec)
 
@@ -2539,9 +2543,11 @@ class Ops_Array(wx.Frame):
     def select_vector_under_manager(self):
         """ Select nodes along the active vector (manager) """
         if self.active_vector is None:
-            wx.MessageBox('Please select an active vector !')
+            logging.warning(_('Please activate a vector !'))
             return
 
+        logging.info(_('Select nodes along the active polyline/vector...'))
+
         self._select_vector_under_manager(self.active_vector)
         self.refresh_array()
 
@@ -2567,6 +2573,7 @@ class Ops_Array(wx.Frame):
         """ Select nodes inside the temporary vector """
 
         if self.mapviewer is not None:
+            logging.info(_('Select nodes inside a temporary polygon/vector...'))
             logging.info(_('Please add points to vector by clicks !'))
 
             self.mapviewer.start_action('select by tmp vector inside', _('Please draw a polygon...'))
@@ -2581,9 +2588,9 @@ class Ops_Array(wx.Frame):
     def select_vector_under_tmp(self):
         """ Select nodes along the temporary vector """
         if self.mapviewer is not None:
+            logging.info(_('Select nodes along a temporary polygon/vector...'))
             logging.info(_('Please add points to vector by clicks !'))
 
-
             self.mapviewer.start_action('select by tmp vector along', _('Please draw a polyline...'))
             self.vectmp.reset()
             self.Active_vector(self.vectmp)
@@ -3272,6 +3279,10 @@ class SelectionData():
         myvect.find_minmax()
         mypoints = self.parent.get_ij_under_polyline(myvect)
 
+        if len(mypoints) == 0:
+            logging.info(_('No nodes under the polyline'))
+            return
+
         self._add_nodes_to_selectionij(mypoints, verif=nbini != 0)
 
         if self.parent.myops is not None:
@@ -6784,6 +6795,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         allij = np.unique(allij, axis=0)
 
+        # filter negative indexes
+        allij = allij[np.where((allij[:, 0] >= 0) & (allij[:, 1] >= 0) & (allij[:, 0] < self.nbx) & (allij[:, 1] < self.nby))]
+
         if usemask:
             mymask = np.logical_not(self.array.mask[allij[:, 0], allij[:, 1]])
             allij = allij[np.where(mymask)]

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

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

@@ -4,10 +4,10 @@ wolfhece/GraphNotebook.py,sha256=2TR8qjEwpMtl34QWgYNVe_PgTnuwhUxT5f9Y2zrmN2U,282
 wolfhece/GraphProfile.py,sha256=OCgJo0YFFBI6H1z-5egJsOOoWF_iziiza0-bbPejNMc,69656
 wolfhece/Lidar2002.py,sha256=bX-nIzdpjD7rOfEgJpTeaW6rIdAXwDp_z4YTM9CgANY,6068
 wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
-wolfhece/Model1D.py,sha256=uL1DJVmDI2xVSE7H6n3icn3QbsPtTHeg8E-6wkDloKw,476914
+wolfhece/Model1D.py,sha256=iy9slhUvP5gXOhsAwjFhX83Rb9pMIDarkUAj9reNRCw,477027
 wolfhece/PyConfig.py,sha256=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=pvvPOhMs1JxyYzEBPwBm7w5oP-0smiZly0pU4mv7LJY,409909
+wolfhece/PyDraw.py,sha256=xn1yWjsNc5HOf9HAzLPlMG7YfB7xuO1dyIL7l0GePTE,411137
 wolfhece/PyGui.py,sha256=oBIBpgBQRR_XXucKE5-RFrtqKj0DRg9VlUCRo8Mzalc,105009
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -43,12 +43,12 @@ wolfhece/pydike.py,sha256=hPBQsmSTW4QAp1wcOzb-TL3L7eet2WT1sJx2q-WNQ-Q,2241
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=x-tnYLNq3MPV51NbaU14trgRj8qyUyOrMdF1zDsUX3I,37444
 wolfhece/pyshields.py,sha256=7k-qe2EJgr9fJE62jyPmlWQwRj8T0DK4iuMU844ZhYs,23281
-wolfhece/pyviews.py,sha256=AUtJY5V43XVH9juIKUSsozKbpkXHCEkWxn0GWuvAo_0,12562
+wolfhece/pyviews.py,sha256=jFbjktYG-knwaqPzECuspZLesBcd40mptlaXqU_phfM,12585
 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=Zb93bxUx5JJ8Mq7jQWBMMRAJLsgSjeX5EIA31aJJ8LI,376066
+wolfhece/wolf_array.py,sha256=QmAcZNRMdGwqXRO3MsRMREYW_3ZdJ41i9gg4WMtAbLM,376746
 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=O8ZZomRXgXIg3ep7c52RJmvZUQl3rFlDBMhUIg4HaA4,388
+wolfhece/apps/version.py,sha256=9pKM_R-pqYp94pRjkkob738cc9PnIms77Dp-TKGaTB0,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
@@ -126,7 +126,7 @@ wolfhece/hydrology/read.py,sha256=itMat6MMn4Y14C3SMU_9JMBtpXFjG4mLNMfXXd5U6Ns,93
 wolfhece/hydrology/slope_manager.py,sha256=vlek0z8qcqB61eleiksyOe3QR1vpbtwfeowy6ms7_Fg,5580
 wolfhece/hydrology/wolfMap_treatment.py,sha256=eAxr24zJGwmDof1aZpcxewVvv_bWDvoO8t9Wwf99Mlo,10606
 wolfhece/hydrometry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/hydrometry/kiwis.py,sha256=KHRfYrtd5hwxKxdChbkTXYH-cDSDcaQJFTEgjrnVMg4,34929
+wolfhece/hydrometry/kiwis.py,sha256=m3LGNxmB_ZY_ug-8BCM8jK_VqN6LtWRGpbPWtgRYFSE,46460
 wolfhece/hydrometry/kiwis_gui.py,sha256=lApsSeBMJNAR1yocggdoHwz_xe6M_oaZ_E13CfHAlQA,23124
 wolfhece/hydrometry/kiwis_wolfgui.py,sha256=GPa5YNp2V2ZlxYQjPiCXERgPuWB_zij4ec2yHpRvoFA,4027
 wolfhece/hydrometry/kiwispie.py,sha256=akOaV46WwzISVlCcPz_phjsBrI_rDACUzdELtjx-xNg,13498
@@ -213,7 +213,7 @@ wolfhece/mar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mar/commontools.py,sha256=vCmoNI2sMOco6Y4KPpKb7WORq45qFU_lSxbKGV9oZ8A,53824
 wolfhece/mar/interface_MAR_WOLF.py,sha256=MWeXaHLDT4Eo9jZOAvz013lmpgGYT1v9VUYGAgBgSRU,21454
 wolfhece/math_parser/__init__.py,sha256=mrD_uFDDZzvyxQkY8ESqcy1bvM7e3__Gi2b_vijvoo8,27977
-wolfhece/math_parser/calculator.py,sha256=5VLYWkyvH7u3yMyQpzgc2uNyjgJHoS9HgLDyl6JqG38,6005
+wolfhece/math_parser/calculator.py,sha256=VCXCT5zhyMSgkO5O8dwIhRht9NNBqA0h1QPliOD4N28,6046
 wolfhece/mesh2d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mesh2d/bc_manager.py,sha256=QTGkb5TR8Y5xVnGUXPXzscGyTEQ6PA8CZPkVNwrlR1Y,53265
 wolfhece/mesh2d/cell_tracker.py,sha256=mPmnD5lEf3gLPuLqtAIo-Gp-ipAwQdPxzjWOGt0b7jM,8958
@@ -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.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,,
+wolfhece-2.1.68.dist-info/METADATA,sha256=yFi2FGPJlzNBz_938XrVtCvrDzn2supoFh-NQY-fyLs,2570
+wolfhece-2.1.68.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.68.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.68.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.68.dist-info/RECORD,,