Mercurial > octave-nkf
comparison scripts/plot/util/private/__go_draw_axes__.m @ 20321:42b7d7758c4a
Remove axes "interpreter" property (bug #45388)
* graphics.in.h (axes::properties): remove interpreter property
* genpropdoc.m: remove "interpreter" from the list of axes properties
* legend.m: create legend axes specific "interpreter" property
* polar.m: bind labels "interpreter" to the axes "ticklabelinterpreter"
* cla.m: use "ticklabelinterpreter" in test
* __go_draw_axes__.m: use "ticklabelinterpreter" property for axes objects
author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
---|---|
date | Thu, 25 Jun 2015 00:22:32 +0200 |
parents | 977853866d69 |
children |
comparison
equal
deleted
inserted
replaced
20320:6db2ea5556a4 | 20321:42b7d7758c4a |
---|---|
2079 | 2079 |
2080 if (strcmpi (obj.xaxislocation, "top")) | 2080 if (strcmpi (obj.xaxislocation, "top")) |
2081 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, | 2081 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, |
2082 obj.xticklabel, obj.xcolor, "x2", plot_stream, true, mono, | 2082 obj.xticklabel, obj.xcolor, "x2", plot_stream, true, mono, |
2083 "border", obj.tickdir, ticklength, fontname, fontspec, | 2083 "border", obj.tickdir, ticklength, fontname, fontspec, |
2084 obj.interpreter, obj.xscale, obj.xsgn, gnuplot_term); | 2084 obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term); |
2085 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, | 2085 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, |
2086 obj.xcolor, "x", plot_stream, true, mono, "border", | 2086 obj.xcolor, "x", plot_stream, true, mono, "border", |
2087 "", "", fontname, fontspec, obj.interpreter, obj.xscale, | 2087 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
2088 obj.xsgn, gnuplot_term); | 2088 obj.xscale, obj.xsgn, gnuplot_term); |
2089 elseif (strcmpi (obj.xaxislocation, "zero")) | 2089 elseif (strcmpi (obj.xaxislocation, "zero")) |
2090 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, | 2090 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, |
2091 obj.xticklabel, obj.xcolor, "x", plot_stream, true, mono, | 2091 obj.xticklabel, obj.xcolor, "x", plot_stream, true, mono, |
2092 "axis", obj.tickdir, ticklength, fontname, fontspec, | 2092 "axis", obj.tickdir, ticklength, fontname, fontspec, |
2093 obj.interpreter, obj.xscale, obj.xsgn, gnuplot_term); | 2093 obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term); |
2094 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, | 2094 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, |
2095 obj.xcolor, "x2", plot_stream, true, mono, "axis", | 2095 obj.xcolor, "x2", plot_stream, true, mono, "axis", |
2096 "", "", fontname, fontspec, obj.interpreter, obj.xscale, | 2096 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
2097 obj.xsgn, gnuplot_term); | 2097 obj.xscale, obj.xsgn, gnuplot_term); |
2098 else | 2098 else |
2099 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, | 2099 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, |
2100 obj.xticklabel, obj.xcolor, "x", plot_stream, true, mono, | 2100 obj.xticklabel, obj.xcolor, "x", plot_stream, true, mono, |
2101 "border", obj.tickdir, ticklength, fontname, fontspec, | 2101 "border", obj.tickdir, ticklength, fontname, fontspec, |
2102 obj.interpreter, obj.xscale, obj.xsgn, gnuplot_term); | 2102 obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term); |
2103 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, | 2103 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, |
2104 obj.xcolor, "x2", plot_stream, true, mono, "border", | 2104 obj.xcolor, "x2", plot_stream, true, mono, "border", |
2105 "", "", fontname, fontspec, obj.interpreter, obj.xscale, | 2105 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
2106 obj.xsgn, gnuplot_term); | 2106 obj.xscale, obj.xsgn, gnuplot_term); |
2107 endif | 2107 endif |
2108 if (strcmpi (obj.yaxislocation, "right")) | 2108 if (strcmpi (obj.yaxislocation, "right")) |
2109 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, | 2109 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, |
2110 obj.yticklabel, obj.ycolor, "y2", plot_stream, ymirror, mono, | 2110 obj.yticklabel, obj.ycolor, "y2", plot_stream, ymirror, mono, |
2111 "border", obj.tickdir, ticklength, fontname, fontspec, | 2111 "border", obj.tickdir, ticklength, fontname, fontspec, |
2112 obj.interpreter, obj.yscale, obj.ysgn, gnuplot_term); | 2112 obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term); |
2113 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, | 2113 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, |
2114 obj.ycolor, "y", plot_stream, ymirror, mono, "border", | 2114 obj.ycolor, "y", plot_stream, ymirror, mono, "border", |
2115 "", "", fontname, fontspec, obj.interpreter, obj.yscale, | 2115 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
2116 obj.ysgn, gnuplot_term); | 2116 obj.yscale, obj.ysgn, gnuplot_term); |
2117 elseif (strcmpi (obj.yaxislocation, "zero")) | 2117 elseif (strcmpi (obj.yaxislocation, "zero")) |
2118 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, | 2118 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, |
2119 obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, mono, | 2119 obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, mono, |
2120 "axis", obj.tickdir, ticklength, fontname, fontspec, | 2120 "axis", obj.tickdir, ticklength, fontname, fontspec, |
2121 obj.interpreter, obj.yscale, obj.ysgn, gnuplot_term); | 2121 obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term); |
2122 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, | 2122 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, |
2123 obj.ycolor, "y2", plot_stream, ymirror, mono, "axis", | 2123 obj.ycolor, "y2", plot_stream, ymirror, mono, "axis", |
2124 "", "", fontname, fontspec, obj.interpreter, obj.yscale, | 2124 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
2125 obj.ysgn, gnuplot_term); | 2125 obj.yscale, obj.ysgn, gnuplot_term); |
2126 else | 2126 else |
2127 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, | 2127 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, |
2128 obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, mono, | 2128 obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, mono, |
2129 "border", obj.tickdir, ticklength, fontname, fontspec, | 2129 "border", obj.tickdir, ticklength, fontname, fontspec, |
2130 obj.interpreter, obj.yscale, obj.ysgn, gnuplot_term); | 2130 obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term); |
2131 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, | 2131 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, |
2132 obj.ycolor, "y2", plot_stream, ymirror, mono, "border", | 2132 obj.ycolor, "y2", plot_stream, ymirror, mono, "border", |
2133 "", "", fontname, fontspec, obj.interpreter, obj.yscale, | 2133 "", "", fontname, fontspec, obj.ticklabelinterpreter, |
2134 obj.ysgn, gnuplot_term); | 2134 obj.yscale, obj.ysgn, gnuplot_term); |
2135 endif | 2135 endif |
2136 do_tics_1 (obj.ztickmode, obj.ztick, obj.zminortick, obj.zticklabelmode, | 2136 do_tics_1 (obj.ztickmode, obj.ztick, obj.zminortick, obj.zticklabelmode, |
2137 obj.zticklabel, obj.zcolor, "z", plot_stream, true, mono, | 2137 obj.zticklabel, obj.zcolor, "z", plot_stream, true, mono, |
2138 "border", obj.tickdir, ticklength, fontname, fontspec, | 2138 "border", obj.tickdir, ticklength, fontname, fontspec, |
2139 obj.interpreter, obj.zscale, obj.zsgn, gnuplot_term); | 2139 obj.ticklabelinterpreter, obj.zscale, obj.zsgn, gnuplot_term); |
2140 endfunction | 2140 endfunction |
2141 | 2141 |
2142 function do_tics_1 (ticmode, tics, mtics, labelmode, labels, color, ax, | 2142 function do_tics_1 (ticmode, tics, mtics, labelmode, labels, color, ax, |
2143 plot_stream, mirror, mono, axispos, tickdir, ticklength, | 2143 plot_stream, mirror, mono, axispos, tickdir, ticklength, |
2144 fontname, fontspec, interpreter, scale, sgn, gnuplot_term) | 2144 fontname, fontspec, interpreter, scale, sgn, gnuplot_term) |