wolfhece 2.1.86__py3-none-any.whl → 2.1.87__py3-none-any.whl

wolfhece/PyVertexvectors.py

@@ -1842,7 +1842,7 @@ class vector:
 
         return s3d
 
-    def get_sz(self,cumul=True):
+    def get_sz(self, cumul=True):
         """
         Calcule et retourne la distance horizontale cumulée ou non
         de chaque point vis-à-vis du premier point
@@ -2306,7 +2306,7 @@ class vector:
 
         return fig,ax
 
-    def deepcopy_vector(self, name: str = None, parentzone = None):
+    def deepcopy_vector(self, name: str = None, parentzone = None) -> 'vector':
         """
         Return a deep copy of the vector.
         """
@@ -2323,6 +2323,13 @@ class vector:
 
         return copied_vector
 
+    def deepcopy(self, name: str = None, parentzone = None) -> 'vector':
+        """
+        Return a deep copy of the vector.
+        """
+
+        return self.deepcopy_vector(name, parentzone)
+
     def set_legend_to_centroid(self, text:str='', visible:bool=True):
         """
         Positionne la légende au centre du vecteur
@@ -2387,10 +2394,18 @@ class vector:
     def sz(self):
         return self.get_sz()
 
+    @property
+    def s(self):
+        sz = self.get_sz()
+        return sz[0]
+
     @x.setter
-    def x(self, new_x:np.ndarray):
+    def x(self, new_x:np.ndarray | list):
         """ Set the x values of the vertices """
 
+        if isinstance(new_x, list):
+            new_x = np.array(new_x)
+
         if len(new_x) != self.nbvertices:
             logging.warning(_('New x values have not the same length as the number of vertices'))
             return
@@ -2401,9 +2416,12 @@ class vector:
         self._reset_listogl()
 
     @y.setter
-    def y(self, new_y:np.ndarray):
+    def y(self, new_y:np.ndarray | list):
         """ Set the y values of the vertices """
 
+        if isinstance(new_y, list):
+            new_y = np.array(new_y)
+
         if len(new_y) != self.nbvertices:
             logging.warning(_('New y values have not the same length as the number of vertices'))
             return
@@ -2414,9 +2432,15 @@ class vector:
         self._reset_listogl()
 
     @z.setter
-    def z(self, new_z:np.ndarray):
+    def z(self, new_z:np.ndarray | float | list):
         """ Set the z values of the vertices """
 
+        if isinstance(new_z, (int, float)):
+            new_z = np.full(self.nbvertices, new_z, dtype=float)
+
+        if isinstance(new_z, list):
+            new_z = np.array(new_z)
+
         if len(new_z) != self.nbvertices:
             logging.warning(_('New z values have not the same length as the number of vertices'))
             return
@@ -2431,9 +2455,12 @@ class vector:
         self._reset_listogl()
 
     @xyz.setter
-    def xyz(self, new_xyz:np.ndarray):
+    def xyz(self, new_xyz:np.ndarray | list):
         """ Set the x, y, z values of the vertices """
 
+        if isinstance(new_xyz, list):
+            new_xyz = np.array(new_xyz)
+
         if len(new_xyz) != self.nbvertices:
             logging.warning(_('New xyz values have not the same length as the number of vertices'))
             return
@@ -2452,9 +2479,12 @@ class vector:
         self._reset_listogl()
 
     @xy.setter
-    def xy(self, new_xy:np.ndarray):
+    def xy(self, new_xy:np.ndarray | list):
         """ Set the x, y values of the vertices """
 
+        if isinstance(new_xy, list):
+            new_xy = np.array(new_xy)
+
         if len(new_xy) != self.nbvertices:
             logging.warning(_('New xy values have not the same length as the number of vertices'))
             return
@@ -2466,9 +2496,12 @@ class vector:
         self._reset_listogl()
 
     @xz.setter
-    def xz(self, new_xz:np.ndarray):
+    def xz(self, new_xz:np.ndarray | list):
         """ Set the x, z values of the vertices """
 
+        if isinstance(new_xz, list):
+            new_xz = np.array(new_xz)
+
         if len(new_xz) != self.nbvertices:
             logging.warning(_('New xz values have not the same length as the number of vertices'))
             return
@@ -2485,9 +2518,12 @@ class vector:
         self._reset_listogl()
 
     @xyzi.setter
-    def xyzi(self, new_xyzi:np.ndarray):
+    def xyzi(self, new_xyzi:np.ndarray | list):
         """ Set the x, y, z, in_use values of the vertices """
 
