Changeset 2212

Timestamp:

Jan 16, 2006, 5:44:22 PM (19 years ago)

Author:

steve

Message:

Added Jake's new vtk viewer

Location:

inundation/pyvolution

Files:

• netherlands.py (modified) (3 diffs)
• shallow_water_vtk.py (modified) (3 diffs)
• vtk_realtime_visualiser.py (modified) (5 diffs)

inundation/pyvolution/netherlands.py

@@ -12 +12 @@
 #rpdb.set_active()
 
-from shallow_water import Domain, Reflective_boundary, Dirichlet_boundary,\
+from shallow_water_vtk import Domain, Reflective_boundary, Dirichlet_boundary,\
      Transmissive_boundary, Constant_height, Constant_stage
 
@@ -83 +83 @@
 N = 130 #size = 33800
 N = 600 #Size = 720000
-N = 20
+N = 100
 
 
@@ -171 +171 @@
 
 
-for t in domain.evolve(yieldstep = 0.05, finaltime = 1.0):
+for t in domain.evolve(yieldstep = 0.005, finaltime = 1.0):
     domain.write_time()
     #domain.write_boundary()

inundation/pyvolution/shallow_water_vtk.py

@@ -76 +76 @@
         if self.visualise is True:
             self.visualiser.start()
+            # Things go haywire if we start evolving before the vis is ready
+            self.visualiser.idle.wait()
+            self.visualiser.idle.clear()
 
         #Store model data, e.g. for visualisation
@@ -89 +92 @@
             #Real time viz
             if self.visualise is True:
-                #pass
-                #Obseleted by the VTK-Visualiser
-                #self.visualiser.update_all()
-                #self.visualiser.update_timer()
-                self.visualiser.request_redraw()
-                if first:
-                    time.sleep(5.0)
-                    first = False
-                else:
-                    time.sleep(1.0)
+                print 'start vtk update'
+                self.visualiser.redraw_ready.set()
+                self.visualiser.idle.wait()
+                self.visualiser.idle.clear()
+                print 'end vtk update'
 
             #Store model data, e.g. for subsequent visualisation
@@ -109 +107 @@
             #Pass control on to outer loop for more specific actions
             yield(t)
-        import pypar
-        profiler.dump_stats("distrib_profile." + str(pypar.size()) + "." + str(pypar.rank()) + ".dat")
-
-
 
 #==================================== End of Updated Shallow Water VTK domain =============

inundation/pyvolution/vtk_realtime_visualiser.py

@@ -3 +3 @@
 
 import threading
-from Queue import Queue, Empty
 import Tkinter
 import vtk
@@ -49 +48 @@
         self.vertices = domain.vertex_coordinates
 
-        # Message queue
-        self.messages = Queue()
-
+        self.idle = threading.Event()
+        self.redraw_ready = threading.Event()
+        
         # Internal use - storage of vtk objects
         self.grids = {}
@@ -83 +82 @@
         self.add_axes()
         self.setup_all()
+        self.root.after(100, self.idle.set)
         self.root.mainloop()
 
@@ -95 +95 @@
 
         # Message handling with after
-        self.root.after(100, self.handle_messages)
+        self.root.after(100, self.redraw)
         
         self.renderWidget = vtkTkRenderWidget(self.root, width=400, height=400)
@@ -183 +183 @@
             self.renderer.AddActor(actor)
 
-    def handle_messages(self):
-        # Expandable to include more kinds of messages if need be
-        # This lookup table is copied because it is modified later
-        handlers = {'redraw': self.message_redraw}.copy()
-        try:
-            while True:
-                message = self.messages.get_nowait()
-                try:
-                    handlers[message]()
-                    # Guard against redrawing more than once per
-                    # call to handle_messages.
-                    if message == 'redraw':
-                        del handlers[message]
-                except KeyError:
-                    pass
-        except Empty:
-            pass
-        self.root.after(100, self.handle_messages)
-
-    def message_redraw(self):
-        """Re-render and repaint the rendered image.
-        This function should only be called from the message handler.
-        Use request_redraw to ask for a redraw"""
-
-        for q in self.domain.quantities:
-            if self.updating[q]:
-                self.draw_quantity(q)
+    def redraw(self):
+        if self.redraw_ready.isSet():
+            self.redraw_ready.wait()
+            self.redraw_ready.clear()
+            for q in self.domain.quantities:
+                if self.updating[q]:
+                    self.draw_quantity(q)
         
-        self.renderWindow.Render()
-        self.root.update_idletasks()
-
-    def request_redraw(self):
-        self.messages.put('redraw')
-
+            self.renderWindow.Render()
+            self.root.update_idletasks()
+            self.idle.set()
+        self.root.after(100, self.redraw)