Changeset 953 for trunk


Ignore:
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:
1 added
2 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/absplt

    r931 r953  
    243243    tk_dialog .warn About "
    244244GSAS\n\
    245 A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
    246 WIDPLT/ABSPLT\nB. Toby, NIST\nNot subject to copyright\n\n\
     245R. B. Von Dreele, Argonne National Lab\n
     246and A. C. Larson, Los Alamos (retired)\n\n\
     247WIDPLT/ABSPLT\nB. H. Toby, Argonne National Lab\n\n\
    247248$Revision\n\
    248249" {} 0 OK
     
    11151116set expgui(docdir) [file join $expgui(scriptdir) doc]
    11161117# location for web pages, if not found locally
    1117 set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
     1118set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
    11181119
    11191120# fetch EXP file processing routines
  • trunk/bkgedit

    r931 r953  
    8282set expgui(pixelregion) 5
    8383# location for web pages, if not found locally
    84 set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
     84set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
    8585set peakinfo(obssym) scross
    8686if {$program == "bkgedit"}  {
     
    10111011    tk_dialog .warn About "
    10121012GSAS\n\
    1013 A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
    1014 LIVEPLOT\nB. Toby, NIST\nNot subject to copyright\n\n\
     1013R. B. Von Dreele, Argonne National Lab\n
     1014and A. C. Larson, Los Alamos (retired)\n\n\
     1015LIVEPLOT\nB. H. Toby, Argonne National Lab\n\n\
    10151016$Revision\n\
    10161017" {} 0 OK
  • trunk/doc/expgui.html

    r930 r953  
    9191<TH>
    9292<A Href="http://www.ncnr.nist.gov/xtal/software/expgui/tutorial3">
    93 <IMG SRC="new.gif" HEIGHT=13 WIDTH=36 alt="New!">
    9493<A Href="osx.html">Mac OS X</A></TH>
    9594</TR><TR>
     
    10099<TR><TH BGCOLOR="#F0F0F0">Tutorials:</TH>
    101100<TH><A Href="http://www.ncnr.nist.gov/xtal/software/expgui/tutorial3">
    102 <IMG SRC="new.gif" HEIGHT=13 WIDTH=36 alt="New!">
    103101NIST<BR>Neutron data</A></TH>
    104102<TH><A Href="http://www.ncnr.nist.gov/xtal/software/expgui/tutorial1/index.html">GSAS Manual<BR>Example #1 (TOF)</A></TH>
     
    136134<P>
    137135<B>Mailing List.</B>
    138 If you would like to get news about about new features
    139 & bug fixes in EXPGUI and also support
    140 the project by demonstrating how many people use it,
    141 please send e-mail to
    142 <a href="mailto:brian.toby@anl.gov?subject=EXPGUI Mailing List">Brian.Toby@ANL.GOV</a>.
     136There is a mailing list for users of EXPGUI for news about about new
     137features, bug fixes in EXPGUI, etc.
     138<A href="http://www.aps.anl.gov/mailman/listinfo/expgui">Subscription info</A>
    143139<P>
    144140<hr>
     
    329325<DL><DL>
    330326The options on the File menu as is the custom contains the commands
    331 for reading and writing experiment files, as well as starting
    332 and ending the program.
     327for reading and writing experiment files, as well as starting,
     328ending and controlling the program.
    333329</DL></DL>
    334330
  • trunk/doc/expguic.html

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

    r952 r953  
    8080
    8181# location for web pages, if not found locally
    82 set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
     82set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
    8383# default for archive mode = on
    8484set expgui(archive) 1
     
    695695\n\n\
    696696Generalized Structure Analysis System\n(GSAS)\n\
    697 A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
     697R. B. Von Dreele,\n
     698APS, Argonne National Laboratory\n
     699and A. C. Larson, Los Alamos (retired)\n\n\
    698700" \
    699701        info 0 OK
     
    41654167$expgui(fm).help.menu add command -command "MakeWWWHelp menu" \
    41664168        -label "Help on menu"
    4167 if {![catch {package require tkcon} errmsg]} {
    4168     $expgui(fm).help.menu add command -label "Open console" \
    4169         -command {tkcon show}
    4170 } elseif {$tcl_platform(platform) == "windows"} {
     4169if {$tcl_platform(platform) == "windows"} {
    41714170    $expgui(fm).help.menu add command -label "Open console" \
    41724171        -command {console show}
    41734172}
     4173if {![catch {package require tkcon} errmsg]} {
     4174    $expgui(fm).help.menu add command -label "Open tkcon console" \
     4175        -command {tkcon show}
     4176}
    41744177# add update commands to buffer
    41754178if [CheckUpdateImplemented $expgui(gsasdir)] {
    4176     $expgui(fm).help.menu add command -command CheckAndDoUpdate -label "Update GSAS/EXPGUI"
    4177 #    $expgui(fm).help.menu add cascade -menu $expgui(fm).help.menu.track \
     4179    $expgui(fm).file.menu add command -command CheckAndDoUpdate -label "Update GSAS/EXPGUI"
     4180#    $expgui(fm).file.menu add cascade -menu $expgui(fm).file.menu.track \
    41784181#       -label "Select EXPGUI version"
    4179 #    menu $expgui(fm).help.menu.track
    4180 #    $expgui(fm).help.menu.track add radiobutton -command {SetSVNbranch trunk} -label Development -value trunk \
     4182#    menu $expgui(fm).file.menu.track
     4183#    $expgui(fm).file.menu.track add radiobutton -command {SetSVNbranch trunk} -label Development -value trunk \
    41814184#       -variable expgui(SVNversion)
    4182 #    $expgui(fm).help.menu.track add radiobutton -command {SetSVNbranch stable} -label Standard -value stable \
     4185#    $expgui(fm).file.menu.track add radiobutton -command {SetSVNbranch stable} -label Standard -value stable \
    41834186#       -variable expgui(SVNversion)
    41844187    # get info about the current CMPR version on the server. Someday we might want to compare this
     
    41954198    }
    41964199} else {
    4197     $expgui(fm).help.menu add command -label "Show update problem" -command {
     4200    $expgui(fm).file.menu add command -label "Show update problem" -command {
    41984201        if {! [file exists [file join $expgui(gsasdir) .svn]]} {
    41994202            MyMessageBox -parent . -title "No .svn" \
  • trunk/fillcif.tcl

    r930 r953  
    7575set expgui(docdir) [file join $expgui(scriptdir) doc]
    7676# location for web pages, if not found locally
    77 set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
     77set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
    7878
    7979# where to find the BWidget program
  • trunk/gsascmds.tcl

    r949 r953  
    20142014        update
    20152015        MyMessageBox -parent . -title "Good luck..." \
    2016             -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." \
     2016            -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." \
    20172017            -icon warning -type Continue -default continue
    20182018#               -helplink "expguierr.html OpenErr"
     
    26592659        # PGPLOT_FONT is needed by PGPLOT
    26602660        set env(PGPLOT_FONT) [file nativename [file join $expgui(pgplotdir) grfont.dat]]
     2661        set env(PGPLOT_DIR) $expgui(pgplotdir)
    26612662        # this is the number of lines/page in the .LST (etc.) file
    26622663        set env(LENPAGE) 60
  • trunk/liveplot

    r930 r953  
    8282set expgui(pixelregion) 5
    8383# location for web pages, if not found locally
    84 set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
     84set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
    8585set peakinfo(obssym) scross
    8686if {$program == "bkgedit"}  {
     
    10111011    tk_dialog .warn About "
    10121012GSAS\n\
    1013 A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
    1014 LIVEPLOT\nB. Toby, NIST\nNot subject to copyright\n\n\
     1013R. B. Von Dreele, Argonne National Lab\n
     1014and A. C. Larson, Los Alamos (retired)\n\n\
     1015LIVEPLOT\nB. H. Toby, Argonne National Lab\n\n\
    10151016$Revision\n\
    10161017" {} 0 OK
  • trunk/lstview

    r930 r953  
    444444    tk_dialog .warn About "
    445445GSAS\n\
    446 A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
    447 LSTVIEW\nB. Toby, NIST\nNot subject to copyright\n\n\
     446R. B. Von Dreele, Argonne National Lab\n
     447and A. C. Larson, Los Alamos (retired)\n\n\
     448LSTVIEW\nB. H. Toby, Argonne National Lab\n\n\
    448449$Revision\n\
    449450" {} 0 OK
     
    713714set expgui(docdir) [file join $expgui(scriptdir) doc]
    714715# location for web pages, if not found locally
    715 set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
     716set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
    716717
    717718source [file join $expgui(scriptdir) gsascmds.tcl]
  • trunk/macromon

    r931 r953  
    444444    tk_dialog .warn About "
    445445GSAS\n\
    446 A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
    447 LSTVIEW\nB. Toby, NIST\nNot subject to copyright\n\n\
     446R. B. Von Dreele, Argonne National Lab\n
     447and A. C. Larson, Los Alamos (retired)\n\n\
     448MACROMON\nB. H. Toby, Argonne National Lab\n\n\
    448449$Revision\n\
    449450" {} 0 OK
     
    713714set expgui(docdir) [file join $expgui(scriptdir) doc]
    714715# location for web pages, if not found locally
    715 set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
     716set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
    716717
    717718source [file join $expgui(scriptdir) gsascmds.tcl]
  • trunk/widplt

    r930 r953  
    243243    tk_dialog .warn About "
    244244GSAS\n\
    245 A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
    246 WIDPLT/ABSPLT\nB. Toby, NIST\nNot subject to copyright\n\n\
     245R. B. Von Dreele, Argonne National Lab\n
     246and A. C. Larson, Los Alamos (retired)\n\n\
     247WIDPLT/ABSPLT\nB. H. Toby, Argonne National Lab\n\n\
    247248$Revision\n\
    248249" {} 0 OK
     
    11151116set expgui(docdir) [file join $expgui(scriptdir) doc]
    11161117# location for web pages, if not found locally
    1117 set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
     1118set expgui(website) 11bm.xor.aps.anl.gov/expguidoc/
    11181119
    11191120# fetch EXP file processing routines
Note: See TracChangeset for help on using the changeset viewer.