Changeset 5670 for trunk

Timestamp:

Jun 7, 2015 2:58:11 PM (9 years ago)

Author:

ldelgass

Message:

Fix glyph style settings in vtkviewer to match glyph viewer

File:

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

trunk/gui/scripts/vtkviewer.tcl

@@ -2665 +2665 @@
                 -normscale 0
                 -opacity 1.0
-                -orientGlyphs 0
+                -orientglyphs 0
                 -outline 0
                 -ptsize 1.0
                 -quality 1
-                -scaleMode "vcomp"
+                -scalemode "vcomp"
                 -shape "sphere"
                 -visible 1
@@ -2678 +2678 @@
             if {$shape != ""} {
                 set settings(-shape) $shape
+            }
+            # Backwards compat with camel case style option
+            if { [info exists settings(-orientGlyphs)] } {
+                set settings(-orientglyphs) $settings(-orientGlyphs)
+                array unset settings -orientGlyphs
+            }
+            # Backwards compat with camel case style option
+            if { [info exists settings(-scaleMode)] } {
+                set settings(-scalemode) $settings(-scaleMode)
+                array unset settings -scaleMode
             }
             SendCmd "outline add $tag"
@@ -2692 +2702 @@
             # Omitting field name for gorient and smode commands
             # defaults to active scalars or vectors depending on mode
-            SendCmd "glyphs gorient $settings(-orientGlyphs) {} $tag"
-            SendCmd "glyphs smode $settings(-scaleMode) {} $tag"
+            SendCmd "glyphs gorient $settings(-orientglyphs) {} $tag"
+            SendCmd "glyphs smode $settings(-scalemode) {} $tag"
             SendCmd "glyphs edges $settings(-edges) $tag"
             SendCmd "glyphs linecolor [Color2RGB $settings(-edgecolor)] $tag"