Changeset 30 for trunk

Timestamp:

Dec 4, 2009 4:59:12 PM (14 years ago)

Author:

toby

Message:

# on 1999/01/20 19:29:10, toby did:
use custom file open box
allow for a new .EXP file to be opened from a dialog
add filesort option
add phase select to readnewexp
fix bug in SetupExtractHist? for empty .EXP files

File:

• trunk/expgui (modified) (10 diffs, 3 props)

trunk/expgui

@@ -4 +4 @@
 # to do: 
 #
-# new file menu box w/sort by that allows for new .EXP names
+# need to change heading and button label depending on where getExpFileName
+# is called from
+#
+# fixup documentation and you are done!
 #
 # global background editing & profile work differently: should both 
@@ -28 +31 @@
 
 if {$argv != ""} {
-    set expgui(expfile) [lindex $argv 0]
+    set expgui(expfile) $argv
     if {[string toupper [file extension $expgui(expfile)]] != ".EXP"} {
         append expgui(expfile) ".EXP"
     }
 } else {
-    # windows needs this update or focus gets screwed up after tk_getOpenFile
-    update
-    set expgui(expfile) [tk_getOpenFile -defaultextension .EXP \
-        -filetypes {{"GSAS Experiment" ".EXP"}} -parent .]
-}
-if {$expgui(expfile) == ""} exit
+    set expgui(expfile) {}
+}
 
 set expgui(debug) 0
@@ -59 +58 @@
 set liveplot(hst) 1
 set liveplot(legend) 1
+set expgui(filesort) 1
 
 #=============================================================================
@@ -102 +102 @@
 set expgui(gsasdir) [file dirname $expgui(scriptdir)]
 set expgui(gsasexe) [file join $expgui(gsasdir) exe]
-catch {cd [string trim [file dirname $expgui(expfile)]]}
 #----------------------------------------------------------------
 # fetch EXP file processing routines 
@@ -119 +118 @@
 }
 #---------------------------------------------------------------------------
+if {$expgui(expfile) != ""} {
+    if ![file exists $expgui(expfile)] {
+        update
+        set ans [tk_dialog .expFileErrorMsg "File Open Error" \
+                "File $expgui(expfile) does not exist" error 0 "Create" "Open other"]
+        if $ans {set expgui(expfile) {}}
+    }
+}
+if {$expgui(expfile) == ""} {
+    # windows needs this update or focus gets screwed up after tk_getOpenFile
+    update
+    set expgui(expfile) [getExpFileName old]
+}
+if {$expgui(expfile) == ""} exit
+# you've been warned this .EXP does not exist!
 if ![file exists $expgui(expfile)] {
-    set ans [tk_dialog .expFileErrorMsg "File Open Error" \
-            "File $expgui(expfile) does not exist" error 0 "Exit" "Create"]
-    if $ans {
-        # create an "empty" exp file
-        createexp $expgui(expfile) \
-                [getstring "title for experiment $expgui(expfile)" 60 0]
-    } else {
-        exit
-    }
-}
+    puts "creating $expgui(expfile)"
+    # create an "empty" exp file
+    createexp $expgui(expfile) \
+            [getstring "title for experiment $expgui(expfile)" 60 0]
+}
+catch {cd [string trim [file dirname $expgui(expfile)]]}
 
 #
@@ -235 +245 @@
 proc SaveAsFile {} {
     global expgui
-    set newexpfile [tk_getSaveFile -defaultextension .EXP \
-        -filetypes {{"GSAS Experiment" ".EXP"}} -parent . \
-        -initialdir [file dirname $expgui(expfile)] \
-        -initialfile [file tail $expgui(expfile)] ]
+    set newexpfile [getExpFileName new]
     if {$newexpfile == ""} return 
     set expgui(expfile) $newexpfile
@@ -254 +261 @@
 # called to read a different .EXP file
 proc readnewexp {} {
-    global expgui
+    global expgui expmap
     if $expgui(changed) {
         set decision [tk_dialog .instrSaveData {Save .EXP changes} \
@@ -265 +272 @@
         }
     }
-    set newexpfile [tk_getOpenFile -defaultextension .EXP \
-        -filetypes {{"GSAS Experiment" ".EXP"}} -parent . \
-        -initialdir [file dirname $expgui(expfile)] ]
+    set newexpfile [getExpFileName old]
     if {$newexpfile == ""} return 
     set expgui(expfile) $newexpfile
     catch {cd [string trim [file dirname $expgui(expfile)]]}
     loadexp $expgui(expfile)
+
+    # select the 1st phase
+    SelectOnePhase [lindex $expmap(phaselist) 0]
+    # select the first histogram in the list by default (if there are any)
+    if {[llength $expmap(histlistboxcontents)] > 0} {set expgui(curhist) 0}
+    if !$expgui(havetix) {
+        RaisePage lsFrame
+    } else {
+        .n raise lsPane
+        set expgui(pagenow) lsFrame
+    }
 }
 
@@ -344 +360 @@
     puts $fp "set expgui(asorttype) $expgui(asorttype)"
     puts $fp "set expgui(hsorttype) $expgui(hsorttype)"
+    puts $fp "set expgui(filesort) $expgui(filesort)"
     if {$tcl_platform(platform) != "windows"} {
         puts $fp "set env(GSASBACKSPACE) $env(GSASBACKSPACE)"
@@ -1747 +1764 @@
     set histlist {}
     foreach item $expgui(curhist) {
-        lappend histlist [lindex $expmap(powderlist) $item]
+        set hist [lindex $expmap(powderlist) $item]
+        if {$hist != ""} {lappend histlist $hist}
     }
     set entrycmd(fobsextract) "histinfo [list $histlist] foextract"
-    if {[llength $histlist] == 0} {
+    if {[llength $histlist] == 0 || [string trim $histlist] == ""} {
         foreach phase {1 2 3 4 5 6 7 8 9} {
             $expgui(lsFrame).f1.a.l$phase config -fg grey