Changeset 4443

Timestamp:

Jun 27, 2014, 12:24:30 AM (10 years ago)

Author:

ldelgass

Message:

cleanups

File:

• branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) (19 diffs)

branches/1.3/gui/scripts/vtkvolumeviewer.tcl

@@ -8 +8 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
+#  Copyright (c) 2004-2014  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -67 +67 @@
     protected method Disconnect {}
     protected method DoResize {}
-    protected method DoReseed {}
     protected method DoRotate {}
     protected method AdjustSetting {what {value ""}}
@@ -91 +90 @@
     private method EnterLegend { x y } 
     private method EventuallyResize { w h } 
-    private method EventuallyReseed { numPoints } 
     private method EventuallyRotate { q } 
     private method EventuallySetCutplane { axis args } 
@@ -129 +127 @@
     private variable _start 0
     private variable _title ""
-    private variable _seeds
 
     common _downloadPopup;              # download options from popup
@@ -136 +133 @@
     private variable _height 0
     private variable _resizePending 0
-    private variable _reseedPending 0
     private variable _rotatePending 0
     private variable _cutplanePending 0
@@ -165 +161 @@
     $_dispatcher register !resize
     $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
-
-    # Reseed event
-    $_dispatcher register !reseed
-    $_dispatcher dispatch $this !reseed "[itcl::code $this DoReseed]; list"
 
     # Rotate event
@@ -344 +336 @@
         puts stderr errs=$errs
     }
+
     # Legend
-
     set _image(legend) [image create photo]
     itk_component add legend {
@@ -374 +366 @@
         [itcl::code $this EventuallyResize %w %h]
 
-    if 0 {
-    bind $itk_component(view) <Configure> \
-        [itcl::code $this EventuallyResize %w %h]
-    }
     # Bindings for panning via mouse
     bind $itk_component(view) <ButtonPress-2> \
@@ -468 +456 @@
 }
 
-itcl::body Rappture::VtkVolumeViewer::EventuallyReseed { numPoints } {
-    set _numSeeds $numPoints
-    if { !$_reseedPending } {
-        set _reseedPending 1
-        $_dispatcher event -after 600 !reseed
-    }
-}
-
 set rotate_delay 100
 
@@ -805 +785 @@
     $_dispatcher cancel !rebuild
     $_dispatcher cancel !resize
-    $_dispatcher cancel !reseed
     $_dispatcher cancel !rotate
     $_dispatcher cancel !xcutplane
@@ -816 +795 @@
     array unset _data 
     array unset _colormaps 
-    array unset _seeds 
     array unset _dataset2style 
     array unset _obj2datasets 
@@ -994 +972 @@
             set label [$_first hints ${axis}label]
             if { $label != "" } {
-                SendCmd "axis name $axis $label"
+                SendCmd [list axis name $axis $label]
             }
             set units [$_first hints ${axis}units]
             if { $units != "" } {
-                SendCmd "axis units $axis $units"
+                SendCmd [list axis units $axis $units]
             }
         }
@@ -1284 +1262 @@
     switch -- $what {
         "volumeVisible" {
-            set bool $_settings(volumeVisible)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
                 SendCmd "volume visible $bool $dataset"
@@ -1297 +1275 @@
         }
         "volume-material" {
-            set val $_settings(volume-material)
+            set val $_settings($what)
             set diffuse [expr {0.01*$val}]
             set specular [expr {0.01*$val}]
@@ -1308 +1286 @@
         }
         "volumeLighting" {
-            set bool $_settings(volumeLighting)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
                 SendCmd "volume lighting $bool $dataset"
@@ -1314 +1292 @@
         }
         "volume-quality" {
-            set val $_settings(volume-quality)
+            set val $_settings($what)
             set val [expr {0.01*$val}]
             foreach dataset [CurrentDatasets -visible] {
@@ -1321 +1299 @@
         }
         "axesVisible" {
-            set bool $_settings(axesVisible)
+            set bool $_settings($what)
             SendCmd "axis visible all $bool"
         }
         "axisLabels" {
-            set bool $_settings(axisLabels)
+            set bool $_settings($what)
             SendCmd "axis labels all $bool"
         }
@@ -1394 +1372 @@
         "volume-palette" {
             set palette [$itk_component(palette) value]
-            set _settings(volume-palette) $palette
+            set _settings($what) $palette
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach {dataobj comp} [split $dataset -] break
@@ -1401 +1379 @@
             set _legendPending 1
         }
-        "volume-palette" {
-            set palette [$itk_component(palette) value]
-            set _settings(volume-palette) $palette
-            foreach dataset [CurrentDatasets -visible $_first] {
-                foreach {dataobj comp} [split $dataset -] break
-                ChangeColormap $dataobj $comp $palette
-            }
-            set _legendPending 1
-        }
         "field" {
             set label [$itk_component(field) value]
             set fname [$itk_component(field) translate $label]
-            set _settings(field) $fname
+            set _settings($what) $fname
             if { [info exists _fields($fname)] } {
                 foreach { label units components } $_fields($fname) break