From 7b86ab679cb22e35a9d315ce61bea073d192fde6 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Fri, 24 May 2019 15:21:41 -0400
Subject: add strip plot support

---
 ds9/library/plotbar.tcl     | 20 +++-----------------
 ds9/library/plotline.tcl    | 19 +++----------------
 ds9/library/plotscatter.tcl | 19 +++----------------
 3 files changed, 9 insertions(+), 49 deletions(-)

diff --git a/ds9/library/plotbar.tcl b/ds9/library/plotbar.tcl
index bd56406..d38a49a 100644
--- a/ds9/library/plotbar.tcl
+++ b/ds9/library/plotbar.tcl
@@ -7,6 +7,7 @@ package provide DS9 1.0
 # used by backup
 proc PlotBarTool {} {
     global iap
+
     PlotBar $iap(tt) [msgcat::mc {Bar Plot Tool}] {} {} {} 2 {}
 }
 
@@ -41,28 +42,14 @@ proc PlotBarDialog {varname wtt title xaxis yaxis} {
     upvar #0 $varname var
     global $varname
 
-    PlotBarProc $varname
-    PlotDialog $varname $wtt $title $xaxis $yaxis
-    PlotDialogBar $varname
-    PlotAddGraph $varname
-}
-
-proc PlotBarProc {varname} {
-    upvar #0 $varname var
-    global $varname
-
     set var(proc,addgraph) PlotBarAddGraph
     set var(proc,updategraph) PlotBarUpdateGraph
     set var(proc,updateelement) PlotBarUpdateElement
     set var(proc,highlite) PlotBarHighliteElement
     set var(proc,button) PlotBarButton
-}
-
-proc PlotDialogBar {varname} {
-    upvar #0 $varname var
-    global $varname
 
-    global ds9
+    PlotDialog $varname $wtt $title $xaxis $yaxis
+    PlotAddGraph $varname
 
     # Graph
     $var(mb).graph add separator
@@ -138,7 +125,6 @@ proc PlotDialogBar {varname} {
 	[list PlotBarUpdateElement $varname]
     WidthDashMenu $var(mb).data.error.width $varname error,width {} \
 	[list PlotBarUpdateElement $varname] {}
-
 }
 
 proc PlotBarAddGraph {varname} {
diff --git a/ds9/library/plotline.tcl b/ds9/library/plotline.tcl
index cc51682..60f1d1b 100644
--- a/ds9/library/plotline.tcl
+++ b/ds9/library/plotline.tcl
@@ -7,6 +7,7 @@ package provide DS9 1.0
 # used by backup
 proc PlotLineTool {} {
     global iap
+
     PlotLine $iap(tt) [msgcat::mc {Line Plot Tool}] {} {} {} 2 {}
 }
 
@@ -41,28 +42,14 @@ proc PlotLineDialog {varname wtt title xaxis yaxis} {
     upvar #0 $varname var
     global $varname
 
-    PlotLineProc $varname
-    PlotDialog $varname $wtt $title $xaxis $yaxis
-    PlotDialogLine $varname
-    PlotAddGraph $varname
-}
-
-proc PlotLineProc {varname} {
-    upvar #0 $varname var
-    global $varname
-
     set var(proc,addgraph) PlotLineAddGraph
     set var(proc,updategraph) PlotUpdateGraph
     set var(proc,updateelement) PlotLineUpdateElement
     set var(proc,highlite) PlotLineHighliteElement
     set var(proc,button) PlotLineButton
-}
 
-proc PlotDialogLine {varname} {
-    upvar #0 $varname var
-    global $varname
-
-    global ds9
+    PlotDialog $varname $wtt $title $xaxis $yaxis
+    PlotAddGraph $varname
 
     # Data
     $var(mb).data add checkbutton -label [msgcat::mc {Show}] \
diff --git a/ds9/library/plotscatter.tcl b/ds9/library/plotscatter.tcl
index 2e9f457..e2e1c1c 100644
--- a/ds9/library/plotscatter.tcl
+++ b/ds9/library/plotscatter.tcl
@@ -7,6 +7,7 @@ package provide DS9 1.0
 # used by backup
 proc PlotScatterTool {} {
     global iap
+
     PlotScatter $iap(tt) [msgcat::mc {Scatter Plot Tool}] {} {} {} 2 {}
 }
 
@@ -41,28 +42,14 @@ proc PlotScatterDialog {varname wtt title xaxis yaxis} {
     upvar #0 $varname var
     global $varname
 
-    PlotScatterProc $varname
-    PlotDialog $varname $wtt $title $xaxis $yaxis
-    PlotDialogScatter $varname
-    PlotAddGraph $varname
-}
-
-proc PlotScatterProc {varname} {
-    upvar #0 $varname var
-    global $varname
-
     set var(proc,addgraph) PlotScatterAddGraph
     set var(proc,updategraph) PlotUpdateGraph
     set var(proc,updateelement) PlotScatterUpdateElement
     set var(proc,highlite) PlotScatterHighliteElement
     set var(proc,button) PlotScatterButton
-}
 
-proc PlotDialogScatter {varname} {
-    upvar #0 $varname var
-    global $varname
-
-    global ds9
+    PlotDialog $varname $wtt $title $xaxis $yaxis
+    PlotAddGraph $varname
 
     # Data
     $var(mb).data add checkbutton -label [msgcat::mc {Show}] \
-- 
cgit v0.12