Changeset 426 for trunk/liveplot

Timestamp:

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

Author:

toby

Message:

# on 2001/09/04 22:53:53, toby did:
set colors/symbols
adjust fonts
cleanup save opts

File:

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

trunk/liveplot

@@ -45 +45 @@
 set graph(yunits) 0
 set graph(autoraise) 1
+set graph(color_diff) blue
+set graph(color_chi2) magenta
+set graph(color_bkg) green
+set graph(color_calc) red
+set graph(color_obs) black
+set graph(color_input) magenta
+set graph(color_fit) blue
 set expgui(debug) 0
 catch {if $env(DEBUG) {set expgui(debug) 1}}
 #set expgui(debug) 1
+set expgui(font) 14
 set expgui(lblfontsize) 15
 set expgui(fadetime) 10
@@ -57 +65 @@
 set peakinfo(obssym) scross
 set peakinfo(obssize) 1.0
+set peakinfo(inpsym) triangle
+set peakinfo(inpsize) 1.0
 # create a set of markers for each phase
 for {set i 1} {$i < 10} {incr i} {
@@ -299 +309 @@
         diffvec set [diffvec + $ymin2]
     }
-    plotdata $box
+    plotdata
 }
 
@@ -385 +395 @@
     }
     
-    plotdata $box
+    plotdata
 }
 
@@ -463 +473 @@
 }
 
-proc plotdata {box} {
+proc plotdata {} {
     global expnam hst peakinfo xunits yunits cycle reflns modtime
-    global lasthst graph expgui
+    global lasthst graph expgui box
 
     # is there a new histogram to load?
@@ -477 +487 @@
         return
     }
+    $box config -title "$expnam cycle $cycle Hist $hst"
+    $box xaxis config -title $xunits
+    $box yaxis config -title $yunits
+    setlegend $box $graph(legend)
+    # reconfigure the data
+    $box element configure 3 \
+            -symbol $peakinfo(obssym) -color $graph(color_obs) \
+            -pixels [expr 0.125 * $peakinfo(obssize)]i
+    $box element config 0 -color $graph(color_chi2) 
+    $box element config 1 -color $graph(color_bkg)
+    $box element config 2 -color $graph(color_calc)
+    $box element config 4 -color $graph(color_diff)
+    global program
+    if {$program == "bkgedit"}  {
+        $box element config 12 -color $graph(color_input) \
+                -pixels [expr 0.125 * $peakinfo(inpsize)]i \
+                -symbol $peakinfo(inpsym)
+        $box element config 11 -color $graph(color_fit)
+    }
     xvec notify now
     obsvec notify now
@@ -483 +512 @@
     diffvec notify now
     wifdvec notify now
-    $box config -title "$expnam cycle $cycle Hist $hst"
-    $box xaxis config -title $xunits
-    $box yaxis config -title $yunits
-    setlegend $box $graph(legend)
-    # reconfigure the obs data
-    $box element configure 3 \
-            -symbol $peakinfo(obssym) \
-            -pixels [expr 0.125 * $peakinfo(obssize)]i
     # now deal with peaks
     for {set i 1} {$i < 10} {incr i} {
@@ -586 +607 @@
             -command "setcolor $i"] -side left
     pack [frame $bx.b] -side top
-    #pack [button $bx.b.1 -command {plotdata $box} -text "Update Plot"] \
+    #pack [button $bx.b.1 -command plotdata -text "Update Plot"] \
             #    -side left
     pack [button $bx.b.4 -command "destroy $bx" -text Close ] -side right
@@ -707 +728 @@
 }
 
