Changeset 5292 for trunk/gui/scripts/nanovisviewer.tcl

Timestamp:

Apr 23, 2015 1:45:49 PM (9 years ago)

Author:

ldelgass

Message:

remove unused methods in nanovis viewer

File:

• trunk/gui/scripts/nanovisviewer.tcl (modified) (12 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -100 +100 @@
     private method GetColormap { cname color }
     private method GetDatasetsWithComponent { cname }
-    private method GetVolumeInfo { w }
     private method HideAllMarkers {}
     private method InitComponentSettings { cname }
@@ -125 +124 @@
     private method SlicerTip {axis}
     private method SwitchComponent { cname }
-    private method ToggleVolume { tag name }
     private method ViewToQuaternion {} {
         return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
@@ -132 +130 @@
 
     private variable _arcball ""
-
     private variable _dlist ""         ;# list of data objects
     private variable _obj2ovride       ;# maps dataobj => style override
@@ -148 +145 @@
     private variable _first ""         ;# This is the topmost volume.
     private variable _current ""       ;# Currently selected component
-    private variable _volcomponents    ;# Array of components found
-    private variable _componentsList   ;# Array of components found
+    private variable _volcomponents    ;# Maps component name to list of
+                                       ;# dataobj-component tags
+    private variable _componentsList   ;# List of components found
     private variable _cname2transferFunction
     private variable _cname2defaultcolormap
-
-    common _downloadPopup              ;# download options from popup
-    private common _hardcopy
     private variable _width 0
     private variable _height 0
     private variable _resizePending 0
     private variable _resizeLegendPending 0
+
+    common _downloadPopup              ;# download options from popup
+    private common _hardcopy
 }
 
@@ -480 +478 @@
             # put the dataobj list in order according to -raise options
             set dlist $_dlist
-            foreach obj $dlist {
-                if {[info exists _obj2ovride($obj-raise)] &&
-                    $_obj2ovride($obj-raise)} {
-                    set i [lsearch -exact $dlist $obj]
+            foreach dataobj $dlist {
+                if {[info exists _obj2ovride($dataobj-raise)] &&
+                    $_obj2ovride($dataobj-raise)} {
+                    set i [lsearch -exact $dlist $dataobj]
                     if {$i >= 0} {
                         set dlist [lreplace $dlist $i $i]
-                        lappend dlist $obj
+                        lappend dlist $dataobj
                     }
                 }
@@ -811 +809 @@
 
 #
-#
 # ReceiveLegend --
 #
@@ -819 +816 @@
 #       representing the legend in the canvas.  In addition, the
 #       active transfer function is displayed.
-#
 #
 itcl::body Rappture::NanovisViewer::ReceiveLegend { cname vmin vmax size } {
@@ -1098 +1094 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: Rotate click <x> <y>
@@ -1660 +1655 @@
 
     blt::table $inner \
-        0,0 $inner.axes  -cspan 2 -anchor w \
-        1,0 $inner.grid  -cspan 2 -anchor w \
-        2,0 $inner.outline  -cspan 2 -anchor w \
-        3,0 $inner.volume  -cspan 2 -anchor w \
-        4,0 $inner.legend  -cspan 2 -anchor w \
-        5,0 $inner.background_l       -anchor e -pady 2 \
-        5,1 $inner.background                   -fill x \
-
-    if 0 {
-    bind $inner <Map> [itcl::code $this GetVolumeInfo $inner]
-    }
+        0,0 $inner.axes -cspan 2 -anchor w \
+        1,0 $inner.grid -cspan 2 -anchor w \
+        2,0 $inner.outline -cspan 2 -anchor w \
+        3,0 $inner.volume -cspan 2 -anchor w \
+        4,0 $inner.legend -cspan 2 -anchor w \
+        5,0 $inner.background_l -anchor e -pady 2 \
+        5,1 $inner.background -fill x
+
     blt::table configure $inner r* -resize none
     blt::table configure $inner r6 -resize expand
@@ -1980 +1972 @@
 }
 
-
 itcl::body Rappture::NanovisViewer::DoResize {} {
     $_arcball resize $_width $_height
@@ -2039 +2030 @@
 }
 
-itcl::body Rappture::NanovisViewer::GetVolumeInfo { w } {
-    set flowobj ""
-    foreach key [array names _obj2flow] {
-        set flowobj $_obj2flow($key)
-        break
-    }
-    if { $flowobj == "" } {
-        return
-    }
-    if { [winfo exists $w.frame] } {
-        destroy $w.frame
-    }
-    set inner [frame $w.frame]
-    blt::table $w \
-        5,0 $inner -fill both -cspan 2 -anchor nw
-    array set hints [$dataobj hints]
-
-    label $inner.volumes -text "Volumes" -font "Arial 9 bold"
-    blt::table $inner \
-        1,0 $inner.volumes  -anchor w \
-    blt::table configure $inner c0 c1 -resize none
-    blt::table configure $inner c2 -resize expand
-
-    set row 3
-    set volumes [get]
-    if { [llength $volumes] > 0 } {
-        blt::table $inner $row,0 $inner.volumes  -anchor w
-        incr row
-    }
-    foreach vol $volumes {
-        array unset info
-        array set info $vol
-        set name $info(name)
-        if { ![info exists _settings(-volumevisible-$name)] } {
-            set _settings(-volumevisible-$name) $info(hide)
-        }
-        checkbutton $inner.vol$row -text $info(label) \
-            -variable [itcl::scope _settings(-volumevisible-$name)] \
-            -onvalue 0 -offvalue 1 \
-            -command [itcl::code $this ToggleVolume $key $name] \
-            -font "Arial 9"
-        Rappture::Tooltip::for $inner.vol$row $info(description)
-        blt::table $inner $row,0 $inner.vol$row -anchor w
-        if { !$_settings(-volume-$name) } {
-            $inner.vol$row select
-        }
-        incr row
-    }
-    blt::table configure $inner r* -resize none
-    blt::table configure $inner r$row -resize expand
-    blt::table configure $inner c3 -resize expand
-    event generate [winfo parent [winfo parent $w]] <Configure>
-}
-
-itcl::body Rappture::NanovisViewer::ToggleVolume { tag name } {
-    set bool $_settings(-volumevisible-$name)
-    SendCmd "volume state $bool $name"
-}
-
 itcl::body Rappture::NanovisViewer::SetOrientation { side } {
     array set positions {
@@ -2121 +2053 @@
     set _settings(-zoom) $_view(-zoom)
 }
-
 
 #