diff options
Diffstat (limited to 'ds9/library/plotdialog.tcl')
| -rw-r--r-- | ds9/library/plotdialog.tcl | 78 |
1 files changed, 46 insertions, 32 deletions
diff --git a/ds9/library/plotdialog.tcl b/ds9/library/plotdialog.tcl index 1054014..59a3473 100644 --- a/ds9/library/plotdialog.tcl +++ b/ds9/library/plotdialog.tcl @@ -41,6 +41,7 @@ proc PlotDialog {varname wtt title xaxis yaxis} { set var(graph,title) "$title" set var(axis,x,title) "$xaxis" set var(axis,y,title) "$yaxis" + set var(axis,y,title,res) {} # can be turned off for external line plots set var(graph,format) 1 @@ -51,8 +52,7 @@ 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 {Graph}] -menu $var(mb).graph - $var(mb) add cascade -label [msgcat::mc {Dataset}] -menu $var(mb).dataset - $var(mb) add cascade -label [msgcat::mc {Select}] -menu $var(mb).select + $var(mb) add cascade -label [msgcat::mc {Data}] -menu $var(mb).data menu $var(mb).file $var(mb).file add command -label "[msgcat::mc {Load Data}]..." \ @@ -139,31 +139,9 @@ proc PlotDialog {varname wtt title xaxis yaxis} { -menu $var(mb).graph.bg $var(mb).graph add separator $var(mb).graph add command -label "[msgcat::mc {Title}]..." \ - -command [list PlotTitleDialog $varname] + -command [list $var(proc,titledialog) $varname] 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).graph.axes add checkbutton -label [msgcat::mc {Log}] \ - -variable ${varname}(axis,x,log) \ - -command [list $var(proc,updategraph) $varname] - $var(mb).graph.axes add checkbutton -label [msgcat::mc {Flip}] \ - -variable ${varname}(axis,x,flip) \ - -command [list $var(proc,updategraph) $varname] - $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).graph.axes add checkbutton -label [msgcat::mc {Log}] \ - -variable ${varname}(axis,y,log) \ - -command [list $var(proc,updategraph) $varname] - $var(mb).graph.axes add checkbutton -label [msgcat::mc {Flip}] \ - -variable ${varname}(axis,y,flip) \ - -command [list $var(proc,updategraph) $varname] - $var(mb).graph.axes add separator - $var(mb).graph.axes add command -label "[msgcat::mc {Range}]..." \ - -command [list PlotRangeDialog $varname] menu $var(mb).graph.legend $var(mb).graph.legend add checkbutton -label [msgcat::mc {Show}] \ @@ -204,10 +182,39 @@ proc PlotDialog {varname wtt title xaxis yaxis} { PlotColorMenu $var(mb).graph.bg $varname graph,bg [list $var(proc,updategraph) $varname] # dataset - menu $var(mb).dataset + menu $var(mb).data + $var(mb).data add cascade -label [msgcat::mc {Select}] \ + -menu $var(mb).data.select + $var(mb).data add separator + menu $var(mb).data.select +} - # select - menu $var(mb).select +proc PlotGraphAxesMenu {varname} { + upvar #0 $varname var + global $varname + + $var(mb).graph.axes add checkbutton -label [msgcat::mc {X Grid}] \ + -variable ${varname}(axis,x,grid) \ + -command [list $var(proc,updategraph) $varname] + $var(mb).graph.axes add checkbutton -label [msgcat::mc {Log}] \ + -variable ${varname}(axis,x,log) \ + -command [list $var(proc,updategraph) $varname] + $var(mb).graph.axes add checkbutton -label [msgcat::mc {Flip}] \ + -variable ${varname}(axis,x,flip) \ + -command [list $var(proc,updategraph) $varname] + $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).graph.axes add checkbutton -label [msgcat::mc {Log}] \ + -variable ${varname}(axis,y,log) \ + -command [list $var(proc,updategraph) $varname] + $var(mb).graph.axes add checkbutton -label [msgcat::mc {Flip}] \ + -variable ${varname}(axis,y,flip) \ + -command [list $var(proc,updategraph) $varname] + $var(mb).graph.axes add separator + $var(mb).graph.axes add command -label "[msgcat::mc {Range}]..." \ + -command [list PlotRangeDialog $varname] } proc PlotChangeMode {varname} { @@ -376,6 +383,7 @@ proc PlotTitleDialog {varname} { set ed(graph,title) $var(graph,title) set ed(axis,x,title) $var(axis,x,title) set ed(axis,y,title) $var(axis,y,title) + set ed(axis,y,title,res) $var(axis,y,title,res) set ed(legend,title) $var(legend,title) DialogCreate $w [msgcat::mc {Title}] ed(ok) @@ -388,6 +396,8 @@ proc PlotTitleDialog {varname} { ttk::entry $f.xtitle -textvariable ed(axis,x,title) -width 30 ttk::label $f.ylabel -text [msgcat::mc {Y Axis Title}] ttk::entry $f.ytitle -textvariable ed(axis,y,title) -width 30 + ttk::label $f.ylabelres -text [msgcat::mc {Y Axis Title Strip}] + ttk::entry $f.ytitleres -textvariable ed(axis,y,titleres) -width 30 ttk::label $f.legendlabel -text [msgcat::mc {Legend Title}] ttk::entry $f.legendtitle -textvariable ed(legend,title) -width 30 @@ -419,6 +429,7 @@ proc PlotTitleDialog {varname} { set var(graph,title) $ed(graph,title) set var(axis,x,title) $ed(axis,x,title) set var(axis,y,title) $ed(axis,y,title) + set var(axis,y,title,res) $ed(axis,y,title,res) set var(legend,title) $ed(legend,title) $var(proc,updategraph) $varname @@ -439,11 +450,11 @@ proc DatasetNameDialog {varname} { set ed(ok) 0 set ed(name) $var(name) - DialogCreate $w [msgcat::mc {Dataset}] ed(ok) + DialogCreate $w [msgcat::mc {Data}] ed(ok) # Param set f [ttk::frame $w.param] - ttk::label $f.label -text [msgcat::mc {Dataset Name}] + ttk::label $f.label -text [msgcat::mc {Data Set Name}] ttk::entry $f.name -textvariable ed(name) -width 30 grid $f.label $f.name -padx 2 -pady 2 -sticky ew @@ -468,7 +479,7 @@ proc DatasetNameDialog {varname} { DialogDismiss $w if {$ed(ok)} { - $var(mb).select entryconfig "$var(name)" -label "$ed(name)" + $var(mb).data.select entryconfig "$var(name)" -label "$ed(name)" set var(name) $ed(name) $var(proc,updateelement) $varname } @@ -524,6 +535,9 @@ proc PlotLineSmoothMenu {which var} { } proc PlotExportDialog {varname format} { + upvar #0 $varname var + global $varname + global giffbox global jpegfbox global tifffbox @@ -566,7 +580,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(frame)} ph] if {$rr} { Error $iap(error) return |