diff options
Diffstat (limited to 'ds9/library')
-rw-r--r-- | ds9/library/plotbar.tcl | 3 | ||||
-rw-r--r-- | ds9/library/plotdialog.tcl | 56 | ||||
-rw-r--r-- | ds9/library/plotline.tcl | 6 | ||||
-rw-r--r-- | ds9/library/plotscatter.tcl | 3 |
4 files changed, 24 insertions, 44 deletions
diff --git a/ds9/library/plotbar.tcl b/ds9/library/plotbar.tcl index a9c8ef9..d64aba6 100644 --- a/ds9/library/plotbar.tcl +++ b/ds9/library/plotbar.tcl @@ -56,7 +56,6 @@ proc PlotBarProc {varname} { set var(proc,updateelement) PlotBarUpdateElement set var(proc,highlite) PlotBarHighliteElement set var(proc,button) PlotBarButton - set var(proc,titledialog) PlotTitleDialog } proc PlotDialogBar {varname} { @@ -65,8 +64,6 @@ proc PlotDialogBar {varname} { global ds9 - PlotGraphAxesMenu $varname - # Graph $var(mb).graph add separator $var(mb).graph add cascade -label "[msgcat::mc {Mode}]..." \ diff --git a/ds9/library/plotdialog.tcl b/ds9/library/plotdialog.tcl index 59a3473..2b96854 100644 --- a/ds9/library/plotdialog.tcl +++ b/ds9/library/plotdialog.tcl @@ -139,9 +139,31 @@ 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 $var(proc,titledialog) $varname] + -command [list PlotTitleDialog $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}] \ @@ -189,34 +211,6 @@ proc PlotDialog {varname wtt title xaxis yaxis} { menu $var(mb).data.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} { upvar #0 $varname var global $varname @@ -383,7 +377,6 @@ 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) @@ -396,8 +389,6 @@ 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 @@ -429,7 +420,6 @@ 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 diff --git a/ds9/library/plotline.tcl b/ds9/library/plotline.tcl index 3db043a..f459c02 100644 --- a/ds9/library/plotline.tcl +++ b/ds9/library/plotline.tcl @@ -45,7 +45,6 @@ proc PlotLineDialog {varname wtt title xaxis yaxis} { PlotLineProc $varname PlotDialog $varname $wtt $title $xaxis $yaxis - PlotGraphAxesMenu $varname PlotDialogLine $varname } @@ -57,7 +56,6 @@ proc PlotLineProc {varname} { set var(proc,updateelement) PlotLineUpdateElement set var(proc,highlite) PlotLineHighliteElement set var(proc,button) PlotLineButton - set var(proc,titledialog) PlotTitleDialog } proc PlotDialogLine {varname} { @@ -66,9 +64,7 @@ proc PlotDialogLine {varname} { global ds9 - PlotGraphAxesMenu $varname - - # Dataset + # Data $var(mb).data add checkbutton -label [msgcat::mc {Show}] \ -variable ${varname}(show) \ -command [list PlotLineUpdateElement $varname] diff --git a/ds9/library/plotscatter.tcl b/ds9/library/plotscatter.tcl index f940c17..f5b7c0c 100644 --- a/ds9/library/plotscatter.tcl +++ b/ds9/library/plotscatter.tcl @@ -56,7 +56,6 @@ proc PlotScatterProc {varname} { set var(proc,updateelement) PlotScatterUpdateElement set var(proc,highlite) PlotScatterHighliteElement set var(proc,button) PlotScatterButton - set var(proc,titledialog) PlotTitleDialog } proc PlotDialogScatter {varname} { @@ -65,8 +64,6 @@ proc PlotDialogScatter {varname} { global ds9 - PlotGraphAxesMenu $varname - # Data $var(mb).data add checkbutton -label [msgcat::mc {Show}] \ -variable ${varname}(show) \ |