diff options
-rw-r--r-- | ds9/library/plot.tcl | 18 | ||||
-rw-r--r-- | ds9/library/plotdata.tcl | 10 | ||||
-rw-r--r-- | ds9/library/plotstate.tcl | 15 |
3 files changed, 16 insertions, 27 deletions
diff --git a/ds9/library/plot.tcl b/ds9/library/plot.tcl index b51dc9f..486fb27 100644 --- a/ds9/library/plot.tcl +++ b/ds9/library/plot.tcl @@ -53,11 +53,6 @@ proc PlotAddGraph {varname} { set var($cc,data,total) 0 set var($cc,data,current) 0 - set var($cc,xdata) {} - set var($cc,ydata) {} - set var($cc,xedata) {} - set var($cc,yedata) {} - PlotInitGraph $varname $var(proc,addgraph) $varname @@ -226,11 +221,6 @@ proc PlotCurrentData {varname} { set var($cc,manage) $var($cc,$nn,manage) set var($cc,dim) $var($cc,$nn,dim) - set var($cc,xdata) $var($cc,$nn,xdata) - set var($cc,ydata) $var($cc,$nn,ydata) - set var($cc,xedata) $var($cc,$nn,xedata) - set var($cc,yedata) $var($cc,$nn,yedata) - PlotRestoreState $varname $nn } @@ -326,11 +316,6 @@ proc PlotExternal {varname} { set var($cc,$nn,manage) $var($cc,manage) set var($cc,$nn,dim) $var($cc,dim) - set var($cc,$nn,xdata) $var($cc,xdata) - set var($cc,$nn,ydata) $var($cc,ydata) - set var($cc,$nn,xedata) $var($cc,xedata) - set var($cc,$nn,yedata) $var($cc,yedata) - PlotSaveState $varname # update data set menu @@ -363,8 +348,7 @@ proc PlotListGenerate {varname} { set rr {} if {$var($cc,xdata) != {}} { - global $var($cc,xdata) $var($cc,ydata) \ - $var($cc,xedata) $var($cc,yedata) + global $var($cc,xdata) $var($cc,ydata) $var($cc,xedata) $var($cc,yedata) set ll [$var($cc,xdata) length] set xx [$var($cc,xdata) range] set yy [$var($cc,ydata) range] diff --git a/ds9/library/plotdata.tcl b/ds9/library/plotdata.tcl index b3b6d36..15d76e8 100644 --- a/ds9/library/plotdata.tcl +++ b/ds9/library/plotdata.tcl @@ -238,11 +238,6 @@ proc PlotDataSetOne {varname dim data} { set var($cc,$nn,manage) 1 set var($cc,$nn,dim) $var($cc,dim) - set var($cc,$nn,xdata) $var($cc,xdata) - set var($cc,$nn,ydata) $var($cc,ydata) - set var($cc,$nn,xedata) $var($cc,xedata) - set var($cc,$nn,yedata) $var($cc,yedata) - PlotSaveState $varname # update data set menu @@ -334,11 +329,6 @@ proc PlotDupData {varname mm} { set var($cc,manage) $var($cc,$nn,manage) set var($cc,dim) $var($cc,$nn,dim) - set var($cc,xdata) $var($cc,$nn,xdata) - set var($cc,ydata) $var($cc,$nn,ydata) - set var($cc,xedata) $var($cc,$nn,xedata) - set var($cc,yedata) $var($cc,$nn,yedata) - PlotRestoreState $varname $nn PlotAddData $varname diff --git a/ds9/library/plotstate.tcl b/ds9/library/plotstate.tcl index 8d20eb9..ed0ab97 100644 --- a/ds9/library/plotstate.tcl +++ b/ds9/library/plotstate.tcl @@ -113,6 +113,11 @@ proc PlotInitGraph {varname} { set var(graph,axis,y,format) $pap(graph,axis,y,format) # per DataSet + set var(graph1,xdata) {} + set var(graph1,ydata) {} + set var(graph1,xedata) {} + set var(graph1,yedata) {} + set var(graph,ds,name) $pap(graph,ds,name) set var(graph,ds,show) $pap(graph,ds,show) set var(graph,ds,smooth) $pap(graph,ds,smooth) @@ -167,6 +172,11 @@ proc PlotSaveState {varname} { set var($cc,axis,y,format) $var(graph,axis,y,format) # per DataSet + set var($cc,$nn,xdata) $var($cc,xdata) + set var($cc,$nn,ydata) $var($cc,ydata) + set var($cc,$nn,xedata) $var($cc,xedata) + set var($cc,$nn,yedata) $var($cc,yedata) + set var($cc,$nn,name) $var(graph,ds,name) set var($cc,$nn,show) $var(graph,ds,show) set var($cc,$nn,smooth) $var(graph,ds,smooth) @@ -221,6 +231,11 @@ proc PlotRestoreState {varname nn} { set var(graph,axis,y,format) $var($cc,axis,y,format) # per DataSet + set var($cc,xdata) $var($cc,$nn,xdata) + set var($cc,ydata) $var($cc,$nn,ydata) + set var($cc,xedata) $var($cc,$nn,xedata) + set var($cc,yedata) $var($cc,$nn,yedata) + set var(graph,ds,name) $var($cc,$nn,name) set var(graph,ds,show) $var($cc,$nn,show) set var(graph,ds,smooth) $var($cc,$nn,smooth) |