wolfhece 2.0.50__py3-none-any.whl → 2.0.52__py3-none-any.whl

wolfhece/PyGui.py

@@ -871,14 +871,14 @@ class Wolf2DModel(GenMapManager):
             fname = self.filenamegen + curextent
             if exists(fname):
                 fname += '.txt'
-                fhead.write_txt_header(fname,wolftype)
+                fhead.write_txt_header(fname, wolftype, forceupdate=True)
 
         mb = self.files_MB_array['Initial Conditions']
         for curextent,text,wolftype in mb:
             fname = self.filenamegen + curextent
             if exists(fname):
                 fname += '.txt'
-                mbhead.write_txt_header(fname,wolftype)
+                mbhead.write_txt_header(fname, wolftype, forceupdate=True)
 
         fname = self.filenamegen + '.lst'
         if not exists(fname):

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 0
-        self.patch = 50
+        self.patch = 52
 
     def __str__(self):
 

wolfhece/wolf_vrt.py

@@ -4,6 +4,8 @@ from osgeo import osr, gdal
 import logging
 from pathlib import Path
 
+from .PyVertexvectors import Zones
+
 def create_vrt(wdir:str, fout:str='out.vrt', format:str='tif'):
     """
     Agglomération de tous les fichiers .tif dans un layer virtuel .vrt
@@ -38,6 +40,9 @@ def create_vrt_from_files(files:list[Path]=[], fout:Path='assembly.vrt'):
     if isinstance(fout, str):
         fout = Path(fout)
 
+    if isinstance(files[0], str):
+        files = [Path(file) for file in files]
+
     # retain current working directory
     oldcwd = os.getcwd()
     # change working directory to the parent of the output file
@@ -49,7 +54,7 @@ def create_vrt_from_files(files:list[Path]=[], fout:Path='assembly.vrt'):
     # restore working directory
     os.chdir(oldcwd)
 
-def create_vrt_from_files_first_based(files:list[Path]=[], fout:Path='assembly.vrt'):
+def create_vrt_from_files_first_based(files:list[Path]=[], fout:Path='assembly.vrt', Nodata:float=99999.):
     """
     Agglomération de tous les fichiers énumérés dans files dans un layer virtuel .vrt
 
@@ -58,6 +63,9 @@ def create_vrt_from_files_first_based(files:list[Path]=[], fout:Path='assembly.v
     if isinstance(fout, str):
         fout = Path(fout)
 
+    if isinstance(files[0], str):
+        files = [Path(file) for file in files]
+
     first = files[0]
     raster:gdal.Dataset
     raster = gdal.Open(str(first))
@@ -82,7 +90,7 @@ def create_vrt_from_files_first_based(files:list[Path]=[], fout:Path='assembly.v
                                    yRes=abs(geotr[5]),
                                    outputBounds=[xmin,ymin,xmax,ymax],
                                    resampleAlg='bilinear',
-                                   srcNodata=99999.)
+                                   srcNodata=Nodata)
 
     # retain current working directory
     oldcwd = os.getcwd()
@@ -155,6 +163,126 @@ def crop_vrt(fn:str, crop:list, fout:str=None):
     else:
         logging.warning('The file does not exist !')
 
