Changeset 3305 for branches/nanovis2/gui/scripts/analyzer.tcl

Timestamp:

Feb 18, 2013, 2:32:14 PM (12 years ago)

Author:

ldelgass

Message:

sync with trunk

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• gui/scripts/analyzer.tcl (modified) (7 diffs)

branches/nanovis2/gui/scripts/analyzer.tcl

@@ -10 +10 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2005  Purdue Research Foundation
+#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -82 +82 @@
     private variable _label2page       ;# maps output label => result set
     private variable _label2desc       ;# maps output label => description
+    private variable _label2item       ;# maps output label => output.xxx item
     private variable _lastlabel ""     ;# label of last example loaded
     private variable _plotlist ""      ;# items currently being plotted
@@ -129 +130 @@
     }
     pack $itk_component(simulate) -side left -padx 4 -pady 4
+
+    # BE CAREFUL: Shift focus when we click on "Simulate".
+    #   This shifts focus away from input widgets and causes them to
+    #   finalize and log any pending changes.  A better way would be
+    #   to have the "sync" operation finalize/sync, but this works
+    #   for now.
+    bind $itk_component(simulate) <ButtonPress> {focus %W}
 
     # if there's a hub url, then add "About" and "Questions" links
@@ -615 +623 @@
             }
 
+            Rappture::Logger::log download [$itk_component(viewselector) value]
             set mesg [Rappture::filexfer::download $data $file]
             if {[string length $mesg] > 0} {
@@ -745 +754 @@
         eval $f.rviewer plot add $_plotlist
         blt::busy release [winfo toplevel $itk_component(hull)]
+        Rappture::Logger::log output $_label2item($name)
+        Rappture::Tooltip::for $itk_component(viewselector) \
+            "@[itcl::code $this _resultTooltip]" -log $_label2item($name)
     }
 }
@@ -830 +842 @@
                                 insert end $name]
                             set _label2page($label) $page
+                            set _label2item($label) output.$item
                             set _label2desc($label) \
                                 [$xmlobj get output.$item.about.description]
@@ -899 +912 @@
                 $itk_component(viewselector) choices delete 0 end
                 catch {unset _label2page}
+                catch {unset _label2item}
                 catch {unset _label2desc}
                 set _plotlist ""