Changeset 112 for trunk

Timestamp:

Dec 4, 2009 5:00:36 PM (14 years ago)

Author:

toby

Message:

# on 1999/10/11 19:48:35, toby did:
cleanup multiple histogram selection -> single histogram transition

rewrite global profile display code to group or not group phases together

File:

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

trunk/expgui

@@ -224 +224 @@
     set entryvar(cycles) [expinfo cycles]
     set entrycmd(cycles) "expinfo cycles"
-    set expgui(globalmode) 0
+    # set expgui(globalmode) 0
     set expgui(printopt) "Print Options ([expinfo print])"
     set entryvar(title) [expinfo title]
@@ -304 +304 @@
     set expgui(expfile) $newexpfile
     catch {cd [string trim [file dirname $expgui(expfile)]]}
+    set expgui(globalmode) 0
     loadexp $expgui(expfile)
 
@@ -1078 +1079 @@
 proc DisplayHistogram {} {
     global expgui entrycmd entryvar expmap
+
+    # trap if more than one histogram is selected unless global mode
+    if {$expgui(globalmode) == 0 && [llength $expgui(curhist)] > 1} {
+        set expgui(curhist) [lindex $expgui(curhist) 0] 
+    }
 
     # display the selected histograms
@@ -1447 +1453 @@
     global expgui entrycmd entryvar expmap
 
+    # trap if more than one histogram is selected unless global mode
+    if {$expgui(globalmode) == 0 && [llength $expgui(curhist)] > 1} {
+        set expgui(curhist) [lindex $expgui(curhist) 0] 
+    }
+
     # display the selected histograms
     $expgui(fracFrame).hs.lbox selection clear 0 end
@@ -1577 +1588 @@
 proc DisplayProfile {} {
     global expgui entrycmd entryvar expmap
+
+    # trap if more than one histogram is selected unless global mode
+    if {$expgui(globalmode) == 0 && [llength $expgui(curhist)] > 1} {
+        set expgui(curhist) [lindex $expgui(curhist) 0] 
+    }
+    # display the selected histograms
     $expgui(profFrame).hs.lbox selection clear 0 end
     foreach h $expgui(curhist) {
@@ -1660 +1677 @@
         # disable traces on entryvar for right now
         set entrycmd(trace) 0
-        # loop through histograms & phases, set up an array by type
-        catch {unset ptypearray histarray phasearray}
+        # loop through histograms & phases, set up an array by phase & profile type
+        catch {unset prtyparray histarray phasearray}
         foreach hist $histlist {
-            foreach i $expmap(phaselist_$hist) {
-                set ptype [string trim [hapinfo $hist $i proftype]]
-                lappend ptypearray(${ptype}_$i) $hist
-                lappend histarray($ptype) $hist
-                lappend phasearray($ptype) $i
+            foreach phase $expmap(phaselist_$hist) {
+                set prtyp [string trim [hapinfo $hist $phase proftype]]
+                set key ${prtyp}_$phase
+                lappend prtyparray($key) $hist
+                lappend histarray($key) $hist
+                lappend phasearray($key) $phase
             }
         }
         
         set ptype ""
-        set title ""
-        set ind -1
-        foreach key "[lsort [array names ptypearray]] 0_0" {
+        set i -1
+        # loop over all combined phases and profile types, sorted 1st by profile number
+        foreach key [lsort [array names prtyparray]] {
             # split key
-            scan $key %d_%d type p
-            # 1st time through
-            if {$ptype == ""} {set ptype $type}
-            if {$ptype == $type} {
-                # we've seen this one before
-                if {$title != ""} {append title "\n"}
-                append title "Phase $p, hist [CompressList $ptypearray($key)]"
-            } else {
-                set hist [lindex $histarray($ptype) 0]
-                set phase [lindex $phasearray($ptype) 0]
-                set nterms [hapinfo $hist $phase profterms]
-                set htype [string range $expmap(htype_$hist) 2 2]
+            scan $key %d_%d prftyp p
+
+            if {$ptype != $prftyp || !$expgui(globalphasemode)} {
+                set ptype $prftyp
+                set curhistlist $histarray($key)
+                set curphaslist $phasearray($key)
+                
+                set hist1 [lindex $curhistlist 0]
+                set phase1 [lindex $curphaslist 0]
+                set nterms [hapinfo $hist1 $phase1 profterms]
+                set htype [string range $expmap(htype_$hist1) 2 2]
                 set lbls $expgui(prof-$htype-$ptype)
-                set i $ptype
-                # Create one frame for this type
-                incr ind
+                # for type 4, add extra terms depending on the cell type
+                if {$ptype == 4} {set lbls [type4lbls $lbls $nterms $phase1]}
+                # Create a frame for this type
+                incr i
+                set boxtitle "Phase $p, hist [CompressList $histarray($key)]"
                 grid [frame $expgui(ProfileBox).f.$i -relief groove -bd 4] \
-                        -column 0 -row $ind -sticky ew
+                        -column 0 -row $i -sticky ew
                 grid [frame $expgui(ProfileBox).f.$i.0] \
                         -column 0 -row 0 -columnspan 20 -sticky ew
@@ -1699 +1718 @@
                         -text "Profile Type $ptype   "] -row 0 -column 0
                 grid [label $expgui(ProfileBox).f.$i.0.1  \
-                        -text $title -anchor w] -row 0 -column 1
+                        -anchor w] -row 0 -column 1
                 grid [frame $expgui(ProfileBox).f.$i.1] \
                         -column 0 -row 1 -columnspan 20 -sticky ew
@@ -1705 +1724 @@
                         -text "Damping"] -row 0 -column 2
                 tk_optionMenu $expgui(ProfileBox).f.$i.1.tkOptDamp \
-                        entryvar(pdamp_$ptype) 0 1 2 3 4 5 6 7 8 9
-                set entrycmd(pdamp_$ptype) "hapinfo \
-                        [list $histarray($ptype)] \
-                        [list $phasearray($ptype)] pdamp"
-                set entryvar(pdamp_$ptype) [hapinfo $hist $phase pdamp]
+                        entryvar(pdamp_$i) 0 1 2 3 4 5 6 7 8 9
                 grid $expgui(ProfileBox).f.$i.1.tkOptDamp -row 0 -column 3
                 grid [button $expgui(ProfileBox).f.$i.1.edit \
-                        -text "Global Edit" \
-                        -command "EditProfile [list $title] \
-                        [list $histarray($ptype)]  [list $phasearray($ptype)] " \
-                        ] -row 0 -column 4 -sticky w
-                # for type 4, add extra terms depending on the cell type
-                if {$ptype == 4} {set lbls [type4lbls $lbls $nterms $phase]}
+                        -text "Global Edit"] -row 0 -column 4 -sticky w
+                set entryvar(pdamp_$i) [hapinfo $hist $phase pdamp]
                 set col -1
                 set row 2
@@ -1725 +1736 @@
                     if {$term == ""} {set term $num}
                     incr col
-                    grid [label $expgui(ProfileBox).f.$i.l${num}_${i} -text "$term"] \
-                            -row $row -column $col
+                    grid [label $expgui(ProfileBox).f.$i.l${num}_${i} \
+                            -text "$term"] -row $row -column $col
                     incr col
                     grid [checkbutton $expgui(ProfileBox).f.$i.ref${num}_${i} \
                             -variable entryvar(pref${num}_$i)] \
                             -row $row -column $col
-                    set entrycmd(pref${num}_$i) "hapinfo \
-                            [list $histarray($ptype)] \
-                            [list $phasearray($ptype)] pref$num"
                     set entryvar(pref${num}_$i) [hapinfo $hist $phase pref$num]
                     if {$col > 10} {set col -1; incr row}
                 }
                 grid columnconfigure $expgui(ProfileBox).f 0 -weight 1
-                set ptype ""
+            } else {
+                # add to the current entry
+                eval lappend curhistlist $histarray($key)
+                eval lappend curphaslist $phasearray($key)
+                append boxtitle "\nPhase $p, hist [CompressList $histarray($key)]"
+            }
+            $expgui(ProfileBox).f.$i.0.1 config -text $boxtitle
+            $expgui(ProfileBox).f.$i.1.edit config -command "\
+                    EditProfile \"\n$boxtitle\" \
+                    [list $curhistlist] \
+                    [list $curphaslist]"
+            set entrycmd(pdamp_$i) "hapinfo \
+                    [list $curhistlist] \
+                    [list $curphaslist] pdamp"
+            for { set num 1 } { $num <= $nterms } { incr num } {
+                set entrycmd(pref${num}_$i) "hapinfo \
+                        [list $curhistlist] \
+                        [list $curphaslist] pref$num"
             }
         }
@@ -2905 +2930 @@
         -variable expgui(globalmode) -underline 0 -value 5 \
         -command sethistlist
-set  expgui(globalmode) 0
+$expgui(fm).option.menu.editmode add separator
+$expgui(fm).option.menu.editmode add checkbutton \
+        -label "Group phases together" \
+        -variable expgui(globalphasemode) \
+        -command sethistlist
+
+set expgui(globalmode) 0
+set expgui(globalphasemode) 1
 
 if {$tcl_platform(platform) != "windows"} {