Changeset 5664

Timestamp:

Jun 5, 2015, 3:11:14 PM (9 years ago)

Author:

ldelgass

Message:

For back compat, keep -color style as meaning colormap in glyph viewer, make
new -constcolor style for setting constant color.

File:

• trunk/gui/scripts/vtkglyphviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -2150 +2150 @@
     set tag $dataobj-$comp
     array set style {
-        -color white
-        -colormap BCGYR
+        -color BCGYR
+        -constcolor white
         -colormode vmag
         -edgecolor black
@@ -2168 +2168 @@
         -wireframe 0
     }
-    set $style(-color) $itk_option(-plotforeground)
+    set $style(-constcolor) $itk_option(-plotforeground)
     set numComponents [$dataobj numComponents $comp]
     if {$numComponents == 3} {
@@ -2212 +2212 @@
     }
     if { $_changed(-colormap) } {
-        set style(-colormap) $_settings(-colormap)
+        set style(-color) $_settings(-colormap)
     }
     if { $_currentColormap == "" } {
-        $itk_component(colormap) value $style(-colormap)
+        $itk_component(colormap) value $style(-color)
     }
 
     SendCmd "outline add $tag"
-    SendCmd "outline color [Color2RGB $style(-color)] $tag"
+    SendCmd "outline color [Color2RGB $style(-constcolor)] $tag"
     SendCmd "outline visible $style(-outline) $tag"
     set _settings(-glyphoutline) $style(-outline)
@@ -2239 +2239 @@
     set _settings(-glyphscale) $style(-gscale)
 
-    if {$style(-colormode) == "constant" || $style(-colormap) == "none"} {
+    if {$style(-colormode) == "constant" || $style(-color) == "none"} {
         SendCmd "glyphs colormode constant {} $tag"
         set _settings(-colormapvisible) 0
@@ -2246 +2246 @@
         SendCmd "glyphs colormode $style(-colormode) $_curFldName $tag"
         set _settings(-colormapvisible) 1
-        set _settings(-colormap) $style(-colormap)
-        SetCurrentColormap $style(-colormap)
+        set _settings(-colormap) $style(-color)
+        SetCurrentColormap $style(-color)
     }
     $itk_component(colormap) value $_settings(-colormap)
     set _colorMode $style(-colormode)
     # constant color only used if colormode set to constant
-    SendCmd "glyphs color [Color2RGB $style(-color)] $tag"
+    SendCmd "glyphs color [Color2RGB $style(-constcolor)] $tag"
     # Omitting field name for gorient and smode commands
     # defaults to active scalars or vectors depending on mode