wolfhece 2.1.19__py3-none-any.whl → 2.1.21__py3-none-any.whl

wolfhece/math_parser/calculator.py

@@ -0,0 +1,179 @@
+import wx
+import logging
+
+
+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))
+
+        self._memory = {}
+
+        self._parser = Parser()
+        self._parsed_command:Expression = None
+
+        self._mapviewer:WolfMapViewer = mapviewer
+        self._last_command = None
+
+        keys = '()C<789/456*123-.0=+'
+        self._btns:list[list[wx.Button]] = [[wx.Button(self, label=c) for c in keys[i:i+4]] for i in range(0,20,4)]
+
+        self._disp = wx.TextCtrl(self, style=wx.TE_RIGHT|wx.TE_RICH2|wx.TE_MULTILINE)
+
+        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.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()
+
+        self.Show()
+
+    def pack(self, items, orient=wx.HORIZONTAL):
+        """ Pack items in a sizer """
+        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  
+    
+    @command.setter
+    def command(self, value):
+        self._disp.Value = str(value)
+        self._disp.SetInsertionPointEnd()
+
+    @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 """        
+        
+        from ..PyDraw import draw_type
+        
+        if '\n' in self.command:
+            self.evaluate_multilines()
+            return False
+        else:
+
+            self._parsed_command = self._parser.parse(self.command)
+
+            symbols = self._parsed_command.symbols()
+            variables = self._parsed_command.variables()
+            functions = self._parsed_command.functions
+
+            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)
+
+            if len(variables) > 0:
+                for var in variables:
+                    if var not in self._memory:
+                        self.comment = f'Variable {var} not defined'
+                        return False
+
+            return True
+
+    def evaluate_multilines(self):
+        """ Evaluate multiline commands """
+
+        self._last_command = self.command
+
+        commands = self.command.split('\n')
+
+        ret = []
+        for command in commands:
+            self.command = command
+            ret.append(str(self.evaluate(mem_last_command=False)))
+
+        self.command = '\n'.join(ret)
+
+
+    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
+
+            elif isinstance(res, WolfArray):
+
+                ids = self._mapviewer.get_list_keys(drawing_type=draw_type.ARRAYS, checked_state=None)
+                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):
+        """ Handle key press """
+
+        egal = '='
+        egal_code = [ord(egal)]
+
+        unicodekey = e.GetUnicodeKey()
+        key = e.GetKeyCode()
+ 
+        ctrl = e.ControlDown()
+        alt  = e.AltDown()
+        shift= e.ShiftDown()
+
+        if unicodekey in egal_code:
+            if not shift : 
+                self.evaluate()
+                return
+
+        e.Skip()
+
+    def bt_press(self, key):
+        """ Handle button press  """
+        if   key == 'C': self._disp.Value = ''
+        elif key == '<': self.command =self._last_command
+        elif key == '=': self.evaluate()
+        else           : self._disp.Value += key
+ 

wolfhece/wolf_array.py

@@ -30,7 +30,7 @@ from scipy.interpolate import interp2d, griddata
 from scipy.ndimage import laplace, label, sum_labels
 import pygltflib
 from shapely.geometry import Point, LineString, MultiLineString
-from shapely.ops import linemerge, substring
+from shapely.ops import linemerge, substring, polygonize_full
 from os.path import dirname,basename,join
 import logging
 from typing import Literal
@@ -7376,7 +7376,13 @@ class WolfArray(Element_To_Draw, header_wolf):
 
             curlist['done'][loci, locj] = 1
 
-    def suxsuy_contour(self, filename:str='', abs:bool=False) -> tuple[list[int,int], list[int,int], vector, bool]:
+    def suxsuy_contour(self, 
+                       filename:str='', 
+                       abs:bool=False,
+                       one_vec_if_ml:bool = True) -> tuple[list[int,int], 
+                                                           list[int,int], 
+                                                           vector | zone, 
+                                                           bool]:
         """
         The borders are computed on basis of the current *mask*
 
@@ -7406,31 +7412,6 @@ class WolfArray(Element_To_Draw, header_wolf):
             translx += self.translx
             transly += self.transly
 
