Mercurial > hg > octave-nkf
changeset 6724:388747e3d96b
[project @ 2007-06-14 17:04:52 by jwe]
| author | jwe |
|---|---|
| date | Thu, 14 Jun 2007 17:04:53 +0000 |
| parents | 8bfb4ff637e1 |
| children | dd930ff7f754 |
| files | ChangeLog aclocal.m4 scripts/ChangeLog scripts/plot/__go_draw_axes__.m src/ChangeLog src/graphics.cc src/graphics.h |
| diffstat | 7 files changed, 34 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ 2007-06-13 Michael Goffioul <michael.goffioul@swing.be> + * configure.in: Set NO_OCT_FILE_STRIP=true for msdosmsvc. + + * aclocal.m4 (OCTAVE_HDF5_DLL): Include return statements in + function body used for test. + * configure.in: Check for CXSparse with C++. + * Makeconf.in (do-subst-config-vals): Also substitute ${libdir} as OCTAVE_CONF_LIBDIR. * mkoctfile.in: Set DEFAULT_LIBDIR and substitute OCTAVE_HOME.
--- a/aclocal.m4 +++ b/aclocal.m4 @@ -994,11 +994,11 @@ dnl AC_DEFUN([OCTAVE_HDF5_DLL], [ AC_CACHE_CHECK([if _HDF5USEDLL_ needs to be defined],octave_cv_hdf5_dll, [ - AC_TRY_LINK([#include <hdf5.h>], [hid_t x = H5T_NATIVE_DOUBLE;], + AC_TRY_LINK([#include <hdf5.h>], [hid_t x = H5T_NATIVE_DOUBLE; return x], octave_cv_hdf5_dll=no, [ CFLAGS_old=$CFLAGS CFLAGS="$CFLAGS -DWIN32 -D_HDF5USEDLL_" - AC_TRY_LINK([#include <hdf5.h>], [hid_t x = H5T_NATIVE_DOUBLE;], + AC_TRY_LINK([#include <hdf5.h>], [hid_t x = H5T_NATIVE_DOUBLE; return x], octave_cv_hdf5_dll=yes, octave_cv_hdf5_dll=no) CFLAGS=$CFLAGS_old])])
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2007-06-14 John W. Eaton <jwe@octave.org> + + * plot/__go_draw_axes__.m: Handle text rotation property. + 2007-06-14 David Bateman <dbateman@free.fr> * general/__splinen__.m: Check also for ND vectors. Fix for N > 2,
--- a/scripts/plot/__go_draw_axes__.m +++ b/scripts/plot/__go_draw_axes__.m @@ -525,14 +525,17 @@ lpos = obj.position; label = obj.string; halign = obj.horizontalalignment; + angle = obj.rotation; if (nd == 3) - fprintf (plot_stream, "set label \"%s\" at %g,%g,%g %s;\n", + fprintf (plot_stream, + "set label \"%s\" at %g,%g,%g %s rotate by %f;\n", undo_string_escapes (label), - lpos(1), lpos(2), lpos(3), halign); + lpos(1), lpos(2), lpos(3), halign, angle); else - fprintf (plot_stream, "set label \"%s\" at %g,%g %s;\n", + fprintf (plot_stream, + "set label \"%s\" at %g,%g %s rotate by %f;\n", undo_string_escapes (label), - lpos(1), lpos(2), halign); + lpos(1), lpos(2), halign, angle); endif otherwise
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2007-06-14 John W. Eaton <jwe@octave.org> + + * graphics.h (text::text_properties::rotation): New data member. + * graphics.cc (text::text_properties::text_properties, + text::text_properties::set, text::text_properties::get, + text::text_properties::factory_defaults): Handle rotation property. + 2007-06-14 David Bateman <dbateman@free.fr> * ov-ch-mat.h (idx_vector index_vector (void) const): Remove
--- a/src/graphics.cc +++ b/src/graphics.cc @@ -1706,6 +1706,7 @@ string (""), units ("data"), position (Matrix (1, 3, 0.0)), + rotation (0), horizontalalignment ("left") { } @@ -1729,6 +1730,8 @@ units = val; else if (name.compare ("position")) position = val; + else if (name.compare ("rotation")) + rotation = val; else if (name.compare ("horizontalalignment")) horizontalalignment = val; else @@ -1753,6 +1756,7 @@ m.assign ("string", string); m.assign ("units", units); m.assign ("position", position); + m.assign ("rotation", rotation); m.assign ("horizontalalignment", horizontalalignment); return m; @@ -1777,6 +1781,8 @@ retval = units; else if (name.compare ("position")) retval = position; + else if (name.compare ("rotation")) + retval = rotation; else if (name.compare ("horizontalalignment")) retval = horizontalalignment; else @@ -1793,6 +1799,7 @@ m["string"] = ""; m["units"] = "data"; m["position"] = Matrix (1, 3, 0.0); + m["rotation"] = 0; m["horizontalalignment"] = "left"; return m;