Changeset 79

Timestamp:

Dec 4, 2009 5:00:03 PM (13 years ago)

Author:

toby

Message:

# on 1999/04/08 20:33:23, toby did:
add tick autoscaling
deal with two word colors (Peach Puff)

File:

• trunk/liveplot (modified) (18 diffs, 3 props)

trunk/liveplot

@@ -46 +46 @@
 set expgui(fadetime) 10
 set expgui(hklbox) 1
+set expgui(autotick) 0
 set expgui(pixelregion) 5
 set peakinfo(obssym) scross
 set peakinfo(obssize) 1.0
+# create a set of markers for each phase
+for {set i 1} {$i < 10} {incr i} {
+    set peakinfo(flag$i) 0
+    set peakinfo(max$i) Inf
+    set peakinfo(min$i) -Inf
+    set peakinfo(dashes$i) 1
+}
 
 if [catch {package require BLT} errmsg] {
@@ -183 +191 @@
             error $errmsg
         }
-        $box config -title "Read error: $errmsg"
-        puts "error message: $errmsg"
+        $box config -title "Read error"
+        tk_dialog .err "Read Error" "Read Error -- $errmsg" \
+                error 0 OK
         update
     }
@@ -196 +205 @@
     update
     # parse the output of a file
-        set lasthst $hst
+    set lasthst $hst
 ###########################################################################
 #       set input [open histdump.inp w]
@@ -203 +212 @@
 #       set input [open "| $expgui(gsasexe)/hstdump $expnam  < histdump.inp" w+]
 ###########################################################################
-        # use histdump for right now
-        set input [open histdump$hst.inp w]
-        puts $input "$expnam"
-        puts $input "L"
-        puts $input "$hst"
-        puts $input "0"
-        close $input
-        # use hstdmp without an experiment name so that output 
-        # is not sent to the .LST file
-        set input [open "| $expgui(gsasexe)/hstdmp < histdump$hst.inp" r]
-        
-        # initalize arrays
-        set num -1
-        set xlist {}
-        set obslist {}
-        set calclist {}
-        set bcklist {}
-        set xunits {}
-        # define a list of reflection positions for each phase
-        for {set i 1} {$i < 10} {incr i} {
-            set reflns($i) {}
-        }
-        set i 0
-        while {[gets $input line] >= 0} {
-            incr i
-            # run update every 50th line
-            if {$i > 50} {set i 0; update}
-            if [scan $line %d num] {
-                if {$num > 0} {
-                    set Ispec 0
-                    set X -999
-                    scan [string range $line 8 end] %e%e%e%e%e%e \
-                            X Iobs Icalc Ispec fixB fitB
-                    #puts $line
-                    # eliminate excluded points
-                    if {$Ispec > 0.0 && $X >= 0} {
-                        lappend xlist $X
-                        lappend obslist $Iobs
-                        lappend calclist $Icalc
-                        lappend bcklist [expr $fixB + $fitB]
-                    }
-                    # add peaks to peak lists
-                    #    puts "[string range $line 6 6]"
-                    # is this 6 or 7; 6 on win & 7 on SGI
-                    if [regexp {[1-9]} [string range $line 6 7] ph] {
-                        lappend reflns($ph) $X
-                    }
-                } 
-            } else {
-                regexp {Time|Theta|keV} $line xunits
-            }
-        }
-        if {$xunits == "Theta"} {set xunits "2-Theta"}
-        close $input
-        catch {file delete histdump$hst.inp}
-        xvec set $xlist
-        obsvec set $obslist
-        calcvec set $calclist
-        bckvec set $bcklist
-        diffvec set [obsvec - calcvec]
-        global obsvec calcvec diffvec 
-        set maxdiff  [set diffvec(max)]
-        set ymin1 [expr [set calcvec(min)] - 1.1*$maxdiff]
-        set ymin2 [expr [set obsvec(min)] - 1.1*$maxdiff]
-        if {$ymin1 < $ymin2} {
-            diffvec set [diffvec + $ymin1]
-        } {
-            diffvec set [diffvec + $ymin2]
-        }
-        plotdata $box
+    # use histdump for right now
+    set input [open histdump$hst.inp w]
+    puts $input "$expnam"
+    puts $input "L"
+    puts $input "$hst"
+    puts $input "0"
+    close $input
+    # use hstdmp without an experiment name so that output 
+    # is not sent to the .LST file
+    set input [open "| $expgui(gsasexe)/hstdmp < histdump$hst.inp" r]
+    
+    # initalize arrays
+    set num -1
+    set xlist {}
+    set obslist {}
+    set calclist {}
+    set bcklist {}
+    set xunits {}
+    # define a list of reflection positions for each phase
+    for {set i 1} {$i < 10} {incr i} {
+        set reflns($i) {}
+    }
+    set i 0
+    while {[gets $input line] >= 0} {
+        incr i
+        # run update every 50th line
+        if {$i > 50} {set i 0; update}
+        if [scan $line %d num] {
+            if {$num > 0} {
+                set Ispec 0
+                set X -999
+                scan [string range $line 8 end] %e%e%e%e%e%e \
+                        X Iobs Icalc Ispec fixB fitB
+                #puts $line
+                # eliminate excluded points
+                if {$Ispec > 0.0 && $X >= 0} {
+                    lappend xlist $X
+                    lappend obslist $Iobs
+                    lappend calclist $Icalc
+                    lappend bcklist [expr $fixB + $fitB]
+                }
+                # add peaks to peak lists
+                #    puts "[string range $line 6 6]"
+                # is this 6 or 7; 6 on win & 7 on SGI
+                if [regexp {[1-9]} [string range $line 6 7] ph] {
+                    lappend reflns($ph) $X
+                }
+            } 
+        } else {
+            regexp {Time|Theta|keV} $line xunits
+        }
+    }
+    if {$xunits == "Theta"} {set xunits "2-Theta"}
+    close $input
+    catch {file delete histdump$hst.inp}
+    xvec set $xlist
+    obsvec set $obslist
+    calcvec set $calclist
+    bckvec set $bcklist
+    diffvec set [obsvec - calcvec]
+    global obsvec calcvec diffvec 
+    set maxdiff  [set diffvec(max)]
+    set cmin [set calcvec(min)]
+    set omin [set obsvec(min)]
+    set cmax [set calcvec(max)]
+    set omax [set obsvec(max)]
+    set expgui(min) [expr $omin < $cmin ? $omin : $cmin]
+    set expgui(max) [expr $omax > $cmax ? $omax : $cmax]
+    set ymin1 [expr $cmin - 1.1*$maxdiff]
+    set ymin2 [expr $omin - 1.1*$maxdiff]
+    if {$ymin1 < $ymin2} {
+        diffvec set [diffvec + $ymin1]
+    } {
+        diffvec set [diffvec + $ymin2]
+    }
+    plotdata $box
 }
 
