octave-nkf: libinterp/corefcn/graphics.cc comparison

comparison libinterp/corefcn/graphics.cc @ 19631:db92e7e28e1f

strip trailing whitespace from most source files * NEWS, doc/interpreter/contributors.in, doc/interpreter/func.txi, doc/interpreter/genpropdoc.m, doc/interpreter/octave_logo.eps, doc/interpreter/plot.txi, doc/interpreter/stmt.txi, examples/data/Makefile.am, libinterp/corefcn/data.cc, libinterp/corefcn/debug.cc, libinterp/corefcn/error.cc, libinterp/corefcn/file-io.cc, libinterp/corefcn/gl-render.cc, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/load-path.cc, libinterp/corefcn/pr-output.cc, libinterp/corefcn/pt-jit.cc, libinterp/corefcn/strfind.cc, libinterp/corefcn/toplev.cc, libinterp/corefcn/toplev.h, libinterp/corefcn/urlwrite.cc, libinterp/corefcn/variables.cc, libinterp/octave-value/ov-classdef.cc, libinterp/octave-value/ov-classdef.h, libinterp/octave.cc, libinterp/parse-tree/lex.h, libinterp/parse-tree/oct-parse.in.yy, libinterp/parse-tree/pt-classdef.h, liboctave/system/file-ops.cc, liboctave/system/oct-env.cc, m4/acinclude.m4, scripts/deprecated/finite.m, scripts/deprecated/fmod.m, scripts/deprecated/fnmatch.m, scripts/deprecated/luinc.m, scripts/deprecated/octave_tmp_file_name.m, scripts/deprecated/syl.m, scripts/deprecated/usage.m, scripts/general/inputParser.m, scripts/general/interp1.m, scripts/general/interp2.m, scripts/general/interp3.m, scripts/general/isequal.m, scripts/general/private/__isequal__.m, scripts/geometry/voronoi.m, scripts/image/image.m, scripts/image/imshow.m, scripts/image/ind2rgb.m, scripts/linear-algebra/bandwidth.m, scripts/linear-algebra/isbanded.m, scripts/miscellaneous/bzip2.m, scripts/miscellaneous/cast.m, scripts/miscellaneous/copyfile.m, scripts/miscellaneous/delete.m, scripts/miscellaneous/fullfile.m, scripts/miscellaneous/getappdata.m, scripts/miscellaneous/gunzip.m, scripts/miscellaneous/isappdata.m, scripts/miscellaneous/ls.m, scripts/miscellaneous/mex.m, scripts/miscellaneous/movefile.m, scripts/miscellaneous/orderfields.m, scripts/miscellaneous/recycle.m, scripts/miscellaneous/rmappdata.m, scripts/miscellaneous/setfield.m, scripts/miscellaneous/symvar.m, scripts/miscellaneous/tar.m, scripts/miscellaneous/tmpnam.m, scripts/miscellaneous/unpack.m, scripts/miscellaneous/ver.m, scripts/miscellaneous/what.m, scripts/miscellaneous/xor.m, scripts/miscellaneous/zip.m, scripts/optimization/fminbnd.m, scripts/optimization/sqp.m, scripts/path/private/getsavepath.m, scripts/path/savepath.m, scripts/pkg/pkg.m, scripts/pkg/private/installed_packages.m, scripts/plot/draw/plotyy.m, scripts/plot/draw/polar.m, scripts/plot/draw/private/__quiver__.m, scripts/plot/draw/private/__scatter__.m, scripts/plot/draw/private/__stem__.m, scripts/plot/draw/surface.m, scripts/plot/draw/surfnorm.m, scripts/plot/util/copyobj.m, scripts/plot/util/hgload.m, scripts/plot/util/hgsave.m, scripts/plot/util/isprop.m, scripts/plot/util/linkprop.m, scripts/plot/util/private/__go_draw_axes__.m, scripts/set/setdiff.m, scripts/set/union.m, scripts/signal/periodogram.m, scripts/sparse/eigs.m, scripts/sparse/ilu.m, scripts/sparse/qmr.m, scripts/sparse/sprand.m, scripts/sparse/sprandn.m, scripts/specfun/beta.m, scripts/specfun/ellipke.m, scripts/specfun/isprime.m, scripts/statistics/base/lscov.m, scripts/testfun/__run_test_suite__.m, scripts/testfun/test.m: Strip trailing whitespace.