+def create_contours(files:list[Path]=[],
+                   fout:Path = 'assembly.vec',
+                   color_exterior:tuple=(255,0,0),
+                   color_interior:tuple=(0,0,255),
+                   width:int=3,
+                   ignore_first:bool=True,
+                   create_extern:bool = True,
+                   create_intern:bool = True,
+                   force_mask_border:bool = True) -> Zones:
+    """
+    Create contour from files
+
+    :param files: list of files to process
+    :type files: list[Path]
+    :param fout: output file
+    :type fout: Path - if None, no output file
+    :param color_exterior: RGB color for exterior contour
+    :type color_exterior: tuple
+    :param color_interior: RGB color for interior contour
+    :type color_interior: tuple
+    :param width: width of the contour
+    :type width: int
+    :param ignore_first: ignore the first file in the list
+    :type ignore_first: bool
+    :param create_extern: create exterior contour
+    :type create_extern: bool
+    :param create_intern: create interior contour
+    :type create_intern: bool
+    :param force_mask_border: force masked data along borders -- [0,:], [-1,:], [:,0], [:,-1
+    :type force_mask_border: bool
+
+    """
+
+    from tqdm import tqdm
+    from .wolf_array import WolfArray
+    from .PyVertexvectors import Zones, zone, vector, wolfvertex, getIfromRGB
+
+    if isinstance(fout, str):
+        fout = Path(fout)
+
+    if not(create_extern or create_intern):
+        logging.warning('No contour to create !')
+        return None
+
+    emprises = Zones()
+
+    start = 1 if ignore_first else 0
+
+    for file in tqdm(files[start:]):
+
+        curzone = zone(name = str(file.name))
+        emprises.add_zone(curzone, forceparent=True)
+
+        curarray = WolfArray(str(file))
+
+        if force_mask_border:
+            curarray.array.mask[0,:] = True
+            curarray.array.mask[-1,:] = True
+            curarray.array.mask[:,0] = True
+            curarray.array.mask[:,-1] = True
+        else:
+            print_name = False
+            if (~curarray.array.mask[0,:]).any():
+                logging.warning('\nNon masked data along border -- [0,:]\n')
+                print_name = True
+
+            if (~curarray.array.mask[-1,:]).any():
+                pre = '' if print_name else '\n'
+                logging.warning(pre+'Non masked data along border -- [-1,:]\n')
+                print_name = True
+
+            if (~curarray.array.mask[:,0]).any():
+                pre = '' if print_name else '\n'
+                logging.warning(pre+'Non masked data along border -- [:,0]\n')
+                print_name = True
+
+            if (~curarray.array.mask[:,-1]).any():
+                pre = '' if print_name else '\n'
+                logging.warning(pre+'Non masked data along border -- [:,-1]\n')
+                print_name = True
+
+            if print_name:
+                logging.warning(f'File: {file}\n')
+
+        if create_intern:
+            ret = curarray.suxsuy_contour(abs = True)
+
+            curvec = ret[2]
+            curvec.myname = 'contour_utile'
+            curzone.add_vector(curvec, forceparent=True)
+
+            curvec.myprop.color = getIfromRGB(color_interior)
+            curvec.myprop.width = width
+
+        if create_extern:
+
+            bounds = curarray.get_bounds(True)
+            vecrect = vector(name = 'contour_externe')
+
+            curzone.add_vector(vecrect, forceparent=True)
+
+            vecrect.add_vertex((wolfvertex(bounds[0][0], bounds[1][0])))
+            vecrect.add_vertex((wolfvertex(bounds[0][1], bounds[1][0])))
+            vecrect.add_vertex((wolfvertex(bounds[0][1], bounds[1][1])))
+            vecrect.add_vertex((wolfvertex(bounds[0][0], bounds[1][1])))
+            vecrect.close_force()
+
+            vecrect.myprop.color = getIfromRGB(color_exterior)
+            vecrect.myprop.width = width
+            vecrect.myprop.legendvisible = True
+            vecrect.myprop.legendtext = file.name
+
+            sh = vecrect.asshapely_ls()
+            vecrect.myprop.legendx = sh.centroid.x
+            vecrect.myprop.legendy = sh.centroid.y
+
+    if fout is not None:
+        emprises.saveas(str(fout))
+
+    return emprises
 
 if __name__=='__main__':
 

{wolfhece-2.0.50.dist-info → wolfhece-2.0.52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.0.50
+Version: 2.0.52
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: AGPL-v3 License
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.0.50.dist-info → wolfhece-2.0.52.dist-info}/RECORD

@@ -7,7 +7,7 @@ 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=nUHEMpTG0zJvBJYOnreTvAISeP7cLsx14Qyrv-y32OY,344956
-wolfhece/PyGui.py,sha256=LZtmQuEa0p-67iYyvLHJRK8uBs1zKmA3UqDzejWogy8,59795
+wolfhece/PyGui.py,sha256=-LTnUVkRsqJw41DPN0jvhBOmDyygw6GgdGsno78cI_o,59833
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=SYKYx_vxF_FVuceLhcIqFQsivGD6EoO_Xu-EGN9Ivko,22252
@@ -52,7 +52,7 @@ wolfhece/wolf_array.py,sha256=E6u0d6kABsegIZxPUZjtWS88lOrVc2d-lyW0uJgj6qo,289157
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
-wolfhece/wolf_vrt.py,sha256=wuMPAXNYTByNGNtvWhwW1fQelPstAPTQZECgXHZ0oTM,5180
+wolfhece/wolf_vrt.py,sha256=5z6astjCCg2-6BgR6qlNpk043kxOZCClcqNPAMowljk,9707
 wolfhece/wolf_zi_db.py,sha256=Ok0MxQYZMMLRJN1QY-HSplLhUzzb6gkXgBQ3ihhLQHk,12669
 wolfhece/wolfresults_2D.py,sha256=5IlGh8MGXKiuzs0de_B73rDC0C9tdAsgXQWhcSMmH8M,155823
 wolfhece/xyz_file.py,sha256=aQOcTHkHRhXHxL_WxTHwzygp6e47San7SHSpxKQU0dw,5457
@@ -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=m9hMTqzhSUcTudApyNNjoAK9e2u5vgEkJVV79xmfM1s,2118
-wolfhece/apps/version.py,sha256=UgOyKKZeqMHM9SHuLgbqUwonY2i_7DM-vnaX7DYSfFE,388
+wolfhece/apps/version.py,sha256=8oE3JduZOrh37rUOmSaJni3r3iRiovCtoxD28-Iwbn0,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
@@ -256,8 +256,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.0.50.dist-info/METADATA,sha256=qy49InLZbsZEYnSKj_5fYK31CxxJZHDDHlA_1Y3Y16c,2233
-wolfhece-2.0.50.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wolfhece-2.0.50.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.0.50.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.0.50.dist-info/RECORD,,
+wolfhece-2.0.52.dist-info/METADATA,sha256=fl0p2rqonKJIadsbbzLXDsXQgp6l3Z1a7cGZuL13Lc0,2233
+wolfhece-2.0.52.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wolfhece-2.0.52.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.0.52.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.52.dist-info/RECORD,,