Changeset 3019 for trunk

Timestamp:

May 30, 2012, 2:16:35 PM (12 years ago)

Author:

ldelgass

Message:

Add cases to handle all vtk viewers in Field2D|3DResult constructors. Also,
bring sequence result viewer routing in line with result viewer.

Location:

trunk/gui/scripts

Files:

• field2dresult.tcl (modified) (3 diffs)
• field3dresult.tcl (modified) (3 diffs)
• sequenceresult.tcl (modified) (2 diffs)

trunk/gui/scripts/field2dresult.tcl

@@ -61 +61 @@
             set servers [Rappture::VisViewer::GetServerList "nanovis"]
         }
-        "vtkcontour" - "vtkheightmap" {
+        "vtkcontour" - "vtkheightmap" - "vtkstreamlines" - "vtkviewer" {
             set servers [Rappture::VisViewer::GetServerList "vtkvis"]
         }
@@ -78 +78 @@
                 }
             }
-            "vtkheightmap" {
+            "flowvis" {
                 itk_component add renderer {
-                    Rappture::VtkHeightmapViewer $itk_interior.ren $servers 
+                    Rappture::FlowvisViewer $itk_interior.ren $servers
                 }
             }
@@ -88 +88 @@
                 }
             }
-            "flowvis" {
+            "vtkheightmap" {
                 itk_component add renderer {
-                    Rappture::FlowvisViewer $itk_interior.ren $servers
+                    Rappture::VtkHeightmapViewer $itk_interior.ren $servers 
+                }
+            }
+            "vtkstreamlines" {
+                itk_component add renderer {
+                    Rappture::VtkStreamlinesViewer $itk_interior.ren $servers
+                }
+            }
+            "vtkviewer" {
+                itk_component add renderer {
+                    Rappture::VtkViewer $itk_interior.ren $servers 
                 }
             }

trunk/gui/scripts/field3dresult.tcl

@@ -59 +59 @@
             set servers [Rappture::VisViewer::GetServerList "nanovis"]
         }
-        "vtkcontour" - "vtkstreamlines" - "vtkvolume" - "vtkviewer"  {
+        "vtkcontour" - "vtkheightmap" - "vtkstreamlines" - "vtkviewer" - "vtkvolume" {
             set servers [Rappture::VisViewer::GetServerList "vtkvis"]
         }
@@ -69 +69 @@
             puts stderr "unknown render mode \"$flags(-mode)\""
         }
-    }           
+    }
     if {"" != $servers && $flags(-mode) != "vtk"} {
         switch -- $flags(-mode) {
@@ -82 +82 @@
                 }
             }
-            "vtkvolume" {
-                catch {
+            "vtkcontour" {
                 itk_component add renderer {
-                    Rappture::VtkVolumeViewer $itk_interior.ren $servers
+                    Rappture::VtkContourViewer $itk_interior.ren $servers
                 }
-                } errs
-                puts stderr errs=$errs
+            }
+            "vtkheightmap" {
+                itk_component add renderer {
+                    Rappture::VtkHeightmapViewer $itk_interior.ren $servers
+                }
             }
             "vtkstreamlines" {
                 itk_component add renderer {
                     Rappture::VtkStreamlinesViewer $itk_interior.ren $servers
+                }
+            }
+            "vtkviewer" {
+                itk_component add renderer {
+                    Rappture::VtkViewer $itk_interior.ren $servers
+                }
+            }
+            "vtkvolume" {
+                itk_component add renderer {
+                    Rappture::VtkVolumeViewer $itk_interior.ren $servers
                 }
             }

trunk/gui/scripts/sequenceresult.tcl

@@ -485 +485 @@
                                 set mode "heightmap"
                             }
+                        } elseif { [info exists env(VTKCONTOUR)] } {
+                            set mode "vtkcontour"
                         } else {
                             set mode "vtk"
+                        }
+                        set extents [$dataobj extents]
+                        if { $extents > 1 } {
+                            set resultMode "flowvis"
                         }
                         Rappture::Field2DResult $viewer -mode $mode
@@ -508 +514 @@
                                 }
                             }
+                            "vtkvolume" {
+                                set fmt "vtkvolume"
+                            }
+                            "vtkstreamlines" {
+                                set fmt "vtkstreamlines"
+                            }
                             "" {
                                 set fmt "auto"