Changeset 3330 for trunk/gui/scripts/field2dresult.tcl

Timestamp:

Feb 24, 2013, 1:11:18 PM (11 years ago)

Author:

gah

Message:

merge (by hand) with Rappture1.2 branch

File:

• trunk/gui/scripts/field2dresult.tcl (modified) (7 diffs)

trunk/gui/scripts/field2dresult.tcl

@@ +1 @@
+# -*- mode: tcl; indent-tabs-mode: nil -*- 
 # ----------------------------------------------------------------------
 #  COMPONENT: field2dresult - plot a field in a ResultSet
@@ -21 +22 @@
 option add *Field2DResult.controlBackground gray widgetDefault
 option add *Field2DResult.controlDarkBackground #999999 widgetDefault
-option add *Field2DResult.plotBackground black widgetDefault
-option add *Field2DResult.plotForeground white widgetDefault
+option add *Field2DResult.plotBackground white widgetDefault
+option add *Field2DResult.plotForeground black widgetDefault
 option add *Field2DResult.font \
     -*-helvetica-medium-r-normal-*-12-* widgetDefault
@@ -31 +32 @@
     itk_option define -mode mode Mode "auto"
 
-    constructor {args} { # defined below }
-    destructor { # defined below }
+    constructor {args} { 
+        # defined below 
+    }
+    destructor { 
+        # defined below 
+    }
 
     public method add {dataobj {settings ""}}
@@ -39 +44 @@
     public method scale {args}
     public method snap {w h}
-    public method parameters {title args} { # do nothing }
+    public method parameters {title args} { 
+        # do nothing 
+    }
     public method download {option args}
 }
@@ -58 +65 @@
     set servers ""
     switch -- $flags(-mode) {
-        "auto" - "heightmap" - "flowvis" {
+        "flowvis" {
             set servers [Rappture::VisViewer::GetServerList "nanovis"]
         }
-        "vtkcontour" - "vtkheightmap" - "vtkstreamlines" - "vtkviewer" {
+        "auto" - "contour" - "heightmap" - "streamlines" - "vtkviewer" {
             set servers [Rappture::VisViewer::GetServerList "vtkvis"]
         }
@@ -73 +80 @@
     if {"" != $servers && $flags(-mode) != "vtk"} {
         switch -- $flags(-mode) {
-            "auto" - "heightmap" {
+            "contour" - "heightmap" {
                 itk_component add renderer {
-                    Rappture::HeightmapViewer $itk_interior.ren $servers 
+                    Rappture::VtkHeightmapViewer $itk_interior.heightmap \
+                        $servers -mode $flags(-mode)
                 }
             }
             "flowvis" {
                 itk_component add renderer {
-                    Rappture::FlowvisViewer $itk_interior.ren $servers
+                    Rappture::FlowvisViewer $itk_interior.flow $servers
                 }
             }
-            "vtkcontour" {
+            "streamlines" {
                 itk_component add renderer {
-                    Rappture::VtkContourViewer $itk_interior.ren $servers 
-                }
-            }
-            "vtkheightmap" {
-                itk_component add renderer {
-                    Rappture::VtkHeightmapViewer $itk_interior.ren $servers 
-                }
-            }
-            "vtkstreamlines" {
-                itk_component add renderer {
-                    Rappture::VtkStreamlinesViewer $itk_interior.ren $servers
+                    Rappture::VtkStreamlinesViewer $itk_interior.streamlines \
+                        $servers
                 }
             }
             "vtkviewer" {
                 itk_component add renderer {
-                    Rappture::VtkViewer $itk_interior.ren $servers 
+                    Rappture::VtkViewer $itk_interior.viewer $servers 
                 }
             }
@@ -113 +112 @@
         }
     }
-
     if {![info exists itk_component(renderer)]} {
         itk_component add renderer {
-            Rappture::ContourResult $itk_interior.ren
+            Rappture::ContourResult $itk_interior.oldcontour
         }
         pack $itk_component(renderer) -expand yes -fill both
     }
     eval itk_initialize $args
+    update
 }