Changeset 953

Timestamp:

Mar 11, 2010 2:00:14 PM (11 years ago)

Author:

toby

Message:

remove NIST refs; review space in dir warn; use PGPLOT_DIR on win-NT, etc.; doc updates; tkcon problems on windows, add open console; move update menu from help

Location:

trunk

Files:

• absplt (modified) (2 diffs)
• bkgedit (modified) (2 diffs)
• doc/RCS (deleted)
• doc/expgui.html (modified) (4 diffs)
• doc/expguic.html (modified) (1 diff)
• example_widplt_11BM (added)
• expgui (modified) (4 diffs)
• fillcif.tcl (modified) (1 diff)
• gsascmds.tcl (modified) (2 diffs)
• liveplot (modified) (2 diffs)
• lstview (modified) (2 diffs)
• macromon (modified) (2 diffs)
• widplt (modified) (2 diffs)
• widplt_11BM (deleted)

trunk/absplt

@@ -243 +243 @@
     tk_dialog .warn About "
 GSAS\n\
-A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
-WIDPLT/ABSPLT\nB. Toby, NIST\nNot subject to copyright\n\n\
+R. B. Von Dreele, Argonne National Lab\n
+and A. C. Larson, Los Alamos (retired)\n\n\
+WIDPLT/ABSPLT\nB. H. Toby, Argonne National Lab\n\n\
 $Revision\n\
 " {} 0 OK
@@ -1115 +1116 @@
 set expgui(docdir) [file join $expgui(scriptdir) doc]
 # location for web pages, if not found locally
-set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
+set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
 
 # fetch EXP file processing routines 

trunk/bkgedit

@@ -82 +82 @@
 set expgui(pixelregion) 5
 # location for web pages, if not found locally
