wolfhece 2.0.13__py3-none-any.whl → 2.0.15__py3-none-any.whl

wolfhece/PyDraw.py

@@ -74,6 +74,7 @@ from .pybridges import Bridges, Bridge, Weirs, Weir
 from .tools_mpl import *
 from .wolf_tiles import Tiles
 from .lagrangian.particle_system_ui import Particle_system_to_draw as Particle_system
+from .opengl.py3d import Wolf_Viewer3D
 
 ID_SELECTCS = 1000
 ID_SORTALONG = 1001
@@ -120,6 +121,7 @@ class WolfMapViewer(wx.Frame):
     myres2D: list
     mytiles: list[Tiles]
     mypartsystems: list[Particle_system]
+    myviewers3d:list[Wolf_Viewer3D]
 
     canvas: GLCanvas  # canvas OpenGL
     context: GLContext  # context OpenGL
@@ -142,6 +144,7 @@ class WolfMapViewer(wx.Frame):
     active_tri: Triangulation
     active_tile: Tiles
     active_particle_system: Particle_system
+    active_viewer3d: Wolf_Viewer3D
 
     def __init__(self, wxparent, title, w=500, h=500, treewidth=200, wolfparent=None, wxlogging=None):
 
@@ -235,6 +238,7 @@ class WolfMapViewer(wx.Frame):
         self.filemenu.AppendSeparator()
         compareitem = self.filemenu.Append(wx.ID_ANY, _('Set comparison'), _('Set comparison'))
         multiview = self.filemenu.Append(wx.ID_ANY, _('Multiviewer'), _('Multiviewer'))
+        viewer3d = self.filemenu.Append(wx.ID_ANY, _('3D viewer'), _('3D viewer'))
         self.filemenu.AppendSeparator()
 
 
@@ -372,6 +376,7 @@ class WolfMapViewer(wx.Frame):
         self.active_profile = None
         self.active_res2d = None
         self.active_particle_system = None
+        self.active_viewer3d = None
         self.selected_treeitem = None
 
         curtool = self.tools[ID_SORTALONG] = {}
@@ -1246,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
         """
@@ -1569,9 +1574,10 @@ class WolfMapViewer(wx.Frame):
         self.mywmsback = []
         self.mywmsfore = []
         self.myres2D = []
+        self.myviewers3d = []
 
         # liste des éléments modifiable dans l'arbre
-        self.all_lists = [self.myarrays, self.myvectors, self.myclouds, self.mytri, self.myothers, self.myviews, self.myres2D, self.mytiles, self.mypartsystems]
+        self.all_lists = [self.myarrays, self.myvectors, self.myclouds, self.mytri, self.myothers, self.myviews, self.myres2D, self.mytiles, self.mypartsystems, self.myviewers3d]
 
         if self.get_configuration() is not None:
             self.menu_options = wx.Menu()
@@ -1787,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:
@@ -3437,6 +3443,26 @@ class WolfMapViewer(wx.Frame):
             for i in range(nb):
                 self.add_viewer_and_link()
 
+        elif itemlabel == _('3D viewer'):
+
+            self.active_viewer3d = Wolf_Viewer3D(self, _("3D Viewer"))
+            self.active_viewer3d.Show()
+            self.myviewers3d.append(self.active_viewer3d)
+
+            for curarray in self.iterator_over_objects(draw_type.ARRAYS):
+                curarray:WolfArray
+                if curarray.checked:
+                    if curarray._array3d is None:
+                        curarray.prepare_3D()
+
+                    if self.active_viewer3d not in curarray.viewers3d:
+                        curarray.viewers3d.append(self.active_viewer3d)
+
+                    self.active_viewer3d.add_array(curarray.idx, curarray._array3d)
+                    self.active_viewer3d.autoscale()
+
+            pass
+
         elif itemlabel == _('Set comparison'):
 
             dlg = wx.SingleChoiceDialog(None,_('Do you want to compare arrays or modelling results?'), _('Array or 2D Model'), [_('Arrays'), _('Modelling')])
@@ -4010,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'):
@@ -4960,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):
@@ -5657,15 +5683,24 @@ class WolfMapViewer(wx.Frame):
     def OnRDClick(self, e):
         self._endactions()
 
-    def OnLDClick(self, e):
+    def OnLDClick(self, e:wx.MouseEvent):
         pos = e.GetPosition()
+
+        ctrldown = e.ControlDown()
+
         x, y = self.getXY(pos)
+
         self.mousex = self.mousedown[0]
         self.mousey = self.mousedown[1]
         self.mousedown = (0., 0.)
         self.oneclick = False
         self.setbounds()
 
+        if ctrldown:
+            if self.active_viewer3d is not None:
+                self.active_viewer3d.force_view(self.mousex, self.mousey, self.active_array.get_value(self.mousex, self.mousey))
+                self.Refresh()
+
     def OnLDown(self, e):
         if not self.move:
             pos = e.GetPosition()

wolfhece/PyPalette.py

@@ -45,6 +45,12 @@ class wolfpalette(wx.Frame,LinearSegmentedColormap):
         LinearSegmentedColormap.__init__(self,'wolf',{},nseg)
         self.set_bounds()
 
+    def get_colors_f32(self):
+
+        colors = self.colorsflt[:,:3].astype(np.float32)
+
+        return colors
+
     def set_bounds(self):
         self.set_under(tuple(self.colormin))
         self.set_over(tuple(self.colormax))

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()