Changeset 200

Timestamp:

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

Author:

toby

Message:

# on 2000/06/09 03:50:40, toby did:
Minor cleanups
loop on $expmap(phaselist_$hist) so only used phases are shown

File:

• trunk/orient.tcl (modified) (5 diffs, 3 props)

trunk/orient.tcl

@@ -237 +237 @@
     # loop over histograms and phases
     set row -1
-    set framePO $pOrientf1
     foreach hist $histlist {
-        foreach phase $expmap(phaselist) {
-            grid [frame $framePO.sp$row -bd 8 -bg white] \
+        foreach phase $expmap(phaselist_$hist) {
+            grid [frame $pOrientf1.sp$row -bd 8 -bg white] \
                 -columnspan 20 -column 0 -row [incr row] -sticky nsew
             # add extra label here when more than one histogram is selected
@@ -248 +247 @@
                 set lbl "Phase $phase"
             }
-            grid [label $framePO.l1$row -text $lbl] \
+            grid [label $pOrientf1.l1$row -text $lbl] \
                     -column 0 -row [incr row] -sticky nws
             set naxis [hapinfo $hist $phase POnaxis]
             set col 0
             foreach var {h k l} {
-                grid [label $framePO.l${var}$row -text $var \
+                grid [label $pOrientf1.l${var}$row -text $var \
                         -anchor center] \
                         -column [incr col] -row $row -sticky ews
             }
-            grid [label $framePO.lrat$row -text "Ratio" -anchor center] \
+            grid [label $pOrientf1.lrat$row -text "Ratio" -anchor center] \
                     -column 10 -row $row -sticky ews
             if {$naxis > 1} {
-                grid [label $framePO.lfrac$row -text "Fraction" \
+                grid [label $pOrientf1.lfrac$row -text "Fraction" \
                         -anchor center] \
                         -column 13 -row $row -sticky ews
             }
-            grid [label $framePO.ld$row -text "Damping"] \
+            grid [label $pOrientf1.ld$row -text "Damping"] \
                     -column 15 -row $row -sticky es
             for {set axis 1} {$axis <= $naxis} {incr axis} {
@@ -282 +281 @@
                 incr row
                 set col -1
-                grid [label $framePO.axis$row -text "axis $axis"\
+                grid [label $pOrientf1.axis$row -text "axis $axis"\
                         -anchor center ] \
                         -column [incr col] -row $row
@@ -288 +287 @@
                 # Axis
                 foreach var {h k l} {
-                    grid [entry $framePO.e${var}$row \
+                    grid [entry $pOrientf1.e${var}$row \
                             -textvariable entryvar(${var}$phax) -width 4] \
                             -column [incr col] -row $row
                 }
                 # Ratio
-                grid [entry $framePO.erat$row \
+                grid [entry $pOrientf1.erat$row \
                         -textvariable entryvar(ratio$phax) -width 10] \
                         -column 10 -row $row -sticky e
                 # ratio refine
-                grid [checkbutton $framePO.ratref$row \
+                grid [checkbutton $pOrientf1.ratref$row \
                         -variable entryvar(ratioref$phax)] \
                         -column 11 -row $row -sticky w
                 if {$naxis > 1} {
                     # Fraction
-                    grid [entry $framePO.efrac$row \
+                    grid [entry $pOrientf1.efrac$row \
                             -textvariable entryvar(fraction$phax) -width 10] \
                             -column 13 -row $row -sticky e
                     # fraction refine
-                    grid [checkbutton $framePO.fracref$row \
+                    grid [checkbutton $pOrientf1.fracref$row \
                             -variable entryvar(fracref$phax)] \
                             -column 14 -row $row -sticky w
                 }
                 #damp
-                tk_optionMenu $framePO.opd$row \
+                tk_optionMenu $pOrientf1.opd$row \
                         entryvar(damp$phax) \
                         0 1 2 3 4 5 6 7 8 9
-                grid $framePO.opd$row \
+                grid $pOrientf1.opd$row \
                         -column 15 -row $row -sticky e
             }
-            grid [button $framePO.add$row -text "Add axis" \
+            grid [button $pOrientf1.add$row -text "Add axis" \
                     -command "AddNewPOaxis $hist $phase"] \
                     -column 0 -columnspan 4 -row [incr row] -sticky nws
@@ -323 +322 @@
         }
     }
-    grid [frame $framePO.sp$row -bd 8 -bg white] \
+    grid [frame $pOrientf1.sp$row -bd 8 -bg white] \
             -columnspan 20 -column 0 -row [incr row] -sticky nsew