Changeset 5447 for branches/1.4

Timestamp:

May 6, 2015, 7:23:07 PM (9 years ago)

Author:

ldelgass

Message:

merge r5339:5340 from trunk

Location:

branches/1.4

Files:

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

branches/1.4/gui/scripts/vtkglyphviewer.tcl

@@ -2151 +2151 @@
         -normscale 1
         -opacity 1.0
-        -orientGlyphs 1
+        -orientglyphs 1
         -outline 0
         -ptsize 1.0
         -quality 1
-        -scaleMode "vmag"
+        -scalemode "vmag"
         -shape "arrow"
         -wireframe 0
@@ -2162 +2162 @@
     if {$numComponents == 3} {
         set style(-shape) "arrow"
-        set style(-orientGlyphs) 1
-        set style(-scaleMode) "vmag"
+        set style(-orientglyphs) 1
+        set style(-scalemode) "vmag"
     } else {
         set style(-shape) "sphere"
-        set style(-orientGlyphs) 0
-        set style(-scaleMode) "scalar"
+        set style(-orientglyphs) 0
+        set style(-scalemode) "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
@@ -2221 +2231 @@
     # 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"