wolfhece 2.1.32__py3-none-any.whl → 2.1.34__py3-none-any.whl

wolfhece/lagrangian/particle_system.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import numpy as np
 from OpenGL.GL  import *
 import logging

wolfhece/lagrangian/particle_system_ui.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import numpy as np
 from typing import Literal, Union
 import wx

wolfhece/lagrangian/particles.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import numpy as np
 from typing import Literal, Union
 from OpenGL.GL  import *

wolfhece/lagrangian/velocity_field.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import numpy as np
 from numba import float64, float32, int32, int64, char
 from numba import jit

wolfhece/math_parser/calculator.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import wx
 import logging
 

wolfhece/mesh2d/bc_manager.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import wx
 import numpy as np
 from scipy.spatial import cKDTree

wolfhece/mesh2d/cell_tracker.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 #Libraries
 from os.path import join, exists
 import matplotlib.pyplot as plt

wolfhece/mesh2d/config_manager.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import wx
 from wx.dataview import TreeListCtrl
 from wx import dataview, StaticText, TextCtrl

wolfhece/mesh2d/cst_2D_boundary_conditions.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 from enum import Enum
 from typing import Union, Literal
 import logging

wolfhece/mesh2d/wolf2dprev.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import re
 import sys
 

wolfhece/multiprojects.py

@@ -1,4 +1,14 @@
 
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 from os.path import exists, join
 import json
 from enum import Enum

wolfhece/opengl/py3d.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import wx
 from wx import glcanvas
 from OpenGL.GL import *
@@ -1220,22 +1230,25 @@ class CanvasOGL(glcanvas.GLCanvas):
 
         x,y,idx,alpha = self.picker[locx, locy]
 
-        logging.info('coords: {} - {}'.format(x,y))
-
-        r,g,b = self.colors[locx, locy]
-        logging.info('color: {} - {} - {}'.format(r,g,b))
+        # r,g,b = self.colors[locx, locy]
+        # logging.info('color: {} - {} - {}'.format(r,g,b))
 
         self.drawposition = not self.drawposition
 
         curarray = self.arrays[list(self.arrays.keys())[int(idx)-1]]
-        i = int(x / curarray.dx)
-        j = int(y / curarray.dy)
-        z = curarray.ztexture[i, j]
-        xyz = self.mvp_glm * vec4(x, y, z, 1.)
+        i = int(x)
+        j = int(y)
+        
+        if i > 0 and i < curarray.ztexture.shape[0] and j > 0 and j < curarray.ztexture.shape[1]:
+            z = curarray.ztexture[i, j]
 
-        self.textTodraw.append(Text_Image_Texture('{z:.3f}', self.parent, Text_Infos(Font_Priority.FONTSIZE, colour=(255,255,255,255)), None, x, y))
+            logging.info('coords: {} - {} - {}'.format(x,y,z))
 
-        self.Refresh()
+            # xyz = self.mvp_glm * vec4(x, y, z, 1.)
+
+            # self.textTodraw.append(Text_Image_Texture('{z:.3f}', self.parent, Text_Infos(Font_Priority.FONTSIZE, colour=(255,255,255,255)), None, x, y))
+
+            # self.Refresh()
 
     def OnRightUp(self, event:wx.MouseEvent):
         """ Called when the right mouse button is released."""
@@ -1702,10 +1715,10 @@ class CanvasOGL(glcanvas.GLCanvas):
 
             glFinish()
 
-            glBindTexture(GL_TEXTURE_2D, self._textureout)
-            self.colors = np.zeros((self.height, self.width, 3), dtype=np.uint8)
-            glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, self.colors, np.uint8)
-            self.colors = self.colors.swapaxes(0, 1)
+            # glBindTexture(GL_TEXTURE_2D, self._textureout)
+            # self.colors = np.zeros((self.height, self.width, 3), dtype=np.uint8)
+            # glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, self.colors, np.uint8)
+            # self.colors = self.colors.swapaxes(0, 1)
 
             glBindTexture(GL_TEXTURE_2D, self._posout)
             self.picker = np.zeros((self.height, self.width, 4), dtype=np.float32)
@@ -1754,6 +1767,8 @@ class Wolf_Viewer3D(wx.Frame):
 
         super(Wolf_Viewer3D, self).__init__(parent, title=title, size=(640, 480))
         self.canvas = CanvasOGL(self)
+        self.sx = 1.
+        self.sy = 1.
         self.Show()
 
     @property

wolfhece/picc.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import geopandas as gpd
 from pathlib import Path
 from typing import List, Union

wolfhece/pyGui1D.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau, Utashi Ciraane Docile
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 """
 This module contains the scripts that are needed to
 create, execute and soon interact with a Wolf-1D model.

wolfhece/pybridges.py

@@ -1,9 +1,11 @@
 """
-Bridges manager
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
 
-:author : Pierre Archambeau
+Copyright (c) 2024 University of Liege. All rights reserved.
 
-2023 - Liège University - HECE
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
 """
 
 from os.path import splitext, exists, join, isfile, basename

wolfhece/pydike.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import logging
 
 from .PyVertexvectors import Triangulation, vector,Zones, zone

wolfhece/pylogging.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 """
 Logging handler to redirect messages sent to the python logging module to wx if necessary
 

wolfhece/pypolygons_scen.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 from os.path import splitext, exists, join, isfile, basename
 from os import listdir, scandir
 import numpy as np

wolfhece/pyshields.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import matplotlib.pyplot as plt
 import math
 import numpy as np

wolfhece/pyviews.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import logging
 
 from .drawing_obj import Element_To_Draw

wolfhece/pywalous.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 from osgeo import ogr, gdal
 import geopandas as gpd
 from os.path import exists, join, dirname, basename

