From a2ec298aae86bcf577e28753820cb6399b1b80b4 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Tue, 28 May 2019 13:37:38 -0400
Subject: add multiple plot support

---
 ds9/library/plotdialog.tcl  | 26 ++++++++++++++++++++++++++
 ds9/library/plotline.tcl    | 20 ++------------------
 ds9/library/plotscatter.tcl | 19 ++-----------------
 3 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/ds9/library/plotdialog.tcl b/ds9/library/plotdialog.tcl
index 39811bc..c4383e6 100644
--- a/ds9/library/plotdialog.tcl
+++ b/ds9/library/plotdialog.tcl
@@ -567,6 +567,32 @@ proc PlotShapeMenu {varname} {
 	[list $var(proc,updateelement) $varname]
 }
 
+proc PlotErrorMenu {varname} {
+    upvar #0 $varname var
+    global $varname
+
+    set tt $var(graph,total)
+    set cc $var(graph,current)
+
+    menu $var(mb).data.error
+    $var(mb).data.error add checkbutton -label [msgcat::mc {Show}] \
+	-variable ${varname}(graph$cc,error) \
+	-command [list $var(proc,updateelement) $varname]
+    $var(mb).data.error add checkbutton -label [msgcat::mc {Cap}] \
+	-variable ${varname}(graph$cc,error,cap) \
+	-command [list $var(proc,updateelement) $varname]
+    $var(mb).data.error add separator
+    $var(mb).data.error add cascade -label [msgcat::mc {Color}] \
+	-menu $var(mb).data.error.color
+    $var(mb).data.error add cascade -label [msgcat::mc {Width}] \
+	-menu $var(mb).data.error.width
+
+    PlotColorMenu $var(mb).data.error.color $varname graph$cc,error,color \
+	[list $var(proc,updateelement) $varname]
+    WidthDashMenu $var(mb).data.error.width $varname graph$cc,error,width {} \
+	[list $var(proc,updateelement) $varname] {}
+}
+
 proc PlotExportDialog {varname format} {
     upvar #0 $varname var
     global $varname
diff --git a/ds9/library/plotline.tcl b/ds9/library/plotline.tcl
index bd86187..5f21f07 100644
--- a/ds9/library/plotline.tcl
+++ b/ds9/library/plotline.tcl
@@ -75,6 +75,7 @@ proc PlotLineDialog {varname wtt title xaxis yaxis} {
     $var(mb).data add command -label "[msgcat::mc {Name}]..." \
 	-command [list DatasetNameDialog $varname]
 
+    # Shape
     PlotShapeMenu $varname
 
     # Smooth
@@ -140,24 +141,7 @@ proc PlotLineDialog {varname wtt title xaxis yaxis} {
 	[list PlotLineUpdateElement $varname]
 
     # Error
-    menu $var(mb).data.error
-    $var(mb).data.error add checkbutton -label [msgcat::mc {Show}] \
-	-variable ${varname}(graph$cc,error) \
-	-command [list PlotLineUpdateElement $varname]
-    $var(mb).data.error add checkbutton -label [msgcat::mc {Cap}] \
-	-variable ${varname}(graph$cc,error,cap) \
-	-command [list PlotLineUpdateElement $varname]
-    $var(mb).data.error add separator
-    $var(mb).data.error add cascade -label [msgcat::mc {Color}] \
-	-menu $var(mb).data.error.color
-    $var(mb).data.error add cascade -label [msgcat::mc {Width}] \
-	-menu $var(mb).data.error.width
-
-    PlotColorMenu $var(mb).data.error.color $varname graph$cc,error,color \
-	[list PlotLineUpdateElement $varname]
-    WidthDashMenu $var(mb).data.error.width $varname graph$cc,error,width {} \
-	[list PlotLineUpdateElement $varname] {}
-
+    PlotErrorMenu $varname
 }
 
 proc PlotLineAddGraph {varname} {
diff --git a/ds9/library/plotscatter.tcl b/ds9/library/plotscatter.tcl
index 5904ce7..342a04e 100644
--- a/ds9/library/plotscatter.tcl
+++ b/ds9/library/plotscatter.tcl
@@ -67,26 +67,11 @@ proc PlotScatterDialog {varname wtt title xaxis yaxis} {
     $var(mb).data add command -label "[msgcat::mc {Name}]..." \
 	-command [list DatasetNameDialog $varname]
 
+    # Shape
     PlotShapeMenu $varname
 
     # Error
-    menu $var(mb).data.error
-    $var(mb).data.error add checkbutton -label [msgcat::mc {Show}] \
-	-variable ${varname}(graph$cc,error) \
-	-command [list PlotScatterUpdateElement $varname]
-    $var(mb).data.error add checkbutton -label [msgcat::mc {Cap}] \
-	-variable ${varname}(graph$cc,error,cap) \
-	-command [list PlotScatterUpdateElement $varname]
-    $var(mb).data.error add separator
-    $var(mb).data.error add cascade -label [msgcat::mc {Color}] \
-	-menu $var(mb).data.error.color
-    $var(mb).data.error add cascade -label [msgcat::mc {Width}] \
-	-menu $var(mb).data.error.width
-
-    PlotColorMenu $var(mb).data.error.color $varname graph$cc,error,color \
-	[list PlotScatterUpdateElement $varname]
-    WidthDashMenu $var(mb).data.error.width $varname graph$cc,error,width {} \
-	[list PlotScatterUpdateElement $varname] {}
+    PlotErrorMenu $varname
 }
 
 proc PlotScatterAddGraph {varname} {
-- 
cgit v0.12