+        if isinstance(new_xyzi, list):
+            new_xyzi = np.array(new_xyzi)
+
         if len(new_xyzi) != self.nbvertices:
             logging.warning(_('New xyzi values have not the same length as the number of vertices'))
             return
@@ -2501,9 +2537,12 @@ class vector:
         self._reset_listogl()
 
     @xyi.setter
-    def xyi(self, new_xyi:np.ndarray):
+    def xyi(self, new_xyi:np.ndarray | list):
         """ Set the x, y, in_use values of the vertices """
 
+        if isinstance(new_xyi, list):
+            new_xyi = np.array(new_xyi)
+
         if len(new_xyi) != self.nbvertices:
             logging.warning(_('New xyi values have not the same length as the number of vertices'))
             return
@@ -2516,9 +2555,12 @@ class vector:
         self._reset_listogl()
 
     @i.setter
-    def i(self, new_i:np.ndarray):
+    def i(self, new_i:np.ndarray | list):
         """ Set the in_use values of the vertices """
 
+        if isinstance(new_i, list):
+            new_i = np.array(new_i)
+
         if len(new_i) != self.nbvertices:
             logging.warning(_('New i values have not the same length as the number of vertices'))
             return
@@ -4128,22 +4170,28 @@ class zone:
             glDeleteLists(self.idgllist,1)
             self.idgllist=-99999
 
-    def deepcopy_zone(self, name: str =None, parent: str= None):
+    def deepcopy_zone(self, name: str =None, parent: str= None) -> "zone":
         """ Return a deep copy of the zone"""
 
         if name is None:
             name =  self.myname + '_copy'
-            if parent:
-                copied_zone = zone(name=name, parent=parent)
-            else:
-                copied_zone = zone(name=name)
-            copied_zone.myvectors = []
-            for vec in self.myvectors:
-                copied_vec = vec.deepcopy_vector(parentzone = copied_zone)
-                copied_zone.add_vector(copied_vec)
-            #     copied_zone.myvectors.append(copied_vec)
-            # copied_zone.nbvectors = len(copied_zone.myvectors) FIXME not needed anymore
-            return copied_zone
+
+        if parent is not None:
+            copied_zone = zone(name=name, parent=parent)
+        else:
+            copied_zone = zone(name=name)
+
+        copied_zone.myvectors = []
+        for vec in self.myvectors:
+            copied_vec = vec.deepcopy_vector(parentzone = copied_zone)
+            copied_zone.add_vector(copied_vec, forceparent=True)
+
+        return copied_zone
+
+    def deepcopy(self, name: str =None, parent: str= None) -> "zone":
+        """ Return a deep copy of the zone"""
+
+        return self.deepcopy_zone(name, parent)
 
     def show_properties(self):
         """ Show properties of the zone --> will be applied to all vectors int he zone """
@@ -6638,18 +6686,25 @@ class Zones(wx.Frame, Element_To_Draw):
                             dlg.Destroy()
                             return
 
-    def deepcopy_zones(self, name:str = None):
+    def deepcopy_zones(self, name:str = None) -> "Zones":
         """
         Return the deep copy of the current
         Zones (a new object).
         """
-        copied_Zones = Zones()
+        copied_Zones = Zones(idx=name)
         for zne in self.myzones:
             new_zne = zne.deepcopy_zone(parent= copied_Zones)
             copied_Zones.add_zone(new_zne,forceparent=True)
         copied_Zones.find_minmax(True)
         return copied_Zones
 
