Changeset 2241

Timestamp:

May 16, 2011, 11:07:56 AM (14 years ago)

Author:

gah

Message:

 

Location:

trunk/gui/scripts

Files:

• analyzer.tcl (modified) (4 diffs)
• barresult.tcl (modified) (3 diffs)
• loader.tcl (modified) (3 diffs)
• visviewer.tcl (modified) (3 diffs)
• vtkviewer2.tcl (modified) (7 diffs)
• xyresult.tcl (modified) (2 diffs)

trunk/gui/scripts/analyzer.tcl

@@ -569 +569 @@
         }
     }
-
     # if there are any valid results, add them to the resultset
     if {$haveresults} {
@@ -580 +579 @@
                 set label [$xmlobj get output.$item.about.label]
             }
-
             set hidden [$xmlobj get output.$item.hide]
-            set hidden [expr {"" != $hidden && $hidden}]
-
+            if { $hidden == "" } {
+                set hidden 0
+            }
             if {"" != $label && !$hidden} {
                 if {![info exists _label2page($label)]} {
@@ -653 +652 @@
     foreach label [array names _label2page] {
         set page $_label2page($label)
-        $page.rviewer clear
+        destroy $page.rviewer
+        #$page.rviewer clear
     }
     $itk_component(resultselector) value ""
@@ -968 +968 @@
                     set str [$_tool xml get $path.about.label]
                     if {"" == $str} {
-1                        set str [$_tool xml element -as id $path]
+                        set str [$_tool xml element -as id $path]
                     }
                     append details "$str = $val\n"

trunk/gui/scripts/barresult.tcl

@@ -251 +251 @@
     }
     pack $itk_component(legend) -expand yes -fill both
-
     after idle [subst {
         update idletasks
@@ -901 +900 @@
     set g $itk_component(plot)
     set elem ""
-  
+    
     # Peek inside of Blt_ZoomStack package to see if we're currently in the
     # middle of a zoom selection.
@@ -1129 +1128 @@
 itcl::body Rappture::BarResult::_axis {option args} {
     set inner [$itk_component(hull).axes component inner]
-
     switch -- $option {
         hilite {

trunk/gui/scripts/loader.tcl

@@ -34 +34 @@
     protected method _downloadValues {}
     protected method _tooltip {}
+
+    private method SetDefaultValue { value } 
 
     private variable _owner ""    ;# thing managing this control
@@ -240 +242 @@
     #
     set str [$_owner xml get $path.default]
-    if {$str != ""} { after 1500 [itcl::code $this value $str] }
+    if { $str != "" } { 
+        bind $itk_component(hull) <Map> [itcl::code $this SetDefaultValue $str]
+    }
 }
 
@@ -314 +318 @@
     # query tooltip on-demand based on current choice
     return "@[itcl::code $this _tooltip]"
+}
+
+#
+# SetDefaultValue --
+#
+#       Sets the designated default value for the loader.  This must be done
+#       after the entire application is assembled, otherwise the default
+#       values set up by the loader will be overwritten by the various widgets
+#       themselves when they try to set their default values.  
+#
+#       This is called from a  <Map> event to the loader (combobox).  This
+#       will get trigger the first time the loader is displayed.  The binding
+#       is then removed.
+#
+itcl::body Rappture::Loader::SetDefaultValue { value } {
+    after idle [itcl::code $this value $value]
+    # We're done. Remove the binding.
+    bind $itk_component(hull) <Map> {}
 }
 

trunk/gui/scripts/visviewer.tcl

@@ -25 +25 @@
     set _servers(vtkvis)  "localhost:2010"
 
-    private variable _sid ""        ;# socket connection to server
+    protected variable _sid ""        ;# socket connection to server
     private common _done            ;# Used to indicate status of send.
     private variable _buffer        ;# buffer for incoming/outgoing commands
@@ -41 +41 @@
     protected variable _parser ""   ;# interpreter for incoming commands
     protected variable _image
+    protected variable _hostname
 
     constructor { hostlist args } {
@@ -222 +223 @@
             continue
         }
+        set _hostname $hostname:$port
         fconfigure $_sid -translation binary -encoding binary
 

trunk/gui/scripts/vtkviewer2.tcl

@@ -140 +140 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkViewer2::constructor {hostlist args} {
+    puts stderr "Enter constructor: [info level -1]"
 
     # Rebuild event
@@ -338 +339 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkViewer2::destructor {} {
+    Disconnect
     $_dispatcher cancel !rebuild
     $_dispatcher cancel !resize
@@ -343 +345 @@
     image delete $_image(download)
     array unset _settings $this-*
-    blt::arcball destroy $_arcball
+    catch { blt::arcball destroy $_arcball}
 }
 
@@ -619 +621 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkViewer2::Connect {} {
+    puts stderr "Enter Connect: [info level -1]"
     set _hosts [GetServerList "vtkvis"]
     if { "" == $_hosts } {
@@ -625 +628 @@
     set result [VisViewer::Connect $_hosts]
     if { $result } {
+        puts stderr "Connected to $_hostname sid=$_sid"
         set w [winfo width $itk_component(view)]
         set h [winfo height $itk_component(view)]
@@ -828 +832 @@
     FixSettings axismode
 
-
     if {"" != $_first} {
         set location [$_first hints camera]
@@ -926 +929 @@
                 if { $location != "" } {
                     array set _view $location
-                    parray _view
                 }
             }

trunk/gui/scripts/xyresult.tcl

@@ -263 +263 @@
 # USAGE: add <dataobj> ?<settings>?
 #
-# Clients use this to add a data object to the plot.  The optional <settings>
+# Clients use this to add a dataobj to the plot.  The optional <settings>
 # are used to configure the plot.  Allowed settings are -color,
 # -brightness, -width, -linestyle and -raise.
@@ -348 +348 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::XyResult::get {} {
-    # put the data object list in order according to -raise options
-    set dlist $_dlist
-    foreach obj $dlist {
+    # put the dataobj list in order according to -raise options
+    set bottom {}
+    set top {}
+    foreach obj $_dlist {
         if {[info exists _dataobj2raise($obj)] && $_dataobj2raise($obj)} {
             set i [lsearch -exact $dlist $obj]