Changeset 2490 for trunk/gui

Timestamp:

Sep 8, 2011, 4:10:52 PM (13 years ago)

Author:

gah

Message:

 

File:

• trunk/gui/scripts/vtkviewer.tcl (modified) (8 diffs)

trunk/gui/scripts/vtkviewer.tcl

@@ -912 +912 @@
             }
             lappend _obj2datasets($dataobj) $tag
-            SetObjectStyle $dataobj $comp
-            # Must create streamlines before setting colormap.
             if { [info exists _obj2ovride($dataobj-raise)] } {
                 SendCmd "dataset visible 1 $tag"
@@ -919 +917 @@
                 SendCmd "dataset visible 0 $tag"
             }
+            SetObjectStyle $dataobj $comp
         }
     }
@@ -1319 +1318 @@
     if { [info exists _colormaps($colormap)] } {
         puts stderr "Colormap $colormap already built"
+        return $colormap
     }
     if { ![info exists _dataset2style($tag)] } {
@@ -1337 +1337 @@
         }
         "spheres" {
-            SendCmd "glyphs colormap $colormap $tag"
+            #SendCmd "glyphs colormap $colormap $tag"
         }
     }
@@ -1784 +1784 @@
     set type [$dataobj type $comp]
     set style [$dataobj style $comp]
-    array set props $style
+    puts stderr "style $dataobj-$comp \"$style\""
     if { $dataobj != $_first } {
-        set props(-wireframe) 1
+        set settings(-wireframe) 1
     }
     if { $type == "streamlines" } {
-        array set props {
+        array set settings {
             -color \#808080
-            -edgevisibility 0
+            -edges 0
             -edgecolor black
             -linewidth 1.0
@@ -1799 +1799 @@
             -seeds 1
             -seedcolor white
-        }
+            -visible 1
+        }
+        array set settings $style
         SendCmd "streamlines add $tag"
         SendCmd "streamlines seed visible off"
@@ -1805 +1807 @@
         set _haveStreams 1
     } elseif { $type == "spheres" } {
-        array set props {
+        array set settings {
             -color \#808080
-            -edgevisibility 0
-            -edgecolor black
-            -linewidth 1.0
-            -opacity 0.4
-            -wireframe 0
-            -lighting 1
-        }
-        SendCmd "glyphs add $tag"
-        SendCmd "glyphs shape sphere $tag"
-        SendCmd "glyphs gscale 0.5 $tag"
-        SendCmd "glyphs visible 1 $tag"
-        SendCmd "glyphs wireframe $props(-wireframe) $tag"
-        SendCmd "glyphs ccolor 0.9 0.2 0.1 $tag"
-        SendCmd "glyphs colormode ccolor $tag"
-        SendCmd "glyphs opacity 1.0 $tag"
-        set _haveSpheres 1
-    } else {
-        array set props {
-            -color \#6666FF
-            -edgevisibility 1
+            -gscale 1
+            -edges 0
             -edgecolor black
             -linewidth 1.0
@@ -1832 +1816 @@
             -wireframe 0
             -lighting 1
-        }
+            -visible 1
+        }
+        array set settings $style
+        SendCmd "glyphs add $tag"
+        SendCmd "glyphs shape sphere $tag"
+        SendCmd "glyphs gscale $settings(-gscale) $tag"
+        #SendCmd "glyphs wireframe $settings(-wireframe) $tag"
+        #SendCmd "glyphs ccolor [Color2RGB $settings(-color)] $tag"
+        #SendCmd "glyphs colormode ccolor $tag"
+        SendCmd "glyphs smode vcomp $tag"
+        #SendCmd "glyphs opacity $settings(-opacity) $tag"
+        SendCmd "glyphs visible $settings(-visible) $tag"
+        set _haveSpheres 1
+    } else {
+        array set settings {
+            -color \#6666FF
+            -edges 1
+            -edgecolor black
+            -linewidth 1.0
+            -opacity 1.0
+            -wireframe 0
+            -lighting 1
+            -visible 1
+        }
+        array set settings $style
+        parray settings
         SendCmd "polydata add $tag"
+        SendCmd "polydata visible $settings(-visible) $tag"
+        set _volume(visible) $settings(-visible)
     } 
     if { $type != "spheres" } {
-    SendCmd "polydata edges $props(-edgevisibility) $tag"
-    SendCmd "polydata color [Color2RGB $props(-color)] $tag"
-    SendCmd "polydata lighting $props(-lighting) $tag"
-    SendCmd "polydata linecolor [Color2RGB $props(-edgecolor)] $tag"
-    SendCmd "polydata linewidth $props(-linewidth) $tag"
-    SendCmd "polydata opacity $props(-opacity) $tag"
-    SendCmd "polydata wireframe $props(-wireframe) $tag"
-    }
-    set _volume(opacity) [expr $props(-opacity) * 100.0]
+        SendCmd "polydata edges $settings(-edges) $tag"
+        set _volume(edges) $settings(-edges)
+        SendCmd "polydata color [Color2RGB $settings(-color)] $tag"
+        SendCmd "polydata lighting $settings(-lighting) $tag"
+        set _volume(lighting) $settings(-lighting)
+        SendCmd "polydata linecolor [Color2RGB $settings(-edgecolor)] $tag"
+        SendCmd "polydata linewidth $settings(-linewidth) $tag"
+        SendCmd "polydata opacity $settings(-opacity) $tag"
+        set _volume(opacity) $settings(-opacity)
+        SendCmd "polydata wireframe $settings(-wireframe) $tag"
+        set _volume(wireframe) $settings(-wireframe)
+    }
+    set _volume(opacity) [expr $settings(-opacity) * 100.0]
     SetColormap $dataobj $comp
 }