@@ -329 +344 @@
     global obsvec calcvec diffvec 
     set maxdiff  [set diffvec(max)]
-    set ymin1 [expr [set calcvec(min)] - 1.1*$maxdiff]
-    set ymin2 [expr [set obsvec(min)] - 1.1*$maxdiff]
+    set cmin [set calcvec(min)]
+    set omin [set obsvec(min)]
+    set cmax [set calcvec(max)]
+    set omax [set obsvec(max)]
+    set expgui(min) [expr $omin < $cmin ? $omin : $cmin]
+    set expgui(max) [expr $omax > $cmax ? $omax : $cmax]
+    set ymin1 [expr $cmin - 1.1*$maxdiff]
+    set ymin2 [expr $omin - 1.1*$maxdiff]
     if {$ymin1 < $ymin2} {
         diffvec set [diffvec + $ymin1]
@@ -336 +357 @@
         diffvec set [diffvec + $ymin2]
     }
+    
     plotdata $box
 }
@@ -416 +438 @@
 proc plotdata {box} {
     global expnam hst peakinfo xunits yunits cycle reflns modtime
-    global lasthst graph
+    global lasthst graph expgui
 
     # is there a new histogram to load?
@@ -443 +465 @@
     # now deal with peaks
     for {set i 1} {$i < 10} {incr i} {
+        if {$expgui(autotick)} {
+            set div [expr ( $expgui(max) - $expgui(min) )/40.]
+            set ymin [expr $expgui(min) - ($i+1) * $div]
+            set ymax [expr $expgui(min) - $i * $div]
+        } else {
+            set ymin $peakinfo(min$i)
+            set ymax $peakinfo(max$i)
+        }
         set j 0
         if [set peakinfo(flag$i)] {
@@ -451 +481 @@
                 }
                 $box marker config peaks${i}_$j  -under 1 \
-                        -coords "$X $peakinfo(min$i) $X $peakinfo(max$i)" 
-                $box marker config peaks${i}_$j \
-                        $graph(MarkerColorOpt) $peakinfo(color$i)
-                if $peakinfo(dashes$i) {
-                    catch {
+                        -coords "$X $ymin $X $ymax" 
+                catch {
+                    $box marker config peaks${i}_$j \
+                            $graph(MarkerColorOpt) [list $peakinfo(color$i)]
+                    if $peakinfo(dashes$i) {
                         $box marker config peaks${i}_$j -dashes "5 5"
                     }
@@ -493 +523 @@
 
 proc minioptionsbox {num} {
-    global blt_version tcl_platform peakinfo
+    global blt_version tcl_platform peakinfo expgui
     set bx .opt$num
     catch {destroy $bx}
@@ -509 +539 @@
                 -variable peakinfo(dashes$i)] -side top 
     }
-    pack [frame $bx.p$i -bd 2 -relief groove] -side top
-    #   pack [checkbutton $bx.p$i.0 -text "Show phase $i reflns" \
-            #           -variable peakinfo(flag$i)] -side left -anchor w
-    pack [label $bx.p$i.1 -text "  Y min:"] -side left
-    pack [entry $bx.p$i.2 -textvariable peakinfo(min$i) -width 5] \
-            -side left
-    pack [label $bx.p$i.3 -text "  Y max:"] -side left
-    pack [entry $bx.p$i.4 -textvariable peakinfo(max$i) -width 5] \
-            -side left
+    if !$expgui(autotick) {
+        pack [frame $bx.p$i -bd 2 -relief groove] -side top
+        #       pack [checkbutton $bx.p$i.0 -text "Show phase $i reflns" \
+                #               -variable peakinfo(flag$i)] -side left -anchor w
+        pack [label $bx.p$i.1 -text "  Y min:"] -side left
+        pack [entry $bx.p$i.2 -textvariable peakinfo(min$i) -width 5] \
+                -side left
+        pack [label $bx.p$i.3 -text "  Y max:"] -side left
+        pack [entry $bx.p$i.4 -textvariable peakinfo(max$i) -width 5] \
+                -side left
+    }
     pack [frame $bx.c$i -bd 2 -relief groove] -side top
     
@@ -680 +712 @@
 # save some of the global options in ~/.gsas_config
 proc SaveOptions {} {
-    global graph expgui
+    global graph expgui peakinfo
     set fp [open [file join ~ .gsas_config] a]
     puts $fp "set graph(legend) $graph(legend)"
@@ -692 +724 @@
     puts $fp "set peakinfo(obssize) $peakinfo(obssize)"
     puts $fp "set expgui(pixelregion) $expgui(pixelregion)"
-
+    puts $fp "set expgui(autotick) $expgui(autotick)"
     close $fp
 }
@@ -735 +767 @@
 
 # fetch EXP file processing routines 
-source [file join $expgui(scriptdir) readexp.tcl]
+#source [file join $expgui(scriptdir) readexp.tcl]
 
 set fl [file join $expgui(scriptdir) icddcmd.tcl]
@@ -791 +823 @@
 $box yaxis config -title {} 
 setlegend $box $graph(legend)
-# create a set of markers for each phase
-for {set i 1} {$i < 10} {incr i} {
-    set peakinfo(flag$i) 0
-    set peakinfo(max$i) Inf
-    set peakinfo(min$i) -Inf
-    set peakinfo(dashes$i) 1
-}
 
 updateifnew
@@ -832 +857 @@
 .a.options.menu add cascade -label "Configure Tickmarks" -menu .a.options.menu.tick
 menu .a.options.menu.tick
+.a.options.menu.tick add radiobutton -label "Manual Placement" \
+        -value 0 -variable expgui(autotick) -command "plotdata $box"
+.a.options.menu.tick add radiobutton -label "Auto locate" \
+        -value 1 -variable expgui(autotick) -command "plotdata $box"
+.a.options.menu.tick add separator
 foreach num {1 2 3 4 5 6 7 8 9} {
     .a.options.menu.tick add command -label "Phase $num" \
@@ -882 +912 @@
     regexp {([a-z]*)([0-9]*)} $element junk var num
     if {$var == "color"} {
-        catch {
+        if {$peakinfo($element) == ""} return
+        if [catch {
             .opt$num.c$num.2 config -bg $peakinfo($element)
-        }
+        } ] return
         set i $num
         set j 0
@@ -890 +921 @@
             catch {
                 $box element config phase$i -color $peakinfo(color$i) 
-            } errmsg
+            } 
             foreach X $reflns($i) {
                 incr j
                 catch {
                     $box marker config peaks${i}_$j \
-                            $graph(MarkerColorOpt) $peakinfo(color$i)
+                            $graph(MarkerColorOpt) [list $peakinfo(color$i)]
                 }
             }