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

Timestamp:

Sep 22, 2008, 5:41:59 PM (16 years ago)

Author:

dkearney

Message:

updated driver to allow the user to revisualize old run files just as rerun did. if driver can find the tool.xml file and where the application is installed, it can also allow the user to run new simulations after preloading old simulations.

Finally figured out where the current tags in group objects were coming from. controlOwner was adjusted to stop putting current tags in things. this only seemed to happen when the application also contained a loader, because we were doing an xml copy of nodes.

rewrote rerun to be a small wrapper around the "driver -load" command. rerun is now a script like rappture, it is populated with rappture's install directory from configure, so configure.in was updated. added some stuff for finding mcc in the configure.in script for a future commit

changed Rappture::Analyzer to accept -notebookpage configure flag so we can specify which page of the analyzer notebook should be currently showing. also inside of the analyzer, changed behavior of simstatus to allow us to still show a message even if the simulation button is disabled. this is helpful because we can tell the user why the simulation button is grayed out. one example of this is the case when we load old run.xml files, but cannot find a tool.xml file. the user cannot run a simulation, even if they change an input, because we can't figure out where the app is installed. now we can tell the user, why they cannot run the simulation.

File:

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

trunk/gui/scripts/analyzer.tcl

@@ -24 +24 @@
 option add *Analyzer.simControlActiveBackground #ffffcc widgetDefault
 option add *Analyzer.simControlActiveOutline black widgetDefault
+option add *Analyzer.notebookpage "about" widgetDefault
 
 option add *Analyzer.font \
@@ -46 +47 @@
     itk_option define -simcontrolactivebackground simControlActiveBackground Background ""
     itk_option define -holdwindow holdWindow HoldWindow ""
+    itk_option define -notebookpage notebookPage NotebookPage ""
 
     constructor {tool args} { # defined below }
@@ -62 +64 @@
     protected method _fixSize {}
     protected method _fixSimControl {}
+    protected method _fixNotebook {}
     protected method _simState {state args}
     protected method _simOutput {message}
@@ -820 +823 @@
 # Used internally to change the "Simulation" button on or off.
 # If the <boolean> is on, then any <message> and <settings> are
-# displayed as well.  The <message> is a note to the user about
+# displayed as well.  If the <boolean> is off, then only display
+# the message. The <message> is a note to the user about
 # what will be simulated, and the <settings> are a list of
 # tool parameter settings of the form {path1 val1 path2 val2 ...}.
@@ -893 +897 @@
         $itk_component(simstatus) configure -state normal
         $itk_component(simstatus) delete 1.0 end
-        $itk_component(simstatus) configure -state disabled
-        Rappture::Tooltip::for $itk_component(simstatus) ""
+        set mesg [lindex $args 0]
+        if {"" != $mesg} {
+            $itk_component(simstatus) insert end $mesg
+        }
     }
 }
@@ -1025 +1031 @@
 
 # ----------------------------------------------------------------------
+# USAGE: _fixNotebook
+#
+# Used internally to switch the active notebook page
+# ----------------------------------------------------------------------
+itcl::body Rappture::Analyzer::_fixNotebook {} {
+    switch -- $itk_option(-notebookpage) {
+        about {
+            $itk_component(notebook) current about
+        }
+        simulate {
+            $itk_component(notebook) current simulate
+        }
+        analyze {
+            $itk_component(notebook) current analyze
+        }
+        default {
+            error "bad value \"$itk_option(-notebookpage)\": should be about, simulate, analyze"
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
 # CONFIGURATION OPTION: -simcontrol
 #
@@ -1033 +1061 @@
     _fixSimControl
 }
+
+# ----------------------------------------------------------------------
+# CONFIGURATION OPTION: -notebookpage
+#
+# Controls which page of the analyzer notebook is shown. It is
+# particularly needed when using rerun, when you don't want to
+# "simulate -ifneeded" because an actual simulation might be
+# kicked off due to differences between tool.xml and run.xml
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Analyzer::notebookpage {
+    _fixNotebook
+}