Changeset 5271

Timestamp:

Apr 17, 2015 10:58:03 PM (5 years ago)

Author:

ldelgass

Message:

more backporting in nanovis viewer

File:

• branches/1.3/gui/scripts/nanovisviewer.tcl (modified) (4 diffs)

branches/1.3/gui/scripts/nanovisviewer.tcl

@@ -126 +126 @@
 
     private variable _arcball ""
-
     private variable _dlist ""         ;# list of data objects
     private variable _obj2ovride       ;# maps dataobj => style override
     private variable _serverDatasets   ;# contains all the dataobj-component
                                        ;# to volumes in the server
-    private variable _serverTfs        ;# contains all the transfer functions
-                                       ;# in the server.
     private variable _recvdDatasets    ;# list of data objs to send to server
     private variable _dataset2style    ;# maps dataobj-component to transfunc
@@ -150 +147 @@
     private variable _first ""         ;# This is the topmost volume.
 
-    common _downloadPopup              ;# download options from popup
+    private common _downloadPopup      ;# download options from popup
     private common _hardcopy
     private variable _width 0
@@ -738 +735 @@
     set lx 10
     set ly [expr {$h - 1}]
-    if {"" == [$c find withtag transfunc]} {
+    if {"" == [$c find withtag colorbar]} {
         $c create image 10 10 -anchor nw \
-            -image $_image(legend) -tags transfunc
+            -image $_image(legend) -tags colorbar
         $c create text $lx $ly -anchor sw \
             -fill $itk_option(-plotforeground) -tags "limits vmin"
         $c create text [expr {$w-$lx}] $ly -anchor se \
             -fill $itk_option(-plotforeground) -tags "limits vmax"
-        $c lower transfunc
-        $c bind transfunc <ButtonRelease-1> \
-            [itcl::code $this AddIsoMarker %x %y]
+        $c lower colorbar
+        $c bind colorbar <ButtonRelease-1> [itcl::code $this AddIsoMarker %x %y]
     }
 
     # Display the markers used by the current transfer function.
     array set limits [limits $tf]
-    $c itemconfigure vmin -text [format %.2g $limits(min)]
+    $c itemconfigure vmin -text [format %g $limits(min)]
     $c coords vmin $lx $ly
 
-    $c itemconfigure vmax -text [format %.2g $limits(max)]
+    $c itemconfigure vmax -text [format %g $limits(max)]
     $c coords vmax [expr {$w-$lx}] $ly
 
@@ -791 +787 @@
 #       representing the legend in the canvas.  In addition, the
 #       active transfer function is displayed.
-#
 #
 itcl::body Rappture::NanovisViewer::ReceiveLegend { tf vmin vmax size } {