Changeset 4762 for branches

Timestamp:

Nov 22, 2014, 11:58:38 PM (10 years ago)

Author:

ldelgass

Message:

Sync glyph viewer with trunk, but don't enable new UI controls yet.

File:

• branches/1.3/gui/scripts/vtkglyphviewer.tcl (modified) (13 diffs)

branches/1.3/gui/scripts/vtkglyphviewer.tcl

@@ -238 +238 @@
         -glyphedges             0
         -glyphlighting          1
+        -glyphnormscale         1
         -glyphopacity           100
+        -glyphorient            1
         -glyphoutline           0
         -glyphscale             1
+        -glyphscalemode         "vmag"
+        -glyphshape             "arrow"
         -glyphvisible           1
         -glyphwireframe         0
@@ -1037 +1041 @@
         # These are settings that rely on a dataset being loaded.
         InitSettings \
-            -glyphlighting \
             -field \
             -glyphedges -glyphlighting -glyphopacity \
@@ -1344 +1347 @@
         "-cutplanevisible" {
             set bool $_settings($what)
-            SendCmd "cutplane visible $bool"
+            SendCmd "cutplane visible 0"
+            if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "cutplane visible $bool $tag"
+                }
+            }
         }
         "-cutplanewireframe" {
@@ -1407 +1415 @@
         "-glyphvisible" {
             set bool $_settings($what)
-            SendCmd "glyphs visible $bool"
+            SendCmd "glyphs visible 0"
+            if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "glyphs visible $bool $tag"
+                }
+            }
             if { $bool } {
                 Rappture::Tooltip::for $itk_component(glyphs) \
@@ -1427 +1440 @@
         "-glyphoutline" {
             set bool $_settings($what)
-            SendCmd "outline visible $bool"
+            SendCmd "outline visible 0"
+            if { $bool } {
+                foreach tag [CurrentDatasets -visible] {
+                    SendCmd "outline visible $bool $tag"
+                }
+            }
         }
         "-glyphopacity" {
@@ -1434 +1452 @@
             SendCmd "glyphs opacity $sval"
         }
+        "-glyphnormscale" {
+            set bool $_settings($what)
+            SendCmd "glyphs normscale $bool"
+        }
+        "-glyphorient" {
+            set bool $_settings($what)
+            SendCmd "glyphs gorient $bool {}"
+        }
         "-glyphscale" {
             set val $_settings($what)
@@ -1439 +1465 @@
                 SendCmd "glyphs gscale $val"
             }
+        }
+        "-glyphscalemode" {
+            set label [$itk_component(scaleMode) value]
+            set mode [$itk_component(scaleMode) translate $label]
+            set _settings($what) $mode
+            SendCmd "glyphs smode $mode {}"
+        }
+        "-glyphshape" {
+            set label [$itk_component(gshape) value]
+            set shape [$itk_component(gshape) translate $label]
+            set _settings($what) $shape
+            SendCmd "glyphs shape $shape"
         }
         "-field" {
@@ -1564 +1602 @@
         -font "Arial 9"
 
+    label $inner.gshape_l -text "Glyph shape" -font "Arial 9" 
+    itk_component add gshape {
+        Rappture::Combobox $inner.gshape -width 10 -editable no
+    }
+    $inner.gshape choices insert end \
+        "arrow"              "arrow"           \
+        "cone"               "cone"            \
+        "cube"               "cube"            \
+        "cylinder"           "cylinder"        \
+        "dodecahedron"       "dodecahedron"    \
+        "icosahedron"        "icosahedron"     \
+        "line"               "line"            \
+        "octahedron"         "octahedron"      \
+        "point"              "point"           \
+        "sphere"             "sphere"          \
+        "tetrahedron"        "tetrahedron"
+
+    $itk_component(gshape) value $_settings(-glyphshape)
+    bind $inner.gshape <<Value>> [itcl::code $this AdjustSetting -glyphshape]
+
+    label $inner.scaleMode_l -text "Scale by" -font "Arial 9" 
+    itk_component add scaleMode {
+        Rappture::Combobox $inner.scaleMode -width 10 -editable no
+    }
+    $inner.scaleMode choices insert end \
+        "scalar" "Scalar"            \
+        "vmag"   "Vector magnitude"  \
+        "vcomp"  "Vector components" \
+        "off"    "Constant size"
+
+    $itk_component(scaleMode) value "[$itk_component(scaleMode) label $_settings(-glyphscalemode)]"
+    bind $inner.scaleMode <<Value>> [itcl::code $this AdjustSetting -glyphscalemode]
+
+    checkbutton $inner.normscale \
+        -text "Normalize scaling" \
+        -variable [itcl::scope _settings(-glyphnormscale)] \
+        -command [itcl::code $this AdjustSetting -glyphnormscale] \
+        -font "Arial 9"
+    Rappture::Tooltip::for $inner.normscale "If enabled, field values are normalized to \[0,1\] before scaling and scale factor is relative to a default size"
+
+    checkbutton $inner.gorient \
+        -text "Orient" \
+        -variable [itcl::scope _settings(-glyphorient)] \
+        -command [itcl::code $this AdjustSetting -glyphorient] \
+        -font "Arial 9"
+    Rappture::Tooltip::for $inner.gorient "Orient glyphs by vector field directions"
+
     checkbutton $inner.wireframe \
         -text "Wireframe" \
@@ -1614 +1699 @@
 
     label $inner.gscale_l -text "Scale factor" -font "Arial 9"
+    if {0} {
     ::scale $inner.gscale -from 1 -to 100 -orient horizontal \
         -variable [itcl::scope _settings(-glyphscale)] \
@@ -1619 +1705 @@
         -showvalue off \
         -command [itcl::code $this AdjustSetting -glyphscale]
+    } else {
+    itk_component add gscale {
+        entry $inner.gscale -font "Arial 9" -bg white \
+            -textvariable [itcl::scope _settings(-glyphscale)]
+    } {
+        ignore -font -background
+    }
+    bind $inner.gscale <Return> \
+        [itcl::code $this AdjustSetting -glyphscale]
+    bind $inner.gscale <KP_Enter> \
+        [itcl::code $this AdjustSetting -glyphscale]
+    }
     Rappture::Tooltip::for $inner.gscale "Set scaling multiplier (or constant size)"
 
@@ -2105 +2203 @@
 
     SendCmd "glyphs add $style(-shape) $tag"
+    set _settings(-glyphshape) $style(-shape)
+    $itk_component(gshape) value $style(-shape)
     SendCmd "glyphs edges $style(-edges) $tag"
     set _settings(-glyphedges) $style(-edges)
@@ -2115 +2215 @@
         SendCmd "glyphs gscale $style(-gscale) $tag"
     }
+    set _settings(-glyphnormscale) $style(-normscale)
+    set _settings(-glyphscale) $style(-gscale)
 
     # constant color only used if colormode set to constant
@@ -2121 +2223 @@
     # 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 quality $style(-quality) $tag"
     SendCmd "glyphs lighting $style(-lighting) $tag"