Changeset 2334

Timestamp:

Feb 5, 2006, 5:14:12 PM (18 years ago)

Author:

steve

Message:

Adding coloring to vtk visualisation

Location:

inundation/pyvolution

Files:

• realtime_visualisation_new.py (modified) (1 diff)
• shallow_water_vtk.py (modified) (2 diffs)
• vtk_realtime_visualiser.py (modified) (7 diffs)

inundation/pyvolution/realtime_visualisation_new.py

@@ -474 +474 @@
 
 
-        colour[6*i  ,:] = s*array([0.3 - q0r, 0.3 - q0, 0.3 + q0b])
-        colour[6*i+1,:] = s*array([0.3 - q1r, 0.3 - q1, 0.3 + q1b])
-        colour[6*i+2,:] = s*array([0.3 - q2r, 0.3 - q2, 0.3 + q2b])
-        colour[6*i+3,:] = s*array([0.3 - q0r, 0.3 - q0, 0.3 + q0b])
-        colour[6*i+4,:] = s*array([0.3 - q2r, 0.3 - q2, 0.3 + q2b])
-        colour[6*i+5,:] = s*array([0.3 - q1r, 0.3 - q1, 0.3 + q1b])
-
-#        #s = 0.1
-#        colour[6*i  ,:] = s*array([0.3 - q0r, 0.0, 0.3 + q0b])
-#        colour[6*i+1,:] = s*array([0.3 - q1r, 0.0, 0.3 + q1b])
-#        colour[6*i+2,:] = s*array([0.3 - q2r, 0.0, 0.3 + q2b])
-#        colour[6*i+3,:] = s*array([0.3 - q0r, 0.0, 0.3 + q0b])
-#        colour[6*i+4,:] = s*array([0.3 - q2r, 0.0, 0.3 + q2b])
-#        colour[6*i+5,:] = s*array([0.3 - q1r, 0.0, 0.3 + q1b])
+#        colour[6*i  ,:] = s*array([0.3 - q0r, 0.3 - q0, 0.3 + q0b])
+#        colour[6*i+1,:] = s*array([0.3 - q1r, 0.3 - q1, 0.3 + q1b])
+#        colour[6*i+2,:] = s*array([0.3 - q2r, 0.3 - q2, 0.3 + q2b])
+#        colour[6*i+3,:] = s*array([0.3 - q0r, 0.3 - q0, 0.3 + q0b])
+#        colour[6*i+4,:] = s*array([0.3 - q2r, 0.3 - q2, 0.3 + q2b])
+#        colour[6*i+5,:] = s*array([0.3 - q1r, 0.3 - q1, 0.3 + q1b])
+
+        s = 0.1
+        colour[6*i  ,:] = s*array([0.3 - q0r, 0.3, 0.3 + q0b])
+        colour[6*i+1,:] = s*array([0.3 - q1r, 0.3, 0.3 + q1b])
+        colour[6*i+2,:] = s*array([0.3 - q2r, 0.3, 0.3 + q2b])
+        colour[6*i+3,:] = s*array([0.3 - q0r, 0.3, 0.3 + q0b])
+        colour[6*i+4,:] = s*array([0.3 - q2r, 0.3, 0.3 + q2b])
+        colour[6*i+5,:] = s*array([0.3 - q1r, 0.3, 0.3 + q1b])
 
 

inundation/pyvolution/shallow_water_vtk.py

@@ -36 +36 @@
             from vtk_realtime_visualiser import Visualiser
             self.visualiser = Visualiser(self,scale_z,rect)
+            self.visualiser.coloring['stage'] = False
+            self.visualiser.coloring['elevation'] = False
             self.visualiser.setup['elevation']=True
             self.visualiser.updating['stage']=True
@@ -42 +44 @@
         if self.visualise_color_stage == True:
             self.visualiser.coloring['stage'] = True
+            
 
 

inundation/pyvolution/vtk_realtime_visualiser.py

@@ -46 +46 @@
         self.qcolor = {}
         self.scale_z = {}
+        self.coloring = {}
         self.default_scale_z = default_scale_z
         self.domain = domain
@@ -57 +58 @@
         # Internal use - storage of vtk objects
         self.grids = {}
+        self.scalars = {}
         self.actors = {}
         self.polydata = {}
@@ -150 +152 @@
         else:
             scale = self.default_scale_z
+            
         #############################################################
         # Disabled the make_vtkpoints call because the extension is
@@ -169 +172 @@
 
         self.grids[q] = vtk.vtkPoints()
+        self.scalars[q] = vtk.vtkFloatArray()
         grid = self.grids[q]
+        scalars = self.scalars[q]
 
         for v in range(self.N_vert):
@@ -175 +180 @@
                                  self.vert_index[v][1],
                                  qty_index[v] * scale)
+            scalars.InsertNextValue(qty_index[v]);
 
         # Can't recycle vtkPolyData objects: Apparently they behave
@@ -183 +189 @@
 
         polydata.SetPoints(grid)
+        if self.coloring[q]:
+            polydata.GetPointData().SetScalars(scalars);
         polydata.SetPolys(self.cells)
 
@@ -217 +225 @@
             self.root.update_idletasks()
             self.idle.set()
-        self.root.after(100, self.redraw)
-
+        self.root.after(100, self.redraw)     
+    
     def shutdown(self):
         self.domain.visualise = False