-set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
+set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
 set peakinfo(obssym) scross
 if {$program == "bkgedit"}  {
@@ -1011 +1011 @@
     tk_dialog .warn About "
 GSAS\n\
-A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
-LIVEPLOT\nB. Toby, NIST\nNot subject to copyright\n\n\
+R. B. Von Dreele, Argonne National Lab\n
+and A. C. Larson, Los Alamos (retired)\n\n\
+LIVEPLOT\nB. H. Toby, Argonne National Lab\n\n\
 $Revision\n\
 " {} 0 OK

trunk/doc/expgui.html

@@ -91 +91 @@
 <TH>
 <A Href="http://www.ncnr.nist.gov/xtal/software/expgui/tutorial3">
-<IMG SRC="new.gif" HEIGHT=13 WIDTH=36 alt="New!">
 <A Href="osx.html">Mac OS X</A></TH>
 </TR><TR>
@@ -100 +99 @@
 <TR><TH BGCOLOR="#F0F0F0">Tutorials:</TH>
 <TH><A Href="http://www.ncnr.nist.gov/xtal/software/expgui/tutorial3">
-<IMG SRC="new.gif" HEIGHT=13 WIDTH=36 alt="New!">
 NIST<BR>Neutron data</A></TH>
 <TH><A Href="http://www.ncnr.nist.gov/xtal/software/expgui/tutorial1/index.html">GSAS Manual<BR>Example #1 (TOF)</A></TH>
@@ -136 +134 @@
 <P>
 <B>Mailing List.</B>
-If you would like to get news about about new features 
-& bug fixes in EXPGUI and also support
-the project by demonstrating how many people use it, 
-please send e-mail to
-<a href="mailto:brian.toby@anl.gov?subject=EXPGUI Mailing List">Brian.Toby@ANL.GOV</a>.
+There is a mailing list for users of EXPGUI for news about about new
+features, bug fixes in EXPGUI, etc.
+<A href="http://www.aps.anl.gov/mailman/listinfo/expgui">Subscription info</A>
 <P>
 <hr>
@@ -329 +325 @@
 <DL><DL>
 The options on the File menu as is the custom contains the commands 
-for reading and writing experiment files, as well as starting 
-and ending the program.
+for reading and writing experiment files, as well as starting,  
+ending and controlling the program.
 </DL></DL>
 

trunk/doc/expguic.html

@@ -54 +54 @@
 <DT>Save As<DD>Saves modifications to the current experiment file to disk
         under a new file name
-<DT>Reread .EXP file<DD>Reread the last saved version of the experiment file from disk.
+<DT>Reread .EXP file<DD>Reread the last saved version of the
+  experiment file from disk.
+<DT>Update GSAS/EXPGUI<DD>This queries the EXPGUI software repository
+  to see if any files in EXPGUI or GSAS has been updated. It then
+  offers the program user the option to update these files. The update
+  will fail if the user does not have permission to change the EXPGUI
+  or GSAS files. In this case, a system administrator may be needed. 
 <DT>EraseHistory<DD>Deletes old history records to speed reading of the .EXP file.
 <DT>convert<DD>Convert a standard ASCII file to the direct access format used by GSAS (and for UNIX, the reverse)

trunk/expgui

@@ -80 +80 @@
 
 # location for web pages, if not found locally
-set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
+set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
 # default for archive mode = on
 set expgui(archive) 1
@@ -695 +695 @@
 \n\n\
 Generalized Structure Analysis System\n(GSAS)\n\
-A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
+R. B. Von Dreele,\n 
+APS, Argonne National Laboratory\n
+and A. C. Larson, Los Alamos (retired)\n\n\
 " \
         info 0 OK
@@ -4165 +4167 @@
 $expgui(fm).help.menu add command -command "MakeWWWHelp menu" \
         -label "Help on menu"
-if {![catch {package require tkcon} errmsg]} {
-    $expgui(fm).help.menu add command -label "Open console" \
-        -command {tkcon show}
-} elseif {$tcl_platform(platform) == "windows"} {
+if {$tcl_platform(platform) == "windows"} {
     $expgui(fm).help.menu add command -label "Open console" \
         -command {console show}
 }
+if {![catch {package require tkcon} errmsg]} {
+    $expgui(fm).help.menu add command -label "Open tkcon console" \
+        -command {tkcon show}
+}
 # add update commands to buffer
 if [CheckUpdateImplemented $expgui(gsasdir)] {
-    $expgui(fm).help.menu add command -command CheckAndDoUpdate -label "Update GSAS/EXPGUI"
-#    $expgui(fm).help.menu add cascade -menu $expgui(fm).help.menu.track \
+    $expgui(fm).file.menu add command -command CheckAndDoUpdate -label "Update GSAS/EXPGUI"
+#    $expgui(fm).file.menu add cascade -menu $expgui(fm).file.menu.track \
 #       -label "Select EXPGUI version"
-#    menu $expgui(fm).help.menu.track 
-#    $expgui(fm).help.menu.track add radiobutton -command {SetSVNbranch trunk} -label Development -value trunk \
+#    menu $expgui(fm).file.menu.track 
+#    $expgui(fm).file.menu.track add radiobutton -command {SetSVNbranch trunk} -label Development -value trunk \
 #       -variable expgui(SVNversion)
-#    $expgui(fm).help.menu.track add radiobutton -command {SetSVNbranch stable} -label Standard -value stable \
+#    $expgui(fm).file.menu.track add radiobutton -command {SetSVNbranch stable} -label Standard -value stable \
 #       -variable expgui(SVNversion)
     # get info about the current CMPR version on the server. Someday we might want to compare this
@@ -4195 +4198 @@
     }
 } else {
-    $expgui(fm).help.menu add command -label "Show update problem" -command {
+    $expgui(fm).file.menu add command -label "Show update problem" -command {
         if {! [file exists [file join $expgui(gsasdir) .svn]]} {
             MyMessageBox -parent . -title "No .svn" \

trunk/fillcif.tcl

@@ -75 +75 @@
 set expgui(docdir) [file join $expgui(scriptdir) doc]
 # location for web pages, if not found locally
-set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
+set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
 
 # where to find the BWidget program

trunk/gsascmds.tcl

@@ -2014 +2014 @@
         update
         MyMessageBox -parent . -title "Good luck..." \
-            -message "You are using a directory with a space in the name ([file dirname $expgui(FileMenuDir)]) -- You may encounter bugs in EXPGUI. Please e-mail them to Brian.Toby@NIST.gov so they can be fixed." \
+            -message "You are using a directory with a space in the name ([file dirname $expgui(FileMenuDir)]) -- You may encounter bugs in EXPGUI. Please e-mail them to Brian.Toby@ANL.gov so they can be fixed." \
             -icon warning -type Continue -default continue
 #               -helplink "expguierr.html OpenErr"
@@ -2659 +2659 @@
         # PGPLOT_FONT is needed by PGPLOT
         set env(PGPLOT_FONT) [file nativename [file join $expgui(pgplotdir) grfont.dat]]
+        set env(PGPLOT_DIR) $expgui(pgplotdir)
         # this is the number of lines/page in the .LST (etc.) file
         set env(LENPAGE) 60

trunk/liveplot

@@ -82 +82 @@
 set expgui(pixelregion) 5
 # location for web pages, if not found locally
-set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
+set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
 set peakinfo(obssym) scross
 if {$program == "bkgedit"}  {
@@ -1011 +1011 @@
     tk_dialog .warn About "
 GSAS\n\
-A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
-LIVEPLOT\nB. Toby, NIST\nNot subject to copyright\n\n\
+R. B. Von Dreele, Argonne National Lab\n
+and A. C. Larson, Los Alamos (retired)\n\n\
+LIVEPLOT\nB. H. Toby, Argonne National Lab\n\n\
 $Revision\n\
 " {} 0 OK

trunk/lstview

@@ -444 +444 @@
     tk_dialog .warn About "
 GSAS\n\
-A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
-LSTVIEW\nB. Toby, NIST\nNot subject to copyright\n\n\
+R. B. Von Dreele, Argonne National Lab\n
+and A. C. Larson, Los Alamos (retired)\n\n\
+LSTVIEW\nB. H. Toby, Argonne National Lab\n\n\
 $Revision\n\
 " {} 0 OK
@@ -713 +714 @@
 set expgui(docdir) [file join $expgui(scriptdir) doc]
 # location for web pages, if not found locally
-set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
+set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
 
 source [file join $expgui(scriptdir) gsascmds.tcl]

trunk/macromon

@@ -444 +444 @@
     tk_dialog .warn About "
 GSAS\n\
-A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
-LSTVIEW\nB. Toby, NIST\nNot subject to copyright\n\n\
+R. B. Von Dreele, Argonne National Lab\n
+and A. C. Larson, Los Alamos (retired)\n\n\
+MACROMON\nB. H. Toby, Argonne National Lab\n\n\
 $Revision\n\
 " {} 0 OK
@@ -713 +714 @@
 set expgui(docdir) [file join $expgui(scriptdir) doc]
 # location for web pages, if not found locally
-set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
+set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
 
 source [file join $expgui(scriptdir) gsascmds.tcl]

trunk/widplt

@@ -243 +243 @@
     tk_dialog .warn About "
 GSAS\n\
-A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
-WIDPLT/ABSPLT\nB. Toby, NIST\nNot subject to copyright\n\n\
+R. B. Von Dreele, Argonne National Lab\n
+and A. C. Larson, Los Alamos (retired)\n\n\
+WIDPLT/ABSPLT\nB. H. Toby, Argonne National Lab\n\n\
 $Revision\n\
 " {} 0 OK
@@ -1115 +1116 @@
 set expgui(docdir) [file join $expgui(scriptdir) doc]
 # location for web pages, if not found locally
-set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
+set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
 
 # fetch EXP file processing routines