Changeset 5339 for trunk

Timestamp:

Apr 28, 2015, 7:10:46 PM (10 years ago)

Author:

ldelgass

Message:

Use all lowercase style options for consistency with existing options. Add
backwards compat for the camel case options already released.

File:

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

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -2152 +2152 @@
         -color white
         -colormap BCGYR
-        -colorMode vmag
+        -colormode vmag
         -edgecolor black
         -edges 0
@@ -2160 +2160 @@
         -normscale 1
         -opacity 1.0
-        -orientGlyphs 1
+        -orientglyphs 1
         -outline 0
         -ptsize 1.0
         -quality 1
-        -scaleMode vmag
+        -scalemode vmag
         -shape arrow
         -wireframe 0
@@ -2172 +2172 @@
     if {$numComponents == 3} {
         set style(-shape) "arrow"
-        set style(-orientGlyphs) 1
-        set style(-scaleMode) "vmag"
-        set style(-colorMode) "vmag"
+        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"
+        set style(-orientglyphs) 0
+        set style(-scalemode) "scalar"
+        set style(-colormode) "scalar"
     }
     array set style [$dataobj style $comp]
+    # Backwards compat with camel case style option
+    if { [info exists style(-orientGlyphs)] } {
+        set style(-orientglyphs) $style(-orientGlyphs)
+        array unset style -orientGlyphs
+    }
+    # Backwards compat with camel case style option
+    if { [info exists style(-scaleMode)] } {
+        set style(-scalemode) $style(-scaleMode)
+        array unset style -scaleMode
+    }
     if { $dataobj != $_first } {
         set style(-opacity) 1
@@ -2234 +2244 @@
         set _settings(-colormap) "none"
     } else {
-        SendCmd "glyphs colormode $style(-colorMode) $_curFldName $tag"
+        SendCmd "glyphs colormode $style(-colormode) $_curFldName $tag"
         set _settings(-colormapvisible) 1
         set _settings(-colormap) $style(-colormap)
@@ -2240 +2250 @@
     }
     $itk_component(colormap) value $_settings(-colormap)
-    set _colorMode $style(-colorMode)
+    set _colorMode $style(-colormode)
     # constant color only used if colormode set to constant
     SendCmd "glyphs color [Color2RGB $style(-color)] $tag"
     # Omitting field name for gorient and smode commands
     # defaults to active scalars or vectors depending on mode
-    SendCmd "glyphs gorient $style(-orientGlyphs) {} $tag"
-    set _settings(-glyphorient) $style(-orientGlyphs)
-    SendCmd "glyphs smode $style(-scaleMode) {} $tag"
-    set _settings(-glyphscalemode) $style(-scaleMode)
-    $itk_component(scaleMode) value "[$itk_component(scaleMode) label $style(-scaleMode)]"
+    SendCmd "glyphs gorient $style(-orientglyphs) {} $tag"
+    set _settings(-glyphorient) $style(-orientglyphs)
+    SendCmd "glyphs smode $style(-scalemode) {} $tag"
+    set _settings(-glyphscalemode) $style(-scalemode)
+    $itk_component(scaleMode) value "[$itk_component(scaleMode) label $style(-scalemode)]"
     SendCmd "glyphs quality $style(-quality) $tag"
     SendCmd "glyphs lighting $style(-lighting) $tag"