Mercurial > octave
changeset 22056:05ad23810150
Use default gridlinestyle of '-' for Matlab compatibility.
* graphics.cc (axes::properties::set_defaults): Use '-' for default
gridlinestyle.
* graphics.in.h (AXES_PROPERTIES): Use '-' for default gridlinestyle.
* grid.m: Don't change gridlinestyle or minorgridlinestyle properties.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 06 Jul 2016 21:55:08 -0700 |
| parents | 21f3cbd5c708 |
| children | 6f10765eca35 |
| files | libinterp/corefcn/graphics.cc libinterp/corefcn/graphics.in.h scripts/plot/appearance/grid.m |
| diffstat | 3 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc Wed Jul 06 20:50:16 2016 -0500 +++ b/libinterp/corefcn/graphics.cc Wed Jul 06 21:55:08 2016 -0700 @@ -4855,7 +4855,7 @@ fontunits = "points"; fontweight = "normal"; - gridlinestyle = ":"; + gridlinestyle = "-"; linestyleorder = "-"; linewidth = 0.5; minorgridlinestyle = ":";
--- a/libinterp/corefcn/graphics.in.h Wed Jul 06 20:50:16 2016 -0500 +++ b/libinterp/corefcn/graphics.in.h Wed Jul 06 21:55:08 2016 -0700 @@ -3840,7 +3840,7 @@ radio_property gridalphamode , "{auto}|manual" color_property gridcolor , color_property (color_values (0.15, 0.15, 0.15), radio_values ("none")) radio_property gridcolormode , "{auto}|manual" - radio_property gridlinestyle , "{:}|-|--|-.|none" + radio_property gridlinestyle , "{-}|--|:|-.|none" double_property labelfontsizemultiplier , 1.1 radio_property layer u , "{bottom}|top" // FIXME: should be kind of string array.
--- a/scripts/plot/appearance/grid.m Wed Jul 06 20:50:16 2016 -0500 +++ b/scripts/plot/appearance/grid.m Wed Jul 06 21:55:08 2016 -0700 @@ -54,6 +54,7 @@ hax = gca (); endif + ## Must be after gca (), since grid with no plot should create one. if (nargs > 2) print_usage (); endif @@ -99,11 +100,9 @@ endif if (grid_on) - set (hax, "xgrid", "on", "ygrid", "on", "zgrid", "on", - "gridlinestyle", ":"); + set (hax, "xgrid", "on", "ygrid", "on", "zgrid", "on"); if (minor_on) - set (hax, "xminorgrid", "on", "yminorgrid", "on", "zminorgrid", "on", - "gridlinestyle", "-", "minorgridlinestyle", ":"); + set (hax, "xminorgrid", "on", "yminorgrid", "on", "zminorgrid", "on"); xg = ifelse (strcmp (get (hax, "xscale"), "log"), "off", "on"); yg = ifelse (strcmp (get (hax, "yscale"), "log"), "off", "on"); zg = ifelse (strcmp (get (hax, "zscale"), "log"), "off", "on");