-        # for i in range(self.nbx-1):
-        #     for j in range(self.nby-1):
-        #         x1 = float(i+1) * dx + translx
-        #         y1 = float(j+1) * dy + transly
-        #         if self.array.mask[i, j] ^ self.array.mask[i + 1, j]: # ^ == xor
-
-        #             # There's a vertical border between the cells (i,j) and
-        #             # (i+1,j).
-
-        #             # Remember vertical borders are (by convention) located
-        #             # on the left side of a cell.
-        #             # Moreover, (i,j) are counted in numpy coordinates
-        #             # (0-based) but the saved files follow Fortran convention
-        #             # (1-based), so we add +1 to both i,j before storing.
-
-        #             indicesX.append([i+2, j+1]) # +2, +1 pour être en accord avec le standard de numérotation Fortran
-        #             locls.append(LineString([[x1,y1-dy],[x1,y1]]))
-
-        #         if self.array.mask[i, j] ^ self.array.mask[i, j +1]:
-        #             # See vertical border's explanation above (and replace
-        #             # with horizontal).
-
-        #             indicesY.append([i+1,j+2]) # +1, +2 pour être en accord avec le standard de numérotation Fortran
-        #             locls.append(LineString([[x1-dx,y1],[x1,y1]]))
-
         horiz = np.where(self.array.mask[0:self.nbx-1,0:self.nby-1] ^ self.array.mask[1:self.nbx,0:self.nby-1])
         vert  = np.where(self.array.mask[0:self.nbx-1,0:self.nby-1] ^ self.array.mask[0:self.nbx-1,1:self.nby])
 
@@ -7462,33 +7443,47 @@ class WolfArray(Element_To_Draw, header_wolf):
                 contourgen.add_vertex(wolfvertex(x,y))
 
         elif contour.geom_type == 'MultiLineString':
-            interior=True
-            # Multiple vectors --> combine
-
-            # searching the longest LineString -> external contour
-            contour:MultiLineString
-            lenghts=[mygeom.length  for mygeom in contour.geoms]
-            ind = np.argmax(lenghts)
+            if one_vec_if_ml:
+                interior=True
+                # Multiple vectors --> combine
+
+                # searching the longest LineString -> external contour
+                contour:MultiLineString
+                lenghts=[mygeom.length  for mygeom in contour.geoms]
+                ind = np.argmax(lenghts)
+
+                xyall=[np.column_stack([np.asarray(mygeom.coords),np.zeros(len(mygeom.coords))]) for mygeom in contour.geoms]
+
+                # coordinates of the longest LineString
+                xy = xyall[ind]
+
+                for i in range(len(xyall)):
+                    if i!=ind:
+                        # Concatenate local LineString to the external contour + 2 connection segments
+                        # Z coordinate is set to 1. -> will be used to check it after and change "in_use" property
+                        xy=np.concatenate([xy,
+                                        np.asarray([xyall[i][0,0],xyall[i][0,1],1.]).reshape([1,3]),
+                                        xyall[i][1:],
+                                        np.asarray([xy[0,0],xy[0,1],1.]).reshape([1,3])])
+
+                nb = len(xy)
+                contourgen = vector(name='external border')
+                for x,y,z in xy:
+                    contourgen.add_vertex(wolfvertex(x,y,z))
+                    contourgen.myvertices[-1].in_use = z == 0. # the new vertex is related to a connection segment --> ignore for numerical precision in intersection operations/calculations
+            else:
+                contourgen = zone(name = 'contour')
 
-            xyall=[np.column_stack([np.asarray(mygeom.coords),np.zeros(len(mygeom.coords))]) for mygeom in contour.geoms]
+                for cur_ls in contour.geoms:
+                    xy = np.asarray(cur_ls.coords)
+                    nb = len(xy)
 
-            # coordinates of the longest LineString
-            xy = xyall[ind]
+                    cur_vec = vector(name='external border')
+                    for x,y in xy:
+                        cur_vec.add_vertex(wolfvertex(x,y))
 
-            for i in range(len(xyall)):
-                if i!=ind:
-                    # Concatenate local LineString to the external contour + 2 connection segments
-                    # Z coordinate is set to 1. -> will be used to check it after and change "in_use" property
-                    xy=np.concatenate([xy,
-                                      np.asarray([xyall[i][0,0],xyall[i][0,1],1.]).reshape([1,3]),
-                                      xyall[i][1:],
-                                      np.asarray([xy[0,0],xy[0,1],1.]).reshape([1,3])])
+                    contourgen.add_vector(cur_vec, forceparent=True)
 
-            nb = len(xy)
-            contourgen = vector(name='external border')
-            for x,y,z in xy:
-                contourgen.add_vertex(wolfvertex(x,y,z))
-                contourgen.myvertices[-1].in_use = z == 0. # the new vertex is related to a connection segment --> ignore for numerical precision in intersection operations/calculations
         else:
             contourgen = None
             err = _(f"Unsupported Shapely contour result: {contour.geom_type}")

