Changeset 907

Timestamp:

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

Author:

toby

Message:

# on 2008/04/15 17:12:02, toby did:
fix child window parentage
record macros

File:

• trunk/excledt.tcl (modified) (38 diffs, 3 props)

trunk/excledt.tcl

@@ -3 +3 @@
 # create the main Excluded Region window
 proc ExclReaddata {box} { 
-    global expgui
+    global expgui graph
 #    if [catch {
         set loadtime [time {
@@ -9 +9 @@
 #       }]
         if $expgui(debug) {
-            tk_dialog .time "Timing info" \
+            tk_dialog $graph(exclbox).time "Timing info" \
                     "Histogram loading took $loadtime" "" 0 OK
         }
@@ -217 +217 @@
 # show tickmark options
 proc minioptionsbox {num} {
-    global blt_version tcl_platform peakinfo expgui
-    set bx .opt$num
+    global blt_version tcl_platform peakinfo expgui graph
+    set bx $graph(exclbox).opt$num
     catch {destroy $bx}
     toplevel $bx
@@ -263 +263 @@
 }
 
-proc makepostscriptout {} {
+proc MakePostscriptOut {{parent {}}} {
     global graph
     if !$graph(printout) {
@@ -280 +280 @@
         }
         if {$msg != ""} {
-            tk_dialog .msg "file created" \
+            tk_dialog $parent.msg "file created" \
                     "Postscript file processed with command \
                     $graph(outcmd). Result: $msg" "" 0 OK
         } else {
-            tk_dialog .msg "file created" \
+            tk_dialog $parent.msg "file created" \
                     "Postscript file processed with command \
                     $graph(outcmd)" "" 0 OK
@@ -291 +291 @@
         $graph(plot) postscript output $graph(outname) -landscape 1 \
                 -decorations no -height 7.i -width 9.5i    
-        tk_dialog .msg "file created" \
+        tk_dialog $parent.msg "file created" \
                 "Postscript file $graph(outname) created" "" 0 OK
     }
@@ -311 +311 @@
 }
 
-proc setpostscriptout {} {
+proc SetPostscriptOut {{parent ""}} {
     global graph tcl_platform
-    set box .out
+    set box ${parent}.out
     catch {destroy $box}
     toplevel $box
@@ -340 +340 @@
 }
 
-proc getsymopts {"sym obs"} {
+proc GetSymbolOpts {"sym obs" {parent ""} {
     global expgui peakinfo
-    set box .out
+    set box $parent.out
     catch {destroy $box}
     toplevel $box
     focus $box
-    wm title .out "Set $sym symbol"
+    wm title $box "Set $sym symbol"
     pack [frame $box.d] -side left -anchor n
     pack [label $box.d.t -text "Symbol type"] -side top
@@ -362 +362 @@
     pack [label $box.e.l -text "Symbol Size"] -side top
     pack [scale $box.e.s -variable expgui(size) \
-            -from .1 -to 3 -resolution 0.05] -side top
+            -from 0.1 -to 3 -resolution 0.05] -side top
     pack [frame $box.a] -side bottom
     pack [button $box.a.1 -text "Apply" -command "setsymopts $sym"] -side left
@@ -518 +518 @@
             global graph
             if {$graph(exclPrompt)} {
-                set ans [MyMessageBox -parent . -message $msg \
+                set ans [MyMessageBox -parent $graph(exclbox) -message $msg \
                         -helplink "expguierr.html ExcludeRegion" \
                         -title "Delete region" -type okcancel]
@@ -535 +535 @@
     } else {
         histinfo $hst excl set $newlist
+        RecordMacroEntry "histinfo $hst excl set [list $newlist]" 0
+        RecordMacroEntry "incr expgui(changed)" 0
         updateplot
     }
@@ -623 +625 @@
     global graph
     if {$graph(exclPrompt)} {
-        set ans [MyMessageBox -parent . -message $msg -title "Exclude?"\
+        set ans [MyMessageBox -parent $graph(exclbox) -message $msg -title "Exclude?"\
                 -type okcancel -helplink "expguierr.html ExcludeRegion"]
     } else {
@@ -690 +692 @@
     }
     histinfo $graph(hst) excl set $exclist
+    RecordMacroEntry "histinfo $graph(hst) excl set [list $exclist]" 0
+    RecordMacroEntry "incr expgui(changed)" 0
 }
 
@@ -696 +700 @@
     global expmap graph expgui
     set hst $graph(hst)
+    set box $graph(exclbox).limit
     if {[string trim [string range $expmap(htype_$hst) 3 3]] == "D"} {
         if {[string range $expmap(htype_$hst) 2 2] == "T"} {
@@ -711 +716 @@
         return
     }
-    set box .limit
     toplevel $box
     wm title $box "Set usable range"
@@ -830 +834 @@
         if {$oldtmin != $tmin} {
             # edited minimum time -- reset d-min & set CHANS -- use EXPEDT
-            SetTminTOF $tmin [winfo parent $graph(plot)]
+            SetTminTOF $tmin $hst [winfo parent $graph(plot)]
             # Qmax got bigger. Show the new data?
             if {$tmin < $oldtmin} {QmaxIncreased}
@@ -839 +843 @@
             # edited 2theta or Energy max -- reset d-min
             histinfo $hst dmin set [tod $tmax $hst]
+            RecordMacroEntry "histinfo $hst dmin set [tod $tmax $hst]" 0
+            RecordMacroEntry "incr expgui(changed)" 0
             if {$tmax > $oldtmax} {QmaxIncreased}
         }
@@ -852 +858 @@
     append msg "to see the full range of data displayed. Do you want to "
     append msg "run POWPREF (& possibly GENLES with zero cycles)?"
-    set ans [MyMessageBox -parent . -message $msg -title "Process limits?"\
+    set ans [MyMessageBox -parent $graph(exclbox) -message $msg -title "Process limits?"\
             -helplink "expguierr.html ProcessRegions" \
             -type {Skip {Run POWPREF} {Run POWPREF & GENLES}}]
@@ -912 +918 @@
         }
         append msg "OK to make this change?"
-        set ans [MyMessageBox -parent . -message $msg -title "Reset limits?"\
+        set ans [MyMessageBox -parent $graph(exclbox) -message $msg -title "Reset limits?"\
                 -helplink "expguierr.html RegionTooBig" \
                 -type {OK Cancel}]
@@ -920 +926 @@
             set exclist [lreplace $exclist end end $item]
             histinfo $hst excl set $exclist
+            RecordMacroEntry "histinfo $hst excl set [list $exclist]" 0
             histinfo $hst dmin set [tod $max $hst]
+            RecordMacroEntry "histinfo $hst dmin set [tod $max $hst]" 0
+            RecordMacroEntry "incr expgui(changed)" 0
             updateplot
             return
@@ -952 +961 @@
     set i [expr {$reg -1}]
     set range [lindex $exclist $i]
-    toplevel [set box .edit]
+    toplevel [set box $graph(exclbox).edit]
     wm title $box "Edit excluded region"
     set beg minimum
@@ -1017 +1026 @@
         set $v $graph($v)
     }
-    bind $box <Return> "destroy .edit"
+    bind $box <Return> "destroy $box"
     grid [frame $box.c] -column 1 -row 99 -columnspan 99
-    grid [button $box.c.1 -text "OK" -command "destroy .edit"] \
+    grid [button $box.c.1 -text "OK" -command "destroy $box"] \
             -column 1 -row 1
     grid [button $box.c.2 -text "Cancel" \
-            -command "set graph(tmin) $tmin; set graph(tmax) $tmax;destroy .edit"] \
+            -command "set graph(tmin) $tmin; set graph(tmax) $tmax;destroy $box"] \
             -column 2 -row 1
     putontop $box
@@ -1206 +1215 @@
 
 # manual zoom option
-proc BLTmanualZoom {} {
+proc BLTplotManualZoom {} {
     global graph
-    catch {toplevel .zoom}
-    wm title .zoom "Manual zoom"
-    eval destroy [grid slaves .zoom]
-    raise .zoom
-    wm title .zoom {Manual Scaling}
-    grid [label .zoom.l1 -text minimum] -row 1 -column 2 
-    grid [label .zoom.l2 -text maximum] -row 1 -column 3 
-    grid [label .zoom.l3 -text x] -row 2 -column 1 
-    grid [label .zoom.l4 -text y] -row 3 -column 1 
-    grid [entry .zoom.xmin -textvariable graph(xmin) -width 10] -row 2 -column 2 
-    grid [entry .zoom.xmax -textvariable graph(xmax) -width 10] -row 2 -column 3 
-    grid [entry .zoom.ymin -textvariable graph(ymin) -width 10] -row 3 -column 2 
-    grid [entry .zoom.ymax -textvariable graph(ymax) -width 10] -row 3 -column 3 
-    grid [frame .zoom.b] -row 4 -column 1 -columnspan 3
-    grid [button .zoom.b.1 -text "Set Scaling" \
+    set parent [winfo parent graph(plot)]
+    if {$parent == "."} {set parent ""}
+    set box ${parent}.zoom
+    catch {toplevel $box}
+    wm title $box "Manual zoom"
+    eval destroy [grid slaves $box]
+    raise $box
+    wm title $box {Manual Scaling}
+    grid [label $box.l1 -text minimum] -row 1 -column 2 
+    grid [label $box.l2 -text maximum] -row 1 -column 3 
+    grid [label $box.l3 -text x] -row 2 -column 1 
+    grid [label $box.l4 -text y] -row 3 -column 1 
+    grid [entry $box.xmin -textvariable graph(xmin) -width 10] -row 2 -column 2 
+    grid [entry $box.xmax -textvariable graph(xmax) -width 10] -row 2 -column 3 
+    grid [entry $box.ymin -textvariable graph(ymin) -width 10] -row 3 -column 2 
+    grid [entry $box.ymax -textvariable graph(ymax) -width 10] -row 3 -column 3 
+    grid [frame $box.b] -row 4 -column 1 -columnspan 3
+    grid [button $box.b.1 -text "Set Scaling" \
              -command "SetManualZoom set"]  -row 4 -column 1 -columnspan 2
-    grid [button .zoom.b.2 -text Reset \
+    grid [button $box.b.2 -text Reset \
             -command "SetManualZoom clear"] -row 4 -column 3
-    grid [button .zoom.b.3 -text Close -command "destroy .zoom"] -row 4 -column 4 
-    grid rowconfigure .zoom 1 -weight 1 -pad 5
-    grid rowconfigure .zoom 2 -weight 1 -pad 5
-    grid rowconfigure .zoom 3 -weight 1 -pad 5
-    grid rowconfigure .zoom 4 -weight 0 -pad 5
-    grid columnconfigure .zoom 1 -weight 1 -pad 20
-    grid columnconfigure .zoom 1 -weight 1 
-    grid columnconfigure .zoom 3 -weight 1 -pad 10
+    grid [button $box.b.3 -text Close -command "destroy $box"] -row 4 -column 4 
+    grid rowconfigure $box 1 -weight 1 -pad 5
+    grid rowconfigure $box 2 -weight 1 -pad 5
+    grid rowconfigure $box 3 -weight 1 -pad 5
+    grid rowconfigure $box 4 -weight 0 -pad 5
+    grid columnconfigure $box 1 -weight 1 -pad 20
+    grid columnconfigure $box 1 -weight 1 
+    grid columnconfigure $box 3 -weight 1 -pad 10
     foreach item {min min max max} \
             format {3   2   3   2} \
@@ -1241 +1253 @@
         catch {set graph(${axis}${item}) [format %.${format}f $val]}
     }
-    putontop .zoom
-    tkwait window .zoom
+    putontop $box
+    tkwait window $box
     afterputontop    
 }
@@ -1304 +1316 @@
         set graph(plot) [graph $graph(exclbox).g -plotbackground white]
     } errmsg] {
-        MyMessageBox -parent . -title "BLT Error" \
+        MyMessageBox -parent $graph(exclbox) -title "BLT Error" \
                 -message "BLT Setup Error: could not create a graph \
 (error msg: $errmsg). \
@@ -1317 +1329 @@
         Blt_ZoomStack $graph(plot)
     } errmsg] {
-        MyMessageBox -parent . -title "BLT Error" \
+        MyMessageBox -parent $graph(exclbox) -title "BLT Error" \
                 -message "BLT Setup Error: could not access a Blt_ routine \
 (msg: $errmsg). \
@@ -1358 +1370 @@
             -label "Update Plot" -command "CheckChanges $startchanges;updateplot"
     $graph(exclmenu).file.menu add command \
-            -label "Make PostScript" -command makepostscriptout
+            -label "Make PostScript" -command "MakePostscriptOut $graph(exclbox)"
     $graph(exclmenu).file.menu add command \
             -label Finish -command "CheckChanges $startchanges;destroy $graph(exclbox)"
@@ -1382 +1394 @@
     foreach var {excl obs} lbl {Excluded Observed} {
         $graph(exclmenu).options.menu.sym add command -label $lbl \
-                -command "getsymopts $var"
+                -command "GetSymbolOpts $var $graph(exclbox)"
     }
 
@@ -1412 +1424 @@
             -variable graph(exclPrompt)
     $graph(exclmenu).options.menu add command -label "Set PS output" \
-            -command setpostscriptout
+            -command "SetPostscriptOut $graph(exclbox)"
     # phase options
     set box $graph(plot)
@@ -1424 +1436 @@
                 -command "minioptionsbox $num"
     }
-    bind $win <Key-Up> "ScanZoom $box %K .1"
-    bind $win <Key-Left> "ScanZoom $box %K .1"
-    bind $win <Key-Right> "ScanZoom $box %K .1"
-    bind $win <Key-Down> "ScanZoom $box %K .1"
+    bind $win <Key-Up> "ScanZoom $box %K 0.1"
+    bind $win <Key-Left> "ScanZoom $box %K 0.1"
+    bind $win <Key-Right> "ScanZoom $box %K 0.1"
+    bind $win <Key-Down> "ScanZoom $box %K 0.1"
     bind $win <Control-Key-Up> "ScanZoom $box %K 1.0"
     bind $win <Control-Key-Left> "ScanZoom $box %K 1.0"
@@ -1535 +1547 @@
         set cycle [getcycle];readdata .g
     }
-    bind $graph(exclbox) <Key-z> {BLTmanualZoom}
-    bind $graph(exclbox) <Key-Z> {BLTmanualZoom}
+    bind $graph(exclbox) <Key-z> {BLTplotManualZoom}
+    bind $graph(exclbox) <Key-Z> {BLTplotManualZoom}
     updateplot
     trace variable peakinfo w plotExclData
@@ -1561 +1573 @@
 
 proc SetDummyRangeBox {hst tmin tmax tstep} {
-    global newhist expmap
+    global newhist expmap graph
     if {[histinfo $hst dtype] != "CONST"} {
-        MyMessageBox -parent $np -title  "Change Range Error" \
+        MyMessageBox -parent $graph(exclbox) -title  "Change Range Error" \
                 -message "This histogram (#$hst) does not have constant steps. The range must be changed in EXPEDT." \
                 -icon error -type ok -default ok \
@@ -1569 +1581 @@
         return
     }
-    catch {toplevel [set np ".dummy"]}
+    catch {toplevel [set np "$graph(exclbox).dummy"]}
     wm title $np "Dummy Histogram Range"
     eval destroy [winfo children $np]
@@ -1765 +1777 @@
         histinfo $hst dstep   set [expr {$newhist(tstep)*1000.}]
         histinfo $hst dmin set [tod $newhist(tmin) $hst]
+        RecordMacroEntry "histinfo $hst excl set [list $exclist]" 0
+        RecordMacroEntry "histinfo $hst dpoints set $pnts" 0
+        RecordMacroEntry "histinfo $hst dstart  set [expr {$newhist(tmin)*1000.}]" 0
+        RecordMacroEntry "histinfo $hst dstep   set [expr {$newhist(tstep)*1000.}]" 0
+        RecordMacroEntry "histinfo $hst dmin set [tod $newhist(tmin) $hst]" 0
     } elseif {[string range $expmap(htype_$hst) 2 2] == "C"} {
         lappend exclist "0 [expr {$newhist(tmin)-$newhist(tstep)}]" \
@@ -1773 +1790 @@
         histinfo $hst dstep   set [expr {$newhist(tstep)*100.}]
         histinfo $hst dmin set [tod $newhist(tmax) $hst]
+        RecordMacroEntry "histinfo $hst excl set [list $exclist]" 0
+        RecordMacroEntry "histinfo $hst dpoints set $pnts" 0
+        RecordMacroEntry "histinfo $hst dstart  set [expr {$newhist(tmin)*100.}]" 0
+        RecordMacroEntry "histinfo $hst dstep   set [expr {$newhist(tstep)*100.}]" 0
+        RecordMacroEntry "histinfo $hst dmin set [tod $newhist(tmin) $hst]" 0
     } else {
         lappend exclist "0 [expr {$newhist(tmin)-$newhist(tstep)}]" \
@@ -1781 +1803 @@
         histinfo $hst dstep   set $newhist(tstep)
         histinfo $hst dmin set [tod $newhist(tmax) $hst]
+        RecordMacroEntry "histinfo $hst excl set [list $exclist]" 0
+        RecordMacroEntry "histinfo $hst dpoints set $pnts" 0
+        RecordMacroEntry "histinfo $hst dstart  set $newhist(tmin)" 0
+        RecordMacroEntry "histinfo $hst dstep   set $newhist(tstep)" 0
+        RecordMacroEntry "histinfo $hst dmin set [tod $newhist(tmin) $hst]" 0
     }
     global expgui
     incr expgui(changed) 5
+    RecordMacroEntry "incr expgui(changed)" 0
     destroy $np
     updateplot
@@ -1789 +1817 @@
 
 # set the minimum tof/d-space using the EXPEDT program
-proc SetTminTOF {tmin parent} {
-    global expgui reflns graph tcl_platform
-    set hst $graph(hst)
+proc SetTminTOF {tmin hst parent} {
+    global expgui
+
+    set errmsg [runSetTminTOF $tmin $hst]
+    # save call to Macro file
+    RecordMacroEntry "runSetTminTOF $tmin $hst" 0
+    RecordMacroEntry "incr expgui(changed)" 0
+
+    if {$expgui(showexptool) || $errmsg != ""} {
+        if {$errmsg != ""} {
+            set err 1
+            append errmsg "\n" $expgui(exptoolout) 
+        } else {
+            set err 0
+            set errmsg $expgui(exptoolout) 
+        }
+        set msg "Please review the result from listing the phase." 
+        if {$errmsg != ""} {append msg "\nIt appears an error occurred!"}
+        ShowBigMessage $parent.msg $msg $errmsg OK "" $err
+    }
+}
+proc runSetTminTOF {tmin hst} {
+    global expgui tcl_platform
     set input [open excl$hst.inp w]
     puts $input "Y"
@@ -1813 +1861 @@
         }
     } errmsg]
+    set fp [open excl$hst.out r]
+    set expgui(exptoolout) [read $fp]
+    close $fp
     loadexp $expgui(expfile)
-    catch {file delete excl$hst.inp}
-    if {$expgui(showexptool) || $err} {
-        set fp [open excl$hst.out r]
-        set out [read $fp]
-        close $fp
-        if {$errmsg != ""} {
-            append errmsg "\n" $out
-        } else {
-            set errmsg $out
-        }
-        set msg "Please review the result from changing the TOF minimum." 
-        if {$err} {append msg "\nIt appears an error occurred!"}
-        ShowBigMessage $parent.msg $msg $errmsg OK "" $err
-    }
-}
+    catch {file delete excl$hst.inp excl$hst.out}
+    if {$err} {
+        return $errmsg
+    } else {
+        return ""
+    }
+}