From 4f9885152c6e8eef1a01e2cc50fa4e3db8bbcb5c Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 31 Jul 2019 13:38:19 -0400 Subject: support multiple graphs per plot --- ds9/library/plot.tcl | 23 +++++++++++++++++++++++ ds9/library/plotconfig.tcl | 3 +-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/ds9/library/plot.tcl b/ds9/library/plot.tcl index b838b69..e01e331 100644 --- a/ds9/library/plot.tcl +++ b/ds9/library/plot.tcl @@ -378,6 +378,7 @@ proc PlotDeleteDataSet {varname} { PlotList $varname } +# used by backup proc PlotCurrentGraph {varname} { upvar #0 $varname var global $varname @@ -394,6 +395,7 @@ proc PlotCurrentGraph {varname} { PlotList $varname } +# used by backup proc PlotCurrentDataSet {varname} { upvar #0 $varname var global $varname @@ -437,6 +439,7 @@ proc PlotChangeAxis {varname} { } } +# used by backup proc PlotChangeLayout {varname} { upvar #0 $varname var global $varname @@ -459,6 +462,7 @@ proc PlotChangeLayout {varname} { PlotLayoutCanvas $varname } +# used by backup proc PlotChangeMode {varname} { upvar #0 $varname var global $varname @@ -620,6 +624,7 @@ proc PlotStatsDestroyCB {varname} { } # procs +# used by backup proc PlotUpdateCanvas {varname} { upvar #0 $varname var global $varname @@ -900,6 +905,7 @@ proc PlotBackup {ch dir} { upvar #0 $varname var global $varname + puts $ch "global $varname" puts $ch "PlotDialog $varname $varname" set cc $var(graph,current) @@ -924,6 +930,23 @@ proc PlotBackup {ch dir} { } puts $ch "wm geometry $var(top) [winfo width $var(top)]x[winfo height $var(top)]" + puts $ch "set ${varname}(layout) $var(layout)" + puts $ch "set ${varname}(layout,strip,weight) $var(layout,strip,weight)" + puts $ch "PlotChangeLayout $varname" + + puts $ch "set ${varname}(background) $var(background)" + puts $ch "set ${varname}(bar,mode) $var(bar,mode)" + puts $ch "PlotUpdateCanvas $varname" + + puts $ch "set ${varname}(mode) $var(mode)" + puts $ch "PlotChangeMode $varname" + + puts $ch "set ${varname}(graph,current) $gr" + puts $ch "PlotCurrentGraph $varname" + + puts $ch "set ${varname}(graph,ds,current) $ds" + puts $ch "PlotCurrentDataSet $varname" + set var(graph,current) $gr PlotCurrentGraph $varname diff --git a/ds9/library/plotconfig.tcl b/ds9/library/plotconfig.tcl index c79c1e2..04040f5 100644 --- a/ds9/library/plotconfig.tcl +++ b/ds9/library/plotconfig.tcl @@ -22,6 +22,7 @@ proc PlotLoadConfigFile {varname filename} { source $filename + set var(graph,title) $analysisplot(graph,title) set var(graph,title,family) $analysisplot(graph,title,family) set var(graph,title,size) $analysisplot(graph,title,size) set var(graph,title,weight) $analysisplot(graph,title,weight) @@ -49,8 +50,6 @@ proc PlotLoadConfigFile {varname filename} { set var(axis,font,slant) $analysisplot(axis,font,slant) # per Graph - set var(graph,title) $analysisplot(graph,title) - set var(graph,legend,title) $analysisplot(legend,title) set var(graph,axis,x,title) $analysisplot(axis,x,title) -- cgit v0.12