wolfhece 2.0.14__py3-none-any.whl → 2.0.16__py3-none-any.whl

wolfhece/PyDraw.py

@@ -1251,7 +1251,7 @@ class WolfMapViewer(wx.Frame):
         else:
             logging.warning( "Can't open the clipboard", "Error")
 
-    def get_mpl_plot(self, center = [0., 0.], width = 500., height = 500., title='', toshow=True) -> (Figure, Axes):
+    def get_mpl_plot(self, center = [0., 0.], width = 500., height = 500., title='', toshow=True) -> tuple[Figure, Axes]:
         """
         Récupère un graphique matplotlib sur base de la fenêtre OpenGL et de la palette de la matrice active
         """
@@ -1793,15 +1793,15 @@ class WolfMapViewer(wx.Frame):
         third.add_WMS()
 
         # Création d'une liste contenant les 3 instances d'objet "WolfMapViewer"
-        list:list[WolfMapViewer] = []
-        list.append(first)
-        list.append(second)
-        list.append(third)
+        mylist:list[WolfMapViewer] = []
+        mylist.append(first)
+        mylist.append(second)
+        mylist.append(third)
 
         # On indique que les objets sont liés en activant le Booléen et en pointant la liste précédente
-        for curlist in list:
+        for curlist in mylist:
             curlist.linked = True
-            curlist.linkedList = list
+            curlist.linkedList = mylist
 
         if ListArrays is not None:
             if len(ListArrays) == 2:
@@ -4036,7 +4036,7 @@ class WolfMapViewer(wx.Frame):
             curarray:WolfArray
             for curarray in self.myarrays:
                 if curarray.plotted:
-                    curarray.filter_inundation(bound)
+                    curarray.filter_inundation(epsilon = bound)
             del wait
 
     def export_results_as(self,which='geotiff'):
@@ -4986,7 +4986,7 @@ class WolfMapViewer(wx.Frame):
 
         return [obj[i] for i in idx]
 
-    def iterator_over_objects(self, drawing_type:draw_type, checked_state:bool=True) -> Element_To_Draw:
+    def iterator_over_objects(self, drawing_type:draw_type, checked_state:bool=True):
         """ Create iterator over objects of type draw_type """
 
         for obj in self.get_list_objects(drawing_type, checked_state):

wolfhece/Results2DGPU.py

@@ -254,7 +254,7 @@ class wolfres2DGPU(Wolfresults_2D):
             curblock.rough_n = WolfArray(path.join(sim_path, 'simul.frot'))
 
         elif path.exists(path.join(sim_path, 'bathymetry.npy')):
-            curblock.top = WolfArray(path.join(sim_path, 'bathymetry.npy'), nullvalue=99999.)
+            curblock.top = WolfArray(path.join(sim_path, 'bathymetry.npy'))
             curblock.waterdepth = WolfArray(path.join(sim_path, 'h.npy'))
             curblock.qx = WolfArray(path.join(sim_path, 'qx.npy'))
             curblock.qy = WolfArray(path.join(sim_path, 'qy.npy'))
@@ -279,6 +279,10 @@ class wolfres2DGPU(Wolfresults_2D):
                     except:
                         logging.error(_('No spatial position (base_coord_x,base_coord_y) in parameters.json -- Results will not be spatially based'))
 
+        # Force nullvalue to zero because it will influence the size of the arrow in vector field views
+        curblock.qx.nullvalue = 0.
+        curblock.qy.nullvalue = 0.
+
         self.loaded_rough = True
 
         self.head_blocks[getkeyblock(0)] = curblock.top.get_header()