author	John W. Eaton <jwe@octave.org>
date	Tue, 20 Jan 2015 10:29:54 -0500
parents	0e1f5a750d00
children	408361a8c72f

comparison

equal deleted inserted replaced

-:0e1f5a750d00
+:db92e7e28e1f
 // Don't reset internal properties and handle_properties
 if (! obj.has_readonly_property (pname) &&
 pname.find ("__") != 0 && pname.find ("current") != 0 &&
 pname != "uicontextmenu" && pname != "parent")
 {
 // Store *mode prop/val in order to set them last
 if (pname.find ("mode") == (pname.length () - 4))
 pval[pname] = it->second;
 else
 obj.set (pname, it->second);
 }
 {
 // Remove child from current parent
 graphics_object old_parent_obj;
 old_parent_obj = gh_manager::get_object (get_parent ());
 if (old_parent_obj.get_handle () != hnp)
 old_parent_obj.remove_child (__myhandle__);
 else
 // Do nothing more
 return;
 if (! error_state && p.ok ())
 p.delete_listener ();
 }
 }
 void
 base_graphics_object::reset_default_properties (void)
 {
 if (valid_object ())
 {
 property_list::pval_map_type factory_pval =
 gh_manager::get_object (0).get_factory_defaults_list ()
 .find (type ())->second;
 xreset_default_properties (get_handle (), factory_pval);
 override_defaults (*this);
 }
 }
 {
 if (! error_state)
 {
 // Input checking and abrev. matching
 diary.set (val, false);
 if (! error_state)
 {
 Fdiary (ovl (diary.current_value ()));
 diary.run_listeners ();
 {
 if (! error_state)
 {
 // Input checking and abrev. matching
 diaryfile.set (val, false);
 if (! error_state)
 {
 Fdiary (ovl (diaryfile.string_value ()));
 diaryfile.run_listeners ();
 {
 if (! error_state)
 {
 // Input checking and abrev. matching
 echo.set (val, false);
 if (! error_state)
 {
 Fecho (ovl (echo.current_value ()));
 echo.run_listeners ();
 {
 if (! error_state)
 {
 // Input checking and abrev. matching
 format.set (val, false);
 if (! error_state)
 {
 Fformat (ovl (format.current_value ()));
 format.run_listeners ();
 }
 }
 }
 {
 if (! error_state)
 {
 // Input checking and abrev. matching
 formatspacing.set (val, false);
 if (! error_state)
 {
 std::string strval = formatspacing.current_value ();
 if (strval == "compact")
 {
 if (! error_state)
 {
 // Input checking and abrev. matching
 recursionlimit.set (val, false);
 if (! error_state)
 {
 double dval = recursionlimit.double_value ();
 Fmax_recursion_depth (ovl (dval));
 root_figure::reset_default_properties (void)
 {
 // empty list of local defaults
 default_properties = property_list ();
 xreset_default_properties (get_handle (),
 xproperties.factory_defaults ());
 }
 // ---------------------------------------------------------------------
 currentaxes = new_currentaxes;
 }
 }
 void
 figure::properties::adopt (const graphics_handle& h)
 {
 base_properties::adopt (h);
 if (! get_currentaxes ().ok ())
 if (modified)
 {
 position.run_listeners (POSTSET);
 mark_modified ();
 }
 if (paperpositionmode.is ("auto"))
 paperposition.set (get_auto_paperposition ());
 }
 }
 Matrix
 figure::properties::get_auto_paperposition (void)
 {
 Matrix pos = get_position ().matrix_value ();
 Matrix sz;
 caseless_str funits = get_units ();
 caseless_str punits = get_paperunits ();
 // Convert position from figure units to paperunits
 if (funits == "normalized" || punits == "normalized")
 {
 sz = screen_size_pixels ();
 pos = convert_position (pos, funits, "inches", sz);
 %!test
 %! hf = figure ("visible", "off", "paperpositionmode", "auto");
 %! in_pos = [0 0 4 5];
 %! tol = 20 * eps ();
 %! unwind_protect
 %!   ## paperpositionmode "auto" converts figure size to paper units
 %!   set (hf, "units", "inches");
 %!   set (hf, "position", in_pos);
 %!   set (hf, "paperunits", "centimeters");
 %!   psz = get (hf, "papersize");
 %!   fsz = in_pos(3:4) * 2.54;
 %!   pos = [(psz/2 .- fsz/2) fsz];
 %!   set (hf, "paperpositionmode", "auto");
 %!   assert (get (hf, "paperposition"), pos, tol)
 %! unwind_protect_cleanup
 %!   close (hf);
 %! end_unwind_protect
 %!test
 %! hf = figure ("visible", "off", "paperpositionmode", "auto");
 %! in_pos = [0 0 4 5];
 %! tol = 20 * eps ();
 %! unwind_protect
 %!   ## likewise with normalized units
 %!   set (hf, "units", "inches");
 %!   set (hf, "position", in_pos);
 %!   psz = get (hf, "papersize");
 %!   set (hf, "paperunits", "normalized");
 %!   fsz = in_pos(3:4) ./ psz;
 %!   pos = [([0.5 0.5] .- fsz/2) fsz];
 %!   assert (get (hf, "paperposition"), pos, tol)
 %! unwind_protect_cleanup
 %!   close (hf);
 %! end_unwind_protect
 %!test
 %! hf = figure ("visible", "off", "paperpositionmode", "auto");
 %! in_pos = [0 0 4 5];
 %! tol = 20 * eps ();
 %! unwind_protect
 %!   ## changing papertype updates paperposition
 %!   set (hf, "units", "inches");
 %!   set (hf, "position", in_pos);
 %!   set  (hf, "papertype", "a4");
 %!   psz = get (hf, "papersize");
 %!   fsz = in_pos(3:4);
 %!   pos = [(psz/2 .- fsz/2) fsz];
 %!   assert (get (hf, "paperposition"), pos, tol)
 %! unwind_protect_cleanup
 %!   close (hf);
 %! end_unwind_protect
 %!   set (hf, "units", "inches");
 %!   set (hf, "position", in_pos);
 %!   set (hf, "paperorientation", "landscape");
 %!   psz = get (hf, "papersize");
 %!   fsz = in_pos(3:4);
 %!   pos = [(psz/2 .- fsz/2) fsz];
 %!   assert (get (hf, "paperposition"), pos, tol)
 %! unwind_protect_cleanup
 %!   close (hf);
 %! end_unwind_protect
 {
 outerposition = default_axes_outerposition ();
 position = default_axes_position ();
 activepositionproperty = "outerposition";
 }
 if (mode != "reset")
 {
 delete_children (true);
 xlabel = gh_manager::make_graphics_handle ("text", __myhandle__,
 lo = std::log10 (lo);
 }
 }
 double tick_sep;
 if (is_logscale)
 {
 if (! (xisinf (hi) || xisinf (lo)))
 tick_sep = 1;  // Tick is every order of magnitude (bug #39449)
 else
 void
 axes::update_axis_limits (const std::string& axis_type,
 const graphics_handle& h)
 {
 if (updating_axis_limits.find (get_handle ().value ()) !=
 updating_axis_limits.end ())
 return;
 Matrix kids = Matrix (1, 1, h.value ());
 }
 void
 axes::update_axis_limits (const std::string& axis_type)
 {
 if ((updating_axis_limits.find (get_handle ().value ()) !=
 updating_axis_limits.end ()) ||
 (updating_aspectratios.find (get_handle ().value ()) !=
 updating_aspectratios.end ()))
 return;
 Matrix yd = get_ydata ().matrix_value ();
 Matrix zd = get_zdata ().matrix_value ();
 NDArray cd = get_cdata ().array_value ();
 bad_data_msg = std::string ();
 if (xd.dims () != yd.dims () ||
 (xd.dims () != zd.dims () && ! zd.is_empty ()))
 {
 bad_data_msg = "x/y/zdata should have the same dimensions";
 return;
 }
 else
 valid_vert = idx(ii,jj);
 }
 }
 }
 // Build cdata
 dim_vector dv = dim_vector::alloc (3);
 NDArray cd;
 bool pervertex = false;
 dv(0) = 1;
 dv(1) = fvc.rows ();
 dv(2) = fvc.columns ();
 cd = fvc.reshape (dv);
 }
 else
 {
 if (! fvc.is_empty ())
 {
 dv(0) = idx.rows ();
 dv(1) = nfaces;
 cd.resize (dv);
 pervertex = true;
 }
 }
 // Build x,y,zdata and eventually per vertex cdata
 Matrix xd (idx.dims ());
 Matrix yd (idx.dims ());
 Matrix zd;
 bool has_zd = false;
 if (vert.columns () > 2)
 {
 zd = Matrix (idx.dims ());
 has_zd = true;
 }
 for (octave_idx_type jj = 0; jj < nfaces; jj++)
 {
 for (octave_idx_type ii = 0; ii < idx.rows (); ii++)
 {
 octave_idx_type row = static_cast<octave_idx_type> (idx(ii,jj)-1);
 xd(ii,jj) = vert(row,0);
 yd(ii,jj) = vert(row,1);
 if (has_zd)
 zd(ii,jj) = vert(row,2);
 if (pervertex)
 for (int kk = 0; kk < fvc.columns (); kk++)
 cd(ii,jj,kk) = fvc(row,kk);
 }
 }
 uitoolbar::reset_default_properties (void)
 {
 // empty list of local defaults
 default_properties = property_list ();
 xreset_default_properties (get_handle (),
 xproperties.factory_defaults ());
 // override with parents' defaults
 override_defaults (*this);
 }
 %!test  # line object
 %! hf = figure ("visible", "off");
 %! unwind_protect
 %!   tol = 20 * eps;
 %!   hax = axes ("defaultlinelinewidth", 3);
 %!
 %!   hli = line (1:10, 1:10, 1:10, "marker", "o",
 %!               "markerfacecolor", "b", "linestyle", ":");
 %!
 %!   reset (hli);
 %!   assert (get (hli, "marker"), get (0, "defaultlinemarker"));
 %!   assert (get (hli, "markerfacecolor"),
 %!           get (0, "defaultlinemarkerfacecolor"));
 %!   assert (get (hli, "linestyle"),
 %!           get (0, "defaultlinelinestyle"));
 %!   assert (get (hli, "linewidth"), 3, tol);  # parent axes defaults
 %!
 %! unwind_protect_cleanup
 %!   close (hf);
 %! end_unwind_protect
 %!test  # patch object
 %! end_unwind_protect
 %!test  # image object
 %! hf = figure ("visible", "off");
 %! unwind_protect
 %!   tol = 20 * eps;
 %!   him = image (rand (10,10), "cdatamapping", "scaled");
 %!
 %!   reset (him);
 %!   assert (get (him, "cdata"), get (0, "defaultimagecdata"), tol);
 %!   assert (get (him, "cdatamapping"),
 %! end_unwind_protect
 %!test  # text object
 %! hf = figure ("visible", "off");
 %! unwind_protect
 %!   tol = 20 * eps;
 %!   hte = text (5, 5, "Hi!", "fontsize", 20 ,"color", "r");
 %!
 %!   reset (hte);
 %!   assert (get (hte, "position"), get (0, "defaulttextposition"), tol);
 %!   assert (get (hte, "fontsize"), get (0, "defaulttextfontsize"), tol);
 %!   assert (get (hte, "color"), get (0, "defaulttextcolor"), tol);
 %! unwind_protect_cleanup
 %!   close (hf);
 %! end_unwind_protect
 %!test  # axes object
 %! hf = figure ("visible", "off");
 %! unwind_protect
 %!   tol = 20 * eps;
 %!   pos = get (0, "defaultaxesposition") * .5;
 %!   hax = axes ("linewidth", 2, "position", pos);
 %!   title ("Reset me, please!");
 %!
 %!   reset (hax);
 %!   assert (get (hax, "linewidth"), get (0, "defaultaxeslinewidth"), tol);
 %!   assert (get (hax, "position"), pos, tol); # axes position is unchanged
 %!   assert (get (hax, "default"), struct ()); # no more axes' defaults
 %!   assert (get (get (hax, "title"), "string"), "");
 %!   close (hf);
 %! end_unwind_protect
 %!test  # root figure object
 %! set (0, "defaultfigurevisible", "off");
 %! hf = figure ("visible", "off", "paperunits", "centimeters",
 %!              "papertype", "a4");
 %! unwind_protect
 %!   reset (hf);
 %!   assert (get (hf, "papertype"), get (0, "defaultfigurepapertype"));
 %!   assert (get (hf, "paperunits"), "centimeters"); # paperunits is unchanged
 obj.set (args(1).map_value ());
 }
 else if (nargin == 2 && args(1).is_string ())
 {
 std::string property = args(1).string_value ();
 octave_map pmap = obj.values_as_struct ();
 if (obj.has_readonly_property (property))
 if (nargout != 0)
 retval = Matrix ();

Mercurial > octave-nkf

comparison libinterp/corefcn/graphics.cc @ 19631:db92e7e28e1f