Changeset 250 for trunk/expgui

Timestamp:

Dec 4, 2009 5:02:54 PM (14 years ago)

Author:

toby

Message:

# on 2000/07/28 20:29:34, toby did:
add phase flag box to histogram page when more than one phase is present
define GetPhaseFlags? & SetPhaseFlag? to implement above
fix title on edit background
label background type (as suggested by Barb & Lachlan)
start paring out "shell" capabilities for Mac

File:

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

trunk/expgui

@@ -424 +424 @@
 Jonathan Wasserman and Brian Toby\n\
 NIST Center for Neutron Research\n\n\
-1998, Not subject to copyright\n\n\
+2000, Not subject to copyright\n\n\
 Revision [lindex $expgui(Revision) 1] (readexp.tcl [lindex $expmap(Revision) 1])\n\n\
 Generalized Structure Analysis System (GSAS)\n\
@@ -1303 +1303 @@
     }
     # Top box
+    if $expgui(haveBW) {
+        catch {destroy $expgui(histFrame).pflag}
+    }
     if {$expgui(globalmode) != 0} {
         $expgui(histFrame).top.txt config \
@@ -1311 +1314 @@
         grid forget $expgui(histFrame).top
         set expgui(bkglbl) "Edit Background"
+        if {$expgui(haveBW) && [llength $expmap(phaselist)] > 1} {
+            TitleFrame $expgui(histFrame).pflag  \
+                    -borderwidth 4 -side left -relief groove \
+                    -text "Phase Flags"
+            set expgui(pflag) [$expgui(histFrame).pflag getframe]
+            grid $expgui(histFrame).pflag -column 1 -row 1 -sticky nsew
+            grid rowconfigure $expgui(histFrame) 2 -minsize 35
+            foreach p $expmap(phaselist) {
+                pack [checkbutton $expgui(pflag).$p \
+                        -command "GetPhaseFlags $hist" \
+                        -variable expgui(pflag$p) -text $p] -side left
+                if {[lsearch $expmap(phaselist_$hist) $p] == -1} {
+                    set expgui(pflag$p) 0
+                } else {
+                    set expgui(pflag$p) 1
+                }
+            }
+        }
     }
 
@@ -1617 +1638 @@
 }
 
+proc GetPhaseFlags {hist} {
+    global expmap expgui
+    set plist {}
+    foreach p $expmap(phaselist) {
+        if {$expgui(pflag$p)} {lappend plist $p}
+    }
+    SetPhaseFlag $hist $plist
+    incr expgui(changed)
+    mapexp
+}
+
+proc SetPhaseFlag {hist plist} {
+    # make a 2 digit key -- hh
+    if {$hist < 10} {
+        set hh " $hist"
+    } else {
+        set hh $hist
+    }
+    set key "HST $hh NPHAS"
+    set str {}
+    foreach iph {1 2 3 4 5 6 7 8 9} {
+        if {[lsearch $plist $iph] != -1} {
+            append str {    1}
+        } else {
+            append str {    0}      
+        }
+    }
+    setexp $key $str 1 68
+}
+
 #-----------------------------------------------------------------------
 # populate the Scaling page
@@ -2096 +2147 @@
     toplevel $w -bg beige
     if {$expgui(globalmode) != 0} {
+        wm title $w "Global Edit Background" 
+    } else {
         wm title $w "Edit Background" 
-    } else {
-        wm title $w "Global Edit Background" 
     }
     
@@ -2122 +2173 @@
     set expgui(orig_backtype) $expgui(backtype)
     set expgui(prev_backtype) $expgui(backtype)
-    eval tk_optionMenu $w.0.type expgui(backtype) {1 2 3 4 5 6}
+    set typemenu [tk_optionMenu $w.0.type expgui(backtype) null]
+    $typemenu delete 0 end
+    foreach item {
+        "1 - Shifted Chebyshev"
+        "2 - Cosine Fourier series"
+        "3 - Radial distribution peaks"
+        "4 - Power series in Q**2n/n!"
+        "5 - Power series in n!/Q**2n"
+        "6 - Power series in Q**2n/n! and n!/Q**2n"
+        "7 - Linear interpolation function"
+        "8 - Reciprocal interpolation function"
+    } {
+        set val [lindex $item 0]
+        $typemenu insert end radiobutton -variable expgui(backtype) \
+                -label $item -value $val
+    }
+
     grid $w.0.type   -row 1 -column 1
     grid [label $w.0.c -text "  Number of terms"  -bg beige] -row 1 -column 2
@@ -2343 +2410 @@
             -bg beige] -row 0 -column 0 -columnspan 10
     grid [label $w.0.b -text "Function type $ptype"  -bg beige]  -row 1 -column 0
-
-    # number of terms
-    #    set expgui(backtype) [histinfo $hist backtype]
-    #    set expgui(orig_backtype) $expgui(backtype)
-    #    set expgui(prev_backtype) $expgui(backtype)
-    #    eval tk_optionMenu $w.0.type expgui(backtype) {1 2 3 4 5 6}
-    #    grid $w.0.type   -row 1 -column 1
-
     grid [label $w.0.c -text "  Peak cutoff" -bg beige] -row 1 -column 3 
     grid [entry $w.0.d -width 10 ]  -row 1 -column 4
