Changeset 2267

Timestamp:

Jan 23, 2006, 3:07:17 PM (18 years ago)

Author:

jack

Message:

Added pause and resume buttons to the vtk visualiser. This
will freeze the evolve thread, allowing interaction with the visualiser.

Disabled use of the vtk_visualiser_ext module, because it doesn't link on windows.
The prebuilt vtk DLLs are built with VC++ and the rest of the project is being built with
MinGW, which don't link together. The speed increase wasn't noticable anyway.

Location:

inundation/pyvolution

Files:

• vtk_realtime_visualiser.py (modified) (4 diffs)
• vtk_visualiser_ext.cpp (modified) (1 diff)

inundation/pyvolution/vtk_realtime_visualiser.py

@@ -52 +52 @@
         self.idle = threading.Event()
         self.redraw_ready = threading.Event()
+        self.unpaused = threading.Event()
+        self.unpaused.set()
 
         # Internal use - storage of vtk objects
@@ -106 +108 @@
 
         self.quitButton = Tkinter.Button(self.root, text='Quit', command=self.shutdown)
-        self.quitButton.pack(side=Tkinter.BOTTOM)
+        self.quitButton.pack(side=Tkinter.RIGHT)
+
+        self.pauseButton = Tkinter.Button(self.root, text='Pause', command=self.unpaused.clear)
+        self.pauseButton.pack(side=Tkinter.LEFT)
+
+        self.resumeButton = Tkinter.Button(self.root, text='Resume', command=self.unpaused.set)
+        self.resumeButton.pack(side=Tkinter.LEFT)
 
     def add_axes(self):
@@ -142 +150 @@
         else:
             scale = self.default_scale_z
-
-        self.grids[q] = make_vtkpoints(self.N_tri,
-                                   self.N_vert,
-                                   scale,
-                                   self.domain.quantities[q].vertex_values,
-                                   self.vert_index,
-                                   self.domain.triangles)
+        #############################################################
+        # Disabled the make_vtkpoints call because the extension is
+        # difficult to get to link under windows
+        #############################################################
+        #self.grids[q] = make_vtkpoints(self.N_tri,
+        #                           self.N_vert,
+        #                           scale,
+        #                           self.domain.quantities[q].vertex_values,
+        #                           self.vert_index,
+        #                           self.domain.triangles)
+        #grid = self.grids[q]
+        #############################################################
+        
+        qty_index = zeros(self.N_vert, Float)
+        for n in range(self.N_tri):
+            for v in range(3):
+                qty_index[self.domain.triangles[n][v]] = self.domain.quantities[q].vertex_values[n][v]
+                
+        self.grids[q] = vtk.vtkPoints()
         grid = self.grids[q]
-        ###################################################
-        # Obsoleted by vtk_visualiser_ext and make_vtkpoints
-        ###################################################
-        #qty_index = zeros(self.N_vert, Float)
-        #for n in range(self.N_tri):
-        #    for v in range(3):
-        #        qty_index[self.domain.triangles[n][v]] = self.domain.quantities[q].vertex_values[n][v]
-        #self.grids[q] = vtk.vtkPoints()
-        #grid = self.grids[q]
-        #for v in range(self.N_vert):
-        #    grid.InsertNextPoint(self.vert_index[v][0],
-        #                         self.vert_index[v][1],
-        #                         qty_index[v] * scale)
-        ###################################################
+        
+        for v in range(self.N_vert):
+            grid.InsertNextPoint(self.vert_index[v][0],
+                                 self.vert_index[v][1],
+                                 qty_index[v] * scale)
 
         # Can't recycle vtkPolyData objects: Apparently they behave
@@ -211 +222 @@
         self.domain.visualise = False
         self.idle.set()
+        self.unpaused.set()
         self.root.withdraw()
         self.root.quit()

inundation/pyvolution/vtk_visualiser_ext.cpp

@@ +1 @@
+/*
+ * Additional functions used by the VTK visualiser
+ * currently not used, since it is a pain to link on windows
+ *
+ */
+
 #include "Python.h"
 #include "Numeric/arrayobject.h"