Mercurial > octave

comparison scripts/plot/util/private/__gnuplot_draw_axes__.m @ 25172:7b1b504c2f12 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update future version numbers in doc strings and comments * NEWS, octave-dock-widget.cc, graphics.in.h, gripes.cc, gripes.h, oct-obj.h, oct.h, quadcc.cc, utils.cc, options-usage.h, lo-array-gripes.cc, lo-array-gripes.h, bitmax.m, chop.m, desktop.m, java2mat.m, mahalanobis.m, md5sum.m, octave_config_info.m, onenormest.m, sleep.m, tmpnam.m, toascii.m, usleep.m, wavread.m, wavwrite.m, annotation.m, __gnuplot_draw_axes__.m, deprecate-props.tst: Refer to future versions as versions 5 and 6, not 4.5+, 4.6, 4.7+, or 4.8.
author John W. Eaton <jwe@octave.org>
date Mon, 09 Apr 2018 07:54:15 -0400
parents 6652d3823428
children ff3d24a818a1 c2bf210ac94f
comparison
equal deleted inserted replaced
25171:333bc155343f 25172:7b1b504c2f12
245 xaxisloc = "x2"; 245 xaxisloc = "x2";
246 xaxisloc_using = "x2"; 246 xaxisloc_using = "x2";
247 else 247 else
248 xaxisloc = "x"; 248 xaxisloc = "x";
249 xaxisloc_using = "x1"; 249 xaxisloc_using = "x1";
250 if (any (strcmp (axis_obj.xaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 250 ### FIXME: DEPRECATED: Remove "zero" in version 5.
251 if (any (strcmp (axis_obj.xaxislocation, {"origin", "zero"})))
251 fputs (plot_stream, "set xzeroaxis;\n"); 252 fputs (plot_stream, "set xzeroaxis;\n");
252 endif 253 endif
253 endif 254 endif
254 if (strcmp (axis_obj.yaxislocation, "right")) 255 if (strcmp (axis_obj.yaxislocation, "right"))
255 yaxisloc = "y2"; 256 yaxisloc = "y2";
256 yaxisloc_using = "y2"; 257 yaxisloc_using = "y2";
257 else 258 else
258 yaxisloc = "y"; 259 yaxisloc = "y";
259 yaxisloc_using = "y1"; 260 yaxisloc_using = "y1";
260 if (any (strcmp (axis_obj.yaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 261 ### FIXME: DEPRECATED: Remove "zero" in version 5.
262 if (any (strcmp (axis_obj.yaxislocation, {"origin", "zero"})))
261 fputs (plot_stream, "set yzeroaxis;\n"); 263 fputs (plot_stream, "set yzeroaxis;\n");
262 endif 264 endif
263 endif 265 endif
264 266
265 have_major_grid = false; 267 have_major_grid = false;
1805 endif 1807 endif
1806 if (strcmp (obj.box, "on") || strcmp (obj.yaxislocation, "right")) 1808 if (strcmp (obj.box, "on") || strcmp (obj.yaxislocation, "right"))
1807 arrow (4, obj.ycolor, obj.linewidth, [1,0,0], [1,1,0]); 1809 arrow (4, obj.ycolor, obj.linewidth, [1,0,0], [1,1,0]);
1808 endif 1810 endif
1809 1811
1810 if (any (strcmp (obj.xaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 1812 ### FIXME: DEPRECATED: Remove "zero" in version 5.
1813 if (any (strcmp (obj.xaxislocation, {"origin", "zero"})))
1811 idx = zeroaxis (idx, obj.xcolor, "x"); 1814 idx = zeroaxis (idx, obj.xcolor, "x");
1812 endif 1815 endif
1813 if (any (strcmp (obj.yaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 1816 ### FIXME: DEPRECATED: Remove "zero" in version 5.
1817 if (any (strcmp (obj.yaxislocation, {"origin", "zero"})))
1814 idx = zeroaxis (idx, obj.ycolor, "y"); 1818 idx = zeroaxis (idx, obj.ycolor, "y");
1815 endif 1819 endif
1816 1820
1817 function idx = zeroaxis (idx, lc, ax) 1821 function idx = zeroaxis (idx, lc, ax)
1818 idx = idx + 1; 1822 idx = idx + 1;
2174 obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term); 2178 obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term);
2175 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, 2179 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel,
2176 obj.xcolor, "x", plot_stream, true, "border", 2180 obj.xcolor, "x", plot_stream, true, "border",
2177 "", "", fontname, fontspec, obj.ticklabelinterpreter, 2181 "", "", fontname, fontspec, obj.ticklabelinterpreter,
2178 obj.xscale, obj.xsgn, gnuplot_term); 2182 obj.xscale, obj.xsgn, gnuplot_term);
2179 elseif (any (strcmp (obj.xaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 2183 ### FIXME: DEPRECATED: Remove "zero" in version 5.
2184 elseif (any (strcmp (obj.xaxislocation, {"origin", "zero"})))
2180 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode, 2185 do_tics_1 (obj.xtickmode, obj.xtick, obj.xminortick, obj.xticklabelmode,
2181 obj.xticklabel, obj.xcolor, "x", plot_stream, true, 2186 obj.xticklabel, obj.xcolor, "x", plot_stream, true,
2182 "axis", obj.tickdir, ticklength, fontname, fontspec, 2187 "axis", obj.tickdir, ticklength, fontname, fontspec,
2183 obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term); 2188 obj.ticklabelinterpreter, obj.xscale, obj.xsgn, gnuplot_term);
2184 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel, 2189 do_tics_1 ("manual", [], "off", obj.xticklabelmode, obj.xticklabel,
2202 obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term); 2207 obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term);
2203 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, 2208 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel,
2204 obj.ycolor, "y", plot_stream, ymirror, "border", 2209 obj.ycolor, "y", plot_stream, ymirror, "border",
2205 "", "", fontname, fontspec, obj.ticklabelinterpreter, 2210 "", "", fontname, fontspec, obj.ticklabelinterpreter,
2206 obj.yscale, obj.ysgn, gnuplot_term); 2211 obj.yscale, obj.ysgn, gnuplot_term);
2207 elseif (any (strcmp (obj.yaxislocation, {"origin", "zero"}))) # FIXME: Remove "zero" in 4.6 2212 ### FIXME: DEPRECATED: Remove "zero" in version 5.
2213 elseif (any (strcmp (obj.yaxislocation, {"origin", "zero"})))
2208 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode, 2214 do_tics_1 (obj.ytickmode, obj.ytick, obj.yminortick, obj.yticklabelmode,
2209 obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror, 2215 obj.yticklabel, obj.ycolor, "y", plot_stream, ymirror,
2210 "axis", obj.tickdir, ticklength, fontname, fontspec, 2216 "axis", obj.tickdir, ticklength, fontname, fontspec,
2211 obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term); 2217 obj.ticklabelinterpreter, obj.yscale, obj.ysgn, gnuplot_term);
2212 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel, 2218 do_tics_1 ("manual", [], "off", obj.yticklabelmode, obj.yticklabel,