Changeset 3298 for branches

Timestamp:

Feb 14, 2013 9:51:54 AM (11 years ago)

Author:

gah

Message:

fix handling for contours/heightmaps across multiple runs

Location:

branches/Rappture 1.2/gui/scripts

Files:

• field2dresult.tcl (modified) (2 diffs)
• resultviewer.tcl (modified) (2 diffs)

branches/Rappture 1.2/gui/scripts/field2dresult.tcl

@@ -79 +79 @@
     if {"" != $servers && $flags(-mode) != "vtk"} {
         switch -- $flags(-mode) {
-            "heightmap" {
+            "contour" - "heightmap" {
                 itk_component add renderer {
                     Rappture::VtkHeightmapViewer $itk_interior.heightmap \
-                        $servers -mode heightmap
+                        $servers -mode $flags(-mode)
                 }
             }
@@ -88 +88 @@
                 itk_component add renderer {
                     Rappture::FlowvisViewer $itk_interior.flow $servers
-                }
-            }
-            "contour" {
-                itk_component add renderer {
-                    Rappture::VtkHeightmapViewer $itk_interior.contour \
-                        $servers -mode contour
                 }
             }

branches/Rappture 1.2/gui/scripts/resultviewer.tcl

@@ -294 +294 @@
                 }
                 2D {
-                    set mode [$dataobj viewer]
+                    set mode "field2d"
+                    set viewer [$dataobj viewer]
                     set extents [$dataobj extents]
                     if { $extents > 1 } {
@@ -302 +303 @@
                         set w $itk_interior.$mode
                         if { ![winfo exists $w] } {
-                            Rappture::Field2DResult $w -mode $mode
+                            Rappture::Field2DResult $w -mode $viewer
                             set _mode2widget($mode) $w
                         }