add strip plot support

7 files changed, 155 insertions, 155 deletions

diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
index bf2d128..5e4b207 100644
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
@@ -70,7 +70,7 @@ proc DS9Def {} {
     }
     set ds9(menu,size,frame,goto) [expr $ds9(menu,start)+0]
     set ds9(menu,size,frame,active) [expr $ds9(menu,start)+3]
-    set ds9(menu,size,analysis) [expr $ds9(menu,start)+36]
+    set ds9(menu,size,analysis) [expr $ds9(menu,start)+35]
     set ds9(menu,size,wrap) 20
 
     set ds9(display) single
diff --git a/ds9/library/plot.tcl b/ds9/library/plot.tcl
index 7c6e8b5..ae5cab5 100644
--- a/ds9/library/plot.tcl
+++ b/ds9/library/plot.tcl
@@ -83,22 +83,22 @@ proc PlotDef {} {
     set pap(bar,mode) normal
 }
 
-proc PlotAddPlot {varname} {
+proc PlotAddGraph {varname} {
     upvar #0 $varname var
     global $varname
 
     global ds9
 
-    incr ${varname}(plot,total)
-    incr ${varname}(plot,current) 0
+    incr ${varname}(graph,total)
+    incr ${varname}(graph,current) 0
 
-    set cc $var(plot,current)
+    set cc $var(graph,current)
 
-    set var(plot,$cc,data,total) 0
-    set var(plot,$cc,data,current) 0
+    set var(graph,$cc,data,total) 0
+    set var(graph,$cc,data,current) 0
 
-    set var(data,total) $var(plot,$cc,data,total)
-    set var(data,current) $var(plot,$cc,data,current)
+    set var(data,total) $var(graph,$cc,data,total)
+    set var(data,current) $var(graph,$cc,data,current)
 
     $var(proc,addplot) $varname
 }
@@ -118,12 +118,12 @@ proc PlotChangeMode {varname} {
 
     switch $var(mode) {
 	pointer {
-	    blt::RemoveBindTag $var(plot) zoom-$var(plot)
-	    bind $var(plot) <1> [list PlotButton $varname %x %y]
+	    blt::RemoveBindTag $var(graph) zoom-$var(graph)
+	    bind $var(graph) <1> [list PlotButton $varname %x %y]
 	}
 	zoom {
-	    bind $var(plot) <1> {}
-	    blt::AddBindTag $var(plot) zoom-$var(plot)
+	    bind $var(graph) <1> {}
+	    blt::AddBindTag $var(graph) zoom-$var(graph)
 	}
     }
 }
@@ -144,10 +144,10 @@ proc PlotClearData {varname} {
     for {set nn 1} {$nn<=$var(data,total)} {incr nn} {
 	if {$var($nn,manage)} {
 	    # delete elements
-	    foreach el [$var(plot) element names] {
+	    foreach el [$var(graph) element names] {
 		set f [split $el -]
 		if {[lindex $f 1] == $nn} {
-		    $var(plot) element delete $el
+		    $var(graph) element delete $el
 		}
 	    }
 
@@ -190,7 +190,7 @@ proc PlotClearData {varname} {
 	set var(axis,y,max) {}
 	set var(axis,y,format) {}
 	
-	$var(mb).plot.select delete $ds9(menu,start) end
+	$var(mb).graph.select delete $ds9(menu,start) end
 
 	$var(proc,updategraph) $varname
 	PlotStats $varname
@@ -199,7 +199,7 @@ proc PlotClearData {varname} {
  	set var(data,total) 1
  	set var(data,current) 1
 
-	$var(mb).plot.select delete [expr $ds9(menu,start)+1] end
+	$var(mb).graph.select delete [expr $ds9(menu,start)+1] end
  	PlotCurrentData $varname
 	$var(proc,updategraph) $varname
     }
@@ -451,7 +451,7 @@ proc PlotDataSetOne {varname dim data} {
     PlotGetVar $varname $nn
 
     # update data set menu
-    $var(mb).plot.select add radiobutton -label "$var(name)" \
+    $var(mb).graph.select add radiobutton -label "$var(name)" \
 	-variable ${varname}(data,current) -value $nn \
 	-command [list PlotCurrentData $varname]
 
@@ -459,7 +459,7 @@ proc PlotDataSetOne {varname dim data} {
     $var(proc,updateelement) $varname
 }
 
-proc PlotDeletePlot {varname} {
+proc PlotDeleteGraph {varname} {
     upvar #0 $varname var
     global $varname
 
@@ -521,7 +521,7 @@ proc PlotDupData {varname mm} {
     set var($nn,bar,relief) $var($mm,bar,relief)
 
     # update data set menu
-    $var(mb).plot.select add radiobutton -label "$var($nn,name)" \
+    $var(mb).graph.select add radiobutton -label "$var($nn,name)" \
 	-variable ${varname}(data,current) -value $nn \
 	-command [list PlotCurrentData $varname]
 
@@ -620,7 +620,7 @@ proc PlotExternal {varname} {
     PlotGetVar $varname $nn
 
     # update data set menu
-    $var(mb).plot.select add radiobutton \
+    $var(mb).graph.select add radiobutton \
 	-label "[msgcat::mc {Data Set}] $nn" \
 	-variable ${varname}(data,current) -value $nn \
 	-command "PlotCurrentData $varname"
@@ -1102,23 +1102,23 @@ proc PlotUpdateGraph {varname} {
 	set ymax $var(axis,y,max)
     }
 
-    $var(plot) xaxis configure -min $xmin -max $xmax \
+    $var(graph) xaxis configure -min $xmin -max $xmax \
 	-descending $var(axis,x,flip)
-    $var(plot) yaxis configure -min $ymin -max $ymax \
+    $var(graph) yaxis configure -min $ymin -max $ymax \
 	-descending $var(axis,y,flip)
 
     if {$var(graph,format)} {
 	if {$var(axis,x,format) != {}} {
-	    $var(plot) xaxis configure \
+	    $var(graph) xaxis configure \
 		-command [list PlotAxisFormat $varname x]
 	} else {
-	    $var(plot) xaxis configure -command {}
+	    $var(graph) xaxis configure -command {}
 	}
 	if {$var(axis,y,format) != {}} {
-	    $var(plot) yaxis configure \
+	    $var(graph) yaxis configure \
 		-command [list PlotAxisFormat $varname y]
 	} else {
-	    $var(plot) yaxis configure -command {}
+	    $var(graph) yaxis configure -command {}
 	}
     }
 
@@ -1145,26 +1145,26 @@ proc PlotUpdateGraph {varname} {
     }
 
     # Graph
-    $var(plot) configure -plotpadx 0 -plotpady 0 \
+    $var(graph) configure -plotpadx 0 -plotpady 0 \
 	-title $var(graph,title) \
 	-font "{$ds9($var(graph,title,family))} $var(graph,title,size) $var(graph,title,weight) $var(graph,title,slant)" \
 	-bg $var(graph,bg) -plotbackground $var(graph,bg)
 
-    $var(plot) xaxis configure \
+    $var(graph) xaxis configure \
 	-bg $var(graph,bg) \
 	-grid $var(axis,x,grid) -logscale $var(axis,x,log) \
 	-title $var(axis,x,title) \
 	-tickfont "{$ds9($var(axis,font,family))} $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
 	-titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
 
-    $var(plot) yaxis configure \
+    $var(graph) yaxis configure \
 	-bg $var(graph,bg) \
 	-grid $var(axis,y,grid) -logscale $var(axis,y,log) \
 	-title $var(axis,y,title) \
 	-tickfont "{$ds9($var(axis,font,family))} $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
 	-titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
 
-    $var(plot) legend configure -hide [expr !$var(legend)] \
+    $var(graph) legend configure -hide [expr !$var(legend)] \
 	-bg $var(graph,bg) \
 	-position $var(legend,position) -title $var(legend,title) \
 	-font "{$ds9($var(legend,font,family))} $var(legend,font,size) $var(legend,font,weight) $var(legend,font,slant)" \
@@ -1182,23 +1182,23 @@ proc PlotCreateElement {varname} {
 
     # delete current elements
     set nn $var(data,current)
-    foreach el [$var(plot) element names] {
+    foreach el [$var(graph) element names] {
 	set f [split $el -]
 	if {[lindex $f 1] == $nn} {
-	    $var(plot) element delete $el
+	    $var(graph) element delete $el
 	}
     }
 
     global $var(xdata) $var(ydata)
-    $var(plot) element create "d-${nn}" -xdata $var(xdata) -ydata $var(ydata)
+    $var(graph) element create "d-${nn}" -xdata $var(xdata) -ydata $var(ydata)
     if {$var(xedata) != {}} {
 	if {[$var(xedata) length] != 0} {
-	    $var(plot) element configure "d-${nn}" -xerror $var(xedata)
+	    $var(graph) element configure "d-${nn}" -xerror $var(xedata)
 	}
     }
     if {$var(yedata) != {}} {
 	if {[$var(yedata) length] != 0} {
-	    $var(plot) element configure "d-${nn}" -yerror $var(yedata)
+	    $var(graph) element configure "d-${nn}" -yerror $var(yedata)
 	}
     }
 }
diff --git a/ds9/library/plotbar.tcl b/ds9/library/plotbar.tcl
index 27c1ac6..0548180 100644
--- a/ds9/library/plotbar.tcl
+++ b/ds9/library/plotbar.tcl
@@ -32,7 +32,7 @@ proc PlotBar {tt wtt title xaxis yaxis dim data} {
     PlotBarProc $varname
     PlotDialog $varname $wtt $title $xaxis $yaxis
     PlotDialogBar $varname
-    PlotAddPlot $varname
+    PlotAddGraph $varname
     
     PlotDataSet $varname $dim $data
     $var(proc,updategraph) $varname
@@ -47,14 +47,14 @@ proc PlotBarDialog {varname wtt title xaxis yaxis} {
     PlotBarProc $varname
     PlotDialog $varname $wtt $title $xaxis $yaxis
     PlotDialogBar $varname
-    PlotAddPlot $varname
+    PlotAddGraph $varname
 }
 
 proc PlotBarProc {varname} {
     upvar #0 $varname var
     global $varname
 
-    set var(proc,addplot) PlotBarAddPlot
+    set var(proc,addplot) PlotBarAddGraph
     set var(proc,updategraph) PlotBarUpdateGraph
     set var(proc,updateelement) PlotBarUpdateElement
     set var(proc,highlite) PlotBarHighliteElement
@@ -144,30 +144,30 @@ proc PlotDialogBar {varname} {
 
 }
 
-proc PlotBarAddPlot {varname} {
+proc PlotBarAddGraph {varname} {
     upvar #0 $varname var
     global $varname
 
     set var(type) bar
-    set var(graph) [ttk::frame $var(top).fr]
-    set var(plot) [blt::barchart $var(graph).bar \
+    set var(canvas) [ttk::frame $var(top).fr]
+    set var(graph) [blt::barchart $var(canvas).bar \
 			-width 600 \
 			-height 500 \
 			-highlightthickness 0 \
 		       ]
 
-    $var(plot) xaxis configure -grid no -stepsize 0
-    $var(plot) yaxis configure -grid yes
+    $var(graph) xaxis configure -grid no -stepsize 0
+    $var(graph) yaxis configure -grid yes
 
-    pack $var(plot) -expand yes -fill both
     pack $var(graph) -expand yes -fill both
+    pack $var(canvas) -expand yes -fill both
 
     # set up zoom stack, assuming mode is zoom
     global ds9
     switch $ds9(wm) {
 	x11 -
-	win32 {Blt_ZoomStack $var(plot) -mode release}
-	aqua {Blt_ZoomStack $var(plot) -mode release -button "ButtonPress-2"}
+	win32 {Blt_ZoomStack $var(graph) -mode release}
+	aqua {Blt_ZoomStack $var(graph) -mode release -button "ButtonPress-2"}
     }
 }
 
@@ -176,7 +176,7 @@ proc PlotBarUpdateGraph {varname} {
     global $varname
 
     PlotUpdateGraph $varname
-    $var(plot) configure -barmode $var(bar,mode)
+    $var(graph) configure -barmode $var(bar,mode)
 }
 
 proc PlotBarUpdateElement {varname} {
@@ -198,7 +198,7 @@ proc PlotBarUpdateElement {varname} {
 	set cap 0
     }
 
-    $var(plot) element configure "d-${nn}" \
+    $var(graph) element configure "d-${nn}" \
 	-label $var(name) -hide [expr !$var(show)] \
 	-relief $var(bar,relief) -color $var(color) \
 	-showerrorbars $show -errorbarcolor $var(error,color) \
diff --git a/ds9/library/plotdialog.tcl b/ds9/library/plotdialog.tcl
index 51c557f..c7e0c09 100644
--- a/ds9/library/plotdialog.tcl
+++ b/ds9/library/plotdialog.tcl
@@ -45,8 +45,8 @@ proc PlotDialog {varname wtt title xaxis yaxis} {
 
     $var(mb) add cascade -label [msgcat::mc {File}] -menu $var(mb).file
     $var(mb) add cascade -label [msgcat::mc {Edit}] -menu $var(mb).edit
+    $var(mb) add cascade -label [msgcat::mc {Canvas}] -menu $var(mb).canvas
     $var(mb) add cascade -label [msgcat::mc {Graph}] -menu $var(mb).graph
-    $var(mb) add cascade -label [msgcat::mc {Plot}] -menu $var(mb).plot
     $var(mb) add cascade -label [msgcat::mc {Data}] -menu $var(mb).data
 
     # File
@@ -122,110 +122,110 @@ proc PlotDialog {varname wtt title xaxis yaxis} {
 	-variable ${varname}(mode) -value zoom \
 	-command [list PlotChangeMode $varname]
 
+    # Canvas
+    menu $var(mb).canvas
+
+    $var(mb).canvas add cascade -label [msgcat::mc {Select Graph}] \
+	-menu $var(mb).canvas.select
+    $var(mb).canvas add separator
+    $var(mb).canvas add command -label [msgcat::mc {Add Graph}] \
+	-command [list PlotAddGraph $varname]
+    $var(mb).canvas add command -label [msgcat::mc {Delete Graph}] \
+	-command [list PlotDeleteGraph $varname]
+    $var(mb).canvas add separator
+    menu $var(mb).canvas.select
+
+    $var(mb).canvas add cascade -label [msgcat::mc {Font}] \
+	-menu $var(mb).canvas.font
+    $var(mb).canvas add cascade -label [msgcat::mc {Background}] \
+	-menu $var(mb).canvas.bg
+    $var(mb).canvas add separator
+    $var(mb).canvas add command -label "[msgcat::mc {Title}]..." \
+	-command [list PlotGraphTitleDialog $varname]
+
+    menu $var(mb).canvas.font
+    $var(mb).canvas.font add cascade -label [msgcat::mc {Title}] \
+	-menu $var(mb).canvas.font.title
+    $var(mb).canvas.font add cascade -label [msgcat::mc {Axes Title}] \
+	-menu $var(mb).canvas.font.textlab
+    $var(mb).canvas.font add cascade -label [msgcat::mc {Axes Number}] \
+	-menu $var(mb).canvas.font.numlab
+    $var(mb).canvas.font add cascade -label [msgcat::mc {Legend Title}] \
+	-menu $var(mb).canvas.font.legendtitle
+    $var(mb).canvas.font add cascade -label [msgcat::mc {Legend}] \
+	-menu $var(mb).canvas.font.legend
+
+    FontMenu $var(mb).canvas.font.title $varname graph,title,family graph,title,size graph,title,weight graph,title,slant [list $var(proc,updategraph) $varname]
+    FontMenu $var(mb).canvas.font.textlab $varname axis,title,family axis,title,size axis,title,weight axis,title,slant [list $var(proc,updategraph) $varname]
+    FontMenu $var(mb).canvas.font.numlab $varname axis,font,family axis,font,size axis,font,weight axis,font,slant [list $var(proc,updategraph) $varname]
+    FontMenu $var(mb).canvas.font.legendtitle $varname legend,title,family legend,title,size legend,title,weight legend,title,slant [list $var(proc,updategraph) $varname]
+    FontMenu $var(mb).canvas.font.legend $varname legend,font,family legend,font,size legend,font,weight legend,font,slant [list $var(proc,updategraph) $varname]
+
+    PlotColorMenu $var(mb).canvas.bg $varname graph,bg [list $var(proc,updategraph) $varname]
+
     # Graph
     menu $var(mb).graph
 
-    $var(mb).graph add cascade -label [msgcat::mc {Select Plot}] \
+    $var(mb).graph add cascade -label [msgcat::mc {Select Data Set}] \
 	-menu $var(mb).graph.select
     $var(mb).graph add separator
-    $var(mb).graph add command -label [msgcat::mc {Add Plot}] \
-	-command [list PlotAddPlot $varname]
-    $var(mb).graph add command -label [msgcat::mc {Delete Plot}] \
-	-command [list PlotDeletePlot $varname]
-    $var(mb).graph add separator
     menu $var(mb).graph.select
 
-    $var(mb).graph add cascade -label [msgcat::mc {Font}] \
-	-menu $var(mb).graph.font
-    $var(mb).graph add cascade -label [msgcat::mc {Background}] \
-	-menu $var(mb).graph.bg
+    $var(mb).graph add cascade -label [msgcat::mc {Axes}] \
+	-menu $var(mb).graph.axes
+    $var(mb).graph add cascade -label [msgcat::mc {Legend}] \
+	-menu $var(mb).graph.legend
     $var(mb).graph add separator
-    $var(mb).graph add command -label "[msgcat::mc {Title}]..." \
-	-command [list PlotGraphTitleDialog $varname]
-
-    menu $var(mb).graph.font
-    $var(mb).graph.font add cascade -label [msgcat::mc {Title}] \
-	-menu $var(mb).graph.font.title
-    $var(mb).graph.font add cascade -label [msgcat::mc {Axes Title}] \
-	-menu $var(mb).graph.font.textlab
-    $var(mb).graph.font add cascade -label [msgcat::mc {Axes Number}] \
-	-menu $var(mb).graph.font.numlab
-    $var(mb).graph.font add cascade -label [msgcat::mc {Legend Title}] \
-	-menu $var(mb).graph.font.legendtitle
-    $var(mb).graph.font add cascade -label [msgcat::mc {Legend}] \
-	-menu $var(mb).graph.font.legend
-
-    FontMenu $var(mb).graph.font.title $varname graph,title,family graph,title,size graph,title,weight graph,title,slant [list $var(proc,updategraph) $varname]
-    FontMenu $var(mb).graph.font.textlab $varname axis,title,family axis,title,size axis,title,weight axis,title,slant [list $var(proc,updategraph) $varname]
-    FontMenu $var(mb).graph.font.numlab $varname axis,font,family axis,font,size axis,font,weight axis,font,slant [list $var(proc,updategraph) $varname]
-    FontMenu $var(mb).graph.font.legendtitle $varname legend,title,family legend,title,size legend,title,weight legend,title,slant [list $var(proc,updategraph) $varname]
-    FontMenu $var(mb).graph.font.legend $varname legend,font,family legend,font,size legend,font,weight legend,font,slant [list $var(proc,updategraph) $varname]
-
-    PlotColorMenu $var(mb).graph.bg $varname graph,bg [list $var(proc,updategraph) $varname]
-
-    # Plot
-    menu $var(mb).plot
-
-    $var(mb).plot add cascade -label [msgcat::mc {Select Data Set}] \
-	-menu $var(mb).plot.select
-    $var(mb).plot add separator
-    menu $var(mb).plot.select
-
-    $var(mb).plot add cascade -label [msgcat::mc {Axes}] \
-	-menu $var(mb).plot.axes
-    $var(mb).plot add cascade -label [msgcat::mc {Legend}] \
-	-menu $var(mb).plot.legend
-    $var(mb).plot add separator
-    $var(mb).plot add command -label "[msgcat::mc {Titles}]..." \
+    $var(mb).graph add command -label "[msgcat::mc {Titles}]..." \
 	-command [list PlotPlotTitleDialog $varname]
 
-    menu $var(mb).plot.axes
-    $var(mb).plot.axes add checkbutton -label [msgcat::mc {X Grid}] \
+    menu $var(mb).graph.axes
+    $var(mb).graph.axes add checkbutton -label [msgcat::mc {X Grid}] \
 	-variable ${varname}(axis,x,grid) \
 	-command [list $var(proc,updategraph) $varname]
-    $var(mb).plot.axes add checkbutton -label [msgcat::mc {Log}] \
+    $var(mb).graph.axes add checkbutton -label [msgcat::mc {Log}] \
 	-variable ${varname}(axis,x,log) \
 	-command [list $var(proc,updategraph) $varname]
-    $var(mb).plot.axes add checkbutton -label [msgcat::mc {Flip}] \
+    $var(mb).graph.axes add checkbutton -label [msgcat::mc {Flip}] \
 	-variable ${varname}(axis,x,flip) \
 	-command [list $var(proc,updategraph) $varname]
-    $var(mb).plot.axes add separator
-    $var(mb).plot.axes add checkbutton -label [msgcat::mc {Y Grid}] \
+    $var(mb).graph.axes add separator
+    $var(mb).graph.axes add checkbutton -label [msgcat::mc {Y Grid}] \
 	-variable ${varname}(axis,y,grid) \
 	-command [list $var(proc,updategraph) $varname]
-    $var(mb).plot.axes add checkbutton -label [msgcat::mc {Log}] \
+    $var(mb).graph.axes add checkbutton -label [msgcat::mc {Log}] \
 	-variable ${varname}(axis,y,log) \
 	-command [list $var(proc,updategraph) $varname]
-    $var(mb).plot.axes add checkbutton -label [msgcat::mc {Flip}] \
+    $var(mb).graph.axes add checkbutton -label [msgcat::mc {Flip}] \
 	-variable ${varname}(axis,y,flip) \
 	-command [list $var(proc,updategraph) $varname]
-    $var(mb).plot.axes add separator
-    $var(mb).plot.axes add command -label "[msgcat::mc {Range}]..." \
+    $var(mb).graph.axes add separator
+    $var(mb).graph.axes add command -label "[msgcat::mc {Range}]..." \
 	-command [list PlotRangeDialog $varname]
 
-    menu $var(mb).plot.legend
-    $var(mb).plot.legend add checkbutton -label [msgcat::mc {Show}] \
+    menu $var(mb).graph.legend
+    $var(mb).graph.legend add checkbutton -label [msgcat::mc {Show}] \
 	-variable ${varname}(legend) \
 	-command [list $var(proc,updategraph) $varname]
-    $var(mb).plot.legend add separator
-    $var(mb).plot.legend add radiobutton -label [msgcat::mc {Right}] \
+    $var(mb).graph.legend add separator
+    $var(mb).graph.legend add radiobutton -label [msgcat::mc {Right}] \
 	-variable ${varname}(legend,position) -value right \
 	-command [list $var(proc,updategraph) $varname]
-    $var(mb).plot.legend add radiobutton -label [msgcat::mc {Left}] \
+    $var(mb).graph.legend add radiobutton -label [msgcat::mc {Left}] \
 	-variable ${varname}(legend,position) -value left \
 	-command [list $var(proc,updategraph) $varname]
-    $var(mb).plot.legend add radiobutton -label [msgcat::mc {Top}] \
+    $var(mb).graph.legend add radiobutton -label [msgcat::mc {Top}] \
 	-variable ${varname}(legend,position) -value top \
 	-command [list $var(proc,updategraph) $varname]
-    $var(mb).plot.legend add radiobutton -label [msgcat::mc {Bottom}] \
+    $var(mb).graph.legend add radiobutton -label [msgcat::mc {Bottom}] \
 	-variable ${varname}(legend,position) -value bottom \
 	-command [list $var(proc,updategraph) $varname]
 
     # dataset
     menu $var(mb).data
 
-    set var(plot,total) 0
-    set var(plot,current) 0
+    set var(graph,total) 0
+    set var(graph,current) 0
 }
 
 proc PlotDataFormatDialog {xarname} {
@@ -511,7 +511,7 @@ proc DatasetNameDialog {varname} {
     DialogDismiss $w
 
     if {$ed(ok)} {
-	$var(mb).plot.select entryconfig "$var(name)" -label "$ed(name)"
+	$var(mb).graph.select entryconfig "$var(name)" -label "$ed(name)"
 	set var(name) $ed(name)
 	$var(proc,updateelement) $varname
     }
@@ -612,7 +612,7 @@ proc PlotExport {varname fn format} {
     # besure we are on top
     raise $var(top)
 
-    set rr [catch {image create photo -format window -data $var(graph)} ph]
+    set rr [catch {image create photo -format window -data $var(canvas)} ph]
     if {$rr} {
 	Error $iap(error)
 	return
diff --git a/ds9/library/plotline.tcl b/ds9/library/plotline.tcl
index 633d72e..8be48ed 100644
--- a/ds9/library/plotline.tcl
+++ b/ds9/library/plotline.tcl
@@ -32,7 +32,7 @@ proc PlotLine {tt wtt title xaxis yaxis dim data} {
     PlotLineProc $varname
     PlotDialog $varname $wtt $title $xaxis $yaxis
     PlotDialogLine $varname
-    PlotAddPlot $varname
+    PlotAddGraph $varname
 
     PlotDataSet $varname $dim $data
     $var(proc,updategraph) $varname
@@ -47,7 +47,7 @@ proc PlotLineDialog {varname wtt title xaxis yaxis} {
     PlotLineProc $varname
     PlotDialog $varname $wtt $title $xaxis $yaxis
     PlotDialogLine $varname
-    PlotAddPlot $varname
+    PlotAddGraph $varname
 }
 
 proc PlotLineProc {varname} {
@@ -55,7 +55,7 @@ proc PlotLineProc {varname} {
     global $varname
 
     set var(proc,updategraph) PlotUpdateGraph
-    set var(proc,addplot) PlotLineAddPlot
+    set var(proc,addplot) PlotLineAddGraph
     set var(proc,updateelement) PlotLineUpdateElement
     set var(proc,highlite) PlotLineHighliteElement
     set var(proc,button) PlotLineButton
@@ -224,27 +224,27 @@ proc PlotDialogLine {varname} {
 
 }
 
-proc PlotLineAddPlot {varname} {
+proc PlotLineAddGraph {varname} {
     upvar #0 $varname var
     global $varname
 
     set var(type) line
-    set var(graph) [ttk::frame $var(top).fr]
-    set var(plot) [blt::graph $var(graph).line \
+    set var(canvas) [ttk::frame $var(top).fr]
+    set var(graph) [blt::graph $var(canvas).line \
 			-width 600 \
 			-height 500 \
 			-highlightthickness 0 \
 		       ]
 
-    pack $var(plot) -expand yes -fill both
     pack $var(graph) -expand yes -fill both
+    pack $var(canvas) -expand yes -fill both
 
     # set up zoom stack, assuming mode is zoom
     global ds9
     switch $ds9(wm) {
 	x11 -
-	win32 {Blt_ZoomStack $var(plot) -mode release}
-	aqua {Blt_ZoomStack $var(plot) -mode release -button "ButtonPress-2"}
+	win32 {Blt_ZoomStack $var(graph) -mode release}
+	aqua {Blt_ZoomStack $var(graph) -mode release -button "ButtonPress-2"}
     }
 }
 
@@ -290,7 +290,7 @@ proc PlotLineUpdateElement {varname} {
 	set cap 0
     }
 
-    $var(plot) element configure "d-${nn}" \
+    $var(graph) element configure "d-${nn}" \
 	-label $var(name) -hide [expr !$var(show)] \
 	-symbol $var(shape,symbol) -fill $clr -scalesymbols no \
 	-pixels 5 -outline $var(shape,color) \
diff --git a/ds9/library/plotprint.tcl b/ds9/library/plotprint.tcl
index 7ceeaef..8d6c98c 100644
--- a/ds9/library/plotprint.tcl
+++ b/ds9/library/plotprint.tcl
@@ -23,18 +23,18 @@ proc PlotPostScript {varname} {
     global ds9
 
     # set postscript fonts
-    $var(plot) configure \
+    $var(graph) configure \
 	-font "$var(graph,title,family) $var(graph,title,size) $var(graph,title,weight) $var(graph,title,slant)"
 
-    $var(plot) xaxis configure \
+    $var(graph) xaxis configure \
 	-tickfont "$var(axis,font,family) $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
 	-titlefont "$var(axis,title,family) $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
 
-    $var(plot) yaxis configure \
+    $var(graph) yaxis configure \
 	-tickfont "$var(axis,font,family) $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
 	-titlefont "$var(axis,title,family) $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
 
-    $var(plot) legend configure \
+    $var(graph) legend configure \
 	-font "$var(legend,font,family) $var(legend,font,size) $var(legend,font,weight) $var(legend,font,slant)" \
 	-titlefont "$var(legend,title,family) $var(legend,title,size) $var(legend,title,weight) $var(legend,title,slant)"
 
@@ -94,26 +94,26 @@ proc PlotPostScript {varname} {
     }
 
     if {$ps(dest) == "file" && $ps(filename) != {}} {
-	eval $var(plot) postscript output $ps(filename) $options
+	eval $var(graph) postscript output $ps(filename) $options
     } else {
 	set ch [open "| $ps(cmd)" w]
-	puts $ch [eval $var(plot) postscript output $options]
+	puts $ch [eval $var(graph) postscript output $options]
 	close $ch
     }
 
     # reset fonts
-    $var(plot) configure \
+    $var(graph) configure \
 	-font "{$ds9($var(graph,title,family))} $var(graph,title,size) $var(graph,title,weight) $var(graph,title,slant)"
 
-    $var(plot) xaxis configure \
+    $var(graph) xaxis configure \
 	-tickfont "{$ds9($var(axis,font,family))} $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
 	-titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
 
-    $var(plot) yaxis configure \
+    $var(graph) yaxis configure \
 	-tickfont "{$ds9($var(axis,font,family))} $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
 	-titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
 
-    $var(plot) legend configure \
+    $var(graph) legend configure \
 	-font "{$ds9($var(legend,font,family))} $var(legend,font,size) $var(legend,font,weight) $var(legend,font,slant)" \
 	-titlefont "{$ds9($var(legend,title,family))} $var(legend,title,size) $var(legend,title,weight) $var(legend,title,slant)"
 }
diff --git a/ds9/library/plotscatter.tcl b/ds9/library/plotscatter.tcl
index 05f36f1..c7ccd3c 100644
--- a/ds9/library/plotscatter.tcl
+++ b/ds9/library/plotscatter.tcl
@@ -32,7 +32,7 @@ proc PlotScatter {tt wtt title xaxis yaxis dim data} {
     PlotScatterProc $varname
     PlotDialog $varname $wtt $title $xaxis $yaxis
     PlotDialogScatter $varname
-    PlotAddPlot $varname
+    PlotAddGraph $varname
     
     PlotDataSet $varname $dim $data
     $var(proc,updategraph) $varname
@@ -47,14 +47,14 @@ proc PlotScatterDialog {varname wtt title xaxis yaxis} {
     PlotScatterProc $varname
     PlotDialog $varname $wtt $title $xaxis $yaxis
     PlotDialogScatter $varname
-    PlotAddPlot $varname
+    PlotAddGraph $varname
 }
 
 proc PlotScatterProc {varname} {
     upvar #0 $varname var
     global $varname
 
-    set var(proc,addplot) PlotScatterAddPlot
+    set var(proc,addplot) PlotScatterAddGraph
     set var(proc,updategraph) PlotUpdateGraph
     set var(proc,updateelement) PlotScatterUpdateElement
     set var(proc,highlite) PlotScatterHighliteElement
@@ -150,27 +150,27 @@ proc PlotDialogScatter {varname} {
 	[list PlotScatterUpdateElement $varname] {}
 }
 
-proc PlotScatterAddPlot {varname} {
+proc PlotScatterAddGraph {varname} {
     upvar #0 $varname var
     global $varname
 
     set var(type) scatter
-    set var(graph) [ttk::frame $var(top).fr]
-    set var(plot) [blt::graph $var(graph).scatter \
+    set var(canvas) [ttk::frame $var(top).fr]
+    set var(graph) [blt::graph $var(canvas).scatter \
 			-width 600 \
 			-height 500 \
 			-highlightthickness 0 \
 		       ]
 
-    pack $var(plot) -expand yes -fill both
     pack $var(graph) -expand yes -fill both
+    pack $var(canvas) -expand yes -fill both
 
     # set up zoom stack, assuming mode is zoom
     global ds9
     switch $ds9(wm) {
 	x11 -
-	win32 {Blt_ZoomStack $var(plot) -mode release}
-	aqua {Blt_ZoomStack $var(plot) -mode release -button "ButtonPress-2"}
+	win32 {Blt_ZoomStack $var(graph) -mode release}
+	aqua {Blt_ZoomStack $var(graph) -mode release -button "ButtonPress-2"}
     }
 }
 
@@ -208,7 +208,7 @@ proc PlotScatterUpdateElement {varname} {
 	set cap 0
     }
 
-    $var(plot) element configure "d-${nn}" \
+    $var(graph) element configure "d-${nn}" \
 	-label $var(name) -hide [expr !$var(show)] \
 	-symbol $var(shape,symbol) -fill $clr -scalesymbols no \
 	-outline $var(shape,color) \
@@ -216,7 +216,7 @@ proc PlotScatterUpdateElement {varname} {
 	-showerrorbars $show -errorbarcolor $var(error,color) \
 	-errorbarwidth $var(error,width) -errorbarcap $cap
 
-    $var(plot) pen configure active -color blue \
+    $var(graph) pen configure active -color blue \
 	-symbol $var(shape,symbol) \
 	-linewidth 0 -pixels 5 \
 	-showerrorbars $show -errorbarcolor $var(error,color) \
@@ -235,18 +235,18 @@ proc PlotScatterButton {varname x y} {
 	return
     }
 
-    set rr [$var(plot) element closest $x $y]
+    set rr [$var(graph) element closest $x $y]
     set elem [lindex $rr 1]
     set row [lindex $rr 3]
 
     if {$elem != {}} {
 	if {$row != {}} {
-	    $var(plot) element deactivate $elem
-	    $var(plot) element activate $elem $row
+	    $var(graph) element deactivate $elem
+	    $var(graph) element activate $elem $row
 	    # rows start at 1
 	    eval "$var(callback) [expr $row+1]"
 	} else {
-	    $var(plot) element deactivate $elem
+	    $var(graph) element deactivate $elem
 	    eval "$var(callback) {}"
 	}
     }
@@ -261,10 +261,10 @@ proc PlotScatterHighliteElement {varname rowlist} {
     }
 
     if {$var(show)} {
-	$var(plot) element deactivate d-1
+	$var(graph) element deactivate d-1
 	if {$rowlist != {}} {
 	    # can have multiple rows
-	    eval "$var(plot) element activate d-1 $rowlist"
+	    eval "$var(graph) element activate d-1 $rowlist"
 	}
     }
 }