diff options
Diffstat (limited to 'ds9/library')
| -rw-r--r-- | ds9/library/plot.tcl | 36 | ||||
| -rw-r--r-- | ds9/library/plotbar.tcl | 7 | ||||
| -rw-r--r-- | ds9/library/plotconfig.tcl | 2 | ||||
| -rw-r--r-- | ds9/library/plotdialog.tcl | 38 | ||||
| -rw-r--r-- | ds9/library/plotline.tcl | 7 | ||||
| -rw-r--r-- | ds9/library/plotprocess.tcl | 4 | ||||
| -rw-r--r-- | ds9/library/plotscatter.tcl | 7 | ||||
| -rw-r--r-- | ds9/library/plotstate.tcl | 12 |
8 files changed, 69 insertions, 44 deletions
diff --git a/ds9/library/plot.tcl b/ds9/library/plot.tcl index baa9c2f..85e9641 100644 --- a/ds9/library/plot.tcl +++ b/ds9/library/plot.tcl @@ -126,7 +126,7 @@ proc PlotLayoutCanvas {varname} { # Graph # used by backup -proc PlotAddGraph {varname} { +proc PlotAddGraph {varname type} { upvar #0 $varname var global $varname @@ -139,7 +139,27 @@ proc PlotAddGraph {varname} { PlotInitGraph $varname # create graph - $var(proc,addgraph) $varname + set var(graph,type) $type + switch $type { + line { + PlotLineAddGraph $varname + set var(graph,proc,updateelement) PlotLineUpdateElement + set var(graph,proc,highlite) PlotHighLiteElement + set var(graph,proc,button) PlotButton + } + bar { + PlotBarAddGraph $varname + set var(graph,proc,updateelement) PlotBarUpdateElement + set var(graph,proc,highlite) PlotHighLiteElement + set var(graph,proc,button) PlotButton + } + scatter { + PlotScatterAddGraph $varname + set var(graph,proc,updateelement) PlotScattterUpdateElement + set var(graph,proc,highlite) PlotScatterHighLiteElement + set var(graph,proc,button) PlotScatterButton + } + } # create menu item $var(mb).canvas.select add radiobutton -label $var(graph,name) \ @@ -155,7 +175,7 @@ proc PlotAddGraph {varname} { } # update menus - $var(proc,updateelement) $varname + $var(graph,proc,updateelement) $varname PlotUpdateGraph $varname PlotUpdateCanvas $varname @@ -230,7 +250,7 @@ proc PlotDeleteGraph {varname} { PlotRestoreState $varname # update menus - $var(proc,updateelement) $varname + $var(graph,proc,updateelement) $varname PlotUpdateGraph $varname PlotUpdateCanvas $varname @@ -265,7 +285,7 @@ proc PlotAddElement {varname} { } # update menus - $var(proc,updateelement) $varname + $var(graph,proc,updateelement) $varname PlotUpdateGraphMenu $varname @@ -342,7 +362,7 @@ proc PlotDeleteDataSet {varname} { PlotRestoreState $varname # update menus - $var(proc,updateelement) $varname + $var(graph,proc,updateelement) $varname PlotUpdateGraphMenu $varname @@ -645,7 +665,7 @@ proc PlotButtonInvoke {varname x y} { upvar #0 $varname var global $varname - $var(proc,button) $varname $x $y + $var(graph,proc,button) $varname $x $y } proc PlotButton {varname x y} { @@ -733,7 +753,7 @@ proc PlotBackup {ch dir} { set var(graph,current) $cc PlotCurrentGraph $varname if {!$first} { - puts $ch "PlotAddGraph $varname" + puts $ch "PlotAddGraph $varname $var($cc,type)" } set first 0 diff --git a/ds9/library/plotbar.tcl b/ds9/library/plotbar.tcl index 654653e..aa7ac5c 100644 --- a/ds9/library/plotbar.tcl +++ b/ds9/library/plotbar.tcl @@ -52,13 +52,8 @@ proc PlotBarDialog {varname wtt} { upvar #0 $varname var global $varname - set var(proc,addgraph) PlotBarAddGraph - set var(proc,updateelement) PlotBarUpdateElement - set var(proc,highlite) PlotHighliteElement - set var(proc,button) PlotButton - PlotDialog $varname $wtt - PlotAddGraph $varname + PlotAddGraph $varname bar } proc PlotBarMenus {varname} { diff --git a/ds9/library/plotconfig.tcl b/ds9/library/plotconfig.tcl index 2c3d623..0b6c6c4 100644 --- a/ds9/library/plotconfig.tcl +++ b/ds9/library/plotconfig.tcl @@ -180,7 +180,7 @@ proc PlotLoadConfigFile {varname filename} { unset var(grid,log) } - $var(proc,updateelement) $varname + $var(graph,proc,updateelement) $varname PlotUpdateGraph $varname PlotUpdateCanvas $varname } diff --git a/ds9/library/plotdialog.tcl b/ds9/library/plotdialog.tcl index 133568e..0b4897a 100644 --- a/ds9/library/plotdialog.tcl +++ b/ds9/library/plotdialog.tcl @@ -111,8 +111,8 @@ proc PlotDialog {varname wtt} { $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 cascade -label [msgcat::mc {Add Graph}] \ + -menu $var(mb).canvas.graph $var(mb).canvas add command -label [msgcat::mc {Delete Graph}] \ -command [list PlotDeleteGraphCurrent $varname] $var(mb).canvas add separator @@ -128,6 +128,14 @@ proc PlotDialog {varname wtt} { $var(mb).canvas add cascade -label [msgcat::mc {Background}] \ -menu $var(mb).canvas.bg + menu $var(mb).canvas.graph + $var(mb).canvas.graph add command -label [msgcat::mc {Line}] \ + -command [list PlotAddGraph $varname line] + $var(mb).canvas.graph add command -label [msgcat::mc {Bar}] \ + -command [list PlotAddGraph $varname bar] + $var(mb).canvas.graph add command -label [msgcat::mc {Scatter}] \ + -command [list PlotAddGraph $varname scatter] + menu $var(mb).canvas.layout $var(mb).canvas.layout add radiobutton -label [msgcat::mc {Column}] \ -variable ${varname}(layout) -value column \ @@ -503,7 +511,7 @@ proc DatasetNameDialog {varname} { $var(mb).graph.select entryconfig "$var(graph,ds,name)" \ -label "$ed(name)" set var(graph,ds,name) $ed(name) - $var(proc,updateelement) $varname + $var(graph,proc,updateelement) $varname } set rr $ed(ok) @@ -544,53 +552,53 @@ proc PlotShapeMenu {varname which} { $var(mb).$which.shape add radiobutton \ -label [msgcat::mc {None}] \ -variable ${varname}(graph,ds,shape,symbol) -value none \ - -command [list $var(proc,updateelement) $varname] + -command [list $var(graph,proc,updateelement) $varname] $var(mb).$which.shape add radiobutton \ -label [msgcat::mc {Circle}] \ -variable ${varname}(graph,ds,shape,symbol) -value circle \ - -command [list $var(proc,updateelement) $varname] + -command [list $var(graph,proc,updateelement) $varname] $var(mb).$which.shape add radiobutton \ -label [msgcat::mc {Square}] \ -variable ${varname}(graph,ds,shape,symbol) -value square \ - -command [list $var(proc,updateelement) $varname] + -command [list $var(graph,proc,updateelement) $varname] $var(mb).$which.shape add radiobutton \ -label [msgcat::mc {Diamond}] \ -variable ${varname}(graph,ds,shape,symbol) -value diamond \ - -command [list $var(proc,updateelement) $varname] + -command [list $var(graph,proc,updateelement) $varname] $var(mb).$which.shape add radiobutton \ -label [msgcat::mc {Plus}] \ -variable ${varname}(graph,ds,shape,symbol) -value plus \ - -command [list $var(proc,updateelement) $varname] + -command [list $var(graph,proc,updateelement) $varname] $var(mb).$which.shape add radiobutton \ -label [msgcat::mc {Cross}] \ -variable ${varname}(graph,ds,shape,symbol) -value cross \ - -command [list $var(proc,updateelement) $varname] + -command [list $var(graph,proc,updateelement) $varname] $var(mb).$which.shape add radiobutton \ -label [msgcat::mc {Simple Plus}] \ -variable ${varname}(graph,ds,shape,symbol) -value splus \ - -command [list $var(proc,updateelement) $varname] + -command [list $var(graph,proc,updateelement) $varname] $var(mb).$which.shape add radiobutton \ -label [msgcat::mc {Simple Cross}] \ -variable ${varname}(graph,ds,shape,symbol) -value scross \ - -command [list $var(proc,updateelement) $varname] + -command [list $var(graph,proc,updateelement) $varname] $var(mb).$which.shape add radiobutton \ -label [msgcat::mc {Triangle}] \ -variable ${varname}(graph,ds,shape,symbol) -value triangle \ - -command [list $var(proc,updateelement) $varname] + -command [list $var(graph,proc,updateelement) $varname] $var(mb).$which.shape add radiobutton \ -label [msgcat::mc {Arrow}] \ -variable ${varname}(graph,ds,shape,symbol) -value arrow \ - -command [list $var(proc,updateelement) $varname] + -command [list $var(graph,proc,updateelement) $varname] $var(mb).$which.shape add separator $var(mb).$which.shape add checkbutton \ -label [msgcat::mc {Fill}] \ -variable ${varname}(graph,ds,shape,fill) \ - -command [list $var(proc,updateelement) $varname] + -command [list $var(graph,proc,updateelement) $varname] $var(mb).$which.shape add cascade -label [msgcat::mc {Color}] \ -menu $var(mb).$which.shape.color PlotColorMenu $var(mb).$which.shape.color $varname graph,ds,shape,color \ - [list $var(proc,updateelement) $varname] + [list $var(graph,proc,updateelement) $varname] } proc PlotErrorMenu {varname which} { diff --git a/ds9/library/plotline.tcl b/ds9/library/plotline.tcl index 972a028..d8bc422 100644 --- a/ds9/library/plotline.tcl +++ b/ds9/library/plotline.tcl @@ -52,13 +52,8 @@ proc PlotLineDialog {varname wtt} { upvar #0 $varname var global $varname - set var(proc,addgraph) PlotLineAddGraph - set var(proc,updateelement) PlotLineUpdateElement - set var(proc,highlite) PlotHighliteElement - set var(proc,button) PlotButton - PlotDialog $varname $wtt - PlotAddGraph $varname + PlotAddGraph $varname line } proc PlotLineMenus {varname} { diff --git a/ds9/library/plotprocess.tcl b/ds9/library/plotprocess.tcl index 4368818..571fa74 100644 --- a/ds9/library/plotprocess.tcl +++ b/ds9/library/plotprocess.tcl @@ -289,7 +289,7 @@ proc PlotCmdUpdateElement {which value} { upvar #0 $cvarname cvar set cvar($which) $value - $cvar(proc,updateelement) $cvarname + $cvar(graph,proc,updateelement) $cvarname } proc PlotCmdFontStyle {which value} { @@ -341,7 +341,7 @@ proc PlotCmdHighliteElement {varname rowlist} { append result "[expr $rr-1] " } - $var(proc,highlite) $varname $result + $var(graph,proc,highlite) $varname $result } proc ProcessSendPlotCmd {proc id param {sock {}} {fn {}}} { diff --git a/ds9/library/plotscatter.tcl b/ds9/library/plotscatter.tcl index ab51c49..0aca541 100644 --- a/ds9/library/plotscatter.tcl +++ b/ds9/library/plotscatter.tcl @@ -52,13 +52,8 @@ proc PlotScatterDialog {varname wtt} { upvar #0 $varname var global $varname - set var(proc,addgraph) PlotScatterAddGraph - set var(proc,updateelement) PlotScatterUpdateElement - set var(proc,highlite) PlotScatterHighliteElement - set var(proc,button) PlotScatterButton - PlotDialog $varname $wtt - PlotAddGraph $varname + PlotAddGraph $varname scatter } diff --git a/ds9/library/plotstate.tcl b/ds9/library/plotstate.tcl index 778420f..893d172 100644 --- a/ds9/library/plotstate.tcl +++ b/ds9/library/plotstate.tcl @@ -96,6 +96,10 @@ proc PlotInitGraph {varname} { set var(graph) $var(canvas).gr$cc set var(graph,type) {} + set var(graph,proc,updateelement) {} + set var(graph,proc,hightlite) {} + set var(graph,proc,button) {} + set var(graph,name) "Graph $var(seq)" set var(graph,format) 1 set var(graph,title) {} @@ -165,6 +169,10 @@ proc PlotSaveState {varname} { set var($cc,graph) $var(graph) set var($cc,type) $var(graph,type) + set var($cc,proc,updateelement) $var(graph,proc,updateelement) + set var($cc,proc,highlite) $var(graph,proc,highlite) + set var($cc,proc,button) $var(graph,proc,button) + set var($cc,name) $var(graph,name) set var($cc,format) $var(graph,format) set var($cc,title) $var(graph,title) @@ -234,6 +242,10 @@ proc PlotRestoreState {varname} { set var(graph) $var($cc,graph) set var(graph,type) $var($cc,type) + set var(graph,proc,updateelement) $var(graph,proc,updateelement) + set var(graph,proc,highlite) $var(graph,proc,highlite) + set var(graph,proc,button) $var(graph,proc,button) + set var(graph,name) $var($cc,name) set var(graph,format) $var($cc,format) set var(graph,title) $var($cc,title) |