add multiple plot support

6 files changed, 129 insertions, 110 deletions

diff --git a/ds9/library/plot.tcl b/ds9/library/plot.tcl
index 8468285..e8f8b0b 100644
--- a/ds9/library/plot.tcl
+++ b/ds9/library/plot.tcl
@@ -125,6 +125,15 @@ proc PlotAddGraph {varname} {
 
     array set $varname [array get pap]
     set var(graph$cc,show) $pap(show)
+    set var(graph$cc,shape,symbol) $pap(shape,symbol)
+    set var(graph$cc,shape,fill) $pap(shape,fill)
+    set var(graph$cc,shape,color) $pap(shape,color)
+    set var(graph$cc,smooth) $pap(smooth)
+    set var(graph$cc,color) $pap(color)
+    set var(graph$cc,fill) $pap(fill)
+    set var(graph$cc,fill,color) $pap(fill,color)
+    set var(graph$cc,width) $pap(width)
+    set var(graph$cc,dash) $pap(dash)
 
     $var(proc,addgraph) $varname
 
@@ -331,30 +340,33 @@ proc PlotDataSet {varname dim data} {
     upvar #0 $varname var
     global $varname
 
+    set tt $var(graph,total)
+    set cc $var(graph,current)
+
     switch -- $dim {
 	4 {
 	    # first data set
 	    PlotDataSetOne $varname "4.1" $data
 
 	    # set color
-	    set cc $var(color)
-	    set var(color) [PlotNextColor $var(color)]
+	    set col $var(graph$cc,color)
+	    set var(graph$cc,color) [PlotNextColor $var(graph$cc,color)]
 
 	    # second data set
 	    PlotDataSetOne $varname "4.2" $data
-	    set var(color) $cc
+	    set var(graph$cc,color) $col
 	}
 	5 {
 	    # first data set
 	    PlotDataSetOne $varname "5.1" $data
 
 	    # set color
-	    set cc $var(color)
-	    set var(color) [PlotNextColor $var(color)]
+	    set col $var(graph$cc,color)
+	    set var(graph$cc,color) [PlotNextColor $var(graph$cc,color)]
 
 	    # second data set
 	    PlotDataSetOne $varname "5.2" $data
-	    set var(color) $cc
+	    set var(graph$cc,color) $col
 	}
 	default {PlotDataSetOne $varname $dim $data}
     }
@@ -606,15 +618,16 @@ proc PlotDupData {varname mm} {
     set var(graph$cc,$nn,dim) $var(graph$cc,$mm,dim)
 
     set var(graph$cc,$nn,show) $var(graph$cc,$mm,show)
-    set var($nn,shape,symbol) $var($mm,shape,symbol)
-    set var($nn,shape,fill) $var($mm,shape,fill)
-    set var($nn,shape,color) $var($mm,shape,color)
-    set var($nn,smooth) $var($mm,smooth)
-    set var($nn,color) [PlotNextColor $var($mm,color)]
-    set var($nn,fill) $var($mm,fill)
-    set var($nn,fill,color) [PlotNextColor $var($mm,fill,color)]
-    set var($nn,width) $var($mm,width)
-    set var($nn,dash) $var($mm,dash)
+    set var(graph$cc,$nn,shape,symbol) $var(graph$cc,$mm,shape,symbol)
+    set var(graph$cc,$nn,shape,fill) $var(graph$cc,$mm,shape,fill)
+    set var(graph$cc,$nn,shape,color) $var(graph$cc,$mm,shape,color)
+    set var(graph$cc,$nn,smooth) $var(graph$cc,$mm,smooth)
+    set var(graph$cc,$nn,color) [PlotNextColor $var(graph$cc,$mm,color)]
+    set var(graph$cc,$nn,fill) $var(graph$cc,$mm,fill)
+    set var(graph$cc,$nn,fill,color) \
+	[PlotNextColor $var(graph$cc,$mm,fill,color)]
+    set var(graph$cc,$nn,width) $var(graph$cc,$mm,width)
+    set var(graph$cc,$nn,dash) $var(graph$cc,$mm,dash)
     set var($nn,error) $var($mm,error)
     set var($nn,error,cap) $var($mm,error,cap)
     set var($nn,error,color) $var($mm,error,color)
@@ -1200,6 +1213,9 @@ proc PlotTitle {varname title xaxis yaxis} {
     upvar #0 $varname var
     global $varname
 
+    set tt $var(graph,total)
+    set cc $var(graph,current)
+
     set var(graph,title) "$title"
     set var(axis,x,title) "$xaxis"
     set var(axis,y,title) "$yaxis"
@@ -1303,23 +1319,26 @@ proc PlotColorMenu {w varname color cmd} {
     upvar #0 $varname var
     global $varname
 
+    set tt $var(graph,total)
+    set cc $var(graph,current)
+
     menu $w
     $w add radiobutton -label [msgcat::mc {Black}] \
-	-variable ${varname}($color) -value black -command $cmd
+	-variable ${varname}(graph$cc,$color) -value black -command $cmd
     $w add radiobutton -label [msgcat::mc {White}] \
-	-variable ${varname}($color) -value white -command $cmd
+	-variable ${varname}(graph$cc,$color) -value white -command $cmd
     $w add radiobutton -label [msgcat::mc {Red}] \
-	-variable ${varname}($color) -value red -command $cmd
+	-variable ${varname}(graph$cc,$color) -value red -command $cmd
     $w add radiobutton -label [msgcat::mc {Green}] \
-	-variable ${varname}($color) -value green -command $cmd
+	-variable ${varname}(graph$cc,$color) -value green -command $cmd
     $w add radiobutton -label [msgcat::mc {Blue}] \
-	-variable ${varname}($color) -value blue -command $cmd
+	-variable ${varname}(graph$cc,$color) -value blue -command $cmd
     $w add radiobutton -label [msgcat::mc {Cyan}] \
-	-variable ${varname}($color) -value cyan -command $cmd
+	-variable ${varname}(graph$cc,$color) -value cyan -command $cmd
     $w add radiobutton -label [msgcat::mc {Magenta}] \
-	-variable ${varname}($color) -value magenta -command $cmd
+	-variable ${varname}(graph$cc,$color) -value magenta -command $cmd
     $w add radiobutton -label [msgcat::mc {Yellow}] \
-	-variable ${varname}($color) -value yellow -command $cmd
+	-variable ${varname}(graph$cc,$color) -value yellow -command $cmd
     $w add separator
     $w add command -label "[msgcat::mc {Other Color}]..." \
 	-command [list ColorMenuOther $varname $color $cmd]
@@ -1334,15 +1353,15 @@ proc PlotSetVar {varname nn} {
 
     set var(graph$cc,name) $var(graph$cc,$nn,name)
     set var(graph$cc,show) $var(graph$cc,$nn,show) 
-    set var(shape,symbol) $var($nn,shape,symbol) 
-    set var(shape,fill) $var($nn,shape,fill) 
-    set var(shape,color) $var($nn,shape,color) 
-    set var(smooth) $var($nn,smooth) 
-    set var(color) $var($nn,color) 
-    set var(fill) $var($nn,fill) 
-    set var(fill,color) $var($nn,fill,color) 
-    set var(width) $var($nn,width) 
-    set var(dash) $var($nn,dash) 
+    set var(graph$cc,shape,symbol) $var(graph$cc,$nn,shape,symbol) 
+    set var(graph$cc,shape,fill) $var(graph$cc,$nn,shape,fill) 
+    set var(graph$cc,shape,color) $var(graph$cc,$nn,shape,color) 
+    set var(graph$cc,smooth) $var(graph$cc,$nn,smooth) 
+    set var(graph$cc,color) $var(graph$cc,$nn,color) 
+    set var(graph$cc,fill) $var(graph$cc,$nn,fill) 
+    set var(graph$cc,fill,color) $var(graph$cc,$nn,fill,color) 
+    set var(graph$cc,width) $var(graph$cc,$nn,width) 
+    set var(graph$cc,dash) $var(graph$cc,$nn,dash) 
     set var(error) $var($nn,error) 
     set var(error,cap) $var($nn,error,cap) 
     set var(error,color) $var($nn,error,color) 
@@ -1359,15 +1378,15 @@ proc PlotGetVar {varname nn} {
 
     set var(graph$cc,$nn,name) $var(graph$cc,name)
     set var(graph$cc,$nn,show) $var(graph$cc,show)
-    set var($nn,shape,symbol) $var(shape,symbol)
-    set var($nn,shape,fill) $var(shape,fill)
-    set var($nn,shape,color) $var(shape,color)
-    set var($nn,smooth) $var(smooth)
-    set var($nn,color) $var(color)
-    set var($nn,fill) $var(fill)
-    set var($nn,fill,color) $var(fill,color)
-    set var($nn,width) $var(width)
-    set var($nn,dash) $var(dash)
+    set var(graph$cc,$nn,shape,symbol) $var(graph$cc,shape,symbol)
+    set var(graph$cc,$nn,shape,fill) $var(graph$cc,shape,fill)
+    set var(graph$cc,$nn,shape,color) $var(graph$cc,shape,color)
+    set var(graph$cc,$nn,smooth) $var(graph$cc,smooth)
+    set var(graph$cc,$nn,color) $var(graph$cc,color)
+    set var(graph$cc,$nn,fill) $var(graph$cc,fill)
+    set var(graph$cc,$nn,fill,color) $var(graph$cc,fill,color)
+    set var(graph$cc,$nn,width) $var(graph$cc,width)
+    set var(graph$cc,$nn,dash) $var(graph$cc,dash)
     set var($nn,error) $var(error)
     set var($nn,error,cap) $var(error,cap)
     set var($nn,error,color) $var(error,color)
diff --git a/ds9/library/plotbar.tcl b/ds9/library/plotbar.tcl
index baad691..c42c18d 100644
--- a/ds9/library/plotbar.tcl
+++ b/ds9/library/plotbar.tcl
@@ -190,7 +190,7 @@ proc PlotBarUpdateElement {varname} {
 
     $var(graph$cc) element configure "d-${nn}" \
 	-label $var(graph$cc,name) -hide [expr !$var(graph$cc,show)] \
-	-relief $var(bar,relief) -color $var(color) \
+	-relief $var(bar,relief) -color $var(graph$cc,color) \
 	-showerrorbars $show -errorbarcolor $var(error,color) \
 	-errorbarwidth $var(error,width) -errorbarcap $cap
 }
diff --git a/ds9/library/plotline.tcl b/ds9/library/plotline.tcl
index f61f456..e6570cd 100644
--- a/ds9/library/plotline.tcl
+++ b/ds9/library/plotline.tcl
@@ -79,48 +79,48 @@ proc PlotLineDialog {varname wtt title xaxis yaxis} {
     menu $var(mb).data.shape
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {None}] \
-	-variable ${varname}(shape,symbol) -value none \
+	-variable ${varname}(graph$cc,shape,symbol) -value none \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Circle}] \
-	-variable ${varname}(shape,symbol) -value circle \
+	-variable ${varname}(graph$cc,shape,symbol) -value circle \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Square}] \
-	-variable ${varname}(shape,symbol) -value square \
+	-variable ${varname}(graph$cc,shape,symbol) -value square \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Diamond}] \
-	-variable ${varname}(shape,symbol) -value diamond \
+	-variable ${varname}(graph$cc,shape,symbol) -value diamond \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Plus}] \
-	-variable ${varname}(shape,symbol) -value plus \
+	-variable ${varname}(graph$cc,shape,symbol) -value plus \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Cross}] \
-	-variable ${varname}(shape,symbol) -value cross \
+	-variable ${varname}(graph$cc,shape,symbol) -value cross \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Simple Plus}] \
-	-variable ${varname}(shape,symbol) -value splus \
+	-variable ${varname}(graph$cc,shape,symbol) -value splus \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Simple Cross}] \
-	-variable ${varname}(shape,symbol) -value scross \
+	-variable ${varname}(graph$cc,shape,symbol) -value scross \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Triangle}] \
-	-variable ${varname}(shape,symbol) -value triangle \
+	-variable ${varname}(graph$cc,shape,symbol) -value triangle \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Arrow}] \
-	-variable ${varname}(shape,symbol) -value arrow \
+	-variable ${varname}(graph$cc,shape,symbol) -value arrow \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.shape add separator
     $var(mb).data.shape add checkbutton \
 	-label [msgcat::mc {Fill}] \
