Changeset 460 for trunk

Timestamp:

Jun 4, 2006, 8:04:15 PM (18 years ago)

Author:

mmc

Message:

Fixed the 3D viewer so that if it detects old-style vtk data, it will
drop back to using the old vtk viewer. This means that older tools
shouldn't be affected by the new nanovis upgrade.

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (1 diff)
• field3dresult.tcl (modified) (2 diffs)
• resultviewer.tcl (modified) (1 diff)

trunk/gui/scripts/field.tcl

@@ -152 +152 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field::mesh {{what -overall}} {
-    if {$what == "component0"} {
+    if {$what == "-overall" || $what == "component0"} {
         set what "component"
     }

trunk/gui/scripts/field3dresult.tcl

@@ -27 +27 @@
 itcl::class Rappture::Field3DResult {
     inherit itk::Widget
+
+    itk_option define -mode mode Mode "auto"
 
     constructor {args} { # defined below }
@@ -65 +67 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field3DResult::constructor {args} {
-    if {"" != $_nanovisHost && "" != $_nanovisPort} {
+    array set flags {
+        -mode auto
+    }
+    array set flags $args
+
+    if {"" != $_nanovisHost && "" != $_nanovisPort && $flags(-mode) != "vtk"} {
         itk_component add renderer {
             Rappture::NanovisViewer $itk_interior.ren \

trunk/gui/scripts/resultviewer.tcl

@@ -228 +228 @@
                     set mode "field3D"
                     if {![info exists _mode2widget($mode)]} {
+                        set mesh [$dataobj mesh]
+                        set mode [expr {("" != $mesh) ? "vtk" : "nanovis"}]
                         set w $itk_interior.field3D
-                        Rappture::Field3DResult $w
+                        Rappture::Field3DResult $w -mode $mode
                         set _mode2widget($mode) $w
                     }