Changeset 5666 for branches/1.4/gui/scripts

Timestamp:

Jun 5, 2015, 3:27:12 PM (9 years ago)

Author:

ldelgass

Message:

Sync glyph viewer with trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/vtkglyphviewer.tcl (modified) (7 diffs)

branches/1.4/gui/scripts/vtkglyphviewer.tcl

@@ -1733 +1733 @@
         Rappture::Combobox $inner.colormap -width 10 -editable no
     }
-
-    $inner.colormap choices insert end [GetColormapList]
+    $inner.colormap choices insert end [GetColormapList -includeNone]
     $itk_component(colormap) value "BCGYR"
     bind $inner.colormap <<Value>> \
@@ -2152 +2151 @@
     array set style {
         -color BCGYR
+        -constcolor white
+        -colormode vmag
         -edgecolor black
         -edges 0
@@ -2167 +2168 @@
         -wireframe 0
     }
+    set $style(-constcolor) $itk_option(-plotforeground)
     set numComponents [$dataobj numComponents $comp]
     if {$numComponents == 3} {
@@ -2172 +2174 @@
         set style(-orientglyphs) 1
         set style(-scalemode) "vmag"
+        set style(-colormode) "vmag"
     } else {
         set style(-shape) "sphere"
         set style(-orientglyphs) 0
         set style(-scalemode) "scalar"
+        set style(-colormode) "scalar"
     }
     array set style [$dataobj style $comp]
@@ -2215 +2219 @@
 
     SendCmd "outline add $tag"
-    SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
+    SendCmd "outline color [Color2RGB $style(-constcolor)] $tag"
     SendCmd "outline visible $style(-outline) $tag"
     set _settings(-glyphoutline) $style(-outline)
@@ -2235 +2239 @@
     set _settings(-glyphscale) $style(-gscale)
 
+    if {$style(-colormode) == "constant" || $style(-color) == "none"} {
+        SendCmd "glyphs colormode constant {} $tag"
+        set _settings(-colormapvisible) 0
+        set _settings(-colormap) "none"
+    } else {
+        SendCmd "glyphs colormode $style(-colormode) $_curFldName $tag"
+        set _settings(-colormapvisible) 1
+        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 $itk_option(-plotforeground)] $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
@@ -2252 +2268 @@
     SendCmd "glyphs opacity $style(-opacity) $tag"
     set _settings(-glyphopacity) [expr $style(-opacity) * 100.0]
-    SetCurrentColormap $style(-color) 
     SendCmd "glyphs wireframe $style(-wireframe) $tag"
     set _settings(-glyphwireframe) $style(-wireframe)