From 86fcbe6827bd920c0fc8317d63f37697f0c22ad8 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Thu, 6 Jun 2019 17:18:30 -0400
Subject: support multiple graphs per  plot

---
 ds9/library/markeranalysishist.tcl | 7 ++++---
 ds9/library/plotdialog.tcl         | 3 ---
 ds9/library/plotstate.tcl          | 7 ++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ds9/library/markeranalysishist.tcl b/ds9/library/markeranalysishist.tcl
index ed585f3..556241c 100644
--- a/ds9/library/markeranalysishist.tcl
+++ b/ds9/library/markeranalysishist.tcl
@@ -86,13 +86,14 @@ proc MarkerAnalysisHistogramCB {frame id} {
 	set vvar(graph,ds,ydata) $ydata
 	blt::vector create $xdata $ydata
     }
-
+ 
     $frame get marker $id analysis histogram $xdata $ydata $vvar(nbins)
 
     if {!$ping} {
 	PlotExternal $vvarname
-	set vvar(smooth) step
-	set vvar(fill) 1
+	set vvar(graph,ds,smooth) step
+	set vvar(graph,ds,fill) 1
+
 	$vvar(proc,updateelement) $vvarname
 	$vvar(proc,updategraph) $vvarname
     }
diff --git a/ds9/library/plotdialog.tcl b/ds9/library/plotdialog.tcl
index e966d77..558925b 100644
--- a/ds9/library/plotdialog.tcl
+++ b/ds9/library/plotdialog.tcl
@@ -34,9 +34,6 @@ proc PlotDialog {varname wtt title xaxis yaxis} {
 
     PlotTitle $varname $title $xaxis $yaxis
 
-    # can be turned off for external line plots
-    set var(graph,format) 1
-
     # create window
     Toplevel $var(top) $var(mb) 7 $wtt [list PlotDestroy $varname]
 
diff --git a/ds9/library/plotstate.tcl b/ds9/library/plotstate.tcl
index aeacd6b..d3c40f2 100644
--- a/ds9/library/plotstate.tcl
+++ b/ds9/library/plotstate.tcl
@@ -92,9 +92,9 @@ proc PlotInitGraph {varname} {
     set cc $var(graph,current)
     set nn $var($cc,data,current)
     set var(graph) $var($cc)
-    set var(graph,ds) $nn
-    
+
     # per Graph
+    set var(graph,format) 1
     set var(graph,legend) $pap(graph,legend)
     set var(graph,legend,title) $pap(graph,legend,title)
     set var(graph,legend,position) $pap(graph,legend,position)
@@ -156,6 +156,7 @@ proc PlotSaveState {varname} {
 
     # per Graph
     set var($cc,title) $var(graph,title)
+    set var($cc,format) $var(graph,format)
 
     set var($cc,legend) $var(graph,legend)
     set var($cc,legend,title) $var(graph,legend,title)
@@ -216,10 +217,10 @@ proc PlotRestoreState {varname} {
     set cc $var(graph,current)
     set nn $var($cc,data,current)
     set var(graph) $var($cc)
-    set var(graph,ds) $nn
 
     # per Graph
     set var(graph,title) $var($cc,title)
+    set var(graph,format) $var($cc,format)
 
     set var(graph,legend) $var($cc,legend)
     set var(graph,legend,title) $var($cc,legend,title)
-- 
cgit v0.12