add multiple plot support

6 files changed, 99 insertions, 97 deletions

diff --git a/ds9/library/plotbar.tcl b/ds9/library/plotbar.tcl
index fcf9c9c..1e2b9c8 100644
--- a/ds9/library/plotbar.tcl
+++ b/ds9/library/plotbar.tcl
@@ -95,28 +95,28 @@ proc PlotBarDialog {varname wtt title xaxis yaxis} {
     # Relief
     menu $var(mb).data.relief
     $var(mb).data.relief add radiobutton -label [msgcat::mc {Flat}] \
-	-variable ${varname}(graph$cc,bar,relief) -value flat \
+	-variable ${varname}(graph,ds,bar,relief) -value flat \
 	-command [list PlotBarUpdateElement $varname]
     $var(mb).data.relief add radiobutton -label [msgcat::mc {Sunken}] \
-	-variable ${varname}(graph$cc,bar,relief) -value sunken \
+	-variable ${varname}(graph,ds,bar,relief) -value sunken \
 	-command [list PlotBarUpdateElement $varname]
     $var(mb).data.relief add radiobutton -label [msgcat::mc {Raised}] \
-	-variable ${varname}(graph$cc,bar,relief) -value raised \
+	-variable ${varname}(graph,ds,bar,relief) -value raised \
 	-command [list PlotBarUpdateElement $varname]
     $var(mb).data.relief add radiobutton -label [msgcat::mc {Solid}] \
-	-variable ${varname}(graph$cc,bar,relief) -value solid \
+	-variable ${varname}(graph,ds,bar,relief) -value solid \
 	-command [list PlotBarUpdateElement $varname]
     $var(mb).data.relief add radiobutton -label [msgcat::mc {Groove}] \
-	-variable ${varname}(graph$cc,bar,relief) -value groove \
+	-variable ${varname}(graph,ds,bar,relief) -value groove \
 	-command [list PlotBarUpdateElement $varname]
 
     # Error
     menu $var(mb).data.error
     $var(mb).data.error add checkbutton -label [msgcat::mc {Show}] \
-	-variable ${varname}(graph$cc,error) \
+	-variable ${varname}(graph,ds,error) \
 	-command [list PlotBarUpdateElement $varname]
     $var(mb).data.error add checkbutton -label [msgcat::mc {Cap}] \
-	-variable ${varname}(graph$cc,error,cap) \
+	-variable ${varname}(graph,ds,error,cap) \
 	-command [list PlotBarUpdateElement $varname]
     $var(mb).data.error add separator
     $var(mb).data.error add cascade -label [msgcat::mc {Color}] \
@@ -124,9 +124,9 @@ proc PlotBarDialog {varname wtt title xaxis yaxis} {
     $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 \
+    PlotColorMenu $var(mb).data.error.color $varname graph,ds,error,color \
 	[list PlotBarUpdateElement $varname]
-    WidthDashMenu $var(mb).data.error.width $varname graph$cc,error,width {} \
+    WidthDashMenu $var(mb).data.error.width $varname graph,ds,error,width {} \
 	[list PlotBarUpdateElement $varname] {}
 }
 
@@ -175,14 +175,14 @@ proc PlotBarUpdateElement {varname} {
     
     PlotSaveState $varname
 
-    if {$var(graph$cc,error)} {
+    if {$var(graph,ds,error)} {
 	set show both
     } else {
 	set show none
     }
 
-    if {$var(graph$cc,error,cap)} {
-	set cap [expr $var(graph$cc,error,width)+3]
+    if {$var(graph,ds,error,cap)} {
+	set cap [expr $var(graph,ds,error,width)+3]
     } else {
 	set cap 0
     }
@@ -190,9 +190,9 @@ proc PlotBarUpdateElement {varname} {
     set nn $var(graph$cc,data,current)
     $var(graph$cc) element configure "d-${nn}" \
 	-label $var(graph,ds,name) -hide [expr !$var(graph,ds,show)] \
-	-relief $var(graph$cc,bar,relief) -color $var(graph,ds,color) \
-	-showerrorbars $show -errorbarcolor $var(graph$cc,error,color) \
-	-errorbarwidth $var(graph$cc,error,width) -errorbarcap $cap
+	-relief $var(graph,ds,bar,relief) -color $var(graph,ds,color) \
+	-showerrorbars $show -errorbarcolor $var(graph,ds,error,color) \
+	-errorbarwidth $var(graph,ds,error,width) -errorbarcap $cap
 }
 
 proc PlotBarButton {varname x y} {
diff --git a/ds9/library/plotconfig.tcl b/ds9/library/plotconfig.tcl
index 98c2604..cd9319f 100644
--- a/ds9/library/plotconfig.tcl
+++ b/ds9/library/plotconfig.tcl
@@ -82,17 +82,18 @@ proc PlotLoadConfigFile {varname filename} {
     set var(graph,ds,width) $analysisplot(width) 
     set var(graph,ds,dash) $analysisplot(dash) 
 
-    set var(graph$cc,shape,symbol) $analysisplot(shape,symbol) 
-    set var(graph$cc,shape,fill) $analysisplot(shape,fill) 
-    set var(graph$cc,shape,color) $analysisplot(shape,color) 
+    set var(graph,ds,shape,symbol) $analysisplot(shape,symbol) 
+    set var(graph,ds,shape,fill) $analysisplot(shape,fill) 
+    set var(graph,ds,shape,color) $analysisplot(shape,color) 
 
-    set var(graph$cc,error) $analysisplot(error) 
-    set var(graph$cc,error,cap) $analysisplot(error,cap) 
-    set var(graph$cc,error,color) $analysisplot(error,color) 
-    set var(graph$cc,error,width) $analysisplot(error,width) 
+    set var(graph,ds,error) $analysisplot(error) 
+    set var(graph,ds,error,cap) $analysisplot(error,cap) 
+    set var(graph,ds,error,color) $analysisplot(error,color) 
+    set var(graph,ds,error,width) $analysisplot(error,width) 
 
-    set var(graph$cc,bar,relief) $analysisplot(bar,relief) 
-    set var(graph$cc,bar,mode) $analysisplot(bar,mode) 
+    set var(graph,ds,bar,relief) $analysisplot(bar,relief) 
+
+    set var(graph,bar,mode) $analysisplot(bar,mode) 
 
     unset analysisplot
 
@@ -127,12 +128,12 @@ proc PlotLoadConfigFile {varname filename} {
     }
     FixVar ${varname}(graph,ds,dash) ${varname}(linear,dash)
 
-    FixVar ${varname}(graph$cc,shape,color) ${varname}(discrete,color)
-    FixVar ${varname}(graph$cc,shape,fill) ${varname}(discrete,fill)
+    FixVar ${varname}(graph,ds,shape,color) ${varname}(discrete,color)
+    FixVar ${varname}(graph,ds,shape,fill) ${varname}(discrete,fill)
 
     if {[info exists ${varname}(discrete)]} {
 	if {$var(discrete)} {
-	    FixVar ${varname}(graph$cc,shape,symbol) \
+	    FixVar ${varname}(graph,ds,shape,symbol) \
 		${varname}(discrete,symbol)
 	} else {
 	    FixVarRm ${varname}(discrete,symbol)
@@ -270,16 +271,17 @@ proc PlotSaveConfigFile {varname filename} {
     set analysisplot(width) $var(graph,ds,width)
     set analysisplot(dash) $var(graph,ds,dash)
 
-    set analysisplot(shape,symbol) $var(graph$cc,shape,symbol)
-    set analysisplot(shape,fill) $var(graph$cc,shape,fill)
-    set analysisplot(shape,color) $var(graph$cc,shape,color)
+    set analysisplot(shape,symbol) $var(graph,ds,shape,symbol)
+    set analysisplot(shape,fill) $var(graph,ds,shape,fill)
+    set analysisplot(shape,color) $var(graph,ds,shape,color)
+
+    set analysisplot(error) $var(graph,ds,error)
+    set analysisplot(error,cap) $var(graph,ds,error,cap)
+    set analysisplot(error,color) $var(graph,ds,error,color)
+    set analysisplot(error,width) $var(graph,ds,error,width)
 
-    set analysisplot(error) $var(graph$cc,error)
-    set analysisplot(error,cap) $var(graph$cc,error,cap)
-    set analysisplot(error,color) $var(graph$cc,error,color)
-    set analysisplot(error,width) $var(graph$cc,error,width)
+    set analysisplot(bar,relief) $var(graph,ds,bar,relief)
 
-    set analysisplot(bar,relief) $var(graph$cc,bar,relief)
     set analysisplot(bar,mode) $var(graph$cc,bar,mode)
 
     puts $ch "array set analysisplot \{ [array get analysisplot] \}"
diff --git a/ds9/library/plotdialog.tcl b/ds9/library/plotdialog.tcl
index 5fabb2b..45891a4 100644
--- a/ds9/library/plotdialog.tcl
+++ b/ds9/library/plotdialog.tcl
@@ -521,43 +521,43 @@ proc PlotShapeMenu {varname} {
     menu $var(mb).data.shape
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {None}] \
-	-variable ${varname}(graph$cc,shape,symbol) -value none \
+	-variable ${varname}(graph,ds,shape,symbol) -value none \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Circle}] \
-	-variable ${varname}(graph$cc,shape,symbol) -value circle \
+	-variable ${varname}(graph,ds,shape,symbol) -value circle \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Square}] \
-	-variable ${varname}(graph$cc,shape,symbol) -value square \
+	-variable ${varname}(graph,ds,shape,symbol) -value square \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Diamond}] \
-	-variable ${varname}(graph$cc,shape,symbol) -value diamond \
+	-variable ${varname}(graph,ds,shape,symbol) -value diamond \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Plus}] \
-	-variable ${varname}(graph$cc,shape,symbol) -value plus \
+	-variable ${varname}(graph,ds,shape,symbol) -value plus \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Cross}] \
-	-variable ${varname}(graph$cc,shape,symbol) -value cross \
+	-variable ${varname}(graph,ds,shape,symbol) -value cross \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Simple Plus}] \
-	-variable ${varname}(graph$cc,shape,symbol) -value splus \
+	-variable ${varname}(graph,ds,shape,symbol) -value splus \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Simple Cross}] \
-	-variable ${varname}(graph$cc,shape,symbol) -value scross \
+	-variable ${varname}(graph,ds,shape,symbol) -value scross \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Triangle}] \
-	-variable ${varname}(graph$cc,shape,symbol) -value triangle \
+	-variable ${varname}(graph,ds,shape,symbol) -value triangle \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.shape add radiobutton \
 	-label [msgcat::mc {Arrow}] \
