From a4133e2d82866f24b6c8e7a4ee79f69ccdd46b12 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Tue, 30 Jul 2019 16:59:27 -0400
Subject: support multiple graphs per  plot

---
 ds9/parsers/plotparser.tac | 6 +++---
 ds9/parsers/plotparser.tcl | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ds9/parsers/plotparser.tac b/ds9/parsers/plotparser.tac
index 61b7765..93064de 100644
--- a/ds9/parsers/plotparser.tac
+++ b/ds9/parsers/plotparser.tac
@@ -298,10 +298,10 @@ graph : {set _ line}
  | SCATTER_ {set _ scatter}
  ;
 
-select: DATASET_ INT_ {ProcessCmdCVAR graph,ds,current $2}
- | GRAPH_ INT_ {ProcessCmdCVAR graph,current $2}
+select: DATASET_ INT_ {ProcessCmdCVAR graph,ds,current $2 PlotCurrentDataSet}
+ | GRAPH_ INT_ {ProcessCmdCVAR graph,current $2 PlotCurrentGraph}
  # backward compatibility
- | INT_ {ProcessCmdCVAR graph,ds,current $1}
+ | INT_ {ProcessCmdCVAR graph,ds,current $1 PlotCurrentDataSet}
  ;
 
 delete: GRAPH_ {ProcessCmdCVAR0 PlotDeleteGraphCurrent}
diff --git a/ds9/parsers/plotparser.tcl b/ds9/parsers/plotparser.tcl
index 31f28be..5051af6 100644
--- a/ds9/parsers/plotparser.tcl
+++ b/ds9/parsers/plotparser.tcl
@@ -5719,9 +5719,9 @@ proc plot::yyparse {} {
                     107 { set _ line }
                     108 { set _ bar }
                     109 { set _ scatter }
-                    110 { ProcessCmdCVAR graph,ds,current $2 }
-                    111 { ProcessCmdCVAR graph,current $2 }
-                    112 { ProcessCmdCVAR graph,ds,current $1 }
+                    110 { ProcessCmdCVAR graph,ds,current $2 PlotCurrentDataSet }
+                    111 { ProcessCmdCVAR graph,current $2 PlotCurrentGraph }
+                    112 { ProcessCmdCVAR graph,ds,current $1 PlotCurrentDataSet }
                     113 { ProcessCmdCVAR0 PlotDeleteGraphCurrent }
                     114 { ProcessCmdCVAR0 PlotDeleteDataSetCurrent }
                     115 { PlotCmdExport [ExtToFormat $1] $1 }
-- 
cgit v0.12