Mercurial > octave
annotate scripts/plot/draw/fill.m @ 19593:446c46af4b42 stable
strip trailing whitespace from most source files
* Makefile.am, NEWS, build-aux/common.mk, configure.ac,
doc/Makefile.am, doc/doxyhtml/Makefile.am,
doc/interpreter/Makefile.am, doc/interpreter/arith.txi,
doc/interpreter/audio.txi, doc/interpreter/basics.txi,
doc/interpreter/bugs.txi, doc/interpreter/container.txi,
doc/interpreter/cp-idx.txi, doc/interpreter/data.txi,
doc/interpreter/debug.txi, doc/interpreter/diagperm.txi,
doc/interpreter/diffeq.txi, doc/interpreter/doccheck/README,
doc/interpreter/doccheck/spellcheck, doc/interpreter/emacs.txi,
doc/interpreter/errors.txi, doc/interpreter/eval.txi,
doc/interpreter/expr.txi, doc/interpreter/external.txi,
doc/interpreter/fn-idx.txi, doc/interpreter/func.txi,
doc/interpreter/geometry.txi, doc/interpreter/geometryimages.m,
doc/interpreter/gpl.txi, doc/interpreter/grammar.txi,
doc/interpreter/gui.txi, doc/interpreter/image.txi,
doc/interpreter/install.txi, doc/interpreter/interp.txi,
doc/interpreter/interpimages.m, doc/interpreter/intro.txi,
doc/interpreter/io.txi, doc/interpreter/java.txi,
doc/interpreter/linalg.txi, doc/interpreter/macros.texi,
doc/interpreter/matrix.txi, doc/interpreter/munge-texi.pl,
doc/interpreter/nonlin.txi, doc/interpreter/numbers.txi,
doc/interpreter/obsolete.txi, doc/interpreter/octave-config.1,
doc/interpreter/octave.texi, doc/interpreter/oop.txi,
doc/interpreter/op-idx.txi, doc/interpreter/optim.txi,
doc/interpreter/package.txi, doc/interpreter/plot.txi,
doc/interpreter/poly.txi, doc/interpreter/preface.txi,
doc/interpreter/quad.txi, doc/interpreter/set.txi,
doc/interpreter/signal.txi, doc/interpreter/sparse.txi,
doc/interpreter/sparseimages.m, doc/interpreter/splineimages.m,
doc/interpreter/stats.txi, doc/interpreter/stmt.txi,
doc/interpreter/strings.txi, doc/interpreter/system.txi,
doc/interpreter/testfun.txi, doc/interpreter/tips.txi,
doc/interpreter/var.txi, doc/interpreter/vectorize.txi,
doc/liboctave/Makefile.am, doc/liboctave/array.texi,
doc/liboctave/bugs.texi, doc/liboctave/cp-idx.texi,
doc/liboctave/dae.texi, doc/liboctave/diffeq.texi,
doc/liboctave/error.texi, doc/liboctave/factor.texi,
doc/liboctave/fn-idx.texi, doc/liboctave/gpl.texi,
doc/liboctave/install.texi, doc/liboctave/intro.texi,
doc/liboctave/liboctave.texi, doc/liboctave/matvec.texi,
doc/liboctave/nleqn.texi, doc/liboctave/nlfunc.texi,
doc/liboctave/ode.texi, doc/liboctave/optim.texi,
doc/liboctave/preface.texi, doc/liboctave/quad.texi,
doc/liboctave/range.texi, doc/refcard/Makefile.am,
doc/refcard/refcard.tex, etc/HACKING, etc/NEWS.1, etc/NEWS.2,
etc/NEWS.3, etc/OLD-ChangeLogs/ChangeLog,
etc/OLD-ChangeLogs/doc-ChangeLog,
etc/OLD-ChangeLogs/scripts-ChangeLog,
etc/OLD-ChangeLogs/src-ChangeLog, etc/OLD-ChangeLogs/test-ChangeLog,
etc/PROJECTS, etc/README.Cygwin, etc/README.MacOS, etc/README.MinGW,
etc/README.gnuplot, etc/gdbinit, etc/icons/Makefile.am,
examples/@polynomial/end.m, examples/@polynomial/subsasgn.m,
examples/Makefile.am, examples/standalonebuiltin.cc,
libgui/Makefile.am, libgui/qterminal/libqterminal/README,
libgui/qterminal/libqterminal/unix/BlockArray.cpp,
libgui/qterminal/libqterminal/unix/BlockArray.h,
libgui/qterminal/libqterminal/unix/Character.h,
libgui/qterminal/libqterminal/unix/CharacterColor.h,
libgui/qterminal/libqterminal/unix/Emulation.cpp,
libgui/qterminal/libqterminal/unix/Emulation.h,
libgui/qterminal/libqterminal/unix/Filter.cpp,
libgui/qterminal/libqterminal/unix/Filter.h,
libgui/qterminal/libqterminal/unix/History.cpp,
libgui/qterminal/libqterminal/unix/History.h,
libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp,
libgui/qterminal/libqterminal/unix/KeyboardTranslator.h,
libgui/qterminal/libqterminal/unix/LineFont.h,
libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp,
libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h,
libgui/qterminal/libqterminal/unix/Screen.cpp,
libgui/qterminal/libqterminal/unix/Screen.h,
libgui/qterminal/libqterminal/unix/ScreenWindow.cpp,
libgui/qterminal/libqterminal/unix/ScreenWindow.h,
libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp,
libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.h,
libgui/qterminal/libqterminal/unix/Vt102Emulation.h,
libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp,
libgui/qterminal/qterminal/main.cpp,
libgui/src/m-editor/file-editor-tab.cc, libgui/src/octave-gui.cc,
libgui/src/octave-qt-link.cc, libinterp/corefcn/data.cc,
libinterp/corefcn/defun-int.h, libinterp/corefcn/det.cc,
libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/graphics.cc,
libinterp/corefcn/graphics.in.h, libinterp/corefcn/ls-mat5.cc,
libinterp/corefcn/lu.cc, libinterp/corefcn/oct-tex-parser.yy,
libinterp/corefcn/oct-tex-symbols.in, libinterp/corefcn/quadcc.cc,
libinterp/corefcn/zfstream.cc, libinterp/dldfcn/__eigs__.cc,
libinterp/dldfcn/__voronoi__.cc, libinterp/gendoc.pl,
libinterp/genprops.awk, libinterp/mk-errno-list, libinterp/mk-pkg-add,
libinterp/mkbuiltins, libinterp/mkdefs, libinterp/mkdocs,
libinterp/mkops, libinterp/octave-value/ov-java.cc,
libinterp/parse-tree/lex.ll, libinterp/parse-tree/oct-parse.in.yy,
libinterp/parse-tree/octave.gperf, liboctave/Makefile.am,
liboctave/array/Array.cc, liboctave/array/module.mk,
liboctave/cruft/daspk/datv.f, liboctave/cruft/daspk/dcnst0.f,
liboctave/cruft/daspk/dcnstr.f, liboctave/cruft/daspk/ddasic.f,
liboctave/cruft/daspk/ddasid.f, liboctave/cruft/daspk/ddasik.f,
liboctave/cruft/daspk/ddaspk.f, liboctave/cruft/daspk/ddstp.f,
liboctave/cruft/daspk/ddwnrm.f, liboctave/cruft/daspk/dfnrmd.f,
liboctave/cruft/daspk/dfnrmk.f, liboctave/cruft/daspk/dhels.f,
liboctave/cruft/daspk/dheqr.f, liboctave/cruft/daspk/dinvwt.f,
liboctave/cruft/daspk/dlinsd.f, liboctave/cruft/daspk/dlinsk.f,
liboctave/cruft/daspk/dmatd.f, liboctave/cruft/daspk/dnedd.f,
liboctave/cruft/daspk/dnedk.f, liboctave/cruft/daspk/dnsd.f,
liboctave/cruft/daspk/dnsid.f, liboctave/cruft/daspk/dnsik.f,
liboctave/cruft/daspk/dnsk.f, liboctave/cruft/daspk/dorth.f,
liboctave/cruft/daspk/dslvd.f, liboctave/cruft/daspk/dslvk.f,
liboctave/cruft/daspk/dspigm.f, liboctave/cruft/daspk/dyypnw.f,
liboctave/cruft/dasrt/ddasrt.f, liboctave/cruft/dasrt/drchek.f,
liboctave/cruft/dassl/ddaslv.f, liboctave/cruft/dassl/ddassl.f,
liboctave/cruft/misc/blaswrap.c, liboctave/cruft/misc/module.mk,
liboctave/cruft/odepack/cfode.f, liboctave/cruft/odepack/dlsode.f,
liboctave/cruft/odepack/ewset.f, liboctave/cruft/odepack/intdy.f,
liboctave/cruft/odepack/prepj.f, liboctave/cruft/odepack/sintdy.f,
liboctave/cruft/odepack/slsode.f, liboctave/cruft/odepack/solsy.f,
liboctave/cruft/odepack/ssolsy.f, liboctave/cruft/odepack/stode.f,
liboctave/cruft/odepack/vnorm.f, liboctave/cruft/ranlib/Basegen.doc,
liboctave/cruft/ranlib/README, liboctave/cruft/ranlib/genbet.f,
liboctave/cruft/ranlib/genexp.f, liboctave/cruft/ranlib/gennch.f,
liboctave/cruft/ranlib/gennf.f, liboctave/cruft/ranlib/gennor.f,
liboctave/cruft/ranlib/getsd.f, liboctave/cruft/ranlib/initgn.f,
liboctave/cruft/ranlib/phrtsd.f, liboctave/cruft/ranlib/randlib.fdoc,
liboctave/cruft/ranlib/setsd.f, liboctave/cruft/ranlib/tstgmn.for,
liboctave/cruft/ranlib/tstmid.for, liboctave/cruft/slatec-fn/atanh.f,
liboctave/cruft/slatec-fn/datanh.f,
liboctave/cruft/slatec-fn/xgmainc.f,
liboctave/cruft/slatec-fn/xsgmainc.f, liboctave/numeric/module.mk,
liboctave/operators/mk-ops.awk, liboctave/operators/mx-ops,
liboctave/operators/sparse-mk-ops.awk,
liboctave/operators/sparse-mx-ops, liboctave/operators/vx-ops,
liboctave/util/module.mk, run-octave.in, scripts/@ftp/ftp.m,
scripts/audio/wavread.m, scripts/deprecated/java_convert_matrix.m,
scripts/deprecated/java_debug.m, scripts/deprecated/java_invoke.m,
scripts/deprecated/java_new.m,
scripts/deprecated/java_unsigned_conversion.m,
scripts/deprecated/javafields.m, scripts/deprecated/javamethods.m,
scripts/deprecated/shell_cmd.m, scripts/general/accumarray.m,
scripts/general/display.m, scripts/general/fieldnames.m,
scripts/general/interp1.m, scripts/general/interp2.m,
scripts/general/interp3.m, scripts/general/isa.m,
scripts/general/methods.m, scripts/general/sortrows.m,
scripts/geometry/convhull.m, scripts/geometry/delaunay.m,
scripts/geometry/delaunay3.m, scripts/geometry/delaunayn.m,
scripts/geometry/griddata.m, scripts/geometry/griddatan.m,
scripts/geometry/voronoi.m, scripts/geometry/voronoin.m,
scripts/gui/guihandles.m, scripts/gui/inputdlg.m,
scripts/gui/listdlg.m, scripts/gui/msgbox.m, scripts/gui/questdlg.m,
scripts/gui/uigetfile.m, scripts/gui/waitbar.m, scripts/gui/warndlg.m,
scripts/help/doc.m, scripts/help/help.m, scripts/help/type.m,
scripts/image/bone.m, scripts/image/cmpermute.m,
scripts/image/cmunique.m, scripts/image/colorcube.m,
scripts/image/colormap.m, scripts/image/contrast.m,
scripts/image/gray2ind.m, scripts/image/image.m,
scripts/image/imshow.m, scripts/image/ind2gray.m, scripts/image/jet.m,
scripts/image/rgb2ntsc.m, scripts/image/spinmap.m,
scripts/io/importdata.m, scripts/io/strread.m, scripts/io/textread.m,
scripts/io/textscan.m, scripts/java/java_get.m,
scripts/java/java_set.m, scripts/java/javaaddpath.m,
scripts/java/javaclasspath.m, scripts/java/javamem.m,
scripts/linear-algebra/linsolve.m, scripts/linear-algebra/qzhess.m,
scripts/miscellaneous/debug.m, scripts/miscellaneous/desktop.m,
scripts/miscellaneous/dir.m, scripts/miscellaneous/dos.m,
scripts/miscellaneous/edit.m, scripts/miscellaneous/fact.m,
scripts/miscellaneous/getappdata.m, scripts/miscellaneous/inputname.m,
scripts/miscellaneous/license.m, scripts/miscellaneous/ls_command.m,
scripts/miscellaneous/run.m, scripts/miscellaneous/setfield.m,
scripts/miscellaneous/unix.m, scripts/miscellaneous/ver.m,
scripts/mk-pkg-add, scripts/mkdoc.pl,
scripts/optimization/fminsearch.m, scripts/optimization/optimset.m,
scripts/optimization/sqp.m, scripts/pkg/pkg.m,
scripts/pkg/private/create_pkgadddel.m,
scripts/pkg/private/fix_depends.m, scripts/pkg/private/install.m,
scripts/plot/appearance/axis.m, scripts/plot/appearance/box.m,
scripts/plot/appearance/clabel.m, scripts/plot/appearance/daspect.m,
scripts/plot/appearance/datetick.m, scripts/plot/appearance/grid.m,
scripts/plot/appearance/legend.m, scripts/plot/appearance/orient.m,
scripts/plot/appearance/shading.m, scripts/plot/appearance/text.m,
scripts/plot/appearance/title.m, scripts/plot/appearance/xlabel.m,
scripts/plot/appearance/ylabel.m, scripts/plot/appearance/zlabel.m,
scripts/plot/draw/area.m, scripts/plot/draw/bar.m,
scripts/plot/draw/barh.m, scripts/plot/draw/colorbar.m,
scripts/plot/draw/contour.m, scripts/plot/draw/contour3.m,
scripts/plot/draw/contourf.m, scripts/plot/draw/ellipsoid.m,
scripts/plot/draw/errorbar.m, scripts/plot/draw/ezcontour.m,
scripts/plot/draw/ezcontourf.m, scripts/plot/draw/ezmesh.m,
scripts/plot/draw/ezpolar.m, scripts/plot/draw/fill.m,
scripts/plot/draw/fplot.m, scripts/plot/draw/hist.m,
scripts/plot/draw/meshc.m, scripts/plot/draw/meshz.m,
scripts/plot/draw/pareto.m, scripts/plot/draw/patch.m,
scripts/plot/draw/peaks.m, scripts/plot/draw/pie.m,
scripts/plot/draw/pie3.m, scripts/plot/draw/plot.m,
scripts/plot/draw/plotyy.m, scripts/plot/draw/private/__bar__.m,
scripts/plot/draw/private/__contour__.m,
scripts/plot/draw/private/__errplot__.m,
scripts/plot/draw/private/__ezplot__.m,
scripts/plot/draw/private/__patch__.m,
scripts/plot/draw/private/__stem__.m, scripts/plot/draw/rectangle.m,
scripts/plot/draw/ribbon.m, scripts/plot/draw/rose.m,
scripts/plot/draw/scatter.m, scripts/plot/draw/scatter3.m,
scripts/plot/draw/semilogx.m, scripts/plot/draw/shrinkfaces.m,
scripts/plot/draw/sombrero.m, scripts/plot/draw/sphere.m,
scripts/plot/draw/stairs.m, scripts/plot/draw/stem.m,
scripts/plot/draw/stemleaf.m, scripts/plot/draw/surf.m,
scripts/plot/draw/surface.m, scripts/plot/draw/surfc.m,
scripts/plot/draw/surfl.m, scripts/plot/draw/surfnorm.m,
scripts/plot/draw/tetramesh.m, scripts/plot/draw/trimesh.m,
scripts/plot/draw/triplot.m, scripts/plot/draw/trisurf.m,
scripts/plot/util/__gnuplot_drawnow__.m,
scripts/plot/util/__plt_get_axis_arg__.m, scripts/plot/util/axes.m,
scripts/plot/util/clf.m, scripts/plot/util/copyobj.m,
scripts/plot/util/figure.m, scripts/plot/util/gcbo.m,
scripts/plot/util/graphics_toolkit.m, scripts/plot/util/hggroup.m,
scripts/plot/util/meshgrid.m, scripts/plot/util/newplot.m,
scripts/plot/util/print.m,
scripts/plot/util/private/__add_default_menu__.m,
scripts/plot/util/private/__fltk_print__.m,
scripts/plot/util/private/__gnuplot_print__.m,
scripts/plot/util/private/__print_parse_opts__.m,
scripts/plot/util/refreshdata.m, scripts/plot/util/subplot.m,
scripts/polynomial/conv.m, scripts/polynomial/poly.m,
scripts/polynomial/polyeig.m, scripts/polynomial/polyfit.m,
scripts/polynomial/polyval.m,
scripts/polynomial/private/__splinefit__.m,
scripts/polynomial/spline.m, scripts/prefs/prefdir.m,
scripts/prefs/preferences.m, scripts/prefs/private/prefsfile.m,
scripts/prefs/rmpref.m, scripts/signal/freqz.m,
scripts/signal/module.mk, scripts/sparse/eigs.m, scripts/sparse/pcg.m,
scripts/sparse/private/__sprand_impl__.m, scripts/sparse/sprand.m,
scripts/sparse/sprandn.m, scripts/sparse/spy.m, scripts/sparse/svds.m,
scripts/specfun/expint.m, scripts/specfun/factor.m,
scripts/special-matrix/gallery.m, scripts/special-matrix/hankel.m,
scripts/special-matrix/toeplitz.m, scripts/startup/inputrc,
scripts/statistics/base/kurtosis.m, scripts/statistics/base/moment.m,
scripts/statistics/base/qqplot.m, scripts/statistics/base/var.m,
scripts/statistics/distributions/betarnd.m,
scripts/statistics/distributions/binoinv.m,
scripts/statistics/distributions/binopdf.m,
scripts/statistics/distributions/binornd.m,
scripts/statistics/distributions/cauchy_rnd.m,
scripts/statistics/distributions/chi2rnd.m,
scripts/statistics/distributions/discrete_pdf.m,
scripts/statistics/distributions/discrete_rnd.m,
scripts/statistics/distributions/empirical_rnd.m,
scripts/statistics/distributions/exprnd.m,
scripts/statistics/distributions/frnd.m,
scripts/statistics/distributions/gamrnd.m,
scripts/statistics/distributions/geornd.m,
scripts/statistics/distributions/hygernd.m,
scripts/statistics/distributions/kolmogorov_smirnov_cdf.m,
scripts/statistics/distributions/laplace_cdf.m,
scripts/statistics/distributions/laplace_pdf.m,
scripts/statistics/distributions/logistic_cdf.m,
scripts/statistics/distributions/logistic_pdf.m,
scripts/statistics/distributions/lognrnd.m,
scripts/statistics/distributions/nbincdf.m,
scripts/statistics/distributions/nbininv.m,
scripts/statistics/distributions/nbinpdf.m,
scripts/statistics/distributions/nbinrnd.m,
scripts/statistics/distributions/normrnd.m,
scripts/statistics/distributions/poissinv.m,
scripts/statistics/distributions/poissrnd.m,
scripts/statistics/distributions/tinv.m,
scripts/statistics/distributions/trnd.m,
scripts/statistics/distributions/unidcdf.m,
scripts/statistics/distributions/unidpdf.m,
scripts/statistics/distributions/unidrnd.m,
scripts/statistics/distributions/unifrnd.m,
scripts/statistics/distributions/wblrnd.m,
scripts/statistics/models/module.mk,
scripts/statistics/tests/kruskal_wallis_test.m,
scripts/strings/base2dec.m, scripts/strings/deblank.m,
scripts/strings/dec2base.m, scripts/strings/dec2bin.m,
scripts/strings/dec2hex.m, scripts/strings/mat2str.m,
scripts/strings/ostrsplit.m, scripts/strings/regexptranslate.m,
scripts/strings/str2num.m, scripts/strings/strcat.m,
scripts/strings/strjoin.m, scripts/strings/strsplit.m,
scripts/strings/strtok.m, scripts/strings/strtrim.m,
scripts/strings/strtrunc.m, scripts/strings/substr.m,
scripts/testfun/__run_test_suite__.m, scripts/testfun/speed.m,
scripts/testfun/test.m, scripts/time/asctime.m,
scripts/time/datenum.m, scripts/time/datevec.m,
scripts/time/weekday.m, src/Makefile.am, test/Makefile.am,
test/build-bc-overload-tests.sh, test/build-sparse-tests.sh,
test/jit.tst, test/line-continue.tst: Strip trailing whitespace.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 20 Jan 2015 08:26:57 -0500 |
| parents | d63878346099 |
| children | fe689210525c |
| rev | line source |
|---|---|
|
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
17610
diff
changeset
|
1 ## Copyright (C) 2007-2013 David Bateman |
| 7020 | 2 ## |
| 3 ## This file is part of Octave. | |
| 4 ## | |
| 5 ## Octave is free software; you can redistribute it and/or modify it | |
| 6 ## under the terms of the GNU General Public License as published by | |
| 7 ## the Free Software Foundation; either version 3 of the License, or (at | |
| 8 ## your option) any later version. | |
| 9 ## | |
| 10 ## Octave is distributed in the hope that it will be useful, but | |
| 11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 ## General Public License for more details. | |
| 14 ## | |
| 15 ## You should have received a copy of the GNU General Public License | |
| 16 ## along with Octave; see the file COPYING. If not, see | |
| 17 ## <http://www.gnu.org/licenses/>. | |
| 18 | |
| 19 ## -*- texinfo -*- | |
|
10793
be55736a0783
Grammarcheck the documentation from m-files.
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
20 ## @deftypefn {Function File} {} fill (@var{x}, @var{y}, @var{c}) |
| 7020 | 21 ## @deftypefnx {Function File} {} fill (@var{x1}, @var{y1}, @var{c1}, @var{x2}, @var{y2}, @var{c2}) |
| 22 ## @deftypefnx {Function File} {} fill (@dots{}, @var{prop}, @var{val}) | |
|
17075
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
23 ## @deftypefnx {Function File} {} fill (@var{hax}, @dots{}) |
| 7650 | 24 ## @deftypefnx {Function File} {@var{h} =} fill (@dots{}) |
|
17075
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
25 ## Create one or more filled 2-D polygons. |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
26 ## |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
27 ## The inputs @var{x} and @var{y} are the coordinates of the polygon vertices. |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
28 ## If the inputs are matrices then the rows represent different vertices and |
|
17122
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17075
diff
changeset
|
29 ## each column produces a different polygon. @code{fill} will close any open |
|
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
30 ## polygons before plotting. |
|
17075
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
31 ## |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
32 ## The input @var{c} determines the color of the polygon. The simplest form |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
33 ## is a single color specification such as a @code{plot} format or an |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
34 ## RGB-triple. In this case the polygon(s) will have one unique color. If |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
35 ## @var{c} is a vector or matrix then the color data is first scaled using |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
36 ## @code{caxis} and then indexed into the current colormap. A row vector will |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
37 ## color each polygon (a column from matrices @var{x} and @var{y}) with a |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
38 ## single computed color. A matrix @var{c} of the same size as @var{x} and |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
39 ## @var{y} will compute the color of each vertex and then interpolate the face |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
40 ## color between the vertices. |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
41 ## |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
42 ## Multiple property/value pairs for the underlying patch object may be |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
43 ## specified, but they must appear in pairs. |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
44 ## |
|
17122
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17075
diff
changeset
|
45 ## If the first argument @var{hax} is an axes handle, then plot into this axis, |
|
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17075
diff
changeset
|
46 ## rather than the current axes returned by @code{gca}. |
|
14001
5f0bb45e615c
doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
47 ## |
|
17122
eaab03308c0b
doc: Rewrite docstrings for most plot functions.
Rik <rik@octave.org>
parents:
17075
diff
changeset
|
48 ## The optional return value @var{h} is a vector of graphics handles to |
|
14001
5f0bb45e615c
doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
49 ## the created patch objects. |
|
17075
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
50 ## |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
51 ## Example: red square |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
52 ## |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
53 ## @example |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
54 ## @group |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
55 ## vertices = [0 0 |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
56 ## 1 0 |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
57 ## 1 1 |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
58 ## 0 1]; |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
59 ## fill (vertices(:,1), vertices(:,2), "r"); |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
60 ## axis ([-0.5 1.5, -0.5 1.5]) |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
61 ## axis equal |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
62 ## @end group |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
63 ## @end example |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
64 ## |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
65 ## @seealso{patch, caxis, colormap} |
| 7020 | 66 ## @end deftypefn |
| 67 | |
|
17075
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
68 function h = fill (varargin) |
| 7020 | 69 |
|
17075
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
70 [hax, varargin] = __plt_get_axis_arg__ ("fill", varargin{:}); |
| 7216 | 71 |
|
17075
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
72 hlist = []; |
| 7215 | 73 iargs = __find_patches__ (varargin{:}); |
| 7216 | 74 |
|
17609
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
75 opts = {}; |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
76 if (numel (varargin) > iargs(end) + 2) |
|
17610
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
77 opts = varargin(iargs(end)+3 : end); |
|
17609
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
78 endif |
|
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
79 |
|
17609
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
80 if (! all (cellfun (@(x) iscolorspec (x), varargin(iargs + 2)))) |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
81 print_usage (); |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
82 endif |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
83 |
|
17211
87ba70043bfc
Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations.
Rik <rik@octave.org>
parents:
17122
diff
changeset
|
84 oldfig = []; |
|
17301
68bcac3c043a
Correct inversion accidentally introduced in cset 87ba70043bfc.
Rik <rik@octave.org>
parents:
17211
diff
changeset
|
85 if (! isempty (hax)) |
|
17211
87ba70043bfc
Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations.
Rik <rik@octave.org>
parents:
17122
diff
changeset
|
86 oldfig = get (0, "currentfigure"); |
|
87ba70043bfc
Don't use ifelse in plot fcns to avoid unnecessary fcn evaluations.
Rik <rik@octave.org>
parents:
17122
diff
changeset
|
87 endif |
| 7215 | 88 unwind_protect |
|
17075
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
89 hax = newplot (hax); |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
90 old_nxtplt = get (hax, "nextplot"); |
|
17610
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
91 unwind_protect |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
92 set (hax, "nextplot", "add"); |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
93 |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
94 for i = 1 : length (iargs) |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
95 cdata = varargin{iargs(i) + 2}; |
| 7020 | 96 |
|
17610
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
97 ## Matlab uses flat/interp shading based on orientation of cdata. |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
98 if (isnumeric (cdata) && isrow (cdata)) |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
99 popt = ["facecolor", "flat", opts]; |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
100 else |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
101 popt = opts; |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
102 endif |
|
17609
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
103 |
|
17610
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
104 [htmp, fail] = __patch__ (hax, varargin{iargs(i)+(0:1)}, cdata, |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
105 popt{:}); |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
106 if (fail) |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
107 print_usage (); |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
108 endif |
|
19593
446c46af4b42
strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
109 |
|
17610
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
110 hlist(end+1, 1) = htmp; |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
111 endfor |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
112 |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
113 unwind_protect_cleanup |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
114 if (strcmp (old_nxtplt, "replace")) |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
115 set (hax, "nextplot", old_nxtplt); |
| 7020 | 116 endif |
|
17610
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
117 end_unwind_protect |
|
17075
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
118 |
| 7215 | 119 unwind_protect_cleanup |
|
17075
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
120 if (! isempty (oldfig)) |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
121 set (0, "currentfigure", oldfig); |
|
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
122 endif |
| 7215 | 123 end_unwind_protect |
| 124 | |
| 7020 | 125 if (nargout > 0) |
|
17075
806f48d8a577
fill.m, shading.m: Overhaul to use new __plt_get_axis_arg__.
Rik <rik@octave.org>
parents:
14237
diff
changeset
|
126 h = hlist; |
| 7020 | 127 endif |
| 7215 | 128 |
| 7020 | 129 endfunction |
| 130 | |
| 131 function iargs = __find_patches__ (varargin) | |
|
17609
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
132 iargs = 1:3:nargin; |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
133 optidx = find (! cellfun (@isnumeric, varargin(iargs)), 1); |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
134 iargs(optidx:end) = []; |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
135 endfunction |
| 7020 | 136 |
|
17609
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
137 function retval = iscolorspec (arg) |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
138 retval = false; |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
139 if (ischar (arg)) |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
140 persistent colors = {"y", "yellow", "r", "red", "m", "magenta", ... |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
141 "c", "cyan", "g", "green", "b", "blue", ... |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
142 "w", "white", "k", "black"}; |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
143 if (any (strcmpi (arg, colors))) |
|
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
144 retval = true; |
| 7020 | 145 endif |
|
17610
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
146 elseif (isnumeric (arg)) |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
147 ## Assume any numeric argument is correctly formatted cdata. |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
148 ## Let patch worry about the multple different input formats |
|
3f8b3588a9f0
fill.m: Properly color faces based on orientation of cdata vector.
Rik <rik@octave.org>
parents:
17609
diff
changeset
|
149 retval = true; |
|
17609
ec31ca0a5812
fill.m: Improve input validation to avoid endless loops (bug #38927).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents:
17572
diff
changeset
|
150 endif |
| 7020 | 151 endfunction |
| 152 | |
|
14001
5f0bb45e615c
doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
153 |
| 7020 | 154 %!demo |
|
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14230
diff
changeset
|
155 %! clf; |
|
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14230
diff
changeset
|
156 %! t1 = (1/16:1/8:1) * 2*pi; |
|
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14230
diff
changeset
|
157 %! t2 = ((1/16:1/8:1) + 1/32) * 2*pi; |
|
14001
5f0bb45e615c
doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
158 %! x1 = sin (t1) - 0.8; |
|
5f0bb45e615c
doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
159 %! y1 = cos (t1); |
|
5f0bb45e615c
doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
160 %! x2 = sin (t2) + 0.8; |
|
5f0bb45e615c
doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
161 %! y2 = cos (t2); |
|
5f0bb45e615c
doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
162 %! h = fill (x1,y1,'r', x2,y2,'g'); |
|
5f0bb45e615c
doc: Update documentation for functions returning a graphics handle h (Bug #34761)
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
163 |