add multiple plot support

4 files changed, 46 insertions, 46 deletions

diff --git a/ds9/parsers/plotparser.tac b/ds9/parsers/plotparser.tac
index 21a94f5..a5378d2 100644
--- a/ds9/parsers/plotparser.tac
+++ b/ds9/parsers/plotparser.tac
@@ -256,19 +256,19 @@ plotCmd : LOAD_ load
  | TITLE_ title
  | BARMODE_ barmode {PlotCmdUpdateGraph bar,mode $2}
 
- | SHOW_ yesno {PlotCmdUpdateElement show $2}
+ | SHOW_ yesno {PlotCmdUpdateElement graph,ds,show $2}
  | COLOR_ color
- | FILL_ yesno {PlotCmdUpdateElement fill $2}
- | FILLCOLOR_ STRING_ {PlotCmdUpdateElement fill,color $2}
+ | FILL_ yesno {PlotCmdUpdateElement graph,ds,fill $2}
+ | FILLCOLOR_ STRING_ {PlotCmdUpdateElement graph,ds,fill,color $2}
  | ERROR_ errorr
  # backward compatibility
  | ERRORBAR_ errorr
- | NAME_ STRING_ {PlotCmdUpdateElement name $2}
+ | NAME_ STRING_ {PlotCmdUpdateElement graph,ds,name $2}
  | SHAPE_ shape
  | RELIEF_ relief {PlotCmdUpdateElement bar,relief $2}
- | SMOOTH_ smooth {PlotCmdUpdateElement smooth $2}
- | WIDTH_ INT_ {PlotCmdUpdateElement width $2}
- | DASH_ yesno {PlotCmdUpdateElement dash $2}
+ | SMOOTH_ smooth {PlotCmdUpdateElement graph,ds,smooth $2}
+ | WIDTH_ INT_ {PlotCmdUpdateElement graph,ds,width $2}
+ | DASH_ yesno {PlotCmdUpdateElement graph,ds,dash $2}
 
  | SELECT_ INT_ {PlotCmdSelectData $2}
  # backward compatibility
@@ -400,9 +400,9 @@ barmode : NORMAL_ {set _ normal}
  | OVERLAP_ {set _ overlap}
  ;
 
-color : STRING_ {PlotCmdUpdateElement color $1}
+color : STRING_ {PlotCmdUpdateElement graph,ds,color $1}
 # backward compatiabilty
- | dummy1 STRING_ {PlotCmdUpdateElement color $2}
+ | dummy1 STRING_ {PlotCmdUpdateElement graph,ds,color $2}
  ;
 
 dummy1 : DISCRETE_