wolfhece/radar/wolfradar.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau, Christophe Dessers
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import wradlib as wrl
 import wx
 from math import floor

wolfhece/rain_SPWMI.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 from os.path import join,exists,normpath
 import requests
 import pandas as pd

wolfhece/rem/REMMaker.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 #!/usr/bin/env python
 import os
 import sys

wolfhece/rem/RasterViz.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 #!/usr/bin/env python
 import os
 import sys

wolfhece/report/reporting.py

@@ -1,4 +1,14 @@
 
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 from docx import Document
 from docx.shared import Pt
 from docx.oxml.ns import qn

wolfhece/scenario/check_scenario.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import inspect
 import os
 import glob

wolfhece/scenario/config_manager.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import wx
 from wx.dataview import TreeListCtrl, TreeListItem
 from wx import dataview, StaticText, TextCtrl
@@ -1389,18 +1399,22 @@ class UI_Manager_2D_GPU():
     def oncreatevrt(self,e:wx.MouseEvent):
         """ Création d'un fichier vrt """
 
+        logging.info(_('Creating vrt ...'))
         mydata = self._treelist.GetItemData(self._selected_item)
 
         # création du fichier vrt
         self._parent.create_vrt(mydata['path'])
+        logging.info(_('... done !'))
 
     def oncreatevec(self,e:wx.MouseEvent):
         """ Création d'un fichier vec """
 
+        logging.info(_('Creating vecz ...'))
         mydata = self._treelist.GetItemData(self._selected_item)
 
         # création du fichier vrt
         new_zones = self._parent.create_vec(mydata['path'])
+        logging.info(_('... done !'))
 
         dlg = wx.MessageDialog(None, _('Do you want to add the new zones to the map ?'), _('Warning'), wx.YES_NO)
         ret = dlg.ShowModal()
@@ -1409,17 +1423,24 @@ class UI_Manager_2D_GPU():
 
             new_zones.set_mapviewer()
 
-            self._parent.mapviewer.add_object('vector', newobj = new_zones, id=mydata['path'].name)
+            cur_ids = self._parent.mapviewer.get_list_keys(drawing_type=draw_type.VECTORS)
+            newid = mydata['path'].name
+            while newid in cur_ids:
+                newid = newid + '_'
+            self._parent.mapviewer.add_object('vector', newobj = new_zones, id=newid)
+            self._parent.mapviewer.Refresh()
 
         dlg.Destroy()
 
     def ontranslatevrt2tif(self,e:wx.MouseEvent):
         """ Traduction d'un fichier vrt en tif """
 
+        logging.info(_('Translating vrt to tif ...'))
         mydata = self._treelist.GetItemData(self._selected_item)
 
         # création du fichier vrt
         self._parent.translate_vrt2tif(mydata['path'])
+        logging.info(_('... done !'))
 
     def oncheck_consistency(self,e:wx.MouseEvent):
         """ Vérification de la cohérence des fichiers """
@@ -1449,6 +1470,7 @@ class UI_Manager_2D_GPU():
     def oncreate_simulation(self,e:wx.MouseEvent):
         """ Creation d'une simulation """
 
+        logging.info(_('Creating simulation ...'))
         hydro = self.choice_hydrograph()
         if hydro is None:
             return
@@ -1526,6 +1548,8 @@ class UI_Manager_2D_GPU():
 
                 self._txtctrl.write(batch)
 
+        logging.info(_('... done !'))
+
     def onrun_batch(self,e:wx.MouseEvent):
         """ run batch file """
 
@@ -1839,7 +1863,12 @@ class UI_Manager_2D_GPU():
 
                     myarray = WolfArray(str(mydata), srcheader=self._parent._header, nullvalue=99999., idx=str(mydata.name))
 
-                    self._parent.mapviewer.add_object('array', newobj=myarray, id=str(mydata.name))
+                    ids = self._parent.mapviewer.get_list_keys(draw_type.ARRAYS)
+                    newid = str(mydata.name)
+                    while newid in ids:
+                        newid = newid + '_'
+                    
+                    self._parent.mapviewer.add_object('array', newobj=myarray, id=newid)
 
             elif mydata.name.endswith(GPU_2D_file_extensions.TXT.value):
                 # Chragement d'un hydrogramme

wolfhece/scenario/imposebc_void.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import inspect
 import ast
 import importlib.util

wolfhece/scenario/update_void.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import inspect
 import ast
 import importlib.util

wolfhece/shaders/quad_geom_shader.glsl

@@ -56,7 +56,8 @@ float get_value(sampler2DRect tex, vec2 pos) {
     float posx = (pos.x - origx) / dx;
     float posy = (pos.y - origy) / dy;
 
-    vec2 texCoord = vec2(posx, posy);
+    //vec2 texCoord = vec2(posx, posy);
+    vec2 texCoord = vec2(posy, posx);
 
     float zValue = texture(tex, texCoord).r * zScale;
     return zValue;

wolfhece/textpillow.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 from os.path import exists, join, realpath, dirname
 from queue import PriorityQueue
 from PIL import Image,ImageDraw,ImageFont

wolfhece/tools_mpl.py

@@ -1,4 +1,14 @@
 
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 from matplotlib.figure import Figure
 from matplotlib.axes import Axes
 

wolfhece/ui/wolf_multiselection_collapsiblepane.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import wx
 import logging
 

wolfhece/ui/wolf_times_selection_comparison_models.py

@@ -1,3 +1,13 @@
+"""
+Author: HECE - University of Liege, Pierre Archambeau
+Date: 2024
+
+Copyright (c) 2024 University of Liege. All rights reserved.
+
+This script and its content are protected by copyright law. Unauthorized
+copying or distribution of this file, via any medium, is strictly prohibited.
+"""
+
 import wx
 import logging