Changeset 1152 for branches/sandbox/expgui

Timestamp:

Jul 6, 2011 5:23:09 PM (10 years ago)

Author:

toby

Message:

a bit of cleanup

File:

• branches/sandbox/expgui (modified) (6 diffs)

branches/sandbox/expgui

@@ -1811 +1811 @@
         set expgui(backtermlbl) ""
         set expgui(backtypelbl) ""
+        set expgui(abstypelbl) "" 
         foreach var {bref bdamp absref absdamp} {
             set entrycmd($var) ""
@@ -1827 +1828 @@
         set expgui(backtermlbl) ""
         set expgui(backtypelbl) ""
+        set expgui(abstypelbl) "" 
         foreach var {bref bdamp absref absdamp} {
             set entrycmd($var) "histinfo [list $histlist] $var"
@@ -1856 +1858 @@
             set entrycmd($var) "histinfo $hist $var"
             set entryvar($var) [eval $entrycmd($var)]
+        }
+        set abstype [histinfo $hist abstype]
+        if {$abstype > 1} {
+            set expgui(abstypelbl) "  Model #$abstype, values: [histinfo $hist abscor1], [histinfo $hist abscor2]"
+        } else {
+            set expgui(abstypelbl) "  Model #$abstype, value: [histinfo $hist abscor1]"
         }
     }
@@ -3262 +3270 @@
     RecordMacroEntry "incr expgui(changed)" 0
     destroy $top
+    DisplayHistogram
 }
 
@@ -3906 +3915 @@
             -row 2 -column 4 -sticky news -padx 4 -pady 3 -sticky e
     # Absorption information.
+    set expgui(abstypelbl) ""
+    grid [label $expgui(absBox).lbl1 \
+              -textvariable expgui(abstypelbl)] \
+            -row 1 -column 1 -columnspan 5 -sticky nws
     grid [label $expgui(absBox).rf1 -text "  Refine Abs./Refl." ] \
-            -row 2 -column 1 -sticky news -padx 4 -pady 3
+            -row 2 -column 1 -sticky news -padx 2 -pady 3
     grid [checkbutton $expgui(absBox).rf2 -text "" \
             -variable  entryvar(absref) ] \
@@ -3915 +3928 @@
     tk_optionMenu $expgui(absBox).d2  entryvar(absdamp) 0 1 2 3 4 5 6 7 8 9
     grid $expgui(absBox).d2 \
-            -row 2 -column 4 -sticky news -padx 4 -pady 3 -sticky e
+        -row 2 -column 4 -sticky news -padx 4 -pady 3 -sticky e
     grid [button $expgui(absBox).edit -textvariable expgui(abslbl) \
-            -command editabsorption] \
-            -row 2 -column 5 -sticky w -padx 2 -pady 3
+              -command editabsorption] \
+        -row 2 -column 5 -sticky nsw -padx 2 -pady 3
 
     #^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^END OF HISTOGRAM PANE CODE ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^