Changeset 28

Timestamp:

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

Author:

toby

Message:

# on 1999/01/13 05:02:47, toby did:
redo loadexp so that page does not change on reload
Add SaveOptions?

File:

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

trunk/expgui

@@ -3 +3 @@
 
 # to do: 
+#
+# new file menu box w/sort by that allows for new .EXP names
 #
 # global background editing & profile work differently: should both 
@@ -37 +39 @@
 }
 if {$expgui(expfile) == ""} exit
-catch {cd [string trim [file dirname $expgui(expfile)]]}
 
 set expgui(debug) 0
@@ -101 +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 
@@ -150 +152 @@
     wm iconname . [file tail $expfile]
 
-    set expgui(curPhase) ""
     # set the number of phases on the phase page
     setphases
 
-    set expgui(pagenow) ""
-
-    # update the histogram list 
-    sethistlist
-
-    if !$expgui(havetix) {
-        RaisePage lsFrame
-    } else {
-        .n raise lsPane
-        set expgui(pagenow) lsFrame
-    }
-    # select the 1st phase
-    SelectOnePhase [lindex $expmap(phaselist) 0]
-    # disable the "global options" that don't make sense
+    # disable the "global options" that don't make sense based 
+    # on the histograms present
     foreach num {1 2 3 4 5} {
         set flag($num) 0
@@ -192 +181 @@
     set entrycmd(trace) 0
 
-    # least squares page
+    # propogate changes on the least squares page
     set entryvar(cycles) [expinfo cycles]
     set entrycmd(cycles) "expinfo cycles"
@@ -207 +196 @@
     # set fo extaction on LS page
     SetupExtractHist
+
+    # update the histogram list
+    sethistlist
+
     # start checking for external changes
     afterawhile
@@ -342 +335 @@
 
     uplevel #0 {source $script}
+}
+
+# save some of the global options in ~/.gsas_config
+proc SaveOptions {} {
+    global expgui env tcl_platform
+    set fp [open [file join ~ .gsas_config] a]
+    puts $fp "set expgui(archive) $expgui(archive)"
+    puts $fp "set expgui(asorttype) $expgui(asorttype)"
+    puts $fp "set expgui(hsorttype) $expgui(hsorttype)"
+    if {$tcl_platform(platform) != "windows"} {
+        puts $fp "set env(GSASBACKSPACE) $env(GSASBACKSPACE)"
+    }
+    close $fp
 }
 
@@ -891 +897 @@
 proc sethistlist {} {
     global expgui expmap
-    set expgui(curhist) {}
     foreach lbox $expgui(HistSelectList) {
         $lbox.title delete 0 end
@@ -954 +959 @@
         set expmap(histlistboxcontents) [lsort -real -index 1 $histlist]
     }
-    # select the first histogram in the list by default (if there are any)
-    if {[llength $histlist] > 0} {set expgui(curhist) 0}
 
     # title field needs to match longest title
@@ -1576 +1579 @@
                 grid [entry $expgui(ProfileBox).f.$i.ent${num}_${i} \
                         -textvariable entryvar(pterm${num}_$i)\
-                        -width 14] -row $row -column $col
+                        -width 12] -row $row -column $col
                 set entrycmd(pterm${num}_$i) "hapinfo $hist $i pterm$num"
                 set entryvar(pterm${num}_$i) [hapinfo $hist $i pterm$num]
@@ -1751 +1754 @@
             $expgui(lsFrame).f1.a.l$phase config -fg grey
             set expgui(Fextract$phase) {}
-            #foreach item "a.ca$phase a.cb$phase a.cc$phase" 
-            foreach item "a.ca$phase a.cc$phase" {
-                $expgui(lsFrame).f1.$item config -state disabled -bd 1
+            foreach item $expgui(ExtractSettingsRadiobuttons) {
+                ${item}$phase config -state disabled -bd 1
             }
         }
@@ -1765 +1767 @@
                 $expgui(lsFrame).f1.a.l$phase config -fg grey
                 set expgui(Fextract$phase) {}
-#               foreach item "a.ca$phase a.cb$phase a.cc$phase" 
-                foreach item "a.ca$phase a.cc$phase" {
-                    $expgui(lsFrame).f1.$item config -state disabled -bd 1
+                foreach item $expgui(ExtractSettingsRadiobuttons) {
+                    ${item}$phase config -state disabled -bd 1
                 }
             } else {
                 $expgui(lsFrame).f1.a.l$phase config -fg black
-#               foreach item "a.ca$phase a.cb$phase a.cc$phase" 
-                foreach item "a.ca$phase a.cc$phase" {
-                    $expgui(lsFrame).f1.$item config -state normal -bd 2
+                foreach item $expgui(ExtractSettingsRadiobuttons) {
+                    ${item}$phase config -state normal -bd 2
                 }
                 set expgui(Fextract$phase) [hapinfo $histlist $phase extmeth]
@@ -1794 +1794 @@
             if $gotphase($phase) {
                 $expgui(lsFrame).f1.a.l$phase config -fg black
-                foreach item "a.ca$phase a.cb$phase a.cc$phase" {
-                    $expgui(lsFrame).f1.$item config -state normal -bd 2
+                foreach item $expgui(ExtractSettingsRadiobuttons) {
+                    ${item}$phase config -state normal -bd 2
                 }
             } else {
                 $expgui(lsFrame).f1.a.l$phase config -fg grey
-                foreach item "a.ca$phase a.cb$phase a.cc$phase" {
-                    $expgui(lsFrame).f1.$item config -state disabled -bd 1
+                foreach item $expgui(ExtractSettingsRadiobuttons) {
+                    ${item}$phase config -state disabled -bd 1
                 }
             }
@@ -2785 +2785 @@
 #           -row 4 -column $num
 }
+set expgui(ExtractSettingsRadiobuttons) $expgui(lsFrame).f1.a.cc 
+lappend expgui(ExtractSettingsRadiobuttons) $expgui(lsFrame).f1.a.ca
+#lappend expgui(ExtractSettingsRadiobuttons) $expgui(lsFrame).f1.a.cb
+
 grid [label $expgui(lsFrame).f1.a.t -text "Intensity Extraction Method" -anchor c] \
         -column 0 -columnspan 11 -row 0
-grid [label $expgui(lsFrame).f1.a.t0 -text "Histogram #" -anchor c] -column 0 -row 1
+grid [label $expgui(lsFrame).f1.a.t0 -text "Phase #" -anchor c] -column 0 -row 1
 grid [label $expgui(lsFrame).f1.a.t1 -text "Rietveld" -anchor c] -column 0 -row 2
 grid [label $expgui(lsFrame).f1.a.t2 -text "F(calc) Weighted" -anchor c] -column 0 -row 3
@@ -2862 +2866 @@
 #---- Global mode menu button
 $expgui(fm).option.menu add cascade -menu $expgui(fm).option.menu.editmode \
-        -label "Global mode"
+        -label "Multiple hist. selection"
 menu $expgui(fm).option.menu.editmode
 $expgui(fm).option.menu.editmode add radiobutton  -label "Off" \
@@ -2891 +2895 @@
             -variable env(GSASBACKSPACE)
 }
+$expgui(fm).option.menu add command -label "Save Options" -underline 1 \
+        -command "SaveOptions"
 
 pack $expgui(fm).file $expgui(fm).option -side left  -in $expgui(fm)
@@ -2950 +2956 @@
 bind . <Control-c> catchQuit
 
+set expgui(curPhase) ""
+set expgui(pagenow) ""
+set expgui(curhist) {}
+
 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
+}