Changeset 3305 for branches/nanovis2/gui/scripts/deviceViewer1D.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/deviceViewer1D.tcl (modified) (9 diffs)

branches/nanovis2/gui/scripts/deviceViewer1D.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
@@ -43 +43 @@
     protected method _loadDevice {}
     protected method _loadParameters {frame path}
-    protected method _changeTabs {}
+    protected method _changeTabs {{why -program}}
     protected method _fixSize {}
     protected method _fixAxes {}
@@ -77 +77 @@
         blt::tabset $itk_interior.tabs -borderwidth 0 -relief flat \
             -side bottom -tearoff 0 \
-            -selectcommand [itcl::code $this _changeTabs]
+            -selectcommand [itcl::code $this _changeTabs -user]
     } {
         keep -activebackground -activeforeground
@@ -456 +456 @@
 
 # ----------------------------------------------------------------------
-# USAGE: _changeTabs
+# USAGE: _changeTabs ?-user|-program?
 #
 # Used internally to change the field being displayed whenever a new
 # tab is selected.
 # ----------------------------------------------------------------------
-itcl::body Rappture::DeviceViewer1D::_changeTabs {} {
+itcl::body Rappture::DeviceViewer1D::_changeTabs {{why -program}} {
     set graph $itk_component(graph)
 
@@ -475 +475 @@
     } else {
         set name [lindex [array names _tab2fields] 0]
+    }
+
+    if {$why eq "-user"} {
+        Rappture::Logger::log device1D -field $name
     }
 
@@ -740 +744 @@
                     bell
                     Rappture::Tooltip::cue $itk_component(geditor) $result
+                    Rappture::Logger::log warning $_marker(path) $result
                     return 0
                 }
@@ -746 +751 @@
                 bell
                 Rappture::Tooltip::cue $itk_component(geditor) $result
+                Rappture::Logger::log warning $_marker(path) $result
                 return 0
             }
@@ -761 +767 @@
             $_owner changed $_marker(path)
             event generate $itk_component(hull) <<Edit>>
+            Rappture::Logger::log input $_marker(path) $value
 
             _changeTabs
@@ -798 +805 @@
 
     # create the widget
-    $type $w -units $units -presets $presets
+    $type $w -units $units -presets $presets -log $path
     pack $w -side top -anchor w
     bind $w <<Value>> [itcl::code $this _controlSet $w $libObj $path]