changeset 21375:e5fd5bc5fd90

update docs for FLTK and Qt graphics
author John W. Eaton <jwe@octave.org>
date Sun, 28 Feb 2016 23:27:19 -0500
parents 1487a68a496a
children 1233bf2a03a5
files doc/interpreter/install.txi doc/interpreter/plot.txi
diffstat 2 files changed, 16 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/install.txi	Sun Feb 28 23:03:54 2016 -0500
+++ b/doc/interpreter/install.txi	Sun Feb 28 23:27:19 2016 -0500
@@ -251,7 +251,8 @@
 
 @item @nospell{gl2ps}
 OpenGL to PostScript printing library (@url{http://www.geuz.org/gl2ps/}).
-@nospell{gl2ps} is required for printing when using the FLTK toolkit.
+@nospell{gl2ps} is required for printing when using OpenGL-based
+graphics toolkits (currently either FLTK or Qt).
 
 @item gnuplot
 Interactive graphics program (@url{http://www.gnuplot.info}).  gnuplot
@@ -495,15 +496,10 @@
 Octave's makefiles to work with other make programs is probably not
 worth your time; instead, we simply recommend installing GNU Make.
 
-There are currently two options for plotting in Octave: (1) the external
-program gnuplot, or (2) the internal graphics engine using OpenGL and
-FLTK@.  Gnuplot is a command-driven interactive function plotting
-program.  Gnuplot is copyrighted, but freely distributable.  As of
-Octave release 3.4, gnuplot is the default option for plotting.  But,
-the internal graphics engine is nearly 100% compatible, certainly for
-most ordinary plots, and users are encouraged to test it.  It is
-anticipated that the internal engine will become the default option at
-the next major release of Octave.
+There are currently three options for plotting in Octave: the external
+program gnuplot, the internal graphics engine using OpenGL coupled with
+either FLTK or Qt widgets.  Gnuplot is a command-driven interactive
+function plotting program.
 
 To compile Octave, you will need a recent version of @code{g++} or other
 ANSI C++ compiler.  In addition, you will need a Fortran 77 compiler or
--- a/doc/interpreter/plot.txi	Sun Feb 28 23:03:54 2016 -0500
+++ b/doc/interpreter/plot.txi	Sun Feb 28 23:27:19 2016 -0500
@@ -37,15 +37,18 @@
 is used is controlled by the @code{graphics_toolkit} function.
 @xref{Graphics Toolkits}.
 
-The function call @code{graphics_toolkit ("fltk")} selects the
+The function call @code{graphics_toolkit ("qt")} selects the
+Qt/OpenGL system, @code{graphics_toolkit ("fltk")} selects the
 FLTK/OpenGL system, and @code{graphics_toolkit ("gnuplot")} selects the
-gnuplot system.  The two systems may be used selectively through the use
+gnuplot system.  The three systems may be used selectively through the use
 of the @code{graphics_toolkit} property of the graphics handle for each
-figure.  This is explained in @ref{Graphics Data Structures}.
-@strong{Caution:} The FLTK toolkit uses single precision variables internally
-which limits the maximum value that can be displayed to approximately
-@math{10^{38}}.  If your data contains larger values you must use the gnuplot
-toolkit which supports values up to @math{10^{308}}.
+figure.  The toolkit used for a given figure may not be changed once the
+figure is initialized.  This is explained in @ref{Graphics Data Structures}.
+@strong{Caution:} The OpenGL-based toolkits use single precision
+variables internally which limits the maximum value that can be
+displayed to approximately @math{10^{38}}.  If your data contains larger
+values you must use the gnuplot toolkit which supports values up to
+@math{10^{308}}.
 
 @node High-Level Plotting
 @section High-Level Plotting