Changeset 2613 for trunk/gui/scripts

Timestamp:

Oct 12, 2011, 1:01:22 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/gui/scripts

Files:

• molvisviewer.tcl (modified) (2 diffs)
• vtkstreamlinesviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/molvisviewer.tcl

@@ -697 +697 @@
         #debug "CACHED: $tag,$cacheid"
         $_image(plot) configure -data $data
+        if 0 {
         $_image(plot) write dummy.jpg -format jpeg
         puts stderr "image width=[image width $_image(plot)] height=[image height $_image(plot)]"
         puts stderr "screen width=$_width height=$_height"
+        }
         set _image(id) $tag
     }
@@ -969 +971 @@
         set readyForNextFrame 0;        # Don't advance to the next frame
                                         # until we get an image.
-        SendCmd "bmp";                  # Flush the results.
+        SendCmd "ppm";                  # Flush the results.
     }
     set _buffering 0;                   # Turn off buffering.

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -974 +974 @@
     set _first ""
     InitSettings axis-xgrid axis-ygrid axis-zgrid axis-mode \
-        axis-visible axis-labels 
+        axis-visible axis-labels cutplane-visible \
+        cutplane-xposition cutplane-yposition cutplane-zposition \
+        cutplane-xvisible cutplane-yvisible cutplane-zvisible
 
     SendCmd "imgflush"
@@ -1044 +1046 @@
             streamlines-numpoints streamlines-lighting \
             streamlines-palette streamlines-field \
-            volume-edges volume-lighting volume-opacity volume-wireframe \
-            cutplane-xvisible cutplane-yvisible cutplane-zvisible \
-            cutplane-xposition cutplane-yposition cutplane-zposition 
+            volume-edges volume-lighting volume-opacity volume-wireframe 
         Zoom reset
         set _reset 0
@@ -1472 +1472 @@
         "streamlines-field" {
             set new [$itk_component(field) value]
-            set value [$itk_component(axismode) translate $new]
+            set value [$itk_component(field) translate $new]
             set _settings(streamlines-field) $value
             if { [info exists _scalarFields($new)] } {
@@ -1489 +1489 @@
             }
             foreach dataset [CurrentDatasets -visible] {
-                SendCmd "dataset ${fieldType} ${name} $dataset"
-                SendCmd "streamlines colormode $_colorMode $dataset"
-                SendCmd "cutplane colormode $_colorMode $dataset"
+                SendCmd "streamlines colormode $_colorMode ${name} $dataset"
+                SendCmd "cutplane colormode $_colorMode ${name} $dataset"
             }
             RequestLegend
@@ -1517 +1516 @@
         return
     }
+    if { [info exists _scalarFields($_currentField)] } {
+        set name $_scalarFields($_currentField)
+    } elseif { [info exists _vectorFields($_currentField)] } {
+        set name $_vectorFields($_currentField)
+    } else {
+        return
+    }
     # Set the legend on the first streamlines dataset.
     foreach dataset [CurrentDatasets -visible $_first] {
         foreach {dataobj comp} [split $dataset -] break
         if { [info exists _dataset2style($dataset)] } {
-            SendCmd "legend $_dataset2style($dataset) $_colorMode {} $w $h 0"
+            SendCmd "legend $_dataset2style($dataset) $_colorMode $name {} $w $h 0"
             break;
         }