Changeset 769


Ignore:
Timestamp:
Dec 4, 2009 5:11:43 PM (11 years ago)
Author:
toby
Message:

# on 2004/01/30 00:39:56, toby did:
update to match new version of CIFEDIT etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/import_cif.tcl

    • Property rcs:date changed from 2003/08/11 19:22:56 to 2004/01/30 00:39:56
    • Property rcs:lines changed from +3 -3 to +13 -9
    • Property rcs:rev changed from 1.11 to 1.12
    r726 r769  
    44# define info used in addcmds.tcl
    55catch {
     6    # make sure vars get set at global level
     7    global CIF
    68    source [file join $expgui(scriptdir) browsecif.tcl]
    79    set description "Crystallographic Information File (CIF)"
     
    215217
    216218proc CallBrowseCIF {txt blocklist selected frame} {
    217     global CIF CIF_index CIF_dataname_index expgui
    218 
    219     catch {
    220         source  [file join $expgui(scriptdir) CIF_index]
    221     }
    222 
    223     # add location of these files & the typical GSAS data directory
    224     # to the dictionary search path
    225     lappend CIF(cif_path) $expgui(scriptdir) [file join [file dirname $expgui(scriptdir)] data]
     219    # is there a defined list of dictionary files?
     220    if {[catch {set ::CIF(dictfilelist)}]} {
     221        set dictfilelist [glob -nocomplain \
     222                              [file join $::expgui(gsasdir) data *.dic]]
     223        foreach file $dictfilelist {
     224            lappend ::CIF(dictfilelist) $file
     225            set ::CIF(dict_$file) 1
     226        }
     227    }
     228    # load the initial CIF dictionaries
     229    LoadDictIndices
    226230   
    227231    BrowseCIF $txt $blocklist $selected $frame
Note: See TracChangeset for help on using the changeset viewer.