Mercurial > octave
changeset 22689:a3e4c8fb69cb
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 27 Oct 2016 22:13:53 -0400 |
parents | 340e37fd3c20 (current diff) 9a0265ead11c (diff) |
children | b4c5fbaa96a8 |
files | configure.ac scripts/ode/odeplot.m |
diffstat | 3 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Oct 27 17:18:27 2016 -0700 +++ b/configure.ac Thu Oct 27 22:13:53 2016 -0400 @@ -33,7 +33,7 @@ OCTAVE_COPYRIGHT="Copyright (C) 2016 John W. Eaton and others." -OCTAVE_RELEASE_DATE="2016-09-20" +OCTAVE_RELEASE_DATE="2016-10-27" ## The "API version" is used as a way of checking that interfaces in the ## liboctave and libinterp libraries haven't changed in a backwardly
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Thu Oct 27 17:18:27 2016 -0700 +++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp Thu Oct 27 22:13:53 2016 -0400 @@ -383,6 +383,9 @@ l->addWidget (m_horizontalScrollBar, 1, 0); l->addWidget (m_verticalScrollBar, 0, 1); + SetConsoleCP (65001); + SetConsoleOutputCP (65001); + // Choose 15 (0xF) as index into the Windows console color map for the // background and 0 (0x0) as the index for the foreground. This // selection corresponds to the indices used in the foregroundColor,
--- a/scripts/ode/odeplot.m Thu Oct 27 17:18:27 2016 -0700 +++ b/scripts/ode/odeplot.m Thu Oct 27 22:13:53 2016 -0400 @@ -66,7 +66,7 @@ ## sets the x limits of the plot. Subsequently, at each time step during the ## integration the ode solver calls @code{odeplot (@var{t}, @var{y}, [])}. ## At the end of the solution the ode solver calls -## @code{odeplot ([], [], "end")} so that odeplot can perform any clean-up +## @code{odeplot ([], [], "done")} so that odeplot can perform any clean-up ## actions required. ## @seealso{odeset, odeget, ode23, ode45} ## @end deftypefn @@ -93,8 +93,9 @@ elseif (strcmp (flag, "init")) ## t is either the time slot [tstart tstop] or [t0, t1, ..., tn] ## y is the initial value vector for the ode solution + idx = 1; told = t(1); - yold = y(:); + yold = y(:,1); figure (); hlines = plot (told, yold, "o-"); xlim ([t(1), t(end)]); # Fix limits which also speeds up plotting