Changeset 4478

Timestamp:

Jul 9, 2014, 9:19:28 PM (10 years ago)

Author:

ldelgass

Message:

merge r4465 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkviewer.tcl (modified) (26 diffs)

branches/1.3/gui/scripts/vtkviewer.tcl

@@ -95 +95 @@
     private method EventuallySetAtomScale { args } 
     private method EventuallySetBondScale { args } 
+    private method EventuallySetGlyphsOpacity { args } 
     private method EventuallySetMoleculeOpacity { args } 
     private method EventuallySetMoleculeQuality { args } 
@@ -108 +109 @@
     private method SetBondScale {}
     private method SetColormap { dataobj comp }
+    private method SetGlyphsOpacity {}
     private method SetLegendTip { x y }
     private method SetMoleculeOpacity {}
@@ -209 +211 @@
     $_dispatcher dispatch $this !polydataOpacity \
         "[itcl::code $this SetPolydataOpacity]; list"
+
+    # Glyphs opacity event
+    $_dispatcher register !glyphsOpacity
+    $_dispatcher dispatch $this !glyphsOpacity \
+        "[itcl::code $this SetGlyphsOpacity]; list"
+
     #
     # Populate parser with commands handle incoming requests
@@ -508 +516 @@
 }
 
+itcl::body Rappture::VtkViewer::SetGlyphsOpacity {} {
+    set _glyphsOpacityPending 0
+    foreach dataset [CurrentDatasets -visible $_first] {
+        foreach { dataobj comp } [split $dataset -] break
+        if { [$dataobj type $comp] == "glyphs" } {
+            SetOpacity $dataset
+        }
+    }
+}
+
 itcl::body Rappture::VtkViewer::SetPolydataOpacity {} {
     set _polydataOpacityPending 0
@@ -550 +568 @@
         set _polydataOpacityPending 1
         $_dispatcher event -after $_scaleDelay !polydataOpacity
+    }
+}
+
+itcl::body Rappture::VtkViewer::EventuallySetGlyphsOpacity { args } {
+    if { !$_glyphsOpacityPending } {
+        set _glyphsOpacityPending 1
+        $_dispatcher event -after $_scaleDelay !glyphsOpacity
     }
 }
@@ -1357 +1382 @@
         }
         "glyphs-outline" {
-            set bool $_settings(glyphs-outline)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1367 +1392 @@
         }
         "glyphs-wireframe" {
-            set bool $_settings(glyphs-wireframe)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1377 +1402 @@
         }
         "glyphs-visible" {
-            set bool $_settings(glyphs-visible)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1387 +1412 @@
         }
         "glyphs-lighting" {
-            set bool $_settings(glyphs-lighting)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1397 +1422 @@
         }
         "glyphs-edges" {
-            set bool $_settings(glyphs-edges)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1408 +1433 @@
         "glyphs-palette" {
             set palette [$itk_component(glyphspalette) value]
-            set _settings(glyphs-palette) $palette
+            set _settings($what) $palette
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach {dataobj comp} [split $dataset -] break
@@ -1429 +1454 @@
         }
         "polydata-outline" {
-            set bool $_settings(polydata-outline)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1439 +1464 @@
         }
         "polydata-wireframe" {
-            set bool $_settings(polydata-wireframe)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1449 +1474 @@
         }
         "polydata-visible" {
-            set bool $_settings(polydata-visible)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1459 +1484 @@
         }
         "polydata-lighting" {
-            set bool $_settings(polydata-lighting)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1469 +1494 @@
         }
         "polydata-edges" {
-            set bool $_settings(polydata-edges)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1480 +1505 @@
         "polydata-palette" {
             set palette [$itk_component(meshpalette) value]
-            set _settings(polydata-palette) $palette
+            set _settings($what) $palette
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach {dataobj comp} [split $dataset -] break
@@ -1501 +1526 @@
         }
         "molecule-outline" {
-            set bool $_settings(molecule-outline)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1511 +1536 @@
         }
         "molecule-wireframe" {
-            set bool $_settings(molecule-wireframe)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1521 +1546 @@
         }
         "molecule-visible" {
-            set bool $_settings(molecule-visible)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1531 +1556 @@
         }
         "molecule-lighting" {
-            set bool $_settings(molecule-lighting)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1541 +1566 @@
         }
         "molecule-edges" {
-            set bool $_settings(molecule-edges)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1552 +1577 @@
         "molecule-palette" {
             set palette [$itk_component(moleculepalette) value]
-            set _settings(molecule-palette) $palette
+            set _settings($what) $palette
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach {dataobj comp} [split $dataset -] break
@@ -1649 +1674 @@
             set value [$itk_component(rscale) value]
             set value [$itk_component(rscale) translate $value]
-            set _settings(molecule-rscale) $value
+            set _settings($what) $value
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach {dataobj comp} [split $dataset -] break
                 set type [$dataobj type $comp]
                 if { $type == "molecule" } {
-                    SendCmd [subst {molecule rscale $_settings(molecule-rscale) $dataset}]
+                    SendCmd [subst {molecule rscale $_settings($what) $dataset}]
                 }
             }
         }
         "molecule-labels" {
-            set bool $_settings(molecule-labels)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                foreach { dataobj comp } [split $dataset -] break
@@ -1996 +2021 @@
         -width 10 \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting glyphs-opacity]
+        -command [itcl::code $this EventuallySetGlyphsOpacity]
     $inner.opacity set $_settings(glyphs-opacity)
 
@@ -2068 +2093 @@
         -width 10 \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting polydata-opacity]
+        -command [itcl::code $this EventuallySetPolydataOpacity]
     $inner.opacity set $_settings(polydata-opacity)