diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-03-06 18:17:57 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-03-06 18:17:57 (GMT) |
| commit | faed66b132635cebcc295b9ae1cfa495237a8ec5 (patch) | |
| tree | fd3d8d4fbb51733d5157d021b250e9169c938301 /ds9/library | |
| parent | 9d02e84906d7782d030e57b8d889f4ec50d431e8 (diff) | |
| parent | 879d80b47fdfa7d5f3d54c765b2e28877dabb939 (diff) | |
| download | blt-faed66b132635cebcc295b9ae1cfa495237a8ec5.zip blt-faed66b132635cebcc295b9ae1cfa495237a8ec5.tar.gz blt-faed66b132635cebcc295b9ae1cfa495237a8ec5.tar.bz2 | |
Merge branch 'master' into devel
Diffstat (limited to 'ds9/library')
| -rw-r--r-- | ds9/library/plotbar.tcl | 2 | ||||
| -rw-r--r-- | ds9/library/plotline.tcl | 25 | ||||
| -rw-r--r-- | ds9/library/plotscatter.tcl | 10 |
3 files changed, 30 insertions, 7 deletions
diff --git a/ds9/library/plotbar.tcl b/ds9/library/plotbar.tcl index 3a1a75c..3779aa6 100644 --- a/ds9/library/plotbar.tcl +++ b/ds9/library/plotbar.tcl @@ -145,6 +145,8 @@ proc PlotDialogBar {varname} { -width 600 \ -height 500 \ -highlightthickness 0 \ + -bg $ds9(bg) \ + -plotbackground $ds9(bg) \ ] $var(graph) xaxis configure -grid no -stepsize 0 diff --git a/ds9/library/plotline.tcl b/ds9/library/plotline.tcl index 50b0f40..eae53f3 100644 --- a/ds9/library/plotline.tcl +++ b/ds9/library/plotline.tcl @@ -166,9 +166,26 @@ proc PlotDialogLine {varname} { [list PlotLineUpdateElement $varname] # Width - WidthDashMenu $var(mb).dataset.width $varname width dash \ - [list PlotLineUpdateElement $varname] \ - [list PlotLineUpdateElement $varname] + menu $var(mb).dataset.width + $var(mb).dataset.width add radiobutton \ + -label {0} -variable ${varname}(width) \ + -value 0 -command [list PlotLineUpdateElement $varname] + $var(mb).dataset.width add radiobutton \ + -label {1} -variable ${varname}(width) \ + -value 1 -command [list PlotLineUpdateElement $varname] + $var(mb).dataset.width add radiobutton \ + -label {2} -variable ${varname}(width) \ + -value 2 -command [list PlotLineUpdateElement $varname] + $var(mb).dataset.width add radiobutton \ + -label {3} -variable ${varname}(width) \ + -value 3 -command [list PlotLineUpdateElement $varname] + $var(mb).dataset.width add radiobutton \ + -label {4} -variable ${varname}(width) \ + -value 4 -command [list PlotLineUpdateElement $varname] + $var(mb).dataset.width add separator + $var(mb).dataset.width add checkbutton \ + -label [msgcat::mc {Dash}] -variable ${varname}(dash) \ + -command [list PlotLineUpdateElement $varname] # Fill menu $var(mb).dataset.fill @@ -208,6 +225,8 @@ proc PlotDialogLine {varname} { -width 600 \ -height 500 \ -highlightthickness 0 \ + -bg $ds9(bg) \ + -plotbackground $ds9(bg) \ ] pack $var(graph) -expand yes -fill both diff --git a/ds9/library/plotscatter.tcl b/ds9/library/plotscatter.tcl index 3816cea..18f7944 100644 --- a/ds9/library/plotscatter.tcl +++ b/ds9/library/plotscatter.tcl @@ -152,6 +152,8 @@ proc PlotDialogScatter {varname} { -width 600 \ -height 500 \ -highlightthickness 0 \ + -bg $ds9(bg) \ + -plotbackground $ds9(bg) \ ] pack $var(graph) -expand yes -fill both @@ -199,10 +201,10 @@ proc PlotScatterUpdateElement {varname} { } $var(graph) element configure "d-${nn}" \ - -label "$var(name)" -hide [expr !$var(show)] \ - -symbol $var(shape,symbol) \ - -fill $clr -outline $var(shape,color) \ - -linewidth 0 -pixels 5 -scalesymbols no \ + -label $var(name) -hide [expr !$var(show)] \ + -symbol $var(shape,symbol) -fill $clr -scalesymbols no \ + -outline $var(shape,color) \ + -linewidth 0 -pixels 5 \ -showerrorbars $show -errorbarcolor $var(error,color) \ -errorbarwidth $var(error,width) -errorbarcap $cap |