Changeset 769

Timestamp:

Dec 4, 2009 5:11:43 PM (14 years ago)

Author:

toby

Message:

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

File:

• trunk/import_cif.tcl (modified) (2 diffs, 3 props)

trunk/import_cif.tcl

@@ -4 +4 @@
 # define info used in addcmds.tcl
 catch {
+    # make sure vars get set at global level
+    global CIF
     source [file join $expgui(scriptdir) browsecif.tcl]
     set description "Crystallographic Information File (CIF)"
@@ -215 +217 @@
 
 proc CallBrowseCIF {txt blocklist selected frame} {
-    global CIF CIF_index CIF_dataname_index expgui
-
-    catch {
-        source  [file join $expgui(scriptdir) CIF_index]
-    }
-
-    # add location of these files & the typical GSAS data directory 
-    # to the dictionary search path
-    lappend CIF(cif_path) $expgui(scriptdir) [file join [file dirname $expgui(scriptdir)] data]
+    # is there a defined list of dictionary files?
+    if {[catch {set ::CIF(dictfilelist)}]} {
+        set dictfilelist [glob -nocomplain \
+                              [file join $::expgui(gsasdir) data *.dic]]
+        foreach file $dictfilelist {
+            lappend ::CIF(dictfilelist) $file
+            set ::CIF(dict_$file) 1
+        }
+    }
+    # load the initial CIF dictionaries
+    LoadDictIndices
     
     BrowseCIF $txt $blocklist $selected $frame