-	-variable ${varname}(shape,fill) \
+	-variable ${varname}(graph$cc,shape,fill) \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.shape add cascade -label [msgcat::mc {Color}] \
 	-menu $var(mb).data.shape.color
@@ -132,23 +132,23 @@ proc PlotLineDialog {varname wtt title xaxis yaxis} {
     menu $var(mb).data.smooth
     $var(mb).data.smooth add radiobutton \
 	-label [msgcat::mc {Step}] \
-	-variable ${varname}(smooth) -value step \
+	-variable ${varname}(graph$cc,smooth) -value step \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.smooth add radiobutton \
 	-label [msgcat::mc {Linear}] \
-	-variable ${varname}(smooth) -value linear \
+	-variable ${varname}(graph$cc,smooth) -value linear \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.smooth add radiobutton \
 	-label [msgcat::mc {Cubic}] \
-	-variable ${varname}(smooth) -value cubic \
+	-variable ${varname}(graph$cc,smooth) -value cubic \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.smooth add radiobutton \
 	-label [msgcat::mc {Quadratic}] \
-	-variable ${varname}(smooth) -value quadratic \
+	-variable ${varname}(graph$cc,smooth) -value quadratic \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.smooth add radiobutton \
 	-label [msgcat::mc {Catrom}] \
-	-variable ${varname}(smooth) -value catrom \
+	-variable ${varname}(graph$cc,smooth) -value catrom \
 	-command [list PlotLineUpdateElement $varname]
 
     # Color
@@ -158,30 +158,30 @@ proc PlotLineDialog {varname wtt title xaxis yaxis} {
     # Width
     menu $var(mb).data.width
     $var(mb).data.width add radiobutton \
-	-label {0} -variable ${varname}(width) \
+	-label {0} -variable ${varname}(graph$cc,width) \
 	-value 0 -command [list PlotLineUpdateElement $varname]
     $var(mb).data.width add radiobutton \
-	-label {1} -variable ${varname}(width) \
+	-label {1} -variable ${varname}(graph$cc,width) \
 	-value 1 -command [list PlotLineUpdateElement $varname]
     $var(mb).data.width add radiobutton \
-	-label {2} -variable ${varname}(width) \
+	-label {2} -variable ${varname}(graph$cc,width) \
 	-value 2 -command [list PlotLineUpdateElement $varname]
     $var(mb).data.width add radiobutton \
-	-label {3} -variable ${varname}(width) \
+	-label {3} -variable ${varname}(graph$cc,width) \
 	-value 3 -command [list PlotLineUpdateElement $varname]
     $var(mb).data.width add radiobutton \
-	-label {4} -variable ${varname}(width) \
+	-label {4} -variable ${varname}(graph$cc,width) \
 	-value 4 -command [list PlotLineUpdateElement $varname]
     $var(mb).data.width add separator
     $var(mb).data.width add checkbutton \
-	-label [msgcat::mc {Dash}] -variable ${varname}(dash) \
+	-label [msgcat::mc {Dash}] -variable ${varname}(graph$cc,dash) \
 	-command [list PlotLineUpdateElement $varname]
 
     # Fill
     menu $var(mb).data.fill
     $var(mb).data.fill add checkbutton \
 	-label [msgcat::mc {Show}] \
-	-variable ${varname}(fill) \
+	-variable ${varname}(graph$cc,fill) \
 	-command [list PlotLineUpdateElement $varname]
     $var(mb).data.fill add separator
     $var(mb).data.fill add cascade -label [msgcat::mc {Color}] \
@@ -240,19 +240,19 @@ proc PlotLineUpdateElement {varname} {
     set nn $var(graph$cc,data,current)
     PlotGetVar $varname $nn
 
-    if {$var(fill)} {
-	set fillClr $var(fill,color)
+    if {$var(graph$cc,fill)} {
+	set fillClr $var(graph$cc,fill,color)
     } else {
 	set fillClr {}
     }
 
-    if {$var(shape,fill)} {
-	set clr $var(shape,color)
+    if {$var(graph$cc,shape,fill)} {
+	set clr $var(graph$cc,shape,color)
     } else {
 	set clr {}
     }
 
-    if {$var(dash)} {
+    if {$var(graph$cc,dash)} {
 	set dash {8 3}
     } else {
 	set dash { }
@@ -272,11 +272,11 @@ proc PlotLineUpdateElement {varname} {
 
     $var(graph$cc) element configure "d-${nn}" \
 	-label $var(graph$cc,name) -hide [expr !$var(graph$cc,show)] \
-	-symbol $var(shape,symbol) -fill $clr -scalesymbols no \
-	-pixels 5 -outline $var(shape,color) \
-	-smooth $var(smooth) \
-	-color $var(color) -areabackground $fillClr \
-	-linewidth $var(width) -dashes $dash \
+	-symbol $var(graph$cc,shape,symbol) -fill $clr -scalesymbols no \
+	-pixels 5 -outline $var(graph$cc,shape,color) \
+	-smooth $var(graph$cc,smooth) \
+	-color $var(graph$cc,color) -areabackground $fillClr \
+	-linewidth $var(graph$cc,width) -dashes $dash \
 	-showerrorbars $show -errorbarcolor $var(error,color) \
 	-errorbarwidth $var(error,width) -errorbarcap $cap
 }
diff --git a/ds9/library/plotscatter.tcl b/ds9/library/plotscatter.tcl
index 55fa8e0..a7dbaf4 100644
--- a/ds9/library/plotscatter.tcl
+++ b/ds9/library/plotscatter.tcl
@@ -71,44 +71,44 @@ proc PlotScatterDialog {varname wtt title xaxis yaxis} {
     menu $var(mb).data.shape
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Circle}] \
-	-variable ${varname}(shape,symbol) -value circle \
+	-variable ${varname}(graph$cc,shape,symbol) -value circle \
 	-command [list PlotScatterUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Square}] \
-	-variable ${varname}(shape,symbol) -value square \
+	-variable ${varname}(graph$cc,shape,symbol) -value square \
 	-command [list PlotScatterUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Diamond}] \
-	-variable ${varname}(shape,symbol) -value diamond \
+	-variable ${varname}(graph$cc,shape,symbol) -value diamond \
 	-command [list PlotScatterUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Plus}] \
-	-variable ${varname}(shape,symbol) -value plus \
+	-variable ${varname}(graph$cc,shape,symbol) -value plus \
 	-command [list PlotScatterUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Cross}] \
-	-variable ${varname}(shape,symbol) -value cross \
+	-variable ${varname}(graph$cc,shape,symbol) -value cross \
 	-command [list PlotScatterUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Simple Plus}] \
-	-variable ${varname}(shape,symbol) -value splus \
+	-variable ${varname}(graph$cc,shape,symbol) -value splus \
 	-command [list PlotScatterUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Simple Cross}] \