+    def deepcopy(self, name:str = None) -> "Zones":
+        """
+        Return the deep copy of the current
+        Zones (a new object).
+        """
+        return self.deepcopy_zones(name=name)
+
 class Grid(Zones):
     """
     Grid to draw on the mapviewer.

wolfhece/apps/check_version.py

@@ -0,0 +1,49 @@
+import pkg_resources
+
+from .version import WolfVersion
+
+def validate_version(expected_version:str):
+
+    # Test de la version afin de s'assurer que les dernières fonctionnalités sont présentes
+    major, minor, patch = str(WolfVersion()).split('.')
+    major = int(major)
+    minor = int(minor)
+    patch = int(patch)
+
+    major_expected, minor_expected, patch_expected = expected_version.split('.')
+    major_expected = int(major_expected)
+    minor_expected = int(minor_expected)
+    patch_expected = int(patch_expected)
+
+    test = major == major_expected and minor == minor_expected and patch >= patch_expected
+
+    if test:
+        return 'Version correcte'
+    else:
+        return 'Version incorrecte'
+
+def validate_package_version(expected_version:str):
+    # Test de la version afin de s'assurer que les dernières fonctionnalités sont présentes
+    # Obtenir la version du paquet 'wolfhece' dans l'espace de
+    # stockage des paquets de l'environnement Python actif.
+    # Potentiellement différente de la version accessible via le PATH
+    # en fonction de la amchine utilisée.
+    pkg_wolfhece = pkg_resources.get_distribution('wolfhece')
+    locversion_pkg = pkg_wolfhece.version
+    major, minor, patch = str(locversion_pkg).split('.')
+    major = int(major)
+    minor = int(minor)
+    patch = int(patch)
+
+    major_expected, minor_expected, patch_expected = expected_version.split('.')
+    major_expected = int(major_expected)
+    minor_expected = int(minor_expected)
+    patch_expected = int(patch_expected)
+
+    test = major == major_expected and minor == minor_expected and patch >= patch_expected
+
+    if test:
+        return 'Version correcte'
+    else:
+        return 'Version incorrecte'
+

wolfhece/apps/version.py

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

wolfhece/scenario/check_scenario.py

@@ -110,9 +110,18 @@ def import_files(module_files:Union[list[Path],list[str]]) -> list[types.ModuleT
         if isinstance(py_file, str):
             py_file = Path(py_file)
 
+        olddir = os.getcwd()
         sys.path.insert(0, str(py_file.parent.absolute()))
-        module = importlib.import_module(str(py_file.name.replace('.py','')))
+        os.chdir(py_file.parent)
+
+        mod_name = py_file.name.replace('.py','')
+        if mod_name in sys.modules:
+            del sys.modules[mod_name]
+
+        module = importlib.import_module(mod_name)
+        # sys.modules.get('update_top_mann_scen')
         sys.path.pop(0)
+        os.chdir(olddir)
 
         modules.append(module)
 

wolfhece/scenario/config_manager.py

@@ -788,26 +788,46 @@ class Config_Manager_2D_GPU:
     def _import_scripts_topo_manning(self, from_path:Path) -> list[types.ModuleType]:
         """ find all scripts from/up a path """
 
+        # tous les fichiers .py
+        # import des modules
+        imported_modules = import_files(from_path.glob('*.py'))
+
+        return imported_modules
+
+    def _list_modules(self, from_path:Path):
+        """ List all modules in structure """
+        import shutil
+
         curtree = self.get_tree(from_path)
         curdicts = self.get_dicts(curtree)
 
         # tous les fichiers .py -> list of lists
         all_py = [curpy for curdict in curdicts for curpy in curdict[GPU_2D_file_extensions.PY.value][WOLF_UPDATE]]
 
-        # import des modules
-        imported_modules = import_files(all_py)
+        # make a copy in the cache folder
+        cache_dir = from_path / '.cache_tmi'
+        cache_dir.mkdir(exist_ok=True)
 
-        return imported_modules
+        # delete all file in the cache folder
+        for curfile in cache_dir.glob('*.py'):
+            curfile.unlink()
 
+        # make a copy of all files in the cache folder
+        for idx, cur_py in enumerate(all_py):
+            shutil.copy(cur_py, cache_dir / f'{idx}.py')
+
+        return self._import_scripts_topo_manning(cache_dir)
 
     def _apply_scripts_update_topo_maning_inf(self,
-                                              modules:list[types.ModuleType],
+                                              dir_modules:Path,
                                               array_bat:WolfArray,
                                               array_mann:WolfArray,
                                               array_inf:WolfArray):
         """ Apply all scripts from a list of modules """
 
-        for curmod in modules:
+        all_py = self._list_modules(dir_modules)
+
+        for curmod in all_py:
             instmod = curmod.Update_Sim_Scenario()
             instmod.update_topobathy(array_bat)
             instmod.update_manning(array_mann)
@@ -815,6 +835,7 @@ class Config_Manager_2D_GPU:
 
     def _import_scripts_bc(self, from_path:Path) -> list[types.ModuleType]:
         """ find all scripts from/up a path """
+        import shutil
 
         curtree = self.get_tree(from_path)
         curdicts = self.get_dicts(curtree)
@@ -822,8 +843,21 @@ class Config_Manager_2D_GPU:
         # tous les fichiers .py -> list of lists
         all_py = [curpy for curdict in curdicts for curpy in curdict[GPU_2D_file_extensions.PY.value][WOLF_BC]]
 
+        cache_dir = from_path / '.cache_bc'
+        cache_dir.mkdir(exist_ok=True)
+
+        # delete all file in the cache folder
+        for curfile in cache_dir.glob('*.py'):
+            curfile.unlink()
+
+        # make a copy of all files in the cache folder
+        cache_py = []
+        for idx, cur_py in enumerate(all_py):
+            shutil.copy(cur_py, cache_dir / f'{idx}.py')
+            cache_py.append(cache_dir / f'{idx}.py')
+
         # import des modules
-        imported_modules = import_files(all_py)
+        imported_modules = import_files(cache_py)
 
         return imported_modules
 
@@ -1014,7 +1048,8 @@ class Config_Manager_2D_GPU:
             infiltration.array.data[:,:] = 0
 
         # applying Python scrpitps on ARRAYS
-        self._apply_scripts_update_topo_maning_inf(self._import_scripts_topo_manning(dir), bat, man, infiltration)
+        # self._apply_scripts_update_topo_maning_inf(self._import_scripts_topo_manning(dir), bat, man, infiltration)
+        self._apply_scripts_update_topo_maning_inf(dir, bat, man, infiltration)
 
         # save arrays on disk
         bat.write_all(str(dir / '__bathymetry_after_scripts.tif'))

{wolfhece-2.1.86.dist-info → wolfhece-2.1.87.dist-info}/METADATA

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

@@ -16,7 +16,7 @@ wolfhece/PyParams.py,sha256=LGt9uBFRVeS0F_kObJw8bPkWFqYSzf5pUTscxVU5Mxo,97725
 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=T1MU1AHJgRISm-euZdFRyLU8u9citTA_PuuT8c6Ilug,248217
+wolfhece/PyVertexvectors.py,sha256=mKwu_gMHMPTayfBNscbXEvi4cEVU3TUMz4ZBwfTSflo,249665
 wolfhece/PyWMS.py,sha256=fyyzm2HFwq8aRwVYHKiBatcZOeKnFi6DWhv4nfscySQ,4602
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -70,11 +70,12 @@ wolfhece/apps/WolfPython3.png,sha256=3G84zx14HnlB9YXMY4VUAO7IB3eu7JFvi4Kpmc_4zBE
 wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
 wolfhece/apps/acceptability.py,sha256=hMIxTRNQARTTWJJaakb6kEK9udNh-w64VDgxxezVk3k,790
 wolfhece/apps/check_install.py,sha256=Xoi_d8MzKzNAy2xqEpERdsqgRPu0hbBWukI0WkIYzD0,1701
+wolfhece/apps/check_version.py,sha256=Zze7ltzcM2ZzIGMwkcASIjapCG8CEzzW9kwNscA3NhM,1768
 wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefgmk,5334
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 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=Arx6OoAjqWy_AcCfcpM6PlGGFut5JIMc0Mz3pV3n9Tk,388
+wolfhece/apps/version.py,sha256=W5dXUE8GFyOo5XU-puzJWyW83xPeYE1ki3o6TPwugMw,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,8 +261,8 @@ wolfhece/report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/report/reporting.py,sha256=JUEXovx_S4jpYkJEBU0AC-1Qw2OkkWyV3VAp6iOfSHc,19494
 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=aZLfOdKCGva2lXVDAVQrn4nd9ONXHQ_ZNDcUcEIbkCo,85621
+wolfhece/scenario/check_scenario.py,sha256=VVjtxfcLAgq_Pf8VSqRq6BJ-y4Zi24CntJpZWxAv3n8,5162
+wolfhece/scenario/config_manager.py,sha256=0B_ZtMkcbZRwzkXHwT6jSC3-Lq85P2oBiq1Qxjkfh2w,86869
 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
@@ -284,8 +285,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.86.dist-info/METADATA,sha256=0_BloYphumWtR3mQkEDD1h8Qi4SHPWB8h9GLNit7ejg,2570
-wolfhece-2.1.86.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-wolfhece-2.1.86.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.86.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.86.dist-info/RECORD,,
+wolfhece-2.1.87.dist-info/METADATA,sha256=0XES9NJJEV_c5J9SqwgKEn5iDnaVZZZk3jLNkIaqJTo,2570
+wolfhece-2.1.87.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+wolfhece-2.1.87.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.87.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.87.dist-info/RECORD,,