Changeset 4001

Timestamp:

Nov 16, 2006, 5:45:34 PM (17 years ago)

Author:

steve

Message:

 

Location:

anuga_core/source/anuga

Files:

• shallow_water/shallow_water_ext.c (modified) (1 diff)
• visualiser/visualiser-tvtk.py (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -1179 +1179 @@
                                      domain.radii,
                                      domain.areas,
+                                     tri_full_flag,
                                      Stage.edge_values,
                                      Xmom.edge_values,

anuga_core/source/anuga/visualiser/visualiser-tvtk.py

@@ -3 +3 @@
 from Tkinter import Tk, Button, Frame, N, E, S, W
 from types import FunctionType, TupleType
-from vtk import vtkActor, vtkCubeAxesActor2D, vtkDelaunay2D, vtkFloatArray, vtkPoints, vtkPolyData, vtkPolyDataMapper, vtkRenderer
-from vtk.tk.vtkTkRenderWidget import vtkTkRenderWidget
+from enthought.tvtk.api import tvtk
+from enthought.tvtk.tools import ivtk
 
 class Visualiser(Thread):
@@ -38 +38 @@
 
     def run(self):
-        self.vtk_renderer = vtkRenderer()
+        self.vtk_renderer = tvtk.Renderer()
         self.setup_gui()
         self.setup_grid()
@@ -166 +166 @@
                     # colour[2] as the upper bound on the scalar
                     # range.
-                    scalars = vtkFloatArray()
+                    scalars = tvtk.FloatArray()
                     map(scalars.InsertNextValue, colour[0](self.build_quantity_dict()))
                     self.vtk_polyData[quantityName].GetPointData().SetScalars(scalars)