summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2019-07-15 19:31:49 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2019-07-15 19:31:49 (GMT)
commit686d6a223d67200d260b30673ca55882111cb921 (patch)
tree870d7b93a3039df059ee94d773b021cb3c552d54
parent72a3ca9f8d1386f58aed3588303f1a69cdddf48f (diff)
downloadblt-686d6a223d67200d260b30673ca55882111cb921.zip
blt-686d6a223d67200d260b30673ca55882111cb921.tar.gz
blt-686d6a223d67200d260b30673ca55882111cb921.tar.bz2
support multiple graphs per plot
-rw-r--r--ds9/library/markeranalysishist.tcl6
-rw-r--r--ds9/library/markeranalysisplot2d.tcl6
-rw-r--r--ds9/library/markeranalysisplot3d.tcl6
-rw-r--r--ds9/library/markeranalysisradial.tcl8
4 files changed, 13 insertions, 13 deletions
diff --git a/ds9/library/markeranalysishist.tcl b/ds9/library/markeranalysishist.tcl
index 41b65a5..76a76a9 100644
--- a/ds9/library/markeranalysishist.tcl
+++ b/ds9/library/markeranalysishist.tcl
@@ -58,7 +58,7 @@ proc MarkerAnalysisHistogramCB {frame id} {
global $varname
upvar #0 $varname var
- set vvarname ${imarker(prefix,histogram)}${id}${frame}
+ set vvarname ${imarker(prefix,histogram)}marker${id}frame${frame}
upvar #0 $vvarname vvar
global $vvarname
@@ -66,8 +66,8 @@ proc MarkerAnalysisHistogramCB {frame id} {
set vvar(id) $id
set vvar(nbins) 512
- set xdata ${vvarname}x
- set ydata ${vvarname}y
+ set xdata ${vvarname}xx
+ set ydata ${vvarname}yy
global $xdata $ydata
set ping [PlotPing $vvarname]
diff --git a/ds9/library/markeranalysisplot2d.tcl b/ds9/library/markeranalysisplot2d.tcl
index fa84bf8..5c93e30 100644
--- a/ds9/library/markeranalysisplot2d.tcl
+++ b/ds9/library/markeranalysisplot2d.tcl
@@ -116,7 +116,7 @@ proc MarkerAnalysisPlot2dCB {frame id} {
global $varname
upvar #0 $varname var
- set vvarname ${imarker(prefix,plot2d)}${id}${frame}
+ set vvarname ${imarker(prefix,plot2d)}marker${id}frame${frame}
upvar #0 $vvarname vvar
global $vvarname
@@ -144,8 +144,8 @@ proc MarkerAnalysisPlot2dCB {frame id} {
set vvar(method) average
}
- set xdata ${vvarname}x
- set ydata ${vvarname}y
+ set xdata ${vvarname}xx
+ set ydata ${vvarname}yy
set xcdata ${vvarname}xc
set ycdata ${vvarname}yc
global $xdata $ydata $xcdata $ycdata
diff --git a/ds9/library/markeranalysisplot3d.tcl b/ds9/library/markeranalysisplot3d.tcl
index 53a1c93..44f2737 100644
--- a/ds9/library/markeranalysisplot3d.tcl
+++ b/ds9/library/markeranalysisplot3d.tcl
@@ -116,7 +116,7 @@ proc MarkerAnalysisPlot3dCB {frame id} {
global $varname
upvar #0 $varname var
- set vvarname ${imarker(prefix,plot3d)}${id}${frame}
+ set vvarname ${imarker(prefix,plot3d)}marker${id}frame${frame}
upvar #0 $vvarname vvar
global $vvarname
@@ -149,8 +149,8 @@ proc MarkerAnalysisPlot3dCB {frame id} {
set vvar(system) image
}
- set xdata ${vvarname}x
- set ydata ${vvarname}y
+ set xdata ${vvarname}xx
+ set ydata ${vvarname}yy
global $xdata $ydata
set ping [PlotPing $vvarname]
diff --git a/ds9/library/markeranalysisradial.tcl b/ds9/library/markeranalysisradial.tcl
index c87acbf..3002207 100644
--- a/ds9/library/markeranalysisradial.tcl
+++ b/ds9/library/markeranalysisradial.tcl
@@ -77,7 +77,7 @@ proc MarkerAnalysisRadialCB {frame id} {
global $varname
upvar #0 $varname var
- set vvarname ${imarker(prefix,radial)}${id}${frame}
+ set vvarname ${imarker(prefix,radial)}marker${id}frame${frame}
upvar #0 $vvarname vvar
global $vvarname
@@ -95,9 +95,9 @@ proc MarkerAnalysisRadialCB {frame id} {
set sys $wcs(system)
}
- set xdata ${imarker(prefix,radial)}${id}${frame}x
- set ydata ${imarker(prefix,radial)}${id}${frame}y
- set yedata ${imarker(prefix,radial)}${id}${frame}ye
+ set xdata ${vvarname}xx
+ set ydata ${vvarname}yy
+ set yedata ${vvarname}ye
global $xdata $ydata $yedata
set ping [PlotPing $vvarname]