From fa91f2c85cbfe7cd5c730ffb9570d154b287b99c Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 26 Jul 2019 17:11:36 -0400 Subject: support multiple graphs per plot --- ds9/library/plot.tcl | 13 +++++++++---- ds9/library/plotstate.tcl | 9 +++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ds9/library/plot.tcl b/ds9/library/plot.tcl index 37620ab..9ebec8f 100644 --- a/ds9/library/plot.tcl +++ b/ds9/library/plot.tcl @@ -210,6 +210,12 @@ proc PlotDeleteGraph {varname} { upvar #0 $varname var global $varname + # reset layout if strip + if {$var(layout) == {strip}} { + set var(layout) column + PlotChangeLayout $varname + } + set cc $var(graph,current) # remove menu item @@ -909,10 +915,9 @@ proc PlotTitle {varname title xaxis yaxis} { upvar #0 $varname var global $varname -# waj -# set var(graph,title) "$title" -# set var(graph,axis,x,title) "$xaxis" -# set var(graph,axis,y,title) "$yaxis" + set var(graph,title) "$title" + set var(graph,axis,x,title) "$xaxis" + set var(graph,axis,y,title) "$yaxis" PlotUpdateGraph $varname } diff --git a/ds9/library/plotstate.tcl b/ds9/library/plotstate.tcl index 9112bf6..14d0067 100644 --- a/ds9/library/plotstate.tcl +++ b/ds9/library/plotstate.tcl @@ -24,9 +24,8 @@ proc PlotDefState {} { set pap(background) white set pap(bar,mode) normal - # waj set pap(graph,format) 1 - set pap(graph,title) {Title} + set pap(graph,title) {} set pap(graph,title,family) helvetica set pap(graph,title,size) 12 set pap(graph,title,weight) normal @@ -55,8 +54,7 @@ proc PlotDefState {} { # per Graph set pap(graph,legend,title) Legend - # waj - set pap(graph,axis,x,title) {X Axis} + set pap(graph,axis,x,title) {} set pap(graph,axis,x,grid) 1 set pap(graph,axis,x,log) 0 set pap(graph,axis,x,flip) 0 @@ -65,8 +63,7 @@ proc PlotDefState {} { set pap(graph,axis,x,max) {} set pap(graph,axis,x,format) {} - # waj - set pap(graph,axis,y,title) {Y Axis} + set pap(graph,axis,y,title) {} set pap(graph,axis,y,grid) 1 set pap(graph,axis,y,log) 0 set pap(graph,axis,y,flip) 0 -- cgit v0.12