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

Timestamp:

Apr 2, 2005 9:33:16 AM (19 years ago)

Author:

mmc

Message:

Updated the code to the latest Rappture XML conventions, and fixed
up the moleculeViewer and energyLevels viewer. Everything works
properly now with the new app-huckel project. You can load up
the molecule viewer, rotate molecules, and view their energy levels.

File:

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

trunk/gui/scripts/analyzer.tcl

@@ -125 +125 @@
 #
 # If the simulation page is showing, this kicks off the simulator
-# by executing the executable.command associated with the -tool.  While
+# by executing the tool.command associated with the -tool.  While
 # the simulation is running, it shows status.  When the simulation is
 # finished, it switches automatically to "analyze" mode and shows
@@ -137 +137 @@
 
         set job(control) ""
+        set job(error) ""
 
         # if the hold window is set, then put up a busy cursor
@@ -152 +153 @@
             set xml2 [$itk_option(-device) xml]
             regsub -all {&} $xml2 {\\\&} xml2
-            regsub {</tool>} $xml "$xml2</tool>" xml
+            regsub {</run>} $xml "$xml2</run>" xml
             puts $fid $xml
             close $fid
@@ -159 +160 @@
         # execute the tool using the path from the tool description
         if {$status == 0} {
-            set cmd [$itk_option(-tool) get executable.command]
+            set cmd [$itk_option(-tool) get tool.command]
 
             set status [catch {eval blt::bgexec \
@@ -211 +212 @@
 
     # if control mode is "auto", then simulate right away
-    if {$_control == "auto"} {
+    if {[string match auto* $_control]} {
         simulate
     }
@@ -231 +232 @@
 
     # try to load new results from the given file
-    set _run [Rappture::Library::open $file]
+    set _run [Rappture::library $file]
 
     # go through the analysis and create widgets to display results
     foreach item [array names _widgets] {
-        $_widgets($item) configure -run $_run
+        $_widgets($item) configure -output $_run
     }
 }
@@ -254 +255 @@
 # CONFIGURATION OPTION: -tool
 #
-# Set to the Rappture::Library object representing the tool being
+# Set to the Rappture::library object representing the tool being
 # run in this analyzer.
 # ----------------------------------------------------------------------
 itcl::configbody Rappture::Analyzer::tool {
     if {![Rappture::library isvalid $itk_option(-tool)]} {
-        error "bad value \"$itk_option(-tool)\": should be Rappture::Library"
+        error "bad value \"$itk_option(-tool)\": should be Rappture::library"
     }
 
@@ -271 +272 @@
 # CONFIGURATION OPTION: -device
 #
-# Set to the Rappture::Library object representing the device being
+# Set to the Rappture::library object representing the device being
 # run in this analyzer.
 # ----------------------------------------------------------------------
@@ -277 +278 @@
     if {$itk_option(-device) != ""
           && ![Rappture::library isvalid $itk_option(-device)]} {
-        error "bad value \"$itk_option(-device)\": should be Rappture::Library"
+        error "bad value \"$itk_option(-device)\": should be Rappture::library"
     }
     reset
@@ -285 +286 @@
 # CONFIGURATION OPTION: -analysis
 #
-# Set to the Rappture::Library object representing the analysis that
+# Set to the Rappture::library object representing the analysis that
 # should be shown in this analyzer.
 # ----------------------------------------------------------------------
 itcl::configbody Rappture::Analyzer::analysis {
     if {![Rappture::library isvalid $itk_option(-analysis)]} {
-        error "bad value \"$itk_option(-analysis)\": should be Rappture::Library"
+        error "bad value \"$itk_option(-analysis)\": should be Rappture::library"
     }
     set _control [$itk_option(-analysis) get control]
@@ -314 +315 @@
                 pack $_widgets($item) -expand yes -fill both
             }
+            elevels* {
+                set name "page[incr counter]"
+
+                set page [$itk_component(results) insert end $name]
+                $itk_component(resultselector) choices insert end \
+                    $name "Energy Levels"
+
+                set _widgets($item) [Rappture::EnergyLevels $page.#auto \
+                    -layout [$itk_option(-analysis) element -flavor object $item]]
+                pack $_widgets($item) -expand yes -fill both
+            }
         }
     }