Changeset 5984

Timestamp:

Feb 9, 2016, 11:51:17 AM (9 years ago)

Author:

gah

Message:

add -appname switch for testing

Location:

branches/1.4

Files:

• gui/apps/launcher.tcl (modified) (2 diffs)
• gui/scripts/analyzer.tcl (modified) (3 diffs)
• gui/scripts/main.tcl (modified) (2 diffs)
• lang/tcl/scripts/task.tcl (modified) (2 diffs)

branches/1.4/gui/apps/launcher.tcl

@@ -43 +43 @@
 set params(input) ""
 
-set _rapptureCwd [pwd]
+set rapptureInfo(cwd) [pwd]
+set rapptureInfo(appName) ""
 
 if {[info exists env(TOOL_PARAMETERS)]} {
@@ -182 +183 @@
             -simset {
                 lappend alist $opt [lindex $argv 0]
+                set argv [lrange $argv 1 end]
+            }
+            -appname {
+                global rapptureInfo
+                set rapptureInfo(appName) $opt [lindex $argv 0]
                 set argv [lrange $argv 1 end]
             }

branches/1.4/gui/scripts/analyzer.tcl

@@ -174 +174 @@
 
     # if there's a hub url, then add "About" and "Questions" links
-    set _appName [$_tool xml get tool.id]
+    global rapptureInfo
+    if { $rapptureInfo(appName) == "" } {
+        set _appName [$_tool xml get tool.id]
+    } else {
+        set _appName $rapptureInfo(appName)
+    }
     set url [Rappture::Tool::resources -huburl]
 
@@ -199 +204 @@
     
     if 0 {
+        # To be eliminated with menu changes.
     itk_component add about {
         button $itk_component(hubcntls).about \
@@ -1567 +1573 @@
         set state normal
     }
-        set state normal
     $m add command -label "About this tool" \
         -command [list Rappture::filexfer::webpage "$url/tools/$_appName"] \

branches/1.4/gui/scripts/main.tcl

@@ -267 +267 @@
 if 0 {
 # The be elimimated with the menu changes
-if {"" != $url && "" != $app} {
+if { "" != $url && "" != $app } {
     set f [$win.pager component breadcrumbarea]
     frame $f.hubcntls
@@ -309 +309 @@
 if { $url != "" && $app != "" } {
     $f.hubcntls.about configure -state normal
-    $f.hubcntls.about configure -state normal
+    $f.hubcntls.questions configure -state normal
 }
 

branches/1.4/lang/tcl/scripts/task.tcl

@@ -219 +219 @@
 
     # write out the driver.xml file for the tool
-    global _rapptureCwd
-    set file [file join $_rapptureCwd "driver[pid].xml"]
+    global rapptureInfo
+    set file [file join $rapptureInfo(cwd) "driver[pid].xml"]
     set status [catch {
         set fid [open $file w]
@@ -580 +580 @@
                 set rdir $_resources(-resultdir)
             } else {
-                global _rapptureCwd
-                set rdir $_rapptureCwd
+                global rapptureInfo
+                set rdir $rapptureInfo(cwd)
             }
         } elseif {$resultdir ne ""} {