Changeset 1030 for branches/sandbox/widplt

Timestamp:

Oct 18, 2010 10:22:17 PM (11 years ago)

Author:

toby

Message:

add delta-d/d & manual zoom to widplt; distrest & distagledit: remove some puts & fix up some indentation

File:

• branches/sandbox/widplt (modified) (8 diffs)

branches/sandbox/widplt

@@ -11 +11 @@
 package require Tk
 bind all <Control-KeyPress-c> {destroy .}
+
 set expnam [lindex $argv 0]
 if {$expnam != ""} {
@@ -442 +443 @@
     global UVWP XY wave lblarr WidSetList WidDisplay ttrange 
     global ABS absSetList AbsDisplay
+    if {$program == "absplt"} {
+        $top yaxis config -title {Abs. Corr.} 
+    } else {
+        $top yaxis config -title {FWHM} 
+    }
     if {$graph(plotunits) == "d"} {
         $top xaxis configure -title "d (A)"
+    } elseif {$graph(plotunits) == "deltad"} {
+        $top xaxis configure -title "d (A)"
+        $top yaxis configure -title "delta-d/d"
     } elseif {$graph(plotunits) == "q"} {
         $top xaxis configure -title "Q (A-1)"
@@ -450 +459 @@
     } else {
         $top xaxis configure -title "2Theta @ $graph(equivwave)"
-    }
-    if {$program == "absplt"} {
-        $top yaxis config -title {Abs. Corr.} 
-    } else {
-        $top yaxis config -title {FWHM} 
     }
     $top yaxis configure -min 0 
@@ -492 +496 @@
                 if {$graph(plotunits) == "d"} {
                     set ttlist [tod $ttlist $item]
+                } elseif {$graph(plotunits) == "deltad"} {
+                    set ttlist [tod $ttlist $item]
                 } elseif {$graph(plotunits) == "q"} {
                     set ttlist [toQ $ttlist $item]
@@ -530 +536 @@
                                         [eval LFWHM $tt $XY($item)]]
                                 lappend lfwhmlist $lfwhm
+                            }
+                        } elseif {$graph(plotunits) == "deltad"} {
+                            set d [tt2d $wave($item) $tt ]
+                            lappend ttlist $d
+                            set gfwhm [deltad $wave($item) $tt \
+                                    [eval FWHM $tt $UVWP($item)]]
+                            lappend fwhmlist [expr {$gfwhm/$d}]
+                            if $lflag {
+                                set lfwhm [deltad $wave($item) $tt \
+                                        [eval LFWHM $tt $XY($item)]]
+                                lappend lfwhmlist [expr {$lfwhm/$d}]
                             }
                         } elseif {$graph(plotunits) == "q"} {
@@ -982 +999 @@
 }
 
+proc BLTmanualZoom {} {
+    global graph box
+    catch {toplevel .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" \
+             -command "SetManualZoom set"]  -row 4 -column 1 -columnspan 2
+    grid [button .zoom.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
+    foreach item {min min max max} \
+            format {3   2   3   2} \
+            axis   {x   y   x   y} {
+        set val [$box ${axis}axis cget -${item}]
+        set graph(${axis}${item}) {(auto)}
+        catch {set graph(${axis}${item}) [format %.${format}f $val]}
+    }
+    bind .zoom <Return> "SetManualZoom set"
+}
+
+proc SetManualZoom {mode} {
+    global graph box
+    if {$mode == "clear"} {
+        foreach item {xmin ymin xmax ymax} {
+            set graph($item) {(auto)}
+        }
+    }
+    foreach item {xmin ymin xmax ymax} {
+        if {[catch {expr $graph($item)}]} {
+            set $item ""
+        } else {
+            set $item $graph($item)
+        }
+    }
+    # reset the zoomstack
+    catch {Blt_ZoomStack $box}
+    catch {$box xaxis config -min $xmin -max $xmax}
+    catch {$box yaxis config -min $ymin -max $ymax}
+    #global program
+    #if {$program == "bkgedit"} {bkgEditMode ""}
+}
+
 #-------------------------------------------------------------------------
 # export current plot to Grace
@@ -1242 +1318 @@
         -variable graph(plotunits) \
         -command "plotdata $box"
+.a.options.menu add radiobutton -label "delta-d/d" -value deltad \
+        -variable graph(plotunits) \
+        -command "plotdata $box"
 .a.options.menu add checkbutton -label "Include legend" \
         -variable graph(legend) \
@@ -1274 +1353 @@
 #----------------------------------------------------------------
 
-    trace variable newmenu(opt) w setoptmsg
+trace variable newmenu(opt) w setoptmsg
+
+bind . <Key-z> {BLTmanualZoom}
+bind . <Key-Z> {BLTmanualZoom}
 
 proc setoptmsg {args} {