Changeset 2604 for trunk/gui

Timestamp:

Oct 6, 2011, 10:07:24 AM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/gui/scripts

Files:

• bugreport.tcl (modified) (1 diff)
• vtkstreamlinesviewer.tcl (modified) (6 diffs)

trunk/gui/scripts/bugreport.tcl

@@ -155 +155 @@
     raise .bugreport
 
-    catch {grab set .bugreport}
+    catch {grab set -local .bugreport}
     update
 }

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -151 +151 @@
     private variable _vectorFields 
     private variable _scalarFields 
+    private variable _fields 
     private variable _currentField
     private variable _numSeeds 200
@@ -1019 +1020 @@
         }
     }
+    array unset _scalarFields
     array set _scalarFields [$_first hints scalars]
+    array unset _vectorFields
     array set _vectorFields [$_first hints vectors]
     set _currentField [$_first hints default]
     $itk_component(field) choices delete 0 end
+    array unset _fields
     foreach name [array names _vectorFields] {
         set value $_vectorFields($name)
         $itk_component(field) choices insert end "$value" "$name"
+        set _fields($value) $name
     }
     foreach name [array names _scalarFields] {
         set value $_scalarFields($name)
         $itk_component(field) choices insert end "$value" "$name"
+        set _fields($value) $name
     }
     $itk_component(field) value $_currentField
@@ -1035 +1041 @@
     InitSettings streamlines-seeds streamlines-visible streamlines-opacity \
         streamlines-numpoints streamlines-lighting streamlines-palette \
-        streamlines-field \
         volume-edges volume-lighting volume-opacity volume-visible \
         volume-wireframe \
@@ -1466 +1471 @@
         }
         "streamlines-field" {
-            set field [$itk_component(field) value]
-            set value [$itk_component(axismode) translate $field]
+            set new [$itk_component(field) value]
+            set value [$itk_component(axismode) translate $new]
+            puts stderr "streamlines-field old field=$_currentField new field = $new value=$value"
             set _settings(streamlines-field) $value
-            if { [info exists _scalarFields($field)] } {
-                set name $_scalarFields($field)
-                set colorMode scalar
+            if { [info exists _scalarFields($new)] } {
+                set name $_scalarFields($new)
+                set _colorMode scalar
                 set fieldType scalar
-            } elseif { [info exists _vectorFields($field)] } {
-                set name $_vectorFields($field)
+                set _currentField $new
+            } elseif { [info exists _vectorFields($new)] } {
+                set name $_vectorFields($new)
                 set _colorMode vmag
                 set fieldType vector
+                set _currentField $new
             } else {
-                error "unknown field \"$field\""
+                puts stderr "unknown field \"$new\""
+                return
             }
             foreach dataset [CurrentDatasets -visible] {
+                puts stderr "dataset ${fieldType} ${name} $dataset"
+                puts stderr "streamlines colormode $_colorMode $dataset"
+                puts stderr "cutplane colormode $_colorMode $dataset"
                 SendCmd "dataset ${fieldType} ${name} $dataset"
                 SendCmd "streamlines colormode $_colorMode $dataset"
@@ -2503 +2515 @@
         $_image(legend) configure -data $bytes
         #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
-        DrawLegend $title
+        DrawLegend $_currentField
     }
 }
@@ -2521 +2533 @@
     
     regsub {\(mag\)} $title "" title 
+    if { [info exists _fields($title)] } {
+        set title $_fields($title)
+    }
     if { $_settings(legend-visible) } {
         set x [expr $w - 2]