Changeset 2943 for trunk/gui/scripts/analyzer.tcl

Timestamp:

Apr 5, 2012, 1:37:35 PM (13 years ago)

Author:

mmc

Message:

Fixed the "Clear" button on the ResultSet? so that you can either
"Clear All" or "Clear One" result. This is nice when you have
generated a lot of results and you want to get rid of a bad one.
Removed the "Parameters..." button and popup. That's almost useless.
We need something like a table that lets you view all datasets and
turn them on/off. The simple "Clear One" sort of works for now.

Fixed the Balloon widget to have a -background option. The newer
style for Rappture going forward will be to use a solid color
(like black) for the balloon background and set the borderwidth
to zero.

File:

• trunk/gui/scripts/analyzer.tcl (modified) (2 diffs)

trunk/gui/scripts/analyzer.tcl

@@ -55 +55 @@
     public method reset {{when -eventually}}
     public method load {xmlobj}
-    public method clear {}
+    public method clear {{xmlobj ""}}
     public method download {option args}
 
@@ -641 +641 @@
 
 # ----------------------------------------------------------------------
-# USAGE: clear
-#
-# Discards all results previously loaded into the analyzer.
-# ----------------------------------------------------------------------
-itcl::body Rappture::Analyzer::clear {} {
-    foreach obj $_runs {
-        itcl::delete object $obj
-    }
-    set _runs ""
-
-    $itk_component(resultset) clear
-
-    # reset the size of the controls area
-    set ht [winfo height $itk_component(results)]
-    set cntlht [$itk_component(resultset) size -controlarea]
-    set frac [expr {double($cntlht)/$ht}]
-    $itk_component(results) fraction end $frac
-
-    foreach label [array names _label2page] {
-        set page $_label2page($label)
-        destroy $page.rviewer
-        #$page.rviewer clear
-    }
-    $itk_component(resultselector) value ""
-    $itk_component(resultselector) choices delete 0 end
-    catch {unset _label2page}
-    catch {unset _label2desc}
-    set _plotlist ""
-
-    $itk_component(resultselector) choices insert end --- "---"
-    $itk_component(resultselector) choices insert end \
-        @download [Rappture::filexfer::label download]
-    set _lastlabel ""
+# USAGE: clear ?<xmlobj>?
+#
+# Discards one or more results previously loaded into the analyzer.
+# If an <xmlobj> is specified, then that one result is cleared.
+# Otherwise, all results are cleared.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Analyzer::clear {{xmlobj ""}} {
+    if {$xmlobj ne ""} {
+        set i [lsearch -exact $_runs $xmlobj]
+        if {$i >= 0} {
+            itcl::delete object $xmlobj
+            set _runs [lreplace $_runs $i $i]
+
+            # delete this result from all viewers
+            foreach label [array names _label2page] {
+                set page $_label2page($label)
+                $page.rviewer clear $xmlobj
+            }
+        }
+    } else {
+        # clear everything
+        foreach obj $_runs {
+            itcl::delete object $obj
+        }
+        set _runs ""
+    }
+
+    if {[llength $_runs] == 0} {
+        # reset the size of the controls area
+        set ht [winfo height $itk_component(results)]
+        set cntlht [$itk_component(resultset) size -controlarea]
+        set frac [expr {double($cntlht)/$ht}]
+        $itk_component(results) fraction end $frac
+
+        foreach label [array names _label2page] {
+            set page $_label2page($label)
+            destroy $page.rviewer
+        }
+        $itk_component(resultselector) value ""
+        $itk_component(resultselector) choices delete 0 end
+        catch {unset _label2page}
+        catch {unset _label2desc}
+        set _plotlist ""
+
+        $itk_component(resultselector) choices insert end --- "---"
+        $itk_component(resultselector) choices insert end \
+            @download [Rappture::filexfer::label download]
+        set _lastlabel ""
+    }
 
     #