wolfhece 2.1.6__py3-none-any.whl → 2.1.7__py3-none-any.whl

wolfhece/apps/version.py

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

wolfhece/multiprojects.py

@@ -175,6 +175,7 @@ class Wolf2D_Project(Project):
         """
         Lie les palettes d'un fichier projet et leur liaison potentielle avec les matrices
         """
+
         pals = self.get_group('palette')
         if pals is None:
             return
@@ -207,6 +208,7 @@ class Wolf2D_Project(Project):
         """
         Change le mode de vue dans une vue possible de "views_2D"
         """
+
         if which in views_2D:
             with ThreadPoolExecutor() as executor:
                 for cursim in self.mysims.values():
@@ -221,10 +223,11 @@ class Wolf2D_Project(Project):
          - chaque entrée est un dictionnaire dont la clé 'values' contient une liste pour chaque matrice du projet
          - chaque élément de liste est un tuple contenant toutes les valeurs utiles
         """
+
         self.poly = zonepoly
         self.poly_values = zonepoly.get_all_values_linked_polygon(self.get_simulations())
 
-    def get_values(self,which_type):
+    def get_values(self,which_type:Union[views_2D, Literal['i','j','block']]=None):
 
         if self.poly_values is None:
             raise Warning(_('Firstly call get_values_inside with a zone as argument -- Retry !'))
@@ -341,7 +344,10 @@ class MultiProjects():
     def get_simulations_list(self, which_project=None) -> list:
         """
         Return a python list of simulations
+
+        :param which_project: str or list of str -- key(s) of the project(s) to get simulations from
         """
+
         if which_project is None:
             allsims=[]
             for curproj in self.projects.values():
@@ -349,6 +355,15 @@ class MultiProjects():
                     allsims+=curproj.get_simulations()
             return allsims
 
+        elif isinstance(which_project, list):
+            allsims=[]
+            for curkey in which_project:
+                if curkey in self.projects.keys():
+                    curproj = self.projects[curkey]
+                    if isinstance(curproj, Wolf2D_Project):
+                        allsims+=curproj.get_simulations()
+            return allsims
+
         elif which_project in self.projects.keys():
             curproj = self.projects[which_project]
             if isinstance(curproj, Wolf2D_Project):
@@ -356,10 +371,13 @@ class MultiProjects():
 
         return None
 
-    def get_simulations_dict(self, which_project=None) -> dict:
+    def get_simulations_dict(self, which_project:Union[str, list[str]]=None) -> dict:
         """
         Return a python dict of simulations
+
+        :param which_project: str or list of str -- key(s) of the project(s) to get simulations from
         """
+
         if which_project is None:
             allsims={}
             for curkey, curproj in self.projects.items():
@@ -367,6 +385,15 @@ class MultiProjects():
                     allsims[curkey] = curproj.get_simulations()
             return allsims
 
+        elif isinstance(which_project, list):
+            allsims={}
+            for curkey in which_project:
+                if curkey in self.projects.keys():
+                    curproj = self.projects[curkey]
+                    if isinstance(curproj, Wolf2D_Project):
+                        allsims[curkey] = curproj.get_simulations()
+            return allsims
+
         elif which_project in self.projects.keys():
             curproj = self.projects[which_project]
             if isinstance(curproj, Wolf2D_Project):
@@ -374,7 +401,9 @@ class MultiProjects():
 
         return None
 
-    def set_currentview(self, which):
+    def set_currentview(self, which:views_2D):
+        """ Change le mode de vue dans une vue possible de 'views_2D' """
+
         for curproj in self.projects.values():
             if isinstance(curproj, Wolf2D_Project):
                 curproj.set_currentview(which)

wolfhece/pypolygons_scen.py

@@ -235,6 +235,8 @@ class Polygons_Analyze(Zones):
 
         self.myname = splitext(basename(myfile))[0]
 
+        self.linked = {}
+
         self.riverbed = self.get_zone(0).myvectors[1]
         self.riverbed.prepare_shapely()
 
@@ -247,23 +249,23 @@ class Polygons_Analyze(Zones):
         for vec in self.polygons_zone.myvectors:
             vec.myprop.used=False # cache les polygones pour ne pas surcharger l'affichage éventuel
 
-    def colorize(self):
-        """Colorisation des polygones pour l'interface graphique"""
-        self.centralpart.myprop.color = getIfromRGB((0,255,0))
-        self.upstream.myprop.color = getIfromRGB((255,0,0))
-        self.downstream.myprop.color = getIfromRGB((0,0,255))
+    # def colorize(self):
+    #     """Colorisation des polygones pour l'interface graphique"""
+    #     self.centralpart.myprop.color = getIfromRGB((0,255,0))
+    #     self.upstream.myprop.color = getIfromRGB((255,0,0))
+    #     self.downstream.myprop.color = getIfromRGB((0,0,255))
 
