Mercurial > octave
view test/bug-45969.tst @ 28189:5624fd0c5efb stable
Fix inconsistent marker size between screen and printout (bug #57552)
* gl2ps-print.cc (gl2ps_renderer::init_marker): undo changes from cset
46fe22bf1458.
* gl-render.h, gl-render.cc (m_printing): New bool data member.
(opengl_renderer::draw_figure): Initialize m_printing with the depending on
"__printing__" property.
(opengl_renderer::points_to_pixels): New method to convert points data to
pixels. Returns the original value when renderering for printing purpose.
(opengl_renderer::set_linewidth, opengl_renderer::set_linewidth,
opengl_renderer::make_marker_list): Use points_to_pixels.
* print.m: Comment out line which prevents redrawing plot after printing.
The markersize may have been changed for printing and this requires a redraw.
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Thu, 12 Mar 2020 20:45:47 +0100 |
| parents | 63b5a17ba30f |
| children | 2838bbd84b87 |
line wrap: on
line source
%!test %! text_filename = tempname (); %! binary_filename = tempname (); %! a = 2; %! b = 10; %! c = 20; %! f1 = @ (f, x) f (x) + a; %! f2 = @ (y) f1 (@ (z) z^2 + b * y, y) + c; %! f2_arg = 5; %! save_default_options ("-text", "local"); %! unwind_protect %! save (text_filename, "f2"); %! save ("-binary", binary_filename, "f2"); %! text = load (text_filename); %! binary = load (binary_filename); %! assert (f2 (f2_arg), text.f2 (f2_arg)); %! assert (f2 (f2_arg), binary.f2 (f2_arg)); %! unwind_protect_cleanup %! unlink (text_filename); %! unlink (binary_filename); %! end_unwind_protect %!testif HAVE_HDF5 %! hdf5_filename = tempname (); %! a = 2; %! b = 10; %! c = 20; %! f1 = @ (f, x) f (x) + a; %! f2 = @ (y) f1 (@ (z) z^2 + b * y, y) + c; %! f2_arg = 5; %! save_default_options ("-text", "local"); %! unwind_protect %! save ("-hdf5", hdf5_filename, "f2"); %! hdf5 = load (hdf5_filename); %! assert (f2 (f2_arg), hdf5.f2 (f2_arg)); %! unwind_protect_cleanup %! unlink (hdf5_filename); %! end_unwind_protect