Changeset 770

Timestamp:

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

Author:

toby

Message:

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

File:

• trunk/fillcif.tcl (modified) (4 diffs, 3 props)

trunk/fillcif.tcl

@@ -19 +19 @@
 #      this file (Included with EXPGUI)
 #
-#  3) file CIF_index must be in the same directory as this file
-#      (Included with EXPGUI)
-#      This file is an index to the CIF dictionaries in use and is generated
-#      using routines in indexCIFdict.tcl
-#     note that variable CIF(cif_path) dictates where these dictionary 
-#     files will be found and the GSAS data directory (../data/) included.
-#
-#  4) The CIF core & powder dictionaries are included in the GSAS data 
+#  3) The CIF core & powder dictionaries are included in the GSAS data 
 #      directory (../data/), files cif_core_2.2.dic and cif_pd.dic
 #      (Included with GSAS/EXPGUI distribution)
 #
-#  5) The GSAS2CIF template files (template_instrument.cif, 
+#  4) The GSAS2CIF template files (template_instrument.cif, 
 #      template_phase.cif and template_publ.cif) are included in the GSAS data 
 #      directory (../data/).
 #      (Included with GSAS/EXPGUI distribution)
 
-if {$tcl_version < 8.2} {
-    tk_dialog .error {Old Tcl/Tk} \
-            "Sorry, the CIF Browser requires version 8.2 or later of the Tcl/Tk package. This is $tcl_version" \
-            warning 0 Sorry
-    exit
-}
-
-if {[llength $argv] != 1} {
-    set file [tk_getOpenFile -title "Select GSAS Experiment" -parent . \
-            -defaultextension EXP -filetypes {{"GSAS experiment" .EXP}}]
-    if {$file == ""} {exit}
-    set prefix [file root $file]
-} else {
-    set prefix $argv
-}
-
-if {[set dir [file dirname $prefix]] != ""} {
-    cd $dir
-    set prefix [file tail $prefix]
-}
 # where is this file running from?
 set script [info script]
@@ -75 +48 @@
 }
 set scriptdir [file dirname $script ]
+
+if {$tcl_version < 8.2} {
+    tk_dialog .error {Old Tcl/Tk} \
+            "Sorry, the CIF Browser requires version 8.2 or later of the Tcl/Tk package. This is $tcl_version" \
+            warning 0 Sorry
+    exit
+}
+
+if {[llength $argv] != 1} {
+    set file [tk_getOpenFile -title "Select GSAS Experiment" -parent . \
+            -defaultextension EXP -filetypes {{"GSAS experiment" .EXP}}]
+    if {$file == ""} {exit}
+    set prefix [file root $file]
+} else {
+    set prefix $argv
+}
+
+if {[set dir [file dirname $prefix]] != ""} {
+    cd $dir
+    set prefix [file tail $prefix]
+}
 # used by some gsascmds routines
 set expgui(scriptdir) $scriptdir
@@ -404 +398 @@
 wm title $defw "CIF definitions"
 set CIF(defBox) $defw.t
-grid [text $CIF(defBox) -width 65 -xscrollcommand "$defw.x set" \
-        -yscrollcommand "$defw.y set"] -column 0 -row 0 -sticky news
+grid [text $CIF(defBox) -width 45 -height 18 -xscrollcommand "$defw.x set" \
+        -yscrollcommand "$defw.y set" -wrap word] -column 0 -row 0 -sticky news
 grid [scrollbar $defw.y -command "$CIF(defBox) yview"] -column 1 -row 0 -sticky ns
 grid [scrollbar $defw.x -command "$CIF(defBox) xview" \
@@ -414 +408 @@
 wm withdraw $defw
 
-if {![file exists [file join $scriptdir CIF_index]]} {
-    MyMessageBox -parent . -title "No CIF index" \
-            -message "File CIF_index was not found in directory $scriptdir. Without this file, CIF definitions can not be read and editing is not recommended. See routine indexCIFdict.tcl for info on creating CIF_index" \
-            -icon error -type {"Oh darn"} -default "oh darn"
-} elseif [catch {
-    source  [file join $scriptdir CIF_index]
-} errmsg] {
-    MyMessageBox -parent . -title "CIF index error" \
-            -message "An error occured reading file CIF_index (directory $scriptdir). Without this file, CIF definitions can not be read and editing is not recommended. See routine indexCIFdict.tcl for info on creating CIF_index. Error: $errmsg" \
-            -icon error -type {"Oh darn"} -default "oh darn"
-}
-
-
-# add location of these files & the typical GSAS data directory 
-# to the dictionary search path
-lappend CIF(cif_path) $scriptdir [file join [file dirname $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 f $dictfilelist {
+        lappend ::CIF(dictfilelist) $f
+        set ::CIF(dict_$f) 1
+    }
+}
+# load the initial CIF dictionaries
+LoadDictIndices
 
 # make frame for the CIF browser