@@ -3075 +3134 @@
     $expgui(fm).file.menu add command -label "Reset" -command "reset"
 }
-$expgui(fm).file.menu add command -label "expnam" -command readnewexp
+if {$tcl_platform(platform) != "macintosh"} {
+    $expgui(fm).file.menu add command -label "expnam" -command readnewexp
+}
 $expgui(fm).file.menu add command -label "Save" -underline 0 \
         -command savearchiveexp
@@ -3097 +3158 @@
 menu $expgui(fm).option.menu
 
-$expgui(fm).option.menu add checkbutton  -label "Archive EXP" \
-        -variable expgui(archive)
-$expgui(fm).option.menu add checkbutton  -label "Use DISAGL window" \
-        -variable expgui(disaglSeparateBox)
-
+if {$tcl_platform(platform) != "macintosh"} {
+    $expgui(fm).option.menu add checkbutton  -label "Archive EXP" \
+            -variable expgui(archive)
+    $expgui(fm).option.menu add checkbutton  -label "Use DISAGL window" \
+            -variable expgui(disaglSeparateBox)
+}
 $expgui(fm).option.menu add cascade -menu  $expgui(fm).option.menu.asort \
         -label "Sort atoms by"
@@ -3160 +3222 @@
 set expgui(globalphasemode) 1
 
-if {$tcl_platform(platform) != "windows"} {
+if {$tcl_platform(platform) == "unix"} {
     $expgui(fm).option.menu  add checkbutton -label "Override backspace" \
             -variable env(GSASBACKSPACE)
@@ -3172 +3234 @@
 pack $expgui(fm).file $expgui(fm).option -side left  -in $expgui(fm)
 
-foreach menu $expgui(menunames) {
-    set m [string tolower $menu]
-    pack [menubutton $expgui(fm).$m -text $menu \
-            -menu $expgui(fm).$m.menu] -side left
-    menu $expgui(fm).$m.menu
+if {$tcl_platform(platform) != "macintosh"} {
+    foreach menu $expgui(menunames) {
+        set m [string tolower $menu]
+        pack [menubutton $expgui(fm).$m -text $menu \
+                -menu $expgui(fm).$m.menu] -side left
+        menu $expgui(fm).$m.menu
+    }
 }
 pack $expgui(fm).help  -side right -in $expgui(fm)
 
-# add the commands in expgui_menulist 
-foreach menu [array names expgui_menulist ] {
-    foreach cmd $expgui_menulist($menu) {
-        set action {}
-        set opt {}
-        catch {set action [lindex $expgui_cmdlist($cmd) 0]}
-        catch {set opt [lindex $expgui_cmdlist($cmd) 2]}
-        if {$expgui(debug) && $action == ""} {puts "blank command for $cmd"}
-        if {$action != "" && $action != "-"} {
-            eval $expgui(fm).$menu.menu add command \
-                    -label $cmd $opt -command [list [subst $action]]
-            if {[lindex $opt 0] == "-underline"} {
-                catch {
-                    set num [lindex $opt 1]
-                    set key [string range $cmd $num $num]
-                    bind . <Alt-[string tolower $key]> [subst $action]
-                    bind . <Alt-[string toupper $key]> [subst $action]
+if {$tcl_platform(platform) != "macintosh"} {
+    # add the commands in expgui_menulist 
+    foreach menu [array names expgui_menulist ] {
+        foreach cmd $expgui_menulist($menu) {
+            set action {}
+            set opt {}
+            catch {set action [lindex $expgui_cmdlist($cmd) 0]}
+            catch {set opt [lindex $expgui_cmdlist($cmd) 2]}
+            if {$expgui(debug) && $action == ""} {puts "blank command for $cmd"}
+            if {$action != "" && $action != "-"} {
+                eval $expgui(fm).$menu.menu add command \
+                        -label $cmd $opt -command [list [subst $action]]
+                if {[lindex $opt 0] == "-underline"} {
+                    catch {
+                        set num [lindex $opt 1]
+                        set key [string range $cmd $num $num]
+                        bind . <Alt-[string tolower $key]> [subst $action]
+                        bind . <Alt-[string toupper $key]> [subst $action]
+                    }
                 }
             }
@@ -3219 +3285 @@
     }
 }
-# set up button bar
-foreach cmd $expgui(buttonlist) {
-    set action {}
-    catch {set action [lindex $expgui_cmdlist($cmd) 0]}
-    if {$expgui(debug) && $action == ""} {puts "blank command for $cmd"}
-    if {$action != ""} {
-        pack [eval button .bar.$cmd -bg beige -activebackground yellow \
-                -text $cmd -command [list [subst $action]]] -side left
+if {$tcl_platform(platform) != "macintosh"} {
+    # set up button bar
+    foreach cmd $expgui(buttonlist) {
+        set action {}
+        catch {set action [lindex $expgui_cmdlist($cmd) 0]}
+        if {$expgui(debug) && $action == ""} {puts "blank command for $cmd"}
+        if {$action != ""} {
+            pack [eval button .bar.$cmd -bg beige -activebackground yellow \
+                    -text $cmd -command [list [subst $action]]] -side left
+        }
     }
 }