Changeset 468

Timestamp:

Jun 8, 2006, 6:58:38 PM (18 years ago)

Author:

mmc

Message:

Fixed bugs that showed up in the nanovis viewer when you switch between
two different fields or clear the existing result viewer.

Fixed the download option for 3D fields.

Location:

trunk/gui/scripts

Files:

• bugreport.tcl (modified) (1 diff)
• field3dresult.tcl (modified) (3 diffs)
• nanovisviewer.tcl (modified) (4 diffs)
• resultviewer.tcl (modified) (1 diff)

trunk/gui/scripts/bugreport.tcl

@@ -101 +101 @@
 }
 
-Rappture::Scroller .bugreport.details
+Rappture::Scroller .bugreport.details -xscrollmode auto -yscrollmode auto
 text .bugreport.details.text -wrap none
 .bugreport.details contents .bugreport.details.text

trunk/gui/scripts/field3dresult.tcl

@@ -37 +37 @@
     public method delete {args}
     public method scale {args}
-    public method download {option}
+    public method download {option args}
 
     # resources file tells us the nanovis server
@@ -144 +144 @@
 # ----------------------------------------------------------------------
 # USAGE: download coming
+# USAGE: download controls <downloadCommand>
 # USAGE: download now
 #
@@ -151 +152 @@
 # "string" is the data itself.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Field3DResult::download {option} {
+itcl::body Rappture::Field3DResult::download {option args} {
     $itk_component(renderer) download $option
 }

trunk/gui/scripts/nanovisviewer.tcl

@@ -793 +793 @@
     # activate the proper volume
     set first [lindex [get] 0]
-
-    set axis [$first hints updir]
-    if {"" != $axis} {
-        _send up $axis
+    if {"" != $first} {
+        set axis [$first hints updir]
+        if {"" != $axis} {
+            _send up $axis
+        }
     }
 
@@ -940 +941 @@
         # nothing to send -- activate the proper volume
         set first [lindex [get] 0]
-
-        set axis [$first hints updir]
-        if {"" != $axis} {
-            _send up $axis
+        if {"" != $first} {
+            set axis [$first hints updir]
+            if {"" != $axis} {
+                _send up $axis
+            }
         }
         foreach key [array names _obj2id *-*] {
@@ -1219 +1221 @@
 
     set dataobj [lindex [get] 0]
+    if {"" == $dataobj} {
+        return
+    }
     set comp [lindex [$dataobj components] 0]
     if {![info exists _obj2style($dataobj-$comp)]} {
@@ -1331 +1336 @@
 
     set dataobj [lindex [get] 0]
-    set comp [lindex [$dataobj components] 0]
-    if {[info exists _obj2id($dataobj-$comp)]} {
-        set ivol $_obj2id($dataobj-$comp)
+    if {"" != $dataobj} {
+        set comp [lindex [$dataobj components] 0]
+        if {[info exists _obj2id($dataobj-$comp)]} {
+            set ivol $_obj2id($dataobj-$comp)
+        }
     }
 

trunk/gui/scripts/resultviewer.tcl

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