diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-07-20 18:31:08 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-07-20 18:31:08 (GMT) |
| commit | 5d2962136e70d87a8aacfa26641338bfec90fb95 (patch) | |
| tree | 44f0714376f5197cd2f4bd34383152745d92929b | |
| parent | adb973c50dc205454719923e48eb6bd484d86847 (diff) | |
| download | blt-5d2962136e70d87a8aacfa26641338bfec90fb95.zip blt-5d2962136e70d87a8aacfa26641338bfec90fb95.tar.gz blt-5d2962136e70d87a8aacfa26641338bfec90fb95.tar.bz2 | |
support multiple graphs per plot
| -rw-r--r-- | ds9/library/markeranalysispanda.tcl | 50 | ||||
| -rw-r--r-- | ds9/library/markeranalysisplot2d.tcl | 1 |
2 files changed, 27 insertions, 24 deletions
diff --git a/ds9/library/markeranalysispanda.tcl b/ds9/library/markeranalysispanda.tcl index 282ff90..a54391a 100644 --- a/ds9/library/markeranalysispanda.tcl +++ b/ds9/library/markeranalysispanda.tcl @@ -95,29 +95,30 @@ proc MarkerAnalysisPandaCB {frame id} { set sys $wcs(system) } - set ping [PlotPing $vvarname] + for {set jj 0} {$jj<$var(angnum)} {incr jj} { + set xdata ${vvarname}xx$jj + set ydata ${vvarname}yy$jj + set yedata ${vvarname}ye$jj + global $xdata $ydata $yedata - if {!$ping} { + if {[info command $xdata] == {}} { + blt::vector create $xdata $ydata $yedata + } + $frame get marker $id analysis panda $xdata $ydata $yedata $sys $jj + } + + if {![PlotPing $vvarname]} { PlotLineDialog $vvarname [string totitle [$frame get marker $id type]] PlotTitle $vvarname "Radial Profile" $sys {} - MarkerAnalysisPandaAxisTitle $vvarname - } - PlotDeleteDataSetAll $vvarname + MarkerAnalysisPandaAxisTitle $vvarname - set data [$frame get marker $id analysis panda $sys] - set id 0 - for {set jj 0} {$jj<$var(angnum)} {incr jj} { - set dd {} - for {set ii 0} {$ii<$var(annuli)} {incr ii} { - lappend dd [lindex $data $id] - incr id - lappend dd [lindex $data $id] - incr id - lappend dd [lindex $data $id] - incr id - } - PlotAddDataSet $vvarname 3 $dd + for {set jj 0} {$jj<$var(angnum)} {incr jj} { + set vvar(graph,ds,xdata) ${vvarname}xx$jj + set vvar(graph,ds,ydata) ${vvarname}yy$jj + set vvar(graph,ds,yedata) ${vvarname}ye$jj + PlotExternal $vvarname xyey + } } PlotStats $vvarname @@ -164,11 +165,12 @@ proc MarkerAnalysisPandaAxisTitle {vvarname} { } } - # set for plot code - set vvar(graph,axis,x,title) $xtitle - set vvar(graph,axis,y,title) $ytitle + set cc 1 + if {[info exists vvar($cc,graph)]} { + set vvar($cc,axis,x,title) $xtitle + set vvar($cc,axis,y,title) $ytitle - # update now (may not make it into plot code) - $vvar(graph) xaxis configure -title $xtitle - $vvar(graph) yaxis configure -title $ytitle + $vvar($cc,graph) xaxis configure -title $xtitle + $vvar($cc,graph) yaxis configure -title $ytitle + } } diff --git a/ds9/library/markeranalysisplot2d.tcl b/ds9/library/markeranalysisplot2d.tcl index 85f2e17..dc695b2 100644 --- a/ds9/library/markeranalysisplot2d.tcl +++ b/ds9/library/markeranalysisplot2d.tcl @@ -149,6 +149,7 @@ proc MarkerAnalysisPlot2dCB {frame id} { set xcdata ${vvarname}xc set ycdata ${vvarname}yc global $xdata $ydata $xcdata $ycdata + if {[info command $xdata] == {}} { blt::vector create $xdata $ydata } |