-    def highlighting(self, rgb=(255,0,0), linewidth=3):
-        """
-        Mise en évidence
-        """
-        self.centralpart.highlighting(rgb,linewidth)
+    # def highlighting(self, rgb=(255,0,0), linewidth=3):
+    #     """
+    #     Mise en évidence
+    #     """
+    #     self.centralpart.highlighting(rgb,linewidth)
 
-    def withdrawal(self):
-        """
-        Mise en retrait
-        """
-        self.centralpart.withdrawal()
+    # def withdrawal(self):
+    #     """
+    #     Mise en retrait
+    #     """
+    #     self.centralpart.withdrawal()
 
     def compute_distance(self, poly:LineString):
         """
@@ -274,7 +276,7 @@ class Polygons_Analyze(Zones):
             centery = np.sum(np.asarray([cur.y for cur in curvert.myvertices[:4]]))/4.
             self.polygons_curvi[curvert.myname] = poly.project(Point([centerx,centery]))
 
-    def find_values_inside_parts(self, linked_arrays):
+    def find_values_inside_parts(self, linked_arrays, force_reset = False):
         """
         Récupère les valeurs à l'intérieur :
          - des parties du pont (amont, centrale, aval)
@@ -290,8 +292,9 @@ class Polygons_Analyze(Zones):
         ***
 
         """
+        if force_reset:
+            self.linked={}
 
-        self.linked={}
         for curkey, curgroup in linked_arrays.items():
             self.linked[curkey] = [(curlink.idx, type(curlink)) for curlink in curgroup]
 
@@ -407,18 +410,23 @@ class Polygons_Analyze(Zones):
                 curdict = vals_ret[curkeypoly]={}
                 for curkey, curvals in curpoly.items():
                     if curvals is not None:
-                        if operator == operators.MEDIAN:
-                            curdict[curkey] = np.median(curvals)
-                        elif operator == operators.MIN:
-                            curdict[curkey] = np.min(curvals)
-                        elif operator == operators.MAX:
-                            curdict[curkey] = np.max(curvals)
-                        elif operator == operators.PERCENTILE95:
-                            curdict[curkey] = np.percentile(curvals,95)
-                        elif operator == operators.PERCENTILE5:
-                            curdict[curkey] = np.percentile(curvals,5)
-                        elif operator == operators.ALL:
-                            curdict[curkey] =  (np.median(curvals), np.min(curvals), np.max(curvals), np.percentile(curvals,95), np.percentile(curvals,5))
+                        try:
+                            if operator == operators.MEDIAN:
+                                curdict[curkey] = np.median(curvals)
+                            elif operator == operators.MIN:
+                                curdict[curkey] = np.min(curvals)
+                            elif operator == operators.MAX:
+                                curdict[curkey] = np.max(curvals)
+                            elif operator == operators.PERCENTILE95:
+                                curdict[curkey] = np.percentile(curvals,95)
+                            elif operator == operators.PERCENTILE5:
+                                curdict[curkey] = np.percentile(curvals,5)
+                            elif operator == operators.ALL:
+                                curdict[curkey] =  (np.median(curvals), np.min(curvals), np.max(curvals), np.percentile(curvals,95), np.percentile(curvals,5))
+                        except:
+                            logging.error(_('Error in extract_info for key {0}').format(curkey))
+                            curdict[curkey] = -1.
+
             return vals_ret
 
         vals = self.get_river_values(which_value, which_group)

{wolfhece-2.1.6.dist-info → wolfhece-2.1.7.dist-info}/METADATA

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

{wolfhece-2.1.6.dist-info → wolfhece-2.1.7.dist-info}/RECORD

@@ -34,13 +34,13 @@ wolfhece/import_ascfiles.py,sha256=jg4urcLdSgFS1Knvh7AVGJqM44qc_uYDNrR568tMh-A,4
 wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
 wolfhece/irm_qdf.py,sha256=749SlAXiN1oXp5tfBJoPNJWxydQlY55K0qvIM5YexlM,15436
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
-wolfhece/multiprojects.py,sha256=AMwEQZqo1Twh6tSPP-4L29-Fa8cI9d6dWce7l88awws,14675
+wolfhece/multiprojects.py,sha256=DdObaugeNrd2I7rtWd6M5W0nVXN8KRVmcXLjMg9oqYs,15795
 wolfhece/picc.py,sha256=KKPNk1BEe7QBzo2icIsdsxUopJ1LXYTomfdfeG2gCeA,7419
 wolfhece/pyGui1D.py,sha256=pzLWXQ_w3Y_yI846w1GklFO9h5lWZOqiUzg1BUPkuRI,121616
 wolfhece/pybridges.py,sha256=HJ1BL1HC7UrgpQ-3jKXkqPFmc-TzToL28Uex2hjHk6c,57166
 wolfhece/pydike.py,sha256=G4jfSZaAHHr4VWEJqnXSvEswXvlOz1yhbhQ6uu3AqyM,1943
 wolfhece/pylogging.py,sha256=i9Zugx3t9dPc7nBwcP20L_R4_k_WawpAQsvbZU8l9Hg,4230
-wolfhece/pypolygons_scen.py,sha256=lrUty990vT1iiILiIuTY8pNStiaZOi2dXWJuL9C-4Ps,26211
+wolfhece/pypolygons_scen.py,sha256=BAo1tg8rJGkmKlEyTbb8gnofk-aPbrKunE2-0YWNaHQ,26581
 wolfhece/pyshields.py,sha256=YS6VVjjzoA-ZR6YRccqjMcW3McNqNLoQODC6TNNkmPw,22983
 wolfhece/pyviews.py,sha256=hYdyrEvWF48dGBDOLIwmC28C0L8I28U4ohXk9nltF94,9666
 wolfhece/pywalous.py,sha256=GRS5TKoVT0J-3PBqMdlyFRHrqkdYC-uHgDPcMjoDEZw,18674
@@ -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=e4viWx1A5GTOG7x_ee5ipUIoVs03YPj1mmqIboCFecM,387
+wolfhece/apps/version.py,sha256=QnnuNPQqjbCKaqce2cE43Ky9-bjQgDRUR3St4eC7HII,387
 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
@@ -264,8 +264,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.6.dist-info/METADATA,sha256=cugMr7AdpxcXB9lUui3lqbla85asvy4lo-Q8-0per-Y,2281
-wolfhece-2.1.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wolfhece-2.1.6.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.6.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.6.dist-info/RECORD,,
+wolfhece-2.1.7.dist-info/METADATA,sha256=tv3E_t--2aA71zEbF4xRjwE3klu3AAVpHUIzRBLFVH8,2281
+wolfhece-2.1.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wolfhece-2.1.7.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.7.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.7.dist-info/RECORD,,