-proc setsymopts {} {
+proc getsymopts {"sym obs"} {
     global expgui peakinfo
     set box .out
@@ -713 +734 @@
     toplevel $box
     focus $box
+    wm title .out "set $sym symbol"
     pack [frame $box.d] -side left -anchor n
     pack [label $box.d.t -text "Symbol type"] -side top
-    set expgui(obssym) $peakinfo(obssym) 
-    set expgui(obssize) $peakinfo(obssize) 
-    foreach symbol {square circle diamond plus cross \
+    set expgui(sym) $peakinfo(${sym}sym) 
+    set expgui(size) $peakinfo(${sym}size) 
+    foreach symbol {square circle diamond triangle plus cross \
             splus scross} \
-            symbol_name {square circle diamond plus cross \
+            symbol_name {square circle diamond triangle plus cross \
             thin-plus thin-cross} {
         pack [radiobutton $box.d.$symbol \
-                -text $symbol_name -variable expgui(obssym) \
+                -text $symbol_name -variable expgui(sym) \
                 -value $symbol] -side top -anchor w
     }
     pack [frame $box.e] -side left -anchor n -fill y
     pack [label $box.e.l -text "Symbol Size"] -side top
-    pack [scale $box.e.s -variable expgui(obssize) \
+    pack [scale $box.e.s -variable expgui(size) \
             -from .1 -to 3 -resolution 0.05] -side top
     pack [frame $box.a] -side bottom
-    pack [button $box.a.1 -text "Apply" -command { \
-            if {$peakinfo(obssym) != $expgui(obssym)} {set peakinfo(obssym) $expgui(obssym)}; \
-            if {$peakinfo(obssize) != $expgui(obssize)} {set peakinfo(obssize) $expgui(obssize)} \
-        } ] -side left
+    pack [button $box.a.1 -text "Apply" -command "setsymopts $sym"] -side left
     pack [button $box.a.2 -text "Close" -command "destroy $box"] -side left
+}
+proc setsymopts {sym} {
+    global peakinfo expgui
+    if {$peakinfo(${sym}sym) != $expgui(sym)} {set peakinfo(${sym}sym) $expgui(sym)}
+    if {$peakinfo(${sym}size) != $expgui(size)} {set peakinfo(${sym}size) $expgui(size)}
 }
 
@@ -741 +765 @@
     global graph expgui peakinfo
     set fp [open [file join ~ .gsas_config] a]
-    puts $fp "set graph(legend) $graph(legend)"
-    puts $fp "set graph(chi2) $graph(chi2)"
-    puts $fp "set graph(printout) $graph(printout)"
-    puts $fp "set graph(outname) $graph(outname)"
-    puts $fp "set graph(outcmd) $graph(outcmd)"
-    puts $fp "set graph(autoraise) $graph(autoraise)"
-    puts $fp "set expgui(lblfontsize) $expgui(lblfontsize)"
-    puts $fp "set expgui(fadetime) $expgui(fadetime)" 
-    puts $fp "set expgui(hklbox) $expgui(hklbox)"
-    puts $fp "set peakinfo(obssym) $peakinfo(obssym)"
-    puts $fp "set peakinfo(obssize) $peakinfo(obssize)"
-    puts $fp "set expgui(pixelregion) $expgui(pixelregion)"
-    puts $fp "set expgui(autotick) $expgui(autotick)"
+    foreach v {printout legend outname outcmd autoraise chi2} {
+        puts $fp "set graph($v) $graph($v)"
+    }
+    foreach v {diff chi2 bkg calc obs input fit} {
+        puts $fp "set graph(color_$v) $graph(color_$v)"
+    }
+    foreach v {font lblfontsize fadetime hklbox pixelregion autotick} {
+        puts $fp "set expgui($v) $expgui($v)"
+    }
+    foreach v {obssym obssize inpsym inpsize} {
+        puts $fp "set peakinfo($v) $peakinfo($v)"
+    }
     close $fp
 }
@@ -834 +857 @@
     }
     waitmsg {Updating}
-    plotdata $box
+    plotdata
     donewaitmsg
 }
@@ -1336 +1359 @@
 source [file join $expgui(scriptdir) gsascmds.tcl]
 source [file join $expgui(scriptdir) readexp.tcl]
+source [file join $expgui(scriptdir) opts.tcl]
 
 # override options with locally defined values
@@ -1344 +1368 @@
     source [file join ~ .gsas_config]
 }
