summaryrefslogtreecommitdiffstats
path: root/ds9
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2019-08-01 15:35:42 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2019-08-01 15:35:42 (GMT)
commit500aec56992397eb4facbd3337e6c9dc194af8c1 (patch)
tree53760de96f8370e17dc7b873ce14f1a20ab020a3 /ds9
parent6e561853425ea49c50dad5fad6cb8177b2bfc20d (diff)
parentf75994fc77b6e520c7df8ecd0d89fa87e2dc44ea (diff)
downloadblt-500aec56992397eb4facbd3337e6c9dc194af8c1.zip
blt-500aec56992397eb4facbd3337e6c9dc194af8c1.tar.gz
blt-500aec56992397eb4facbd3337e6c9dc194af8c1.tar.bz2
Merge branch 'master' into devel
Diffstat (limited to 'ds9')
-rw-r--r--ds9/library/plot.tcl6
-rw-r--r--ds9/library/plotstate.tcl1
2 files changed, 6 insertions, 1 deletions
diff --git a/ds9/library/plot.tcl b/ds9/library/plot.tcl
index e01e331..d54f31f 100644
--- a/ds9/library/plot.tcl
+++ b/ds9/library/plot.tcl
@@ -641,6 +641,7 @@ proc PlotUpdateCanvas {varname} {
column {
set legendpos $var(legend,position)
+ set var(layout,axis,x,title) {}
set var(layout,axis,x,min) 0
set var(layout,axis,x,max) 1
set var(layout,axis,x,grid) 1
@@ -663,6 +664,7 @@ proc PlotUpdateCanvas {varname} {
set xmax $var($first,axis,x,max)
}
+ set var(layout,axis,x,title) $var($first,axis,x,title)
set var(layout,axis,x,min) $xmin
set var(layout,axis,x,max) $xmax
set var(layout,axis,x,grid) $var($first,axis,x,grid)
@@ -778,10 +780,12 @@ proc PlotUpdateGraph {varname} {
}
if {$var(graph,axis,x,manage)} {
+ set xtitle $var(graph,axis,x,title)
set xgrid $var(graph,axis,x,grid)
set xlog $var(graph,axis,x,log)
set xflip $var(graph,axis,x,flip)
} else {
+ set xtitle $var(layout,axis,x,title)
set xgrid $var(layout,axis,x,grid)
set xlog $var(layout,axis,x,log)
set xflip $var(layout,axis,x,flip)
@@ -817,7 +821,7 @@ proc PlotUpdateGraph {varname} {
}
if {[$var(graph) xaxis cget -showticks]} {
- $var(graph) xaxis configure -title $var(graph,axis,x,title)
+ $var(graph) xaxis configure -title $xtitle
} else {
$var(graph) xaxis configure -title {}
}
diff --git a/ds9/library/plotstate.tcl b/ds9/library/plotstate.tcl
index d7fd277..58e7404 100644
--- a/ds9/library/plotstate.tcl
+++ b/ds9/library/plotstate.tcl
@@ -11,6 +11,7 @@ proc PlotDefState {} {
# per Canvas
set pap(layout) grid
set pap(layout,strip,weight) 50
+ set pap(layout,axis,x,title) {}
set pap(layout,axis,x,min) 0
set pap(layout,axis,x,max) 0
set pap(layout,axis,x,grid) 0