@@ -489,8 +489,8 @@ oldGraphScale : LINEARLINEAR_ {PlotCmdUpdateGraph "axis,x,log" 0; PlotCmdUpdateG
 
 # backward compatibility
 oldLine : DISCRETE_ shapes {PlotCmdUpdateElement shape,symbol $2}
- | dummy2 WIDTH_ INT_ {PlotCmdUpdateElement width $3}
- | dummy2 DASH_ yesno {PlotCmdUpdateElement dash $3}
+ | dummy2 WIDTH_ INT_ {PlotCmdUpdateElement graph,ds,width $3}
+ | dummy2 DASH_ yesno {PlotCmdUpdateElement graph,ds,dash $3}
  | dummy2 STYLE_ INT_ {PlotCmdUpdateElement error $3}
  ;
 
@@ -503,10 +503,10 @@ dummy2 : LINE_
  ; 
 
 # backward compatibility
-oldView : DISCRETE_ yesno {PlotCmdUpdateElement show $2}
- | LINE_ yesno {PlotCmdUpdateElement show $2; PlotCmdUpdateElement smooth linear}
- | STEP_ yesno {PlotCmdUpdateElement show $2; PlotCmdUpdateElement smooth step}
- | QUADRATIC_ yesno {PlotCmdUpdateElement show $2; PlotCmdUpdateElement smooth quadratic}
+oldView : DISCRETE_ yesno {PlotCmdUpdateElement graph,ds,show $2}
+ | LINE_ yesno {PlotCmdUpdateElement graph,ds,show $2; PlotCmdUpdateElement graph,ds,smooth linear}
+ | STEP_ yesno {PlotCmdUpdateElement graph,ds,show $2; PlotCmdUpdateElement graph,ds,smooth step}
+ | QUADRATIC_ yesno {PlotCmdUpdateElement graph,ds,show $2; PlotCmdUpdateElement graph,ds,smooth quadratic}
  | ERROR_ yesno {PlotCmdUpdateElement error $2}
  | ERRORBAR_ yesno {PlotCmdUpdateElement error $2}
  ;
diff --git a/ds9/parsers/plotparser.tcl b/ds9/parsers/plotparser.tcl
index 5f3b39a..2f771c4 100644
--- a/ds9/parsers/plotparser.tcl
+++ b/ds9/parsers/plotparser.tcl
@@ -5430,14 +5430,14 @@ proc plot::yyparse {} {
                     79 { ProcessCmdCVAR mode $2 PlotChangeMode }
                     81 { PlotCmdUpdateGraph graph,bg $2 }
                     85 { PlotCmdUpdateGraph bar,mode $2 }
-                    86 { PlotCmdUpdateElement show $2 }
-                    88 { PlotCmdUpdateElement fill $2 }
-                    89 { PlotCmdUpdateElement fill,color $2 }
-                    92 { PlotCmdUpdateElement name $2 }
+                    86 { PlotCmdUpdateElement graph,ds,show $2 }
+                    88 { PlotCmdUpdateElement graph,ds,fill $2 }
+                    89 { PlotCmdUpdateElement graph,ds,fill,color $2 }
+                    92 { PlotCmdUpdateElement graph,ds,name $2 }
                     94 { PlotCmdUpdateElement bar,relief $2 }
-                    95 { PlotCmdUpdateElement smooth $2 }
-                    96 { PlotCmdUpdateElement width $2 }
-                    97 { PlotCmdUpdateElement dash $2 }
+                    95 { PlotCmdUpdateElement graph,ds,smooth $2 }
+                    96 { PlotCmdUpdateElement graph,ds,width $2 }
+                    97 { PlotCmdUpdateElement graph,ds,dash $2 }
                     98 { PlotCmdSelectData $2 }
                     99 { PlotCmdSelectData $2 }
                     102 { PlotCmdExport [ExtToFormat $1] $1 }
@@ -5518,8 +5518,8 @@ proc plot::yyparse {} {
                     177 { set _ stacked }
                     178 { set _ aligned }
                     179 { set _ overlap }
-                    180 { PlotCmdUpdateElement color $1 }
-                    181 { PlotCmdUpdateElement color $2 }
+                    180 { PlotCmdUpdateElement graph,ds,color $1 }
+                    181 { PlotCmdUpdateElement graph,ds,color $2 }
                     189 { PlotCmdUpdateElement error $1 }
                     190 { PlotCmdUpdateElement error,cap $2 }
                     191 { PlotCmdUpdateElement error,color $2 }
@@ -5563,13 +5563,13 @@ proc plot::yyparse {} {
                     236 { PlotCmdUpdateGraph "axis,x,log" 1; PlotCmdUpdateGraph "axis,y,log" 0 }
                     237 { PlotCmdUpdateGraph "axis,x,log" 1; PlotCmdUpdateGraph "axis,y,log" 1 }
                     238 { PlotCmdUpdateElement shape,symbol $2 }
-                    239 { PlotCmdUpdateElement width $3 }
-                    240 { PlotCmdUpdateElement dash $3 }
+                    239 { PlotCmdUpdateElement graph,ds,width $3 }
+                    240 { PlotCmdUpdateElement graph,ds,dash $3 }
                     241 { PlotCmdUpdateElement error $3 }
-                    248 { PlotCmdUpdateElement show $2 }
-                    249 { PlotCmdUpdateElement show $2; PlotCmdUpdateElement smooth linear }
-                    250 { PlotCmdUpdateElement show $2; PlotCmdUpdateElement smooth step }
-                    251 { PlotCmdUpdateElement show $2; PlotCmdUpdateElement smooth quadratic }
+                    248 { PlotCmdUpdateElement graph,ds,show $2 }
+                    249 { PlotCmdUpdateElement graph,ds,show $2; PlotCmdUpdateElement graph,ds,smooth linear }
+                    250 { PlotCmdUpdateElement graph,ds,show $2; PlotCmdUpdateElement graph,ds,smooth step }
+                    251 { PlotCmdUpdateElement graph,ds,show $2; PlotCmdUpdateElement graph,ds,smooth quadratic }
                     252 { PlotCmdUpdateElement error $2 }
                     253 { PlotCmdUpdateElement error $2 }
                 }
diff --git a/ds9/parsers/plotsendparser.tac b/ds9/parsers/plotsendparser.tac
index 379fe28..87aaf2c 100644
--- a/ds9/parsers/plotsendparser.tac
+++ b/ds9/parsers/plotsendparser.tac
@@ -81,19 +81,19 @@ plotCmd : STATS_ {ProcessSendCmdCVAR PlotStatsGenerate}
  | FONT_ fontt
  | TITLE_ title
  | BARMODE_ {PlotSendCmdCVARGet bar,mode}
- | SHOW_ {PlotSendCmdCVARYesNo show}
- | COLOR_ {PlotSendCmdCVARGet color}
- | FILL_ {PlotSendCmdCVARGet fill}
- | FILLCOLOR_ {PlotSendCmdCVARGet fill,color}
+ | SHOW_ {ProcessSendCmdCVARYesNo graph,ds,show}
+ | COLOR_ {ProcessSendCmdCVARGet graph,ds,color}
+ | FILL_ {ProcessSendCmdCVARGet graph,ds,fill}
+ | FILLCOLOR_ {ProcessSendCmdCVARGet graph,ds,fill,color}
  | ERROR_ errorr
  # backward compatibility
  | ERRORBAR_ errorr
- | NAME_ {PlotSendCmdCVARGet name}
+ | NAME_ {ProcessSendCmdCVARGet graph,ds,name}
  | SHAPE_ shape
  | RELIEF_ {PlotSendCmdCVARGet bar,relief}
- | SMOOTH_ {PlotSendCmdCVARGet smooth}
- | WIDTH_ {PlotSendCmdCVARGet width}
- | DASH_ {PlotSendCmdCVARYesNo dash}
+ | SMOOTH_ {ProcessSendCmdCVARGet graph,ds,smooth}
+ | WIDTH_ {ProcessSendCmdCVARGet graph,ds,width}
+ | DASH_ {ProcessSendCmdCVARYesNo graph,ds,dash}
  | SELECT_ {PlotSendCmdCVARGet data,current}
  # backward compatibility
  | DATASET_ {PlotSendCmdCVARGet data,current}
diff --git a/ds9/parsers/plotsendparser.tcl b/ds9/parsers/plotsendparser.tcl
index ce58ec1..f154a65 100644
--- a/ds9/parsers/plotsendparser.tcl
+++ b/ds9/parsers/plotsendparser.tcl
@@ -1491,15 +1491,15 @@ proc plotsend::yyparse {} {
                     15 { ProcessSendCmdCVARGet mode }
                     17 { ProcessSendCmdCVARGet graph,bg }
                     21 { PlotSendCmdCVARGet bar,mode }
-                    22 { PlotSendCmdCVARYesNo show }
-                    23 { PlotSendCmdCVARGet color }
-                    24 { PlotSendCmdCVARGet fill }
-                    25 { PlotSendCmdCVARGet fill,color }
-                    28 { PlotSendCmdCVARGet name }
+                    22 { ProcessSendCmdCVARYesNo graph,ds,show }
+                    23 { ProcessSendCmdCVARGet graph,ds,color }
+                    24 { ProcessSendCmdCVARGet graph,ds,fill }
+                    25 { ProcessSendCmdCVARGet graph,ds,fill,color }
+                    28 { ProcessSendCmdCVARGet graph,ds,name }
                     30 { PlotSendCmdCVARGet bar,relief }
-                    31 { PlotSendCmdCVARGet smooth }
-                    32 { PlotSendCmdCVARGet width }
-                    33 { PlotSendCmdCVARYesNo dash }
+                    31 { ProcessSendCmdCVARGet graph,ds,smooth }
+                    32 { ProcessSendCmdCVARGet graph,ds,width }
+                    33 { ProcessSendCmdCVARYesNo graph,ds,dash }
                     34 { PlotSendCmdCVARGet data,current }
                     35 { PlotSendCmdCVARGet data,current }
                     36 { ProcessSendCmdCVARYesNo "axis,$1,grid" }