{wolfhece-2.1.19.dist-info → wolfhece-2.1.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.19
+Version: 2.1.21
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: AGPL-v3 License
 Project-URL: Homepage, https://uee.uliege.be/hece
@@ -13,6 +13,7 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Python: <3.11,>=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: wxpython
+Requires-Dist: triangle
 Requires-Dist: numpy
 Requires-Dist: pyopengl
 Requires-Dist: pandas

{wolfhece-2.1.19.dist-info → wolfhece-2.1.21.dist-info}/RECORD

@@ -6,7 +6,7 @@ wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/Model1D.py,sha256=-cMz-ePSYzrKVVDidiDOz6cojEZ3y6u9gIb7RPwT6Y8,476593
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
 wolfhece/PyCrosssections.py,sha256=f4dNYRUGZKePruaaBiTcn5vlrw8TFTj9XwTDrdiF_uU,112450
-wolfhece/PyDraw.py,sha256=YlgDQm0xiJP0uWLCpLVFhjH9YPl3O7JyO-2tLYlqxqw,384535
+wolfhece/PyDraw.py,sha256=eZCDOZsiZ9dVFtfeg4Cxep_HHMcyo11kGMK7a4xge-E,384933
 wolfhece/PyGui.py,sha256=fqy8f3tLt7myJskVvspTQ_ZO7kaiSNKmcfFLrfr4w7M,103174
 wolfhece/PyGuiHydrology.py,sha256=r8kcY2eGAQzSwVtLpyMUiBL5xBpMBsi7ovs0PgStGWw,14648
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
@@ -15,7 +15,7 @@ wolfhece/PyParams.py,sha256=Aj8kcT044abwBYU_OiEcJWcyNVqxYithNfbzdHyI-QA,97072
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=dHTjyYYTn0F_NWerlAOBKHV79RUzEEtMJMldQtVc1Cs,40092
-wolfhece/PyVertexvectors.py,sha256=4K0T74MUH-ycX79hFa2618vKVTu9qOSh49hlbKrydMg,224123
+wolfhece/PyVertexvectors.py,sha256=YcLs8xwmD3UqGDxfjzRedZolLN3SCHotoXxzP2U4HkU,226029
 wolfhece/PyWMS.py,sha256=pV7JdzbreQGXCg3E6PwllchEUYu2YiPZEIua2ppJorA,4304
 wolfhece/RatingCurve.py,sha256=f6IGLS5aJBJD_t_k903m_yRZ60MzKNKanzD6njXZxa8,22200
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -48,7 +48,7 @@ wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
 wolfhece/test_Results2DGPU.py,sha256=NOJ_hFXrcLSQXS1dtsqXRQltqIZtDSHMz_EgAJ2_FHU,307
 wolfhece/textpillow.py,sha256=zEfLrKhfCDyMaVuQOUjHqz6MGKeQ4aewMxOsWi5-wKI,13832
 wolfhece/tools_mpl.py,sha256=q8Yc4aukPPiUcEzREvZRM_em67XqXaahdoaNt0DETfE,266
-wolfhece/wolf_array.py,sha256=8cYHIwul4VVkSXwGqPMLaEv8n3c5cC0Ozp5xdfupUsI,342928
+wolfhece/wolf_array.py,sha256=uYyymkYRDOk43GK7Wn91IKCJ5CmjLiMIgXReRFTkzuc,342457
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
@@ -66,7 +66,7 @@ wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9
 wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
 wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
 wolfhece/apps/splashscreen.py,sha256=LkEVMK0eCc84NeCWD3CGja7fuQ_k1PrZdyqD3GQk_8c,2118
-wolfhece/apps/version.py,sha256=pxI-blXjVWz8Af7dvteh6caxvhN-mCRsq-_4uSmye8s,388
+wolfhece/apps/version.py,sha256=vzfNBTFSbty1piUlbNtlxS283UUEd8VsyNhwhWSDzS0,388
 wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
 wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -212,6 +212,8 @@ wolfhece/mar/Interface_MAR_WOLF_objet.py,sha256=_PNOrZDr-7CR19x_XHqLB5Si2hk8e469
 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=klFB2kMsC0VfQ5IoXBZ1xzn8jbSrJGzYJ7NTHgC_9vc,5707
 wolfhece/mesh2d/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/mesh2d/bc_manager.py,sha256=OzN4NPlDniv9HsLTUQrJkBY6U_a3SkqNpvjIw0TcguI,52967
 wolfhece/mesh2d/cell_tracker.py,sha256=AR-Bty-QnrY1ni8Lwak2kU2UWMAJSBCF2ugl2YpfsB4,8660
@@ -268,8 +270,8 @@ wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,11
 wolfhece/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
-wolfhece-2.1.19.dist-info/METADATA,sha256=nBRFLNjydXPkETNSMpS4ccjkMxDi8kgcghfRBWX9Vmg,2282
-wolfhece-2.1.19.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-wolfhece-2.1.19.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.19.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.19.dist-info/RECORD,,
+wolfhece-2.1.21.dist-info/METADATA,sha256=ANQmVNuOvZofxG3nqK3bG02bjcuvPb9e1KhL1pqroUQ,2307
+wolfhece-2.1.21.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+wolfhece-2.1.21.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.21.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.21.dist-info/RECORD,,