-	-variable ${varname}(graph$cc,shape,symbol) -value arrow \
+	-variable ${varname}(graph,ds,shape,symbol) -value arrow \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.shape add separator
     $var(mb).data.shape add checkbutton \
@@ -567,7 +567,7 @@ proc PlotShapeMenu {varname} {
     $var(mb).data.shape add cascade -label [msgcat::mc {Color}] \
 	-menu $var(mb).data.shape.color
 
-    PlotColorMenu $var(mb).data.shape.color $varname graph$cc,shape,color \
+    PlotColorMenu $var(mb).data.shape.color $varname graph,ds,shape,color \
 	[list $var(proc,updateelement) $varname]
 }
 
@@ -580,10 +580,10 @@ proc PlotErrorMenu {varname} {
 
     menu $var(mb).data.error
     $var(mb).data.error add checkbutton -label [msgcat::mc {Show}] \
-	-variable ${varname}(graph$cc,error) \
+	-variable ${varname}(graph,ds,error) \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.error add checkbutton -label [msgcat::mc {Cap}] \
-	-variable ${varname}(graph$cc,error,cap) \
+	-variable ${varname}(graph,ds,error,cap) \
 	-command [list $var(proc,updateelement) $varname]
     $var(mb).data.error add separator
     $var(mb).data.error add cascade -label [msgcat::mc {Color}] \
@@ -591,9 +591,9 @@ proc PlotErrorMenu {varname} {
     $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 \
+    PlotColorMenu $var(mb).data.error.color $varname graph,ds,error,color \
 	[list $var(proc,updateelement) $varname]
-    WidthDashMenu $var(mb).data.error.width $varname graph$cc,error,width {} \
+    WidthDashMenu $var(mb).data.error.width $varname graph,ds,error,width {} \
 	[list $var(proc,updateelement) $varname] {}
 }
 
diff --git a/ds9/library/plotline.tcl b/ds9/library/plotline.tcl
index b8e13e8..3ff098f 100644
--- a/ds9/library/plotline.tcl
+++ b/ds9/library/plotline.tcl
@@ -178,8 +178,8 @@ proc PlotLineUpdateElement {varname} {
 	set fillClr {}
     }
 
-    if {$var(graph$cc,shape,fill)} {
-	set clr $var(graph$cc,shape,color)
+    if {$var(graph,ds,shape,fill)} {
+	set clr $var(graph,ds,shape,color)
     } else {
 	set clr {}
     }
@@ -190,14 +190,14 @@ proc PlotLineUpdateElement {varname} {
 	set dash { }
     }
 
-    if {$var(graph$cc,error)} {
+    if {$var(graph,ds,error)} {
 	set show both
     } else {
 	set show none
     }
 
-    if {$var(graph$cc,error,cap)} {
-	set cap [expr $var(graph$cc,error,width)+3]
+    if {$var(graph,ds,error,cap)} {
+	set cap [expr $var(graph,ds,error,width)+3]
     } else {
 	set cap 0
     }
@@ -205,13 +205,13 @@ proc PlotLineUpdateElement {varname} {
     set nn $var(graph$cc,data,current)
     $var(graph$cc) element configure "d-${nn}" \
 	-label $var(graph,ds,name) -hide [expr !$var(graph,ds,show)] \
-	-symbol $var(graph$cc,shape,symbol) -fill $clr -scalesymbols no \
-	-pixels 5 -outline $var(graph$cc,shape,color) \
+	-symbol $var(graph,ds,shape,symbol) -fill $clr -scalesymbols no \
+	-pixels 5 -outline $var(graph,ds,shape,color) \
 	-smooth $var(graph,ds,smooth) \
 	-color $var(graph,ds,color) -areabackground $fillClr \
 	-linewidth $var(graph,ds,width) -dashes $dash \
-	-showerrorbars $show -errorbarcolor $var(graph$cc,error,color) \
-	-errorbarwidth $var(graph$cc,error,width) -errorbarcap $cap
+	-showerrorbars $show -errorbarcolor $var(graph,ds,error,color) \
+	-errorbarwidth $var(graph,ds,error,width) -errorbarcap $cap
 }
 
 proc PlotLineButton {varname x y} {
diff --git a/ds9/library/plotscatter.tcl b/ds9/library/plotscatter.tcl
index d129a63..96f34ff 100644
--- a/ds9/library/plotscatter.tcl
+++ b/ds9/library/plotscatter.tcl
@@ -102,24 +102,24 @@ proc PlotScatterUpdateElement {varname} {
     
     PlotSaveState $varname
 
-    if {$var(graph$cc,shape,symbol) == "none"} {
-	set var(graph$cc,shape,symbol) circle
+    if {$var(graph,ds,shape,symbol) == "none"} {
+	set var(graph,ds,shape,symbol) circle
     }
 
-    if {$var(graph$cc,shape,fill)} {
-	set clr $var(graph$cc,shape,color)
+    if {$var(graph,ds,shape,fill)} {
+	set clr $var(graph,ds,shape,color)
     } else {
 	set clr {}
     }
 
-    if {$var(graph$cc,error)} {
+    if {$var(graph,ds,error)} {
 	set show both
     } else {
 	set show none
     }
 
-    if {$var(graph$cc,error,cap)} {
-	set cap [expr $var(graph$cc,error,width)+3]
+    if {$var(graph,ds,error,cap)} {
+	set cap [expr $var(graph,ds,error,width)+3]
     } else {
 	set cap 0
     }
@@ -127,17 +127,17 @@ proc PlotScatterUpdateElement {varname} {
     set nn $var(graph$cc,data,current)
     $var(graph$cc) element configure "d-${nn}" \
 	-label $var(graph,ds,name) -hide [expr !$var(graph,ds,show)] \
-	-symbol $var(graph$cc,shape,symbol) -fill $clr -scalesymbols no \
-	-outline $var(graph$cc,shape,color) \
+	-symbol $var(graph,ds,shape,symbol) -fill $clr -scalesymbols no \
+	-outline $var(graph,ds,shape,color) \
 	-linewidth 0 -pixels 5 \
-	-showerrorbars $show -errorbarcolor $var(graph$cc,error,color) \
-	-errorbarwidth $var(graph$cc,error,width) -errorbarcap $cap
+	-showerrorbars $show -errorbarcolor $var(graph,ds,error,color) \
+	-errorbarwidth $var(graph,ds,error,width) -errorbarcap $cap
 
     $var(graph$cc) pen configure active -color blue \
-	-symbol $var(graph$cc,shape,symbol) \
+	-symbol $var(graph,ds,shape,symbol) \
 	-linewidth 0 -pixels 5 \
-	-showerrorbars $show -errorbarcolor $var(graph$cc,error,color) \
-	-errorbarwidth $var(graph$cc,error,width) -errorbarcap $cap
+	-showerrorbars $show -errorbarcolor $var(graph,ds,error,color) \
+	-errorbarwidth $var(graph,ds,error,width) -errorbarcap $cap
 }
 
 proc PlotScatterButton {varname x y} {
diff --git a/ds9/library/plotstate.tcl b/ds9/library/plotstate.tcl
index 333679d..d9a4f21 100644
--- a/ds9/library/plotstate.tcl
+++ b/ds9/library/plotstate.tcl
@@ -104,16 +104,16 @@ proc PlotInitState {varname} {
     set var(graph,ds,width) $pap(graph,ds,width)
     set var(graph,ds,dash) $pap(graph,ds,dash)
 
-    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,ds,shape,symbol) $pap(shape,symbol)
+    set var(graph,ds,shape,fill) $pap(shape,fill)
+    set var(graph,ds,shape,color) $pap(shape,color)
 
-    set var(graph$cc,error) $pap(error)
-    set var(graph$cc,error,cap) $pap(error,cap)
-    set var(graph$cc,error,color) $pap(error,color)
-    set var(graph$cc,error,width) $pap(error,width)
+    set var(graph,ds,error) $pap(error)
+    set var(graph,ds,error,cap) $pap(error,cap)
+    set var(graph,ds,error,color) $pap(error,color)
+    set var(graph,ds,error,width) $pap(error,width)
 
-    set var(graph$cc,bar,relief) $pap(bar,relief)
+    set var(graph,ds,bar,relief) $pap(bar,relief)
 }
 
 proc PlotSaveState {varname} {
@@ -133,16 +133,16 @@ proc PlotSaveState {varname} {
     set var(graph$cc,$nn,width) $var(graph,ds,width)
     set var(graph$cc,$nn,dash) $var(graph,ds,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,shape,symbol) $var(graph,ds,shape,symbol)
+    set var(graph$cc,$nn,shape,fill) $var(graph,ds,shape,fill)
+    set var(graph$cc,$nn,shape,color) $var(graph,ds,shape,color)
 
-    set var(graph$cc,$nn,error) $var(graph$cc,error)
-    set var(graph$cc,$nn,error,cap) $var(graph$cc,error,cap)
-    set var(graph$cc,$nn,error,color) $var(graph$cc,error,color)
-    set var(graph$cc,$nn,error,width) $var(graph$cc,error,width)
+    set var(graph$cc,$nn,error) $var(graph,ds,error)
+    set var(graph$cc,$nn,error,cap) $var(graph,ds,error,cap)
+    set var(graph$cc,$nn,error,color) $var(graph,ds,error,color)
+    set var(graph$cc,$nn,error,width) $var(graph,ds,error,width)
 
-    set var(graph$cc,$nn,bar,relief) $var(graph$cc,bar,relief)
+    set var(graph$cc,$nn,bar,relief) $var(graph,ds,bar,relief)
 }
 
 proc PlotRestoreState {varname nn} {
@@ -162,14 +162,14 @@ proc PlotRestoreState {varname nn} {
     set var(graph,ds,width) $var(graph$cc,$nn,width) 
     set var(graph,ds,dash) $var(graph$cc,$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,ds,shape,symbol) $var(graph$cc,$nn,shape,symbol) 
+    set var(graph,ds,shape,fill) $var(graph$cc,$nn,shape,fill) 
+    set var(graph,ds,shape,color) $var(graph$cc,$nn,shape,color)
 
-    set var(graph$cc,error) $var(graph$cc,$nn,error) 
-    set var(graph$cc,error,cap) $var(graph$cc,$nn,error,cap) 
-    set var(graph$cc,error,color) $var(graph$cc,$nn,error,color) 
-    set var(graph$cc,error,width) $var(graph$cc,$nn,error,width) 
+    set var(graph,ds,error) $var(graph$cc,$nn,error) 
+    set var(graph,ds,error,cap) $var(graph$cc,$nn,error,cap) 
+    set var(graph,ds,error,color) $var(graph$cc,$nn,error,color) 
+    set var(graph,ds,error,width) $var(graph$cc,$nn,error,width) 
 
-    set var(graph$cc,bar,relief) $var(graph$cc,$nn,bar,relief) 
+    set var(graph,ds,bar,relief) $var(graph$cc,$nn,bar,relief) 
 }