-	-variable ${varname}(shape,symbol) -value scross \
+	-variable ${varname}(graph$cc,shape,symbol) -value scross \
 	-command [list PlotScatterUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Triangle}] \
-	-variable ${varname}(shape,symbol) -value triangle \
+	-variable ${varname}(graph$cc,shape,symbol) -value triangle \
 	-command [list PlotScatterUpdateElement $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Arrow}] \
-	-variable ${varname}(shape,symbol) -value arrow \
+	-variable ${varname}(graph$cc,shape,symbol) -value arrow \
 	-command [list PlotScatterUpdateElement $varname]
     $var(mb).data.shape add separator
     $var(mb).data.shape add checkbutton \
 	-label [msgcat::mc {Fill}] \
-	-variable ${varname}(shape,fill) \
+	-variable ${varname}(graph$cc,shape,fill) \
 	-command [list PlotScatterUpdateElement $varname]
     $var(mb).data.shape add cascade -label [msgcat::mc {Color}] \
 	-menu $var(mb).data.shape.color
@@ -166,12 +166,12 @@ proc PlotScatterUpdateElement {varname} {
     set nn $var(graph$cc,data,current)
     PlotGetVar $varname $nn
 
-    if {$var(shape,symbol) == "none"} {
-	set var(shape,symbol) circle
+    if {$var(graph$cc,shape,symbol) == "none"} {
+	set var(graph$cc,shape,symbol) circle
     }
 
-    if {$var(shape,fill)} {
-	set clr $var(shape,color)
+    if {$var(graph$cc,shape,fill)} {
+	set clr $var(graph$cc,shape,color)
     } else {
 	set clr {}
     }
@@ -190,14 +190,14 @@ proc PlotScatterUpdateElement {varname} {
 
     $var(graph$cc) element configure "d-${nn}" \
 	-label $var(graph$cc,name) -hide [expr !$var(graph$cc,show)] \
-	-symbol $var(shape,symbol) -fill $clr -scalesymbols no \
-	-outline $var(shape,color) \
+	-symbol $var(graph$cc,shape,symbol) -fill $clr -scalesymbols no \
+	-outline $var(graph$cc,shape,color) \
 	-linewidth 0 -pixels 5 \
 	-showerrorbars $show -errorbarcolor $var(error,color) \
 	-errorbarwidth $var(error,width) -errorbarcap $cap
 
     $var(graph$cc) pen configure active -color blue \
-	-symbol $var(shape,symbol) \
+	-symbol $var(graph$cc,shape,symbol) \
 	-linewidth 0 -pixels 5 \
 	-showerrorbars $show -errorbarcolor $var(error,color) \
 	-errorbarwidth $var(error,width) -errorbarcap $cap
diff --git a/ds9/parsers/plotsendparser.tac b/ds9/parsers/plotsendparser.tac
index 5bb9769..2424089 100644
--- a/ds9/parsers/plotsendparser.tac
+++ b/ds9/parsers/plotsendparser.tac
@@ -82,18 +82,18 @@ plotCmd : STATS_ {ProcessSendCmdCVAR PlotStatsGenerate}
  | TITLE_ title
  | BARMODE_ {ProcessSendCmdCVARGet bar,mode}
  | SHOW_ {PlotSendCmdCVARYesNo show}
- | COLOR_ {ProcessSendCmdCVARGet color}
- | FILL_ {ProcessSendCmdCVARGet fill}
- | FILLCOLOR_ {ProcessSendCmdCVARGet fill,color}
+ | COLOR_ {PlotSendCmdCVARGet color}
+ | FILL_ {PlotSendCmdCVARGet fill}
+ | FILLCOLOR_ {PlotSendCmdCVARGet fill,color}
  | ERROR_ errorr
  # backward compatibility
  | ERRORBAR_ errorr
  | NAME_ {PlotSendCmdCVARGet name}
  | SHAPE_ shape
  | RELIEF_ {ProcessSendCmdCVARGet bar,relief}
- | SMOOTH_ {ProcessSendCmdCVARGet smooth}
- | WIDTH_ {ProcessSendCmdCVARGet width}
- | DASH_ {ProcessSendCmdCVARYesNo dash}
+ | SMOOTH_ {PlotSendCmdCVARGet smooth}
+ | WIDTH_ {PlotSendCmdCVARGet width}
+ | DASH_ {PlotSendCmdCVARYesNo dash}
  | SELECT_ {PlotSendCmdCVARGet data,current}
  # backward compatibility
  | DATASET_ {PlotSendCmdCVARGet data,current}
@@ -149,9 +149,9 @@ errorr : {ProcessSendCmdCVARYesNo error}
  | WIDTH_ {ProcessSendCmdCVARGet error,width}
  ;
 
-shape : {ProcessSendCmdCVARGet shape,symbol}
- | FILL_ {ProcessSendCmdCVARYesNo shape,fill}
- | COLOR_ {ProcessSendCmdCVARGet shape,color}
+shape : {PlotSendCmdCVARGet shape,symbol}
+ | FILL_ {PlotSendCmdCVARYesNo shape,fill}
+ | COLOR_ {PlotSendCmdCVARGet shape,color}
  ;
 
 %%
diff --git a/ds9/parsers/plotsendparser.tcl b/ds9/parsers/plotsendparser.tcl
index bee2627..ebc5af0 100644
--- a/ds9/parsers/plotsendparser.tcl
+++ b/ds9/parsers/plotsendparser.tcl
@@ -1492,14 +1492,14 @@ proc plotsend::yyparse {} {
                     17 { ProcessSendCmdCVARGet graph,bg }
                     21 { ProcessSendCmdCVARGet bar,mode }
                     22 { PlotSendCmdCVARYesNo show }
-                    23 { ProcessSendCmdCVARGet color }
-                    24 { ProcessSendCmdCVARGet fill }
-                    25 { ProcessSendCmdCVARGet fill,color }
+                    23 { PlotSendCmdCVARGet color }
+                    24 { PlotSendCmdCVARGet fill }
+                    25 { PlotSendCmdCVARGet fill,color }
                     28 { PlotSendCmdCVARGet name }
                     30 { ProcessSendCmdCVARGet bar,relief }
-                    31 { ProcessSendCmdCVARGet smooth }
-                    32 { ProcessSendCmdCVARGet width }
-                    33 { ProcessSendCmdCVARYesNo dash }
+                    31 { PlotSendCmdCVARGet smooth }
+                    32 { PlotSendCmdCVARGet width }
+                    33 { PlotSendCmdCVARYesNo dash }
                     34 { PlotSendCmdCVARGet data,current }
                     35 { PlotSendCmdCVARGet data,current }
                     36 { ProcessSendCmdCVARYesNo "axis,$1,grid" }
@@ -1536,9 +1536,9 @@ proc plotsend::yyparse {} {
                     67 { ProcessSendCmdCVARYesNo error,cap }
                     68 { ProcessSendCmdCVARGet error,color }
                     69 { ProcessSendCmdCVARGet error,width }
-                    70 { ProcessSendCmdCVARGet shape,symbol }
-                    71 { ProcessSendCmdCVARYesNo shape,fill }
-                    72 { ProcessSendCmdCVARGet shape,color }
+                    70 { PlotSendCmdCVARGet shape,symbol }
+                    71 { PlotSendCmdCVARYesNo shape,fill }
+                    72 { PlotSendCmdCVARGet shape,color }
                 }
                 unsetupvalues $dc
                 # pop off tokens from the stack if normal rule