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

Timestamp:

Sep 4, 2008 5:23:26 PM (16 years ago)

Author:

gah

Message:

fixes for entry label editting

File:

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

trunk/gui/scripts/nanovisviewer.tcl

@@ -57 +57 @@
     public method delete {args}
     public method scale {args}
-    public method GetLimits { ivol } {
-        if { [info exists _id2style($ivol)] } {
-            set tf $_id2style($ivol)
-            set _limits(min) ""
-            set _limits(max) ""
-            foreach ivol $_style2ids($tf) {
-            if { ![info exists _limits($ivol-min)] } {
-                puts stderr "In GetLimits $ivol"
-                parray _limits
-                error "can't find $ivol limits"
-            }
-                if { $_limits(min) == "" || 
-                     $_limits(min) > $_limits($ivol-min) } {
-                    set _limits(min) $_limits($ivol-min)
-                }
-                if { $_limits(max) == "" || 
-                     $_limits(max) < $_limits($ivol-max) } {
-                    set _limits(max) $_limits($ivol-max)
-                }
-            }
-        }
-        return [array get _limits] 
-    }
+    public method GetLimits { ivol } 
     public method download {option args}
     public method parameters {title args} { 
@@ -609 +587 @@
 # USAGE: delete ?<dataobj1> <dataobj2> ...?
 #
-# Clients use this to delete a dataobj from the plot.  If no dataobjs
-# are specified, then all dataobjs are deleted.
+#       Clients use this to delete a dataobj from the plot.  If no dataobjs
+#       are specified, then all dataobjs are deleted.  No data objects are
+#       deleted.  They are only removed from the display list.
+#
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::delete {args} {
@@ -616 +596 @@
         set args $_dlist
     }
-    # delete all specified dataobjs
+    # Delete all specified dataobjs
     set changed 0
     foreach dataobj $args {
         set pos [lsearch -exact $_dlist $dataobj]
-        if {$pos >= 0} {
+        if { $pos >= 0 } {
             set _dlist [lreplace $_dlist $pos $pos]
             foreach key [array names _obj2ovride $dataobj-*] {
@@ -628 +608 @@
         }
     }
-    # if anything changed, then rebuild the plot
+    # If anything changed, then rebuild the plot
     if {$changed} {
         $_dispatcher event -idle !rebuild
@@ -717 +697 @@
     }
     set result [VisViewer::Connect $_hosts]
+    if { $result } {
+        set w [winfo width $itk_component(3dview)]
+        set h [winfo height $itk_component(3dview)]
+        _send "screen $w $h"
+    }
     return $result
 }
@@ -826 +811 @@
 
     if 0 {
+        # Add this when we fix grid for volumes
     _send "volume axis label x \"\""
     _send "volume axis label y \"\""
@@ -1035 +1021 @@
         }
     }
+    set w [winfo width $itk_component(3dview)]
+    set h [winfo height $itk_component(3dview)]
+    _send "screen $w $h"
+
+    #
+    # Reset the camera and other view parameters
+    #
+    set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
+    _send "camera angle $xyz"
+    _send "camera zoom $_view(zoom)"
+    
+    _fixSettings light
+    _fixSettings transp
+    _fixSettings isosurface 
+    _fixSettings grid
+    _fixSettings axes
+    _fixSettings outline
+
     if {[llength $_sendobjs] > 0} {
         # send off new data objects
@@ -1040 +1044 @@
         return
     } 
-
-    set w [winfo width $itk_component(3dview)]
-    set h [winfo height $itk_component(3dview)]
-    _send "screen $w $h"
 
     # nothing to send -- activate the proper ivol
@@ -1082 +1082 @@
     _send "volume data state [_state volume] $vols"
     $_dispatcher event -idle !legend
-    
-    #
-    # Reset the camera and other view parameters
-    #
-    _send "camera angle [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]"
-    _send "camera zoom $_view(zoom)"
-    
-    _fixSettings light
-    _fixSettings transp
-    _fixSettings isosurface 
-    _fixSettings grid
-    _fixSettings axes
-    _fixSettings outline
 }
 
@@ -1577 +1564 @@
     }
     SendBytes "transfunc define $tf { $cmap } { $wmap }\n"
-    #puts stdout "transfunc define $tf { $cmap } { $wmap }\n"
     return [SendBytes "volume shading transfunc $tf $_style2ids($tf)\n"]
 }
@@ -1745 +1731 @@
     return ""
 }
+
+itcl::body Rappture::NanovisViewer::GetLimits { ivol } {
+    if { ![info exists _id2style($ivol)] } {
+        return
+    }
+    set tf $_id2style($ivol)
+    set _limits(min) ""
+    set _limits(max) ""
+    foreach ivol $_style2ids($tf) {
+        if { ![info exists _limits($ivol-min)] } {
+            error "can't find $ivol limits"
+        }
+        if { $_limits(min) == "" || $_limits(min) > $_limits($ivol-min) } {
+            set _limits(min) $_limits($ivol-min)
+        }
+        if { $_limits(max) == "" || $_limits(max) < $_limits($ivol-max) } {
+            set _limits(max) $_limits($ivol-max)
+        }
+    }
+    return [array get _limits] 
+}