Changeset 113

Timestamp:

Dec 4, 2009 5:00:37 PM (11 years ago)

Author:

toby

Message:

# on 1999/10/11 19:49:28, toby did:
* empty log message *

File:

• trunk/addcmds.tcl (modified) (8 diffs, 3 props)

trunk/addcmds.tcl

@@ -158 +158 @@
                     < exptool.in >& exptool.out
         }
-    }
+    } errmsg
     # load the revised exp file
     loadexp $expgui(expfile)
@@ -165 +165 @@
     close $fp
     destroy $np
+    if {$errmsg != ""} {
+        append errmsg "\n" $out
+    } else {
+        set errmsg $out
+    }
     ShowBigMessage \
                  $np \
                  "Please review the result from adding the phase" \
-                 $out
+                 $errmsg
     file delete exptool.in exptool.out
 }
@@ -360 +365 @@
                         [file join [file dirname $inp] \
                         [string trim [string range $line 26 end]]]
+            }
+        }
+    } else {
+        # is the file one big record?
+        set len [gets $in line]
+        # a instrument parameter file should be more than 4 lines
+        if {$len <= 4*80} {
+            set ans [tk_dialog .err "Read error" \
+                    "File $inp is not direct access. OK to convert?" \
+                    error 0 OK QUIT]
+            if {$ans == 0} {
+                close $in
+                set oldname ${inp}.original
+                file rename $inp $oldname
+                if [catch {
+                    exec [file join $expgui(gsasexe) convstod] < \
+                            $oldname > $inp
+                } errmsg] {
+                    tk_dialog .warn Notify \
+                            "Error in conversion:\n$errmsg" warning 0 OK
+                }
+                set in [open $inp r]
+                set line {}
+            } else {
+                return
+            }
+        }
+        seek $in 0
+        set i 0
+        while {[string length [set line [read $in 80]]] == 80} {
+            incr i
+            # scan for BANK lines
+            if {[string first BANK $line] == 0} {
+                scan $line "BANK%d" num
+                lappend newhist(banklist) $num
+            }
+            # check for "Instrument parameter file" line
+            if {$i == 2 && [string first "Instrument parameter" $line] == 0} {
+                validateinstfile $np \
+                        [file join [file dirname $inp] \
+                        [string trim [string range $line 26 end]]]
+            }
+        }
+    }
+    # were banks found?
+    if {$newhist(banklist) == ""} {
+        tk_dialog .err "Read error" \
+                "File $inp has no BANK lines. This is not a valid GSAS data file." \
+                error 0 OK
+        return
+    }
+    set newhist(rawfile) $inp
+    foreach i $newhist(banklist) {
+#       pack [checkbutton $np.bank.$i -text $i \
+#               -variable newhist(bank$i)] -side left
+        pack [radiobutton $np.bank.$i -text $i \
+                -variable newhist(banknum) -value $i] -side left
+    }
+}
+
+proc getinstfile {np} {
+    global newhist tcl_platform
+    if {$tcl_platform(platform) == "windows"} {
+        set inp [
+        tk_getOpenFile -parent $np -initialfile $newhist(instfile) -filetypes {
+            {"Inst files" .INST} {"Inst files" .INS} 
+            {"Inst files" .PRM} {"All files" *}
+        }
+        ]
+    } else {
+        set inp [
+        tk_getOpenFile -parent $np -initialfile $newhist(instfile) -filetypes {
+            {"Inst files" .INS*} {"Inst files" .ins*} 
+            {"Inst files" .PRM}  {"Inst files" .prm} 
+            {"All files" *}
+        }
+        ]
+    }
+    validateinstfile $np $inp
+}
+
+proc validateinstfile {np inp} {
+    global tcl_platform expgui newhist
+    if {$inp == ""} return
+    if [catch {set in [open $inp r]}] {
+        tk_dialog .err "Open error" "Unable to open file $inp" \
+                error 0 OK
+        return 
+    }
+    set newhist(instbanks) {}
+    foreach child [pack slaves $np.set] {destroy $child}
+    # is this a properly formatted file?
+    if {$tcl_platform(platform) == "windows"} {
+        # are lines the correct length?
+
+        #--> can we check that lines are terminated CR-LF?
+
+        while {[set len [gets $in line]] > 0} {
+            if {$len != 80} {
+                set ans [tk_dialog .err "Read error" \
+                        "File $inp is not direct access. OK to convert?" \
+                        error 0 OK QUIT]
+                if {$ans == 0} {
+                    close $in
+                    WinCvt $inp
+                    set in [open $inp r]
+                    set line {}
+                } else {
+                    return
+                }
+            }
+            # scan for the INS   BANK line
+            if {[string first "INS   BANK" $line] == 0} {
+                set newhist(instbanks) \
+                        [string trim [string range $line 12 end]]
             }
         }
@@ -387 +507 @@
         }
         seek $in 0
-        set i 0
-        while {[string length [set line [read $in 80]]] == 80} {
-            incr i
-            # scan for BANK lines
-            if {[string first BANK $line] == 0} {
-                scan $line "BANK%d" num
-                lappend newhist(banklist) $num
-            }
-            # check for "Instrument parameter file" line
-            if {$i == 2 && [string first "Instrument parameter" $line] == 0} {
-                validateinstfile $np \
-                        [file join [file dirname $inp] \
-                        [string trim [string range $line 26 end]]]
-            }
-        }
-    }
-    # were banks found?
-    if {$newhist(banklist) == ""} {
-        tk_dialog .err "Read error" \
-                "File $inp has no BANK lines. This is not a valid GSAS data file." \
-                error 0 OK
-        return
-    }
-    set newhist(rawfile) $inp
-    foreach i $newhist(banklist) {
-#       pack [checkbutton $np.bank.$i -text $i \
-#               -variable newhist(bank$i)] -side left
-        pack [radiobutton $np.bank.$i -text $i \
-                -variable newhist(banknum) -value $i] -side left
-    }
-}
-
-proc getinstfile {np} {
-    global newhist tcl_platform
-    if {$tcl_platform(platform) == "windows"} {
-        set inp [
-        tk_getOpenFile -parent $np -initialfile $newhist(instfile) -filetypes {
-            {"Inst files" .INST} {"Inst files" .INS} 
-            {"Inst files" .PRM} {"All files" *}
-        }
-        ]
-    } else {
-        set inp [
-        tk_getOpenFile -parent $np -initialfile $newhist(instfile) -filetypes {
-            {"Inst files" .INS*} {"Inst files" .ins*} 
-            {"Inst files" .PRM}  {"Inst files" .prm} 
-            {"All files" *}
-        }
-        ]
-    }
-    validateinstfile $np $inp
-}
-
-proc validateinstfile {np inp} {
-    global tcl_platform expgui newhist
-    if {$inp == ""} return
-    if [catch {set in [open $inp r]}] {
-        tk_dialog .err "Open error" "Unable to open file $inp" \
-                error 0 OK
-        return 
-    }
-    set newhist(instbanks) {}
-    foreach child [pack slaves $np.set] {destroy $child}
-    # is this a properly formatted file?
-    if {$tcl_platform(platform) == "windows"} {
-        # are lines the correct length?
-
-        #--> can we check that lines are terminated CR-LF?
-
-        while {[set len [gets $in line]] > 0} {
-            if {$len != 80} {
-                set ans [tk_dialog .err "Read error" \
-                        "File $inp is not direct access. OK to convert?" \
-                        error 0 OK QUIT]
-                if {$ans == 0} {
-                    close $in
-                    WinCvt $inp
-                    set in [open $inp r]
-                    set line {}
-                } else {
-                    return
-                }
-            }
-            # scan for the INS   BANK line
-            if {[string first "INS   BANK" $line] == 0} {
-                set newhist(instbanks) \
-                        [string trim [string range $line 12 end]]
-            }
-        }
-    } else {
-        # is the file one big record?
-        set len [gets $in line]
-        if {$len <= 80} {
-            set ans [tk_dialog .err "Read error" \
-                    "File $inp is not direct access. OK to convert?" \
-                    error 0 OK QUIT]
-            if {$ans == 0} {
-                close $in
-                set oldname ${inp}.original
-                file rename $inp $oldname
-                if [catch {
-                    exec [file join $expgui(gsasexe) convstod] < \
-                            $oldname > $inp
-                } errmsg] {
-                    tk_dialog .warn Notify \
-                            "Error in conversion:\n$errmsg" warning 0 OK
-                }
-                set in [open $inp r]
-                set line {}
-            } else {
-                return
-            }
-        }
-        seek $in 0
         while {[string length [set line [read $in 80]]] == 80} {
             # scan for the INS   BANK line
@@ -592 +598 @@
                     < exptool.in >& exptool.out
         }
-    }
+    } errmsg
     # load the revised exp file
     loadexp $expgui(expfile)
@@ -599 +605 @@
     close $fp
     destroy $np
+    if {$errmsg != ""} {
+        append errmsg "\n" $out
+    } else {
+        set errmsg $out
+    }
     ShowBigMessage \
                  $np \
                  "Please review the result from adding the phase" \
-                 $out
+                 $errmsg
     file delete exptool.in exptool.out
 }
@@ -714 +725 @@
                     < exptool.in >& exptool.out
         }
-    }
+    } errmsg
     # load the revised exp file
     loadexp $expgui(expfile)
@@ -721 +732 @@
     close $fp
     destroy $np
+    if {$errmsg != ""} {
+        append errmsg "\n" $out
+    } else {
+        set errmsg $out
+    }
     ShowBigMessage \
                  $np \
                  "Please review the result from adding the atom" \
-                 $out
+                 $errmsg
     file delete exptool.in exptool.out
 }