Changeset 1142 for branches

Timestamp:

Jun 1, 2011 5:50:48 PM (13 years ago)

Author:

toby

Message:

Add y-magnification regions to liveplot

File:

• branches/sandbox/liveplot (modified) (4 diffs)

branches/sandbox/liveplot

@@ -357 +357 @@
         catch {$vec variable $vec}
     }
+    ApplyMag
     set maxdiff  [set diffvec(max)]
     set cmin [set calcvec(min)]
@@ -441 +442 @@
         wifdvec set $sumlist
         wifdvec set [wifdvec / [wifdvec length]]
-    }
-    if {$graph(OmCoS)} {
+    } elseif {$graph(OmCoS)} {
         wifdvec set $WGT
         wifdvec expr sqrt(wifdvec)
         wifdvec set [wifdvec * diffvec]
+    } else {
+        wifdvec length 0
     }
     if $graph(backsub) {
@@ -451 +453 @@
         calcvec set [calcvec - bckvec]
     }
+    ApplyMag
     global obsvec calcvec diffvec 
     set maxdiff  [set diffvec(max)]
@@ -2089 +2092 @@
 .a.options.menu.tick add separator
 
+pack [menubutton .a.mag -text Magnification -underline 0 -menu .a.mag.menu] \
+        -side left
+menu .a.mag.menu
+set maglist {}
+proc ShowMag {} {
+    global blt_version tcl_platform peakinfo expgui
+    set bx .opt
+    catch {destroy $bx}
+    toplevel $bx
+    putontop $bx
+    wm iconname $bx "Mag Regs"
+    wm title $bx "Plot Magnification Regions"
+    pack [label $bx.0 -text "Magnification Regions:"] -side top
+    if {[llength $::maglist] == 0} {
+        set lbl "None"
+    } else {
+        set lbl ""
+        set xm $::xvec(min)
+        set ym 1.0
+        set ::maglist [lsort -real -index 0 $::maglist]
+        foreach pair $::maglist {
+            foreach {xh ymh} $pair {}
+            append lbl "\tfrom $xm to $xh: times $ym\n"
+            set xm $xh
+            set ym $ymh
+        }
+        set xh $::xvec(max)
+        append lbl "\tfrom $xm to $xh: times $ym"
+    }
+    pack [label $bx.1 -text $lbl -justify left] -side top
+    pack [button $bx.2 -text "Close" -command "destroy $bx"] -side top
+    tkwait window $bx
+    afterputontop
+}
+
+proc AddMag {} {
+    set bx .opt
+    catch {destroy $bx}
+    toplevel $bx
+    putontop $bx
+    wm iconname $bx "Add Regs"
+    wm title $bx "Add Plot Magnification Region"
+    pack [frame $bx.0] -side top
+    pack [label $bx.0.a -text "Magnify from "] -side left
+    pack [entry $bx.0.b -textvariable xmin -width 6] -side left
+    pack [label $bx.0.c -text " to next region. Multiply by "] -side left
+    pack [entry $bx.0.d -textvariable mult -width 4] -side left
+    pack [frame $bx.2] -side top
+    pack [button $bx.2.a -text "Add" -command "destroy $bx"] -side left
+    pack [button $bx.2.b -text "Cancel" -command "set mult {}; destroy $bx"] -side left
+    if {[catch {expr $::mult}]} {set ::mult 1.0}
+    if {$::mult <= 0} {set ::mult 1.0}
+    tkwait window $bx
+    afterputontop
+    catch {
+        if {$::xmin < $::xvec(min)} {set ::xmin $::xvec(min)} 
+        if {$::xmin > $::xvec(max)} {set ::xmin $::xvec(max)} 
+        if {$::mult > 0} {
+            lappend ::maglist [list $::xmin $::mult]
+            readdata .g
+        } else {
+            MyMessageBox -parent . -title "Invalid" \
+                -message "Invalid input, try again" \
+                -icon error -type Continue -default continue
+        }
+    }
+}
+proc ApplyMag {} {
+    foreach mrk [.g marker names mag*] {
+        .g marker delete $mrk
+    }
+    if {[llength $::maglist] == 0} return
+    global xvec
+    vector create ymult([xvec length])
+    set xl $xvec(min)
+    set ym 1.0
+    set i 0
+    set ::maglist [lsort -real -index 0 $::maglist]
+    foreach pair $::maglist {
+        foreach {xh ymh} $pair {}
+        set xr [xvec search $xl $xh]
+        #puts "$xl $xh [lindex $xr 0]:[lindex $xr end] $ym"
+        if {[lindex $xr 0] != [lindex $xr end]} {
+            set ymult([lindex $xr 0]:[lindex $xr end]) $ym
+            .g marker create line -coords "$xl -Inf $xl Inf" -name mag[incr i]
+            .g marker create text -coords "$xl Inf" -name mag[incr i] -text "x$ym" -anchor w
+        }
+        set xl $xh
+        set ym $ymh
+    }
+    set xh $xvec(max)
+    set xr [xvec search $xl $xh]
+    set ymult([lindex $xr 0]:[lindex $xr end]) $ym
+    #puts "$xl $xh [lindex $xr 0]:[lindex $xr end] $ym"
+    .g marker create line -coords "$xl -Inf $xl Inf" -name mag[incr i]
+    .g marker create text -coords "$xl Inf" -name mag[incr i] -text "x$ym" -anchor w
+    foreach vec {obsvec calcvec bckvec diffvec} {
+        global $vec
+        $vec expr {$vec * ymult}
+    }
+}
+
 if {$program == "liveplot"} {
+    .a.mag.menu add command -label "Add region" -command "AddMag"
+    .a.mag.menu add command -label "Show" -command "ShowMag"
+    .a.mag.menu add separator
+    .a.mag.menu add command -label "Clear" \
+        -command "set maglist {}; readdata .g"
     .a.options.menu add command -label "Obs symbol" -command getsymopts
 } else {