+SetTkDefaultOptions $expgui(font)
 
 if [file executable [file join $expgui(gsasexe) $expgui(tcldump)]] {
@@ -1360 +1385 @@
 # create the graph
 if [catch {
-    set box [graph .g]
+    set box [graph .g -plotbackground white]
 } errmsg] {
     tk_dialog .err "BLT Error" \
@@ -1384 +1409 @@
 }
 
-$box element create 0 -xdata xvec -ydata wifdvec -color magenta \
+$box element create 0 -xdata xvec -ydata wifdvec -color $graph(color_chi2) \
         -line 3 -symbol none -label "Chi2" -mapy y2
-$box element create 1 -label bckgr -color green  -symbol none  
-$box element config 1 -xdata xvec -ydata bckvec
-$box element create 3 -color black -linewidth 0 -label Obs \
+$box element create 1 -label bckgr -symbol none  
+$box element config 1 -xdata xvec -ydata bckvec -color $graph(color_bkg)
+$box element create 3 -color $graph(color_obs) -linewidth 0 -label Obs \
         -symbol $peakinfo(obssym) \
         -pixels [expr 0.125 * $peakinfo(obssize)]i
-$box element create 2 -label Calc -color red  -symbol none  
-$box element create 4 -label diff -color blue  -symbol none  
+$box element create 2 -label Calc -color $graph(color_calc) -symbol none  
+$box element create 4 -label diff -color $graph(color_diff) -symbol none  
 
 if {$program == "liveplot"} {
@@ -1406 +1431 @@
     $box element create 11
     $box element create 12
-    $box element configure 12  -color magenta  -pixels 12 \
-            -line 0 -symbol triangle -label "bkg pts"
-    $box element configure 11 -color blue \
+    $box element configure 12  -color $graph(color_input) \
+            -pixels [expr 0.125 * $peakinfo(inpsize)]i \
+            -line 0 -symbol $peakinfo(inpsym) -label "bkg pts"
+    $box element configure 11 -color $graph(color_fit) \
             -symbol none -label "Cheb fit" -dashes 5 -line 2
     $box element show "3 2 11 12"
@@ -1442 +1468 @@
     .a.file.menu.tick add checkbutton -label "Phase $num" \
             -variable  peakinfo(flag$num) \
-            -command {plotdata $box}
+            -command plotdata
 }
 .a.file.menu add cascade -label "Histogram" -menu .a.file.menu.hist
@@ -1467 +1493 @@
 menu .a.options.menu.tick
 .a.options.menu.tick add radiobutton -label "Manual Placement" \
-        -value 0 -variable expgui(autotick) -command "plotdata $box"
+        -value 0 -variable expgui(autotick) -command plotdata
 .a.options.menu.tick add radiobutton -label "Auto locate" \
-        -value 1 -variable expgui(autotick) -command "plotdata $box"
+        -value 1 -variable expgui(autotick) -command plotdata
 .a.options.menu.tick add separator
 foreach num {1 2 3 4 5 6 7 8 9} {
@@ -1475 +1501 @@
             -command "minioptionsbox $num"
 }
-.a.options.menu add command -label "Obs symbol" -command setsymopts
+if {$program == "liveplot"} {
+    .a.options.menu add command -label "Obs symbol" -command getsymopts
+} else {
+    .a.options.menu add cascade -label "Symbol Type" -menu .a.options.menu.sym
+    menu .a.options.menu.sym
+    foreach var {obs inp} lbl {Observed "Input bkg"} {
+        .a.options.menu.sym add command -label $lbl -command "getsymopts $var"
+    }
+}
+.a.options.menu add cascade -label "Symbol color" -menu .a.options.menu.color
+menu .a.options.menu.color
+set l1 {obs calc diff bkg chi2}
+set l2 {Observed Calculated Obs-Calc Background Cumulative-Chi2}
+if {$program != "liveplot"} {
+    lappend l1 input fit
+    lappend l2 "Input points" "Cheb. fit"
+}
+    
+foreach var $l1 lbl $l2 {
+    .a.options.menu.color add command -label $lbl \
+        -command "set graph(color_$var) \[tk_chooseColor -initialcolor \$graph(color_$var) -title \"Choose \$lbl color\"]; plotdata"
+}
 if {$expgui(tcldump) != "" && $program == "liveplot"} {
     .a.options.menu add cascade -label "X units" -menu .a.options.menu.xunits
@@ -1508 +1555 @@
         -command {setlegend $box $graph(legend)}
 .a.options.menu add command -label "Set PS output" -command setpostscriptout
+.a.options.menu add cascade -menu  .a.options.menu.font \
+        -label "Screen font"
+menu .a.options.menu.font
+foreach f {10 11 12 13 14 16 18 20 22} {
+    .a.options.menu.font add radiobutton \
+            -command {SetTkDefaultOptions $expgui(font); ResizeFont .} \
+        -label $f -value $f -variable expgui(font) -font "Helvetica -$f"
+}
 if {$program == "liveplot"} {
     .a.options.menu add checkbutton -label "Raise on update" \