Menu
▾
▴
plplot-cvs — For PLplot svn commit messages
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(33) |
Jun
|
Jul
(30) |
Aug
(2) |
Sep
|
Oct
(30) |
Nov
(136) |
Dec
(59) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(255) |
Feb
(169) |
Mar
(322) |
Apr
(185) |
May
(33) |
Jun
(89) |
Jul
(47) |
Aug
(59) |
Sep
(40) |
Oct
(31) |
Nov
(74) |
Dec
(84) |
| 2002 |
Jan
(163) |
Feb
(78) |
Mar
(23) |
Apr
(5) |
May
(22) |
Jun
(75) |
Jul
(143) |
Aug
(48) |
Sep
(111) |
Oct
(58) |
Nov
(124) |
Dec
(278) |
| 2003 |
Jan
(106) |
Feb
(276) |
Mar
(354) |
Apr
(97) |
May
(14) |
Jun
(3) |
Jul
(7) |
Aug
(21) |
Sep
(83) |
Oct
(110) |
Nov
(3) |
Dec
(119) |
| 2004 |
Jan
(318) |
Feb
(409) |
Mar
(68) |
Apr
(23) |
May
(105) |
Jun
(147) |
Jul
(69) |
Aug
(53) |
Sep
(23) |
Oct
(14) |
Nov
(15) |
Dec
(63) |
| 2005 |
Jan
(146) |
Feb
(69) |
Mar
(157) |
Apr
(127) |
May
(166) |
Jun
(8) |
Jul
(5) |
Aug
(3) |
Sep
(8) |
Oct
(17) |
Nov
(29) |
Dec
(34) |
| 2006 |
Jan
(3) |
Feb
(4) |
Mar
(1) |
Apr
(70) |
May
(241) |
Jun
(82) |
Jul
(344) |
Aug
(196) |
Sep
(87) |
Oct
(57) |
Nov
(121) |
Dec
(86) |
| 2007 |
Jan
(60) |
Feb
(67) |
Mar
(102) |
Apr
(28) |
May
(13) |
Jun
(29) |
Jul
(38) |
Aug
(56) |
Sep
(91) |
Oct
(89) |
Nov
(50) |
Dec
(68) |
| 2008 |
Jan
(87) |
Feb
(47) |
Mar
(100) |
Apr
(34) |
May
(65) |
Jun
(54) |
Jul
(98) |
Aug
(128) |
Sep
(109) |
Oct
(141) |
Nov
(40) |
Dec
(206) |
| 2009 |
Jan
(176) |
Feb
(226) |
Mar
(134) |
Apr
(84) |
May
(152) |
Jun
(85) |
Jul
(91) |
Aug
(153) |
Sep
(141) |
Oct
(59) |
Nov
(87) |
Dec
(75) |
| 2010 |
Jan
(58) |
Feb
(41) |
Mar
(51) |
Apr
(74) |
May
(81) |
Jun
(39) |
Jul
(30) |
Aug
(43) |
Sep
(76) |
Oct
(59) |
Nov
(62) |
Dec
(52) |
| 2011 |
Jan
(125) |
Feb
(41) |
Mar
(96) |
Apr
(53) |
May
(21) |
Jun
(23) |
Jul
(48) |
Aug
(71) |
Sep
(37) |
Oct
(81) |
Nov
(60) |
Dec
(32) |
| 2012 |
Jan
(51) |
Feb
(23) |
Mar
|
Apr
(8) |
May
(2) |
Jun
|
Jul
(8) |
Aug
(25) |
Sep
(4) |
Oct
(32) |
Nov
(17) |
Dec
(2) |
| 2013 |
Jan
(8) |
Feb
(2) |
Mar
(9) |
Apr
(9) |
May
(37) |
Jun
(48) |
Jul
(63) |
Aug
(42) |
Sep
(59) |
Oct
(83) |
Nov
(141) |
Dec
(133) |
| 2014 |
Jan
(57) |
Feb
(58) |
Mar
(58) |
Apr
(25) |
May
(14) |
Jun
(3) |
Jul
(6) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ai...@us...> - 2014-03-04 21:09:32
|
Revision: 13038
http://sourceforge.net/p/plplot/code/13038
Author: airwin
Date: 2014-03-04 21:09:29 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
Propagate plot3dcl and plsurf3dcl to Octave binding for PLplot.
Build tested on Linux, and I also demonstrated with interactive octave
use that "help plot3dcl" and "help plsurf3dcl" give the expected
(because of the Octave help string bug for UTF-8) truncated result.
There were no run time tests of these functions since they are not
(yet) used in any examples.
Modified Paths:
--------------
trunk/bindings/octave/plplot_octave.i
trunk/bindings/swig-support/swig_documentation.i
Modified: trunk/bindings/octave/plplot_octave.i
===================================================================
--- trunk/bindings/octave/plplot_octave.i 2014-03-04 20:42:19 UTC (rev 13037)
+++ trunk/bindings/octave/plplot_octave.i 2014-03-04 21:09:29 UTC (rev 13038)
@@ -1182,8 +1182,8 @@
}
}
-// %feature commands supporting swig-generated documentation for the bindings.
-// Must occur before any %ignore directives or %rename directives.
+//%feature commands supporting swig-generated documentation for the bindings.
+// Must occur before any%ignore directives or%rename directives.
%include swig_documentation.i
// This test function should be removed when we are confident of our
@@ -1364,7 +1364,8 @@
PLINT ly, const PLFLT *clevel, PLINT nlevel, const PLFLT *xg, const PLFLT *yg )
{
PLcGrid2 grid2;
- f2c( xg, xgg, nx, ny ); f2c( yg, ygg, nx, ny );
+ f2c( xg, xgg, nx, ny );
+ f2c( yg, ygg, nx, ny );
grid2.nx = nx; grid2.ny = ny;
grid2.xg = xgg; grid2.yg = ygg;
f2c( f, ff, nx, ny );
@@ -1377,7 +1378,8 @@
PLINT ly, const PLFLT *clevel, PLINT nlevel, const PLFLT *xg, const PLFLT *yg )
{
PLcGrid2 grid2;
- f2c( xg, xgg, nx, ny ); f2c( yg, ygg, nx, ny );
+ f2c( xg, xgg, nx, ny );
+ f2c( yg, ygg, nx, ny );
grid2.nx = nx; grid2.ny = ny;
grid2.xg = xgg; grid2.yg = ygg;
f2c( f, ff, nx, ny );
@@ -1454,14 +1456,14 @@
%ignore plot3dc;
%rename( plot3dc ) my_plot3dc;
%ignore plot3dcl;
-//unimplemented:%rename(plot3dcl) my_plot3dcl;
+%rename( plot3dcl ) my_plot3dcl;
%{
// Plots a 3-d representation of the function z[x][y].
void my_plot3d( const PLFLT *x, const PLFLT *y, const PLFLT *z,
PLINT nx, PLINT ny, PLINT opt, PLINT side )
{
- f2c( z, zz, nx, ny )
+ f2c( z, zz, nx, ny );
c_plot3d( x, y, (const PLFLT **) zz, nx, ny, opt, side );
}
@@ -1470,9 +1472,20 @@
PLINT nx, PLINT ny, PLINT opt,
const PLFLT *clevel, PLINT nlevel )
{
- f2c( z, zz, nx, ny )
+ f2c( z, zz, nx, ny );
c_plot3dc( x, y, (const PLFLT **) zz, nx, ny, opt, clevel, nlevel );
}
+// Plots a 3-d representation of the function z[x][y] with contour with y
+// index limits
+ void my_plot3dcl( const PLFLT * x, const PLFLT * y, const PLFLT * z,
+ PLINT nx, PLINT ny, PLINT opt,
+ const PLFLT * clevel, PLINT nlevel,
+ PLINT indexxmin, PLINT indexxmax, const PLINT * indexymin, const PLINT * indexymax )
+ {
+ f2c( z, zz, nx, ny );
+ c_plot3dcl( x, y, (const PLFLT **) zz, nx, ny, opt, clevel, nlevel,
+ indexxmin, indexxmax, indexymin, indexymax );
+ }
%}
void my_plot3d( const PLFLT *ArrayX, const PLFLT *ArrayY, const PLFLT *MatrixCk,
@@ -1481,24 +1494,41 @@
void my_plot3dc( const PLFLT *ArrayX, const PLFLT *ArrayY, const PLFLT *MatrixCk,
PLINT nx, PLINT ny, PLINT opt, const PLFLT *Array, PLINT n );
+void my_plot3dcl( const PLFLT *ArrayX, const PLFLT *ArrayY, const PLFLT *MatrixCk,
+ PLINT nx, PLINT ny, PLINT opt, const PLFLT *Array, PLINT n,
+ PLINT ixstart, PLINT n, const PLINT *Array, const PLINT *ArrayCk );
+
// plsurf3d-related wrappings:
%ignore plsurf3d;
%rename( plsurf3d ) my_plsurf3d;
%ignore plsurf3dl;
-//unimplemented:%rename(plsurf3d) my_plsurf3d;
+%rename( plsurf3dl ) my_plsurf3dl;
%{
void my_plsurf3d( const PLFLT *x, const PLFLT *y, const PLFLT *z,
PLINT nx, PLINT ny, PLINT opt, const PLFLT *clevel, PLINT nlevel )
{
- f2c( z, zz, nx, ny )
+ f2c( z, zz, nx, ny );
c_plsurf3d( x, y, (const PLFLT **) zz, nx, ny, opt, clevel, nlevel );
}
+
+ void my_plsurf3dl( const PLFLT * x, const PLFLT * y, const PLFLT * z,
+ PLINT nx, PLINT ny, PLINT opt, const PLFLT * clevel, PLINT nlevel,
+ PLINT indexxmin, PLINT indexxmax, const PLINT * indexymin, const PLINT * indexymax )
+ {
+ f2c( z, zz, nx, ny );
+ c_plsurf3dl( x, y, (const PLFLT **) zz, nx, ny, opt, clevel, nlevel,
+ indexxmin, indexxmax, indexymin, indexymax );
+ }
%}
void my_plsurf3d( const PLFLT *ArrayX, const PLFLT *ArrayY, const PLFLT *MatrixCk,
PLINT nx, PLINT ny, PLINT opt, const PLFLT *Array, PLINT n );
+void my_plsurf3dl( const PLFLT *ArrayX, const PLFLT *ArrayY, const PLFLT *MatrixCk,
+ PLINT nx, PLINT ny, PLINT opt, const PLFLT *Array, PLINT n,
+ PLINT ixstart, PLINT n, const PLINT *Array, const PLINT *ArrayCk );
+
// plshade-related wrappers.
%ignore plshade;
@@ -1558,7 +1588,8 @@
PLINT rectangular, const PLFLT *xg, const PLFLT *yg )
{
PLcGrid2 grid2;
- f2c( xg, xgg, nx, ny ); f2c( yg, ygg, nx, ny );
+ f2c( xg, xgg, nx, ny );
+ f2c( yg, ygg, nx, ny );
grid2.nx = nx; grid2.ny = ny;
grid2.xg = xgg; grid2.yg = ygg;
f2c( a, aa, nx, ny );
@@ -1660,7 +1691,8 @@
PLINT rectangular, const PLFLT *xg, const PLFLT *yg )
{
PLcGrid2 grid2;
- f2c( xg, xgg, nx, ny ); f2c( yg, ygg, nx, ny );
+ f2c( xg, xgg, nx, ny );
+ f2c( yg, ygg, nx, ny );
grid2.nx = nx; grid2.ny = ny;
grid2.xg = xgg; grid2.yg = ygg;
f2c( a, aa, nx, ny );
@@ -1728,7 +1760,8 @@
void my_plvect2( const PLFLT *u, const PLFLT *v, PLINT nx, PLINT ny, PLFLT scale, const PLFLT *xg, const PLFLT *yg )
{
PLcGrid2 grid2;
- f2c( xg, xgg, nx, ny ); f2c( yg, ygg, nx, ny );
+ f2c( xg, xgg, nx, ny );
+ f2c( yg, ygg, nx, ny );
grid2.nx = nx; grid2.ny = ny;
grid2.xg = xgg; grid2.yg = ygg;
f2c( u, uu, nx, ny );
@@ -1806,7 +1839,8 @@
PLFLT valuemin, PLFLT valuemax, const PLFLT *xg, const PLFLT *yg )
{
PLcGrid2 grid2;
- f2c( xg, xgg, ( nx + 1 ), ( ny + 1 ) ); f2c( yg, ygg, ( nx + 1 ), ( ny + 1 ) );
+ f2c( xg, xgg, ( nx + 1 ), ( ny + 1 ) );
+ f2c( yg, ygg, ( nx + 1 ), ( ny + 1 ) );
grid2.nx = nx + 1; grid2.ny = ny + 1;
grid2.xg = xgg; grid2.yg = ygg;
f2c( a, aa, nx, ny );
Modified: trunk/bindings/swig-support/swig_documentation.i
===================================================================
--- trunk/bindings/swig-support/swig_documentation.i 2014-03-04 20:42:19 UTC (rev 13037)
+++ trunk/bindings/swig-support/swig_documentation.i 2014-03-04 21:09:29 UTC (rev 13038)
@@ -3749,7 +3749,11 @@
index in the range from indexxmin to indexxmax - 1. The dimension
of indexymax is indexxmax.
")
+#ifdef SWIG_OCTAVE
+my_plot3dcl;
+#else
plot3dcl;
+#endif
%feature( "docstring", "Parse command-line arguments
@@ -6566,7 +6570,11 @@
index in the range from indexxmin to indexxmax - 1. The dimension
of indexymax is indexxmax.
")
+#ifdef SWIG_OCTAVE
+my_plsurf3dl;
+#else
plsurf3dl;
+#endif
%feature( "docstring", "Plot shaded 3-d surface plot
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-03-04 20:42:21
|
Revision: 13037
http://sourceforge.net/p/plplot/code/13037
Author: airwin
Date: 2014-03-04 20:42:19 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
Style previous commit.
Modified Paths:
--------------
trunk/src/plvect.c
Modified: trunk/src/plvect.c
===================================================================
--- trunk/src/plvect.c 2014-03-04 20:41:18 UTC (rev 13036)
+++ trunk/src/plvect.c 2014-03-04 20:42:19 UTC (rev 13037)
@@ -200,21 +200,23 @@
vmax = ( v[i][j] > vmax ) ? v[i][j] : vmax;
}
}
- if (umax != 0.0)
+ if ( umax != 0.0 )
{
- dxmin = dxmin / umax;
+ dxmin = dxmin / umax;
}
- else {
- dxmin = 10E10;
+ else
+ {
+ dxmin = 10E10;
}
- if (vmax != 0.0)
+ if ( vmax != 0.0 )
{
- dymin = dymin / vmax;
+ dymin = dymin / vmax;
}
- else {
- dymin = 10E10;
+ else
+ {
+ dymin = 10E10;
}
- lscale = 1.5 * MIN( dxmin, dymin);
+ lscale = 1.5 * MIN( dxmin, dymin );
if ( scale < 0.0 )
{
scale = -scale * lscale;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-03-04 20:41:21
|
Revision: 13036
http://sourceforge.net/p/plplot/code/13036
Author: airwin
Date: 2014-03-04 20:41:18 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
Fix syntax error (missing double quote) introduced by last commit.
Modified Paths:
--------------
trunk/scripts/style_source.sh
Modified: trunk/scripts/style_source.sh
===================================================================
--- trunk/scripts/style_source.sh 2014-03-04 19:11:54 UTC (rev 13035)
+++ trunk/scripts/style_source.sh 2014-03-04 20:41:18 UTC (rev 13036)
@@ -214,7 +214,7 @@
# C source in utils.
csource_LIST="$csource_LIST utils/*.c"
-csource_LIST="$csource_LIST bindings/tcl/*.[ch] bindings/f95/*.c bindings/f95/plstubs.h bindings/gnome2/*/*.c bindings/ocaml/plplot_impl.c bindings/ocaml/plcairo/plcairo_impl.c bindings/python/plplot_widgetmodule.c bindings/tk/*.[ch] bindings/tk-x-plat/*.[ch]
+csource_LIST="$csource_LIST bindings/tcl/*.[ch] bindings/f95/*.c bindings/f95/plstubs.h bindings/gnome2/*/*.c bindings/ocaml/plplot_impl.c bindings/ocaml/plcairo/plcairo_impl.c bindings/python/plplot_widgetmodule.c bindings/tk/*.[ch] bindings/tk-x-plat/*.[ch]"
export cppsource_LIST
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-03-04 19:12:00
|
Revision: 13035
http://sourceforge.net/p/plplot/code/13035
Author: airwin
Date: 2014-03-04 19:11:54 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
Update Python and Octave documentation strings consistent with
doc/docbook/src/api.xml.
This update includes the following interrelated components.
Update api2swigdoc.pl by forming a rename hash to keep track of the
renaming that occurs in bindings/octave/plplot_octave.i, and using the
renamed documentation names for the Octave documentation case. This
solves a bug that occurred in the previous version where documentation
of the renamed octave functions was lost.
Propagate the improved results from api2swigdoc.pl using the
check_swig_documentation target and copying the comparison file
generated with api2swigdoc.pl to
bindings/swig-support/swig_documentation.i. This is a major change to
that latter file not only because of the api2swigdoc.pl changes but
also because api.xml has been updated extensively since the last time
the check_swig_documentation target was run. For example, api.xml
includes UTF-8 characters now so those have been propagated to
bindings/swig-support/swig_documentation.i.
The UTF-8 characters in swig_documentation.i trigger an Octave bug
where help strings which include UTF-8 characters are displayed in a
truncated fashion, i.e., only displayed up to the first such
character. Such truncated display is not a showstopper bug, but it is
an annoyance. We have now made an extremely simple test case not
involving PLplot which shows the display bug, and Andrew is
investigating that test case further.
The UTF-8 characters in swig_documentation.i end up in the
swig-generated file bindings/python/plplotc.py which causes run-time
problems since that file has no encoding string on the first or second
line (which is demanded by Python standards). Swig should give users
control of the encoding of that file, but to work around that swig
bug, I have created the _plplotcmodule_fixed custom target which uses
sed (now required to build the Python binding of PLplot) to append "
It uses coding: utf-8" to the first line of that file.
Changed target depends (just in the build tree since the
fixed plplotc.py is automatically installed with no
further action required in the installed examples tree) from
_plplotcmodule to _plplotcmodule_fixed.
The result has been tested on Linux using the test_noninteractive and
test_interactive targets in the build tree and also (using the
CMake-based build system) for the installed examples tree.
Modified Paths:
--------------
trunk/bindings/octave/plplot_octave.i
trunk/bindings/python/CMakeLists.txt
trunk/bindings/swig-support/CMakeLists.txt
trunk/bindings/swig-support/swig_documentation.i
trunk/cmake/modules/python.cmake
trunk/doc/docbook/bin/api2swigdoc.pl
trunk/examples/CMakeLists.txt
trunk/examples/python/CMakeLists.txt
Modified: trunk/bindings/octave/plplot_octave.i
===================================================================
--- trunk/bindings/octave/plplot_octave.i 2014-03-04 17:52:01 UTC (rev 13034)
+++ trunk/bindings/octave/plplot_octave.i 2014-03-04 19:11:54 UTC (rev 13035)
@@ -1182,6 +1182,10 @@
}
}
+// %feature commands supporting swig-generated documentation for the bindings.
+// Must occur before any %ignore directives or %rename directives.
+%include swig_documentation.i
+
// This test function should be removed when we are confident of our
// dealings with all types of octave string arrays.
void testppchar( PLINT n, const PLINT *Array, const char **ArrayCk );
@@ -1881,7 +1885,6 @@
// Probably never deal with this one.
%ignore plMinMax2dGrid;
-//%feature commands supporting swig-generated documentation for the bindings.
-%include swig_documentation.i
+
// swig-compatible common PLplot API definitions from here on.
%include plplotcapi.i
Modified: trunk/bindings/python/CMakeLists.txt
===================================================================
--- trunk/bindings/python/CMakeLists.txt 2014-03-04 17:52:01 UTC (rev 13034)
+++ trunk/bindings/python/CMakeLists.txt 2014-03-04 19:11:54 UTC (rev 13035)
@@ -102,6 +102,31 @@
)
endif(WIN32_AND_NOT_CYGWIN)
+ # Fixup required to deal with UTF-8 help strings. Note the DEPENDS
+ # only brings in a file dependency on the shared object and
+ # not ${CMAKE_CURRENT_BINARY_DIR}/plplotc.py that is also built
+ # by swig. Therefore, when the _plplotcmodule_fixed target is run the
+ # following command is only executed if
+ # ${CMAKE_CURRENT_BINARY_DIR}/plplotc_fixed.py is outdated relative
+ # to the shared object and it ignores the dating of
+ # ${CMAKE_CURRENT_BINARY_DIR}/plplotc.py. Thus, that file
+ # can be overwritten by the command below without affecting whether
+ # the custom command is run or not.
+ add_custom_command(
+ OUTPUT
+ ${CMAKE_CURRENT_BINARY_DIR}/plplotc_fixed.py
+ COMMAND ${SED_EXECUTABLE} -e "1s?^\\(.*\\)\$?\\1 It uses coding: utf-8?" < ${CMAKE_CURRENT_BINARY_DIR}/plplotc.py > ${CMAKE_CURRENT_BINARY_DIR}/plplotc_fixed.py
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/plplotc_fixed.py ${CMAKE_CURRENT_BINARY_DIR}/plplotc.py
+ DEPENDS _plplotcmodule
+ VERBATIM
+ )
+ add_custom_target(
+ _plplotcmodule_fixed ALL
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplotc_fixed.py
+ )
+ add_dependencies(_plplotcmodule_fixed _plplotcmodule)
+
add_library(plplot_widgetmodule MODULE plplot_widgetmodule.c)
set_target_properties(plplot_widgetmodule PROPERTIES PREFIX "")
set_source_files_properties(
Modified: trunk/bindings/swig-support/CMakeLists.txt
===================================================================
--- trunk/bindings/swig-support/CMakeLists.txt 2014-03-04 17:52:01 UTC (rev 13034)
+++ trunk/bindings/swig-support/CMakeLists.txt 2014-03-04 19:11:54 UTC (rev 13035)
@@ -29,6 +29,7 @@
${CMAKE_CURRENT_BINARY_DIR}/swig_documentation.i_compare
COMMAND ${PERL_EXECUTABLE}
${CMAKE_SOURCE_DIR}/doc/docbook/bin/api2swigdoc.pl
+ ${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave.i
${CMAKE_SOURCE_DIR}/doc/docbook/src/plplotdoc.xml.in
${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
${CMAKE_CURRENT_BINARY_DIR}/swig_documentation.i_compare
Modified: trunk/bindings/swig-support/swig_documentation.i
===================================================================
--- trunk/bindings/swig-support/swig_documentation.i 2014-03-04 17:52:01 UTC (rev 13034)
+++ trunk/bindings/swig-support/swig_documentation.i 2014-03-04 19:11:54 UTC (rev 13035)
@@ -68,15 +68,15 @@
Advances to the next subpage if sub=0, performing a page advance if
there are no remaining subpages on the current page. If subpages
- aren't being used, pladv(0) will always advance the page. If sub>0,
+ aren't being used, pladv(0) will always advance the page. If page>0,
PLplot switches to the specified subpage. Note that this allows you
to overwrite a plot on the specified subpage; if this is not what you
intended, use pleop followed by plbop to first advance the page. This
- routine is called automatically (with sub=0) by plenv, but if plenv is
- not used, pladv must be called after initializing PLplot but before
+ routine is called automatically (with page=0) by plenv, but if plenv
+ is not used, pladv must be called after initializing PLplot but before
defining the viewport.
- Redacted form: pladv(sub)
+ Redacted form: pladv(page)
This function is used in examples 1,2,4,6-12,14-18,20,21,23-27,29,31.
@@ -84,13 +84,14 @@
SYNOPSIS:
-pladv(sub)
+pladv(page)
ARGUMENTS:
- sub (PLINT, input) : Specifies the subpage number (starting from 1
+ page (PLINT, input) : Specifies the subpage number (starting from 1
in the top left corner and increasing along the rows) to which to
- advance. Set to zero to advance to the next subpage.
+ advance. Set to zero to advance to the next subpage (or to the
+ next page if subpages are not being used).
")
pladv;
@@ -260,12 +261,13 @@
nbin (PLINT, input) : Number of bins (i.e., number of values in x
and y arrays.)
- x (PLFLT *, input) : Pointer to array containing values associated
- with bins. These must form a strictly increasing sequence.
+ x (const PLFLT *, input) : Pointer to array containing values
+ associated with bins. These must form a strictly increasing
+ sequence.
- y (PLFLT *, input) : Pointer to array containing number of points
- in bin. This is a PLFLT (instead of PLINT) array so as to allow
- histograms of probabilities, etc.
+ y (const PLFLT *, input) : Pointer to array containing number of
+ points in bin. This is a PLFLT (instead of PLINT) array so as to
+ allow histograms of probabilities, etc.
opt (PLINT, input) : Is a combination of several flags:
opt=PL_BIN_DEFAULT: The x represent the lower bin boundaries, the
@@ -515,6 +517,57 @@
")
plbox3;
+%feature( "docstring", "Calculate broken-down time from continuous time for the current stream
+
+DESCRIPTION:
+
+ Calculate broken-down time; year, month, day, hour, min, sec; from
+ continuous time, ctime for the current stream. This function is the
+ inverse of plctime.
+
+ The PLplot definition of broken-down time is a calendar time that
+ completely ignores all time zone offsets, i.e., it is the user's
+ responsibility to apply those offsets (if so desired) before using the
+ PLplot time API. By default broken-down time is defined using the
+ proleptic Gregorian calendar without the insertion of leap seconds and
+ continuous time is defined as the number of seconds since the Unix
+ epoch of 1970-01-01T00:00:00Z. However, other definitions of
+ broken-down and continuous time are possible, see plconfigtime.
+
+ Redacted form: General: plbtime(year, month, day, hour, min, sec,
+ ctime)
+ Perl/PDL: Not available?
+
+
+ This function is used in example 29.
+
+
+
+SYNOPSIS:
+
+plbtime(year, month, day, hour, min, sec, ctime)
+
+ARGUMENTS:
+
+ year (PLINT *, output) : Output year.
+
+ month (PLINT *, output) : Output month in range from 0 (January) to
+ 11 (December).
+
+ day (PLINT *, output) : Output day in range from 1 to 31.
+
+ hour (PLINT *, output) : Output hour in range from 0 to 23.
+
+ min (PLINT *, output) : Output minute in range from 0 to 59
+
+ sec (PLFLT *, output) : Output second in floating range from 0. to
+ 60.
+
+ ctime (PLFLT, input) : Continous time from which the broken-down
+ time is calculated.
+")
+plbtime;
+
%feature( "docstring", "Calculate world coordinates and corresponding window index from relative device coordinates
DESCRIPTION:
@@ -594,13 +647,13 @@
")
plclear;
-%feature( "docstring", "Set color, map0
+%feature( "docstring", "Set color, cmap0
DESCRIPTION:
- Sets the color for color map0 (see the PLplot documentation).
+ Sets the color index for cmap0 (see the PLplot documentation).
- Redacted form: plcol0(color)
+ Redacted form: plcol0(icol0)
This function is used in examples 1-9,11-16,18-27,29.
@@ -608,11 +661,11 @@
SYNOPSIS:
-plcol0(color)
+plcol0(icol0)
ARGUMENTS:
- color (PLINT, input) : Integer representing the color. The
+ icol0 (PLINT, input) : Integer representing the color. The
defaults at present are (these may change):
0 black (default background)
1 red (default foreground)
@@ -636,11 +689,11 @@
")
plcol0;
-%feature( "docstring", "Set color, map1
+%feature( "docstring", "Set color, cmap1
DESCRIPTION:
- Sets the color for color map1 (see the PLplot documentation).
+ Sets the color for cmap1 (see the PLplot documentation).
Redacted form: plcol1(col1)
@@ -803,7 +856,7 @@
label_opts (const PLINT *, input) : Options for each of
n_labels labels.
- labels (const char *const *, input) : n_labels text labels for the
+ labels (const char * const *, input) : n_labels text labels for the
color bar. No label is drawn if no label position is specified
with one of the PL_COLORBAR_LABEL_RIGHT, PL_COLORBAR_LABEL_TOP,
PL_COLORBAR_LABEL_LEFT, or PL_COLORBAR_LABEL_BOTTOM bits in the
@@ -815,40 +868,134 @@
but it can be larger if multiple numerical axis labels for the
long edges of the color bar are desired.
- axis_opts (const char *const *, input) : An array of n_axes axis
+ axis_opts (const char * const *, input) : An array of n_axes axis
options (interpreted as for plbox) for the color bar's axis
definitions.
- ticks (PLFLT *, input) : An array of n_axes values of the spacing
- of the major tick marks (interpreted as for plbox) for the color
- bar's axis definitions.
+ ticks (const PLFLT *, input) : An array of n_axes values of the
+ spacing of the major tick marks (interpreted as for plbox) for the
+ color bar's axis definitions.
- sub_ticks (PLINT *, input) : An array of n_axes values of the
+ sub_ticks (const PLINT *, input) : An array of n_axes values of the
number of subticks (interpreted as for plbox) for the color bar's
axis definitions.
- n_values (PLINT, input) : An array containing the number of
+ n_values (const PLINT *, input) : An array containing the number of
elements in each of the n_axes rows of the two-dimensional values
array.
- values (PLFLT *const *, input) : A two-dimensional array containing
- the numeric values for the data range represented by the color
- bar. For a row index of i_axis (where 0 < i_axis < n_axes), the
- number of elements in the row is specified by n_values[i_axis].
- For PL_COLORBAR_IMAGE and PL_COLORBAR_GRADIENT the number of
- elements is 2, and the corresponding row elements of the values
- array are the minimum and maximum value represented by the
- colorbar. For PL_COLORBAR_SHADE, the number and values of the
+ values (const PLFLT * const *, input) : A two-dimensional array
+ containing the numeric values for the data range represented by
+ the color bar. For a row index of i_axis (where 0 < i_axis <
+ n_axes), the number of elements in the row is specified by
+ n_values[i_axis]. For PL_COLORBAR_IMAGE and PL_COLORBAR_GRADIENT
+ the number of elements is 2, and the corresponding row elements of
+ the values array are the minimum and maximum value represented by
+ the colorbar. For PL_COLORBAR_SHADE, the number and values of the
elements of a row of the values array is interpreted the same as
the nlevel and clevel arguments of plshades.
")
+#ifdef SWIG_OCTAVE
+my_plcolorbar;
+#else
plcolorbar;
+#endif
+%feature( "docstring", "Configure the transformation between continuous and broken-down time for the current stream
+
+DESCRIPTION:
+
+ Configure the transformation between continuous and broken-down time
+ for the current stream. This transformation is used by both plbtime
+ and plctime.
+
+ Redacted form: General: plconfigtime(scale, offset1, offset2,
+ ccontrol, ifbtime_offset, year, month, day, hour, min, sec)
+ Perl/PDL: Not available?
+
+
+ This function is used in example 29.
+
+
+
+SYNOPSIS:
+
+plconfigtime(scale, offset1, offset2, ccontrol, ifbtime_offset, year, month, day, hour, min, sec)
+
+ARGUMENTS:
+
+ scale (PLFLT, input) : The number of days per continuous time unit.
+ As a special case, if
+ scale is 0., then all other arguments are ignored, and the result (the
+ default used by PLplot) is the equivalent of a call to
+ plconfigtime(1./86400., 0., 0., 0x0, 1, 1970, 0, 1, 0, 0, 0.).
+ That is, for this special case broken-down time is calculated with
+ the proleptic Gregorian calendar with no leap seconds inserted,
+ and the continuous time is defined as the number of seconds since
+ the Unix epoch of 1970-01-01T00:00:00Z.
+
+ offset1 (PLFLT, input) : If
+ ifbtime_offset is true, the parameters
+ offset1 and
+ offset2 are completely ignored. Otherwise, the sum of these parameters
+ (with units in days) specify the epoch of the continuous time
+ relative to the MJD epoch corresponding to the Gregorian calendar
+ date of 1858-11-17T00:00:00Z or JD = 2400000.5. Two PLFLT numbers
+ are used to specify the origin to allow users (by specifying
+ offset1 as an integer that can be exactly represented by a
+ floating-point variable and specifying
+ offset2 as a number in the range from 0. to 1) the chance to minimize
+ the numerical errors of the continuous time representation.
+
+ offset2 (PLFLT, input) : See documentation of
+ offset1.
+
+ ccontrol (PLINT, input) : ccontrol contains bits controlling the
+ transformation. If the 0x1 bit is set, then the proleptic Julian
+ calendar is used for broken-down time rather than the proleptic
+ Gregorian calendar. If the 0x2 bit is set, then leap seconds that
+ have been historically used to define UTC are inserted into the
+ broken-down time. Other possibilities for additional control bits
+ for ccontrol exist such as making the historical time corrections
+ in the broken-down time corresponding to ET (ephemeris time) or
+ making the (slightly non-constant) corrections from international
+ atomic time (TAI) to what astronomers define as terrestrial time
+ (TT). But those additional possibilities have not been
+ implemented yet in the qsastime library (one of the PLplot utility
+ libraries).
+
+ ifbtime_offset (PLBOOL, input) : ifbtime_offset controls how the
+ epoch of the continuous time scale is specified by the user. If
+ ifbtime_offset is false, then
+ offset1 and
+ offset2 are used to specify the epoch, and the following broken-down
+ time parameters are completely ignored. If
+ ifbtime_offset is true, then
+ offset1 and
+ offset2 are completely ignored, and the following broken-down time
+ parameters are used to specify the epoch.
+
+ year (PLINT, input) : Year of epoch.
+
+ month (PLINT, input) : Month of epoch in range from 0 (January) to
+ 11 (December).
+
+ day (PLINT, input) : Day of epoch in range from 1 to 31.
+
+ hour (PLINT, input) : Hour of epoch in range from 0 to 23
+
+ min (PLINT, input) : Minute of epoch in range from 0 to 59.
+
+ sec (PLFLT, input) : Second of epoch in floating range from 0. to
+ 60.
+")
+plconfigtime;
+
%feature( "docstring", "Contour plot
DESCRIPTION:
- Draws a contour plot of the data in z[
+ Draws a contour plot of the data in f[
nx][
ny], using the nlevel contour levels specified by clevel. Only the
region of the array from kx to lx and from ky to ly is plotted out. A
@@ -859,11 +1006,11 @@
information.
Redacted form: [PLEASE UPDATE! ONLY PERL INFO IS LIKELY CORRECT!] F95:
- plcont(z, kx, lx, ky, ly, clevel, tr?) or plcont(z, kx, lx, ky, ly,
+ plcont(f, kx, lx, ky, ly, clevel, tr?) or plcont(f, kx, lx, ky, ly,
clevel, xgrid, ygrid)
- Java: pls.cont(z, kx, lx, ky, ly, clevel, xgrid, ygrid)
- Perl/PDL: plcont(z, kx, lx, ky, ly, clevel, pltr, pltr_data)
- Python: plcont2(z, kx, lx, ky, ly, clevel)
+ Java: pls.cont(f, kx, lx, ky, ly, clevel, xgrid, ygrid)
+ Perl/PDL: plcont(f, kx, lx, ky, ly, clevel, pltr, pltr_data)
+ Python: plcont2(f, kx, lx, ky, ly, clevel)
This function is used in examples 9,14,16,22.
@@ -872,27 +1019,27 @@
SYNOPSIS:
-plcont(z, nx, ny, kx, lx, ky, ly, clevel, nlevel, pltr, pltr_data)
+plcont(f, nx, ny, kx, lx, ky, ly, clevel, nlevel, pltr, pltr_data)
ARGUMENTS:
- z (PLFLT **, input) : Pointer to a vectored two-dimensional array
- containing data to be contoured.
+ f (const PLFLT * const *, input) : Pointer to a vectored
+ two-dimensional array containing data to be contoured.
- nx, ny (PLINT, input) : Physical dimensions of array z.
+ nx, ny (PLINT, input) : Physical dimensions of array f.
kx, lx (PLINT, input) : Range of x indices to consider.
ky, ly (PLINT, input) : Range of y indices to consider.
- clevel (PLFLT *, input) : Pointer to array specifying levels at
- which to draw contours.
+ clevel (const PLFLT *, input) : Pointer to array specifying levels
+ at which to draw contours.
nlevel (PLINT, input) : Number of contour levels to draw.
pltr (void (*) (PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer) , input) :
Pointer to function that defines transformation between indices
- in array z and the world coordinates (C only). Transformation
+ in array f and the world coordinates (C only). Transformation
functions are provided in the PLplot library: pltr0 for identity
mapping, and pltr1 and pltr2 for arbitrary mappings respectively
defined by one- and two-dimensional arrays. In addition,
@@ -908,7 +1055,11 @@
information to pltr0, pltr1, pltr2, or whatever routine that is
externally supplied.
")
+#ifdef SWIG_OCTAVE
+my_plcont;
+#else
plcont;
+#endif
%feature( "docstring", "Copy state parameters from the reference stream to the current stream
@@ -944,6 +1095,58 @@
")
plcpstrm;
+%feature( "docstring", "Calculate continuous time from broken-down time for the current stream
+
+DESCRIPTION:
+
+ Calculate continuous time, ctime, from broken-down time for the
+ current stream. The broken-down
+ time is specified by the following parameters: year, month, day, hour,
+ min, and sec. This function is the inverse of plbtime.
+
+ The PLplot definition of broken-down time is a calendar time that
+ completely ignores all time zone offsets, i.e., it is the user's
+ responsibility to apply those offsets (if so desired) before using the
+ PLplot time API. By default broken-down time is defined using the
+ proleptic Gregorian calendar without the insertion of leap seconds and
+ continuous time is defined as the number of seconds since the Unix
+ epoch of 1970-01-01T00:00:00Z. However, other definitions of
+ broken-down and continuous time are possible, see plconfigtime which
+ specifies that transformation for the current stream.
+
+ Redacted form: General: plctime(year, month, day, hour, min, sec,
+ ctime)
+ Perl/PDL: Not available?
+
+
+ This function is used in example 29.
+
+
+
+SYNOPSIS:
+
+plctime(year, month, day, hour, min, sec, ctime)
+
+ARGUMENTS:
+
+ year (PLINT, input) : Input year.
+
+ month (PLINT, input) : Input month in range from 0 (January) to 11
+ (December).
+
+ day (PLINT, input) : Input day in range from 1 to 31.
+
+ hour (PLINT, input) : Input hour in range from 0 to 23
+
+ min (PLINT, input) : Input minute in range from 0 to 59.
+
+ sec (PLFLT, input) : Input second in floating range from 0. to 60.
+
+ ctime (PLFLT *, output) : Continous time calculated from the
+ broken-down time specified by the previous parameters.
+")
+plctime;
+
%feature( "docstring", "End plotting session
DESCRIPTION:
@@ -987,7 +1190,7 @@
")
plend1;
-%feature( "docstring", "Same as plenv but if in multiplot mode does not advance the subpage, instead clears it.
+%feature( "docstring", "Same as plenv but if in multiplot mode does not advance the subpage, instead clears it
DESCRIPTION:
@@ -1225,14 +1428,14 @@
n (PLINT, input) : Number of error bars to draw.
- xmin (PLFLT *, input) : Pointer to array with x coordinates of
- left-hand endpoint of error bars.
+ xmin (const PLFLT *, input) : Pointer to array with x coordinates
+ of left-hand endpoint of error bars.
- xmax (PLFLT *, input) : Pointer to array with x coordinates of
- right-hand endpoint of error bars.
+ xmax (const PLFLT *, input) : Pointer to array with x coordinates
+ of right-hand endpoint of error bars.
- y (PLFLT *, input) : Pointer to array with y coordinates of error
- bar.
+ y (const PLFLT *, input) : Pointer to array with y coordinates of
+ error bar.
")
plerrx;
@@ -1261,14 +1464,14 @@
n (PLINT, input) : Number of error bars to draw.
- x (PLFLT *, input) : Pointer to array with x coordinates of error
- bars.
+ x (const PLFLT *, input) : Pointer to array with x coordinates of
+ error bars.
- ymin (PLFLT *, input) : Pointer to array with y coordinates of
- lower endpoint of error bars.
+ ymin (const PLFLT *, input) : Pointer to array with y coordinates
+ of lower endpoint of error bars.
- ymax (PLFLT *, input) : Pointer to array with y coordinate of upper
- endpoint of error bar.
+ ymax (const PLFLT *, input) : Pointer to array with y coordinate of
+ upper endpoint of error bar.
")
plerry;
@@ -1315,10 +1518,10 @@
n (PLINT, input) : Number of vertices in polygon.
- x (PLFLT *, input) : Pointer to array with x coordinates of
+ x (const PLFLT *, input) : Pointer to array with x coordinates of
vertices.
- y (PLFLT *, input) : Pointer to array with y coordinates of
+ y (const PLFLT *, input) : Pointer to array with y coordinates of
vertices.
")
plfill;
@@ -1349,13 +1552,13 @@
n (PLINT, input) : Number of vertices in polygon.
- x (PLFLT *, input) : Pointer to array with x coordinates of
+ x (const PLFLT *, input) : Pointer to array with x coordinates of
vertices.
- y (PLFLT *, input) : Pointer to array with y coordinates of
+ y (const PLFLT *, input) : Pointer to array with y coordinates of
vertices.
- z (PLFLT *, input) : Pointer to array with z coordinates of
+ z (const PLFLT *, input) : Pointer to array with z coordinates of
vertices.
")
plfill3;
@@ -1386,7 +1589,7 @@
affects symbols produced by plpoin. This routine has no effect unless
the extended character set is loaded (see plfontld).
- Redacted form: plfont(font)
+ Redacted form: plfont(ifont)
This function is used in examples 1,2,4,7,13,24,26.
@@ -1394,11 +1597,11 @@
SYNOPSIS:
-plfont(font)
+plfont(ifont)
ARGUMENTS:
- font (PLINT, input) : Specifies the font: 1: Normal font (simplest
+ ifont (PLINT, input) : Specifies the font: 1: Normal font (simplest
and fastest)
2: Roman font
3: Italic font
@@ -1413,7 +1616,7 @@
Sets the character set to use for subsequent character drawing. May
be called before initializing PLplot.
- Redacted form: plfontld(set)
+ Redacted form: plfontld(fnt)
This function is used in examples 1,7.
@@ -1421,11 +1624,11 @@
SYNOPSIS:
-plfontld(set)
+plfontld(fnt)
ARGUMENTS:
- set (PLINT, input) : Specifies the character set to load: 0:
+ fnt (PLINT, input) : Specifies the character set to load: 0:
Standard character set
1: Extended character set
")
@@ -1456,14 +1659,41 @@
")
plgchr;
-%feature( "docstring", "Returns 8-bit RGB values for given color from color map0
+%feature( "docstring", "Get the cmap1 argument range for continuous color plots
DESCRIPTION:
- Returns 8-bit RGB values (0-255) for given color from color map0 (see
- the PLplot documentation). Values are negative if an invalid color id
- is given.
+ Get the cmap1 argument range for continuous color plots. (Use
+ plgsmap1_range to set the cmap1 argument range.)
+ Redacted form: plgcmap1_range(min_color, max_color)
+
+ This function is currently not used in any example.
+
+
+
+SYNOPSIS:
+
+plgcmap1_range(min_color, max_color)
+
+ARGUMENTS:
+
+ min_color (PLFLT *, output) : Pointer to the current minimum cmap1
+ floating point argument.
+
+ max_color (PLFLT *, output) : Pointer to the current maximum cmap1
+ floating point argument.
+")
+plgcmap1_range;
+
+%feature( "docstring", "Returns 8-bit RGB values for given color index from cmap0
+
+DESCRIPTION:
+
+ Returns 8-bit RGB values (0-255) for given color from cmap0 (see the
+ PLplot documentation). Values are negative if an invalid color id is
+ given.
+
Redacted form: plgcol0(icol0, r, g, b)
This function is used in example 2.
@@ -1486,13 +1716,13 @@
")
plgcol0;
-%feature( "docstring", "Returns 8-bit RGB values and double alpha value for given color from color map0.
+%feature( "docstring", "Returns 8-bit RGB values and double alpha transparency value for given color index from cmap0
DESCRIPTION:
- Returns 8-bit RGB values (0-255) and double alpha value (0.0 - 1.0)
- for given color from color map0 (see the PLplot documentation).
- Values are negative if an invalid color id is given.
+ Returns 8-bit RGB values (0-255) and double alpha transparency value
+ (0.0 - 1.0) for given color from cmap0 (see the PLplot
+ documentation). Values are negative if an invalid color id is given.
This function is used in example 30.
@@ -1500,7 +1730,7 @@
SYNOPSIS:
-plgcol0a(icol0, r, g, b, a)
+plgcol0a(icol0, r, g, b, alpha)
ARGUMENTS:
@@ -1512,7 +1742,8 @@
b (PLINT *, output) : Pointer to 8-bit blue value.
- a (PLFLT *, output) : Pointer to PLFLT alpha value.
+ alpha (PLFLT *, output) : Pointer to PLFLT alpha transparency
+ value.
")
plgcol0a;
@@ -1545,12 +1776,12 @@
")
plgcolbg;
-%feature( "docstring", " Returns the background color (cmap0[0]) by 8-bit RGB value and double alpha value.
+%feature( "docstring", " Returns the background color (cmap0[0]) by 8-bit RGB value and double alpha transparency value
DESCRIPTION:
Returns the background color (cmap0[0]) by 8-bit RGB value and double
- alpha value.
+ alpha transparency value.
This function is used in example 31.
@@ -1558,7 +1789,7 @@
SYNOPSIS:
-plgcolbga(r, g, b, a)
+plgcolbga(r, g, b, alpha)
ARGUMENTS:
@@ -1571,7 +1802,8 @@
b (PLINT *, output) : Pointer to an unsigned 8-bit integer (0-255)
representing the degree of blue in the color.
- a (PLFLT *, output) : Pointer to PLFLT alpha value.
+ alpha (PLFLT *, output) : Pointer to PLFLT alpha transparency
+ value.
")
plgcolbga;
@@ -1711,6 +1943,30 @@
")
plgdiplt;
+%feature( "docstring", "Get drawing mode (depends on
+device support!)
+
+DESCRIPTION:
+
+ Get drawing mode. Note only one device driver (cairo) currently
+ supports this at the moment, and for that case the PLINT value
+ returned by this function is one of PL_DRAWMODE_DEFAULT,
+ PL_DRAWMODE_REPLACE, PL_DRAWMODE_XOR, or PL_DRAWMODE_UNKNOWN. This
+ function returns PL_DRAWMODE_UNKNOWN for the rest of the device
+ drivers. See also plsdrawmode.
+
+ Redacted form: plgdrawmode()
+
+ This function is used in example 34.
+
+
+
+SYNOPSIS:
+
+plgdrawmode()
+")
+plgdrawmode;
+
%feature( "docstring", "Get family file parameters
DESCRIPTION:
@@ -1718,7 +1974,7 @@
Gets information about current family file, if familying is enabled.
See the PLplot documentation for more information.
- Redacted form: plgfam(fam, num, bmax)
+ Redacted form: plgfam(p_fam, p_num, p_bmax)
This function is used in examples 14,31.
@@ -1726,18 +1982,18 @@
SYNOPSIS:
-plgfam(fam, num, bmax)
+plgfam(p_fam, p_num, p_bmax)
ARGUMENTS:
- fam (PLINT *, output) : Pointer to variable with the Boolean family
- flag value. If nonzero, familying is enabled.
+ p_fam (PLINT *, output) : Pointer to variable with the Boolean
+ family flag value. If nonzero, familying is enabled.
- num (PLINT *, output) : Pointer to variable with the current family
- file number.
+ p_num (PLINT *, output) : Pointer to variable with the current
+ family file number.
- bmax (PLINT *, output) : Pointer to variable with the maximum file
- size (in bytes) for a family file.
+ p_bmax (PLINT *, output) : Pointer to variable with the maximum
+ file size (in bytes) for a family file.
")
plgfam;
@@ -1748,7 +2004,7 @@
Gets information about the current font using the FCI approach. See
the PLplot documentation for more information.
- Redacted form: plgfci(fci)
+ Redacted form: plgfci(p_fci)
This function is used in example 23.
@@ -1756,11 +2012,11 @@
SYNOPSIS:
-plgfci(fci)
+plgfci(p_fci)
ARGUMENTS:
- fci (PLUNICODE *, output) : Pointer to PLUNICODE (unsigned 32-bit
+ p_fci (PLUNICODE *, output) : Pointer to PLUNICODE (unsigned 32-bit
integer) variable which is updated with current FCI value.
")
plgfci;
@@ -1862,7 +2118,7 @@
instance: screen drivers will usually interpret them as number of
pixels, whereas printer drivers will usually use mm.
- Redacted form: plgpage(xp, yp, xleng, yleng, xoff, yoff)
+ Redacted form: plgpage(p_xp, p_yp, p_xleng, p_yleng, p_xoff, p_yoff)
This function is used in examples 14 and 31.
@@ -1870,21 +2126,22 @@
SYNOPSIS:
-plgpage(xp, yp, xleng, yleng, xoff, yoff)
+plgpage(p_xp, p_yp, p_xleng, p_yleng, p_xoff, p_yoff)
ARGUMENTS:
- xp (PLFLT *, output) : Pointer to number of pixels/inch (DPI), x.
+ p_xp (PLFLT *, output) : Pointer to number of pixels/inch (DPI), x.
- yp (PLFLT *, output) : Pointer to number of pixels/inch (DPI) in y.
+ p_yp (PLFLT *, output) : Pointer to number of pixels/inch (DPI) in
+ y.
- xleng (PLINT *, output) : Pointer to x page length value.
+ p_xleng (PLINT *, output) : Pointer to x page length value.
- yleng (PLINT *, output) : Pointer to y page length value.
+ p_yleng (PLINT *, output) : Pointer to y page length value.
- xoff (PLINT *, output) : Pointer to x page offset.
+ p_xoff (PLINT *, output) : Pointer to x page offset.
- yoff (PLINT *, output) : Pointer to y page offset.
+ p_yoff (PLINT *, output) : Pointer to y page offset.
")
plgpage;
@@ -1948,10 +2205,10 @@
n (PLINT, input) : Number of vertices in polygon.
- x (PLFLT *, input) : Pointer to array with x coordinates of
+ x (const PLFLT *, input) : Pointer to array with x coordinates of
vertices.
- y (PLFLT *, input) : Pointer to array with y coordinates of
+ y (const PLFLT *, input) : Pointer to array with y coordinates of
vertices.
angle (PLFLT, input) : Angle (degrees) of gradient vector from x
@@ -1983,28 +2240,28 @@
SYNOPSIS:
-plggriddata(x, y, z, npts, xg, nptsx, yg, nptsy, zg, type, data)
+plgriddata(x, y, z, npts, xg, nptsx, yg, nptsy, zg, type, data)
ARGUMENTS:
- x (PLFLT *, input) : The input x array.
+ x (const PLFLT *, input) : The input x array.
- y (PLFLT *, input) : The input y array.
+ y (const PLFLT *, input) : The input y array.
- z (PLFLT *, input) : The input z array. Each triple x[i], y[i],
- z[i] represents one data sample coordinate.
+ z (const PLFLT *, input) : The input z array. Each triple x[i],
+ y[i], z[i] represents one data sample coordinate.
npts (PLINT, input) : The number of data samples in the x, y and z
arrays.
- xg (PLFLT *, input) : The input array that specifies the grid
+ xg (const PLFLT *, input) : The input array that specifies the grid
spacing in the x direction. Usually xg has nptsx equally spaced
values from the minimum to the maximum values of the x input
array.
nptsx (PLINT, input) : The number of points in the xg array.
- yg (PLFLT *, input) : The input array that specifies the grid
+ yg (const PLFLT *, input) : The input array that specifies the grid
spacing in the y direction. Similar to the xg parameter.
nptsy (PLINT, input) : The number of points in the yg array.
@@ -2036,7 +2293,11 @@
GRID_NNI, only weights greater than data will be accepted. If
0, all weights will be accepted.
")
+#ifdef SWIG_OCTAVE
+my_plgriddata;
+#else
plgriddata;
+#endif
%feature( "docstring", "Get current subpage parameters
@@ -2079,7 +2340,7 @@
Gets the number of the current output stream. See also plsstrm.
- Redacted form: plgstrm(strm)
+ Redacted form: plgstrm(p_strm)
This function is used in example 1,20.
@@ -2087,11 +2348,11 @@
SYNOPSIS:
-plgstrm(strm)
+plgstrm(p_strm)
ARGUMENTS:
- strm (PLINT *, output) : Pointer to current stream value.
+ p_strm (PLINT *, output) : Pointer to current stream value.
")
plgstrm;
@@ -2191,12 +2452,12 @@
DESCRIPTION:
- Returns current values of the digmax and digits flags for the x axis.
- digits is updated after the plot is drawn, so this routine should only
- be called after the call to plbox (or plbox3) is complete. See the
- PLplot documentation for more information.
+ Returns current values of the p_digmax and p_digits flags for the x
+ axis. p_digits is updated after the plot is drawn, so this routine
+ should only be called after the call to plbox (or plbox3) is complete.
+ See the PLplot documentation for more information.
- Redacted form: plgxax(digmax, digits)
+ Redacted form: plgxax(p_digmax, p_digits)
This function is used in example 31.
@@ -2204,16 +2465,16 @@
SYNOPSIS:
-plgxax(digmax, digits)
+plgxax(p_digmax, p_digits)
ARGUMENTS:
- digmax (PLINT *, output) : Pointer to variable with the maximum
+ p_digmax (PLINT *, output) : Pointer to variable with the maximum
number of digits for the x axis. If nonzero, the printed label
has been switched to a floating point representation when the
- number of digits exceeds digmax.
+ number of digits exceeds p_digmax.
- digits (PLINT *, output) : Pointer to variable with the actual
+ p_digits (PLINT *, output) : Pointer to variable with the actual
number of digits for the numeric labels (x axis) from the last
plot.
")
@@ -2226,7 +2487,7 @@
Identical to plgxax, except that arguments are flags for y axis. See
the description of plgxax for more detail.
- Redacted form: plgyax(digmax, digits)
+ Redacted form: plgyax(p_digmax, p_digits)
This function is used in example 31.
@@ -2234,16 +2495,16 @@
SYNOPSIS:
-plgyax(digmax, digits)
+plgyax(p_digmax, p_digits)
ARGUMENTS:
- digmax (PLINT *, output) : Pointer to variable with the maximum
+ p_digmax (PLINT *, output) : Pointer to variable with the maximum
number of digits for the y axis. If nonzero, the printed label
has been switched to a floating point representation when the
- number of digits exceeds digmax.
+ number of digits exceeds p_digmax.
- digits (PLINT *, output) : Pointer to variable with the actual
+ p_digits (PLINT *, output) : Pointer to variable with the actual
number of digits for the numeric labels (y axis) from the last
plot.
")
@@ -2256,7 +2517,7 @@
Identical to plgxax, except that arguments are flags for z axis. See
the description of plgxax for more detail.
- Redacted form: plgzax(digmax, digits)
+ Redacted form: plgzax(p_digmax, p_digits)
This function is used in example 31.
@@ -2264,16 +2525,16 @@
SYNOPSIS:
-plgzax(digmax, digits)
+plgzax(p_digmax, p_digits)
ARGUMENTS:
- digmax (PLINT *, output) : Pointer to variable with the maximum
+ p_digmax (PLINT *, output) : Pointer to variable with the maximum
number of digits for the z axis. If nonzero, the printed label
has been switched to a floating point representation when the
- number of digits exceeds digmax.
+ number of digits exceeds p_digmax.
- digits (PLINT *, output) : Pointer to variable with the actual
+ p_digits (PLINT *, output) : Pointer to variable with the actual
number of digits for the numeric labels (z axis) from the last
plot.
")
@@ -2304,8 +2565,8 @@
n (PLINT, input) : Number of data points.
- data (PLFLT *, input) : Pointer to array with values of the n data
- points.
+ data (const PLFLT *, input) : Pointer to array with values of the n
+ data points.
datmin (PLFLT, input) : Left-hand edge of lowest-valued bin.
@@ -2372,11 +2633,11 @@
")
plhlsrgb;
-%feature( "docstring", "Plot a 2D matrix using color map1
+%feature( "docstring", "Plot a 2D matrix using cmap1
DESCRIPTION:
- Plot a 2D matrix using color map1.
+ Plot a 2D matrix using cmap1.
Redacted form: General: plimagefr(idata, xmin, xmax, ymin, ymax,
zmin, zmax, valuemin, valuemax, pltr, pltr_data)
@@ -2392,8 +2653,8 @@
ARGUMENTS:
- idata (PLFLT**, input) : A 2D array of values (intensities) to
- plot. Should have dimensions idata[nx][ny].
+ idata (const PLFLT * const *, input) : A 2D array of values
+ (intensities) to plot. Should have dimensions idata[nx][ny].
nx, ny (PLINT, input) : Dimensions of idata
@@ -2428,9 +2689,13 @@
information to pltr0, pltr1, pltr2, or whatever routine is
externally supplied.
")
+#ifdef SWIG_OCTAVE
+my_plimagefr;
+#else
plimagefr;
+#endif
-%feature( "docstring", "Plot a 2D matrix using color map1 with automatic colour adjustment
+%feature( "docstring", "Plot a 2D matrix using cmap1 with automatic colour adjustment
DESCRIPTION:
@@ -2452,8 +2717,8 @@
ARGUMENTS:
- idata (PLFLT**, input) : A 2D array of values (intensities) to
- plot. Should have dimensions idata[nx][ny].
+ idata (const PLFLT * const *, input) : A 2D array of values
+ (intensities) to plot. Should have dimensions idata[nx][ny].
nx, ny (PLINT, input) : Dimensions of idata
@@ -2721,7 +2986,7 @@
text_colors (const PLINT *, input) : Array of nlegend cmap0 text
colors.
- text (const char *const *, input) : Array of nlegend text string
+ text (const char * const *, input) : Array of nlegend text string
annotations.
box_colors (const PLINT *, input) : Array of nlegend cmap0 colors
@@ -2764,7 +3029,7 @@
symbols to be drawn across the width of the plotted area (
PL_LEGEND_SYMBOL).
- symbols (const char *const *, input) : Array of nlegend symbols
+ symbols (const char * const *, input) : Array of nlegend symbols
(plpoin indices) (
PL_LEGEND_SYMBOL).
")
@@ -2816,9 +3081,11 @@
n (PLINT, input) : Number of points defining line.
- x (PLFLT *, input) : Pointer to array with x coordinates of points.
+ x (const PLFLT *, input) : Pointer to array with x coordinates of
+ points.
- y (PLFLT *, input) : Pointer to array with y coordinates of points.
+ y (const PLFLT *, input) : Pointer to array with y coordinates of
+ points.
")
plline;
@@ -2845,11 +3112,14 @@
n (PLINT, input) : Number of points defining line.
- x (PLFLT *, input) : Pointer to array with x coordinates of points.
+ x (const PLFLT *, input) : Pointer to array with x coordinates of
+ points.
- y (PLFLT *, input) : Pointer to array with y coordinates of points.
+ y (const PLFLT *, input) : Pointer to array with y coordinates of
+ points.
- z (PLFLT *, input) : Pointer to array with z coordinates of points.
+ z (const PLFLT *, input) : Pointer to array with z coordinates of
+ points.
")
plline3;
@@ -2860,7 +3130,7 @@
This sets the line style according to one of eight predefined patterns
(also see plstyl).
- Redacted form: pllsty(n)
+ Redacted form: pllsty(lin)
This function is used in examples 9,12,22,25.
@@ -2868,18 +3138,18 @@
SYNOPSIS:
-pllsty(n)
+pllsty(lin)
ARGUMENTS:
- n (PLINT, input) : Integer value between 1 and 8. Line style 1 is a
- continuous line, line style 2 is a line with short dashes and
+ lin (PLINT, input) : Integer value between 1 and 8. Line style 1 is
+ a continuous line, line style 2 is a line with short dashes and
gaps, line style 3 is a line with long dashes and gaps, line style
4 has long dashes and short gaps and so on.
")
pllsty;
-%feature( "docstring", "Plot continental outline in world coordinates.
+%feature( "docstring", "Plot continental outline in world coordinates
DESCRIPTION:
@@ -2912,8 +3182,8 @@
the corresponding plot coordinates. If no transform is desired,
mapform can be replaced by NULL.
- type (char *, input) : type is a character string. The value of
- this parameter determines the type of background. The possible
+ type (const char *, input) : type is a character string. The value
+ of this parameter determines the type of background. The possible
values are: \"globe\" -- continental outlines
\"usa\" -- USA and state boundaries
\"cglobe\" -- continental outlines and countries
@@ -2940,7 +3210,7 @@
")
plmap;
-%feature( "docstring", "Plot latitude and longitude lines.
+%feature( "docstring", "Plot latitude and longitude lines
DESCRIPTION:
@@ -3024,14 +3294,14 @@
ARGUMENTS:
- x (PLFLT *, input) : Pointer to set of x coordinate values at which
- the function is evaluated.
+ x (const PLFLT *, input) : Pointer to set of x coordinate values at
+ which the function is evaluated.
- y (PLFLT *, input) : Pointer to set of y coordinate values at which
- the function is evaluated.
+ y (const PLFLT *, input) : Pointer to set of y coordinate values at
+ which the function is evaluated.
- z (PLFLT **, input) : Pointer to a vectored two-dimensional array
- with set of function values.
+ z (const PLFLT * const *, input) : Pointer to a vectored
+ two-dimensional array with set of function values.
nx (PLINT, input) : Number of x values at which function is
evaluated.
@@ -3047,16 +3317,20 @@
opt=DRAW_LINEXY: Network of lines is drawn connecting points
at which function is defined.
")
+#ifdef SWIG_OCTAVE
+my_plmesh;
+#else
plmesh;
+#endif
-%feature( "docstring", "Magnitude colored plot surface mesh with contour.
+%feature( "docstring", "Magnitude colored plot surface mesh with contour
DESCRIPTION:
- Identical to plmesh but with extra functionalities: the surface mesh
- can be colored accordingly to the current z value being plotted, a
- contour plot can be drawn at the base XY plane, and a curtain can be
- drawn between the plotted function border and the base XY plane.
+ A more powerful form of plmesh: the surface mesh can be colored
+ accordingly to the current z value being plotted, a contour plot can
+ be drawn at the base XY plane, and a curtain can be drawn between the
+ plotted function border and the base XY plane.
Redacted form: plmeshc(x, y, z, opt, clevel)
@@ -3070,14 +3344,14 @@
ARGUMENTS:
- x (PLFLT *, input) : Pointer to set of x coordinate values at which
- the function is evaluated.
+ x (const PLFLT *, input) : Pointer to set of x coordinate values at
+ which the function is evaluated.
- y (PLFLT *, input) : Pointer to set of y coordinate values at which
- the function is evaluated.
+ y (const PLFLT *, input) : Pointer to set of y coordinate values at
+ which the function is evaluated.
- z (PLFLT **, input) : Pointer to a vectored two-dimensional array
- with set of function values.
+ z (const PLFLT * const *, input) : Pointer to a vectored
+ two-dimensional array with set of function values.
nx (PLINT, input) : Number of x values at which function is
evaluated.
@@ -3104,12 +3378,16 @@
the borders of the plotted function.
- clevel (PLFLT *, input) : Pointer to the array that defines the
- contour level spacing.
+ clevel (const PLFLT *, input) : Pointer to the array that defines
+ the contour level spacing.
nlevel (PLINT, input) : Number of elements in the clevel array.
")
+#ifdef SWIG_OCTAVE
+my_plmeshc;
+#else
plmeshc;
+#endif
%feature( "docstring", "Creates a new stream and makes it the default
@@ -3196,7 +3474,7 @@
")
plmtex;
-%feature( "docstring", "Write text relative to viewport boundaries in 3D plots.
+%feature( "docstring", "Write text relative to viewport boundaries in 3D plots
DESCRIPTION:
@@ -3280,14 +3558,14 @@
ARGUMENTS:
- x (PLFLT *, input) : Pointer to set of x coordinate values at which
- the function is evaluated.
+ x (const PLFLT *, input) : Pointer to set of x coordinate values at
+ which the function is evaluated.
- y (PLFLT *, input) : Pointer to set of y coordinate values at which
- the function is evaluated.
+ y (const PLFLT *, input) : Pointer to set of y coordinate values at
+ which the function is evaluated.
- z (PLFLT **, input) : Pointer to a vectored two-dimensional array
- with set of function values.
+ z (const PLFLT * const *, input) : Pointer to a vectored
+ two-dimensional array with set of function values.
nx (PLINT, input) : Number of x values at which function is
evaluated.
@@ -3308,19 +3586,25 @@
should be draw on the figure. If side is true sides are drawn,
otherwise no sides are drawn.
")
+#ifdef SWIG_OCTAVE
+my_plot3d;
+#else
plot3d;
+#endif
-%feature( "docstring", "Magnitude colored plot surface with contour.
+%feature( "docstring", "Magnitude colored plot surface with contour
DESCRIPTION:
- Identical to plot3d but with extra functionalities: the surface mesh
- can be colored accordingly to the current z value being plotted, a
- contour plot can be drawn at the base XY plane, and a curtain can be
+ Aside from dropping the
+ side functionality this is a more powerful form of plot3d: the surface
+ mesh can be colored accordingly to the current z value being plotted,
+ a contour plot can be drawn at the base XY plane, and a curtain can be
drawn between the plotted function border and the base XY plane. The
- arguments are identical to plmeshc. The only difference between
- plmeshc and plot3dc is that plmeshc draws the bottom side of the
- surface, while plot3dc only draws the surface as viewed from the top.
+ arguments are identical to those of plmeshc. The only difference
+ between plmeshc and plot3dc is that plmeshc draws the bottom side of
+ the surface, while plot3dc only draws the surface as viewed from the
+ top.
Redacted form: General: plot3dc(x, y, z, opt, clevel)
Perl/PDL: Not available?
@@ -3333,9 +3617,140 @@
SYNOPSIS:
plot3dc(x, y, z, nx, ny, opt, clevel, nlevel)
+
+ARGUMENTS:
+
+ x (const PLFLT *, input) : Pointer to set of x coordinate values at
+ which the function is evaluated.
+
+ y (const PLFLT *, input) : Pointer to set of y coordinate values at
+ which the function is evaluated.
+
+ z (const PLFLT * const *, input) : Pointer to a vectored
+ two-dimensional array with set of function values.
+
+ nx (PLINT, input) : Number of x values at which function is
+ evaluated.
+
+ ny (PLINT, input) : Number of y values at which function is
+ evaluated.
+
+ opt (PLINT, input) : Determines the way in which the surface is
+ represented. To specify more than one option just add the options,
+ e.g. DRAW_LINEXY + MAG_COLOR opt=DRAW_LINEX: Lines are drawn
+ showing z as a function of x for each value of y[j].
+ opt=DRAW_LINEY: Lines are drawn showing z as a function of y
+ for each value of x[i].
+ opt=DRAW_LINEXY: Network of lines is drawn connecting points
+ at which function is defined.
+ opt=MAG_COLOR: Each line in the mesh is colored according to
+ the z value being plotted. The color is used from the current
+ color map 1.
+ opt=BASE_CONT: A contour plot is drawn at the base XY plane
+ using parameters
+ nlevel and
+ clevel.
+ opt=DRAW_SIDES: draws a curtain between the base XY plane and
+ the borders of the plotted function.
+
+
+ clevel (const PLFLT *, input) : Pointer to the array that defines
+ the contour level spacing.
+
+ nlevel (PLINT, input) : Number of elements in the clevel array.
")
+#ifdef SWIG_OCTAVE
+my_plot3dc;
+#else
plot3dc;
+#endif
+%feature( "docstring", "Magnitude colored plot surface with contour for z[x][y] with y index limits
+
+DESCRIPTION:
+
+ When the implementation is completed this variant of plot3dc (see that
+ function's documentation for more details) should be suitable for the
+ case where the area of the x, y coordinate grid where z is defined can
+ be non-rectangular. The implementation is incomplete so the last 4
+ parameters of plot3dcl; indexxmin, indexxmax, indexymin, and
+ indexymax; are currently ignored and the functionality is otherwise
+ identical to that of plot3dc.
+
+ Redacted form: General: plot3dcl(x, y, z, opt, clevel, indexxmin,
+ indexymin, indexymax)
+ Perl/PDL: Not available?
+
+
+ This function is not used in any example.
+
+
+
+SYNOPSIS:
+
+plot3dcl(x, y, z, nx, ny, opt, clevel, nlevel, indexxmin, indexxmax, indexymin, indexymax)
+
+ARGUMENTS:
+
+ x (const PLFLT *, input) : Pointer to set of x coordinate values at
+ which the function is evaluated.
+
+ y (const PLFLT *, input) : Pointer to set of y coordinate values at
+ which the function is evaluated.
+
+ z (const PLFLT * const *, input) : Pointer to a vectored
+ two-dimensional array with set of function values.
+
+ nx (PLINT, input) : Number of x values at which the function is
+ evaluated.
+
+ ny (PLINT, input) : Number of y values at which the function is
+ evaluated.
+
+ opt (PLINT, input) : Determines the way in which the surface is
+ represented. To specify more than one option just add the options,
+ e.g. DRAW_LINEXY + MAG_COLOR opt=DRAW_LINEX: Lines are drawn
+ showing z as a function of x for each value of y[j].
+ opt=DRAW_LINEY: Lines are drawn showing z as a function of y
+ for each value of x[i].
+ opt=DRAW_LINEXY: Network of lines is drawn connecting points
+ at which function is defined.
+ opt=MAG_COLOR: Each line in the mesh is colored according to
+ the z value being plotted. The color is used from the current
+ color map 1.
+ opt=BASE_CONT: A contour plot is drawn at the base XY plane
+ using parameters
+ nlevel and
+ clevel.
+ opt=DRAW_SIDES: draws a curtain between the base XY plane and
+ the borders of the plotted function.
+
+
+ clevel (const PLFLT *, input) : Pointer to the array that defines
+ the contour level spacing.
+
+ nlevel (PLINT, input) : Number of elements in the clevel array.
+
+ indexxmin (PLINT, input) : The index value (which must be ≥ 0) that
+ corresponds to the first x index where z is defined.
+
+ indexxmax (PLINT, input) : The index value (which must be ≤ nx)
+ which corresponds (by convention) to one more than the last x
+ index value where z is defined.
+
+ indexymin (const PLINT *, input) : Array of y index values which
+ all must be ≥ 0. These values are the first y index where z is
+ defined for a particular x index in the range from indexxmin to
+ indexxmax - 1. The dimension of indexymin is indexxmax.
+
+ indexymax (const PLINT *, input) : Array of y index values which
+ all must be ≤ ny. These values correspond (by convention) to one
+ more than the last y index where z is defined for a particular x
+ index in the range from indexxmin to indexxmax - 1. The dimension
+ of indexymax is indexxmax.
+")
+plot3dcl;
+
%feature( "docstring", "Parse command-line arguments
DESCRIPTION:
@@ -3381,7 +3796,7 @@
p_argc (int *, input) : pointer to number of arguments.
- argv (char **, input) : Pointer to character array containing
+ argv (const char **, input) : Pointer to character array containing
*p_argc command-line arguments.
mode (PLINT, input) : Parsing mode with the following
@@ -3430,17 +3845,17 @@
nlin (PLINT, input) : Number of sets of lines making up the
pattern, either 1 or 2.
- inc (PLINT *, input) : Pointer to array with nlin elements.
+ inc (const PLINT *, input) : Pointer to array with nlin elements.
Specifies the line inclination in tenths of a degree. (Should be
between -900 and 900).
- del (PLINT *, input) : Pointer to array with nlin elements.
+ del (const PLINT *, input) : Pointer to array with nlin elements.
Specifies the spacing in micrometers between the lines making up
the pattern.
")
plpat;
-%feature( "docstring", "Draw a line between two points, accounting for coordinate transforms.
+%feature( "docstring", "Draw a line between two points, accounting for coordinate transforms
DESCRIPTION:
@@ -3505,11 +3920,11 @@
n (PLINT, input) : Number of points in the x and y arrays.
- x (PLFLT *, input) : Pointer to an array with X coordinates of
- points.
+ x (const PLFLT *, input) : Pointer to an array with X coordinates
+ of points.
- y (PLFLT *, input) : Pointer to an array with Y coordinates of
- points.
+ y (const PLFLT *, input) : Pointer to an array with Y coordinates
+ of points.
code (PLINT, input) : Hershey symbol code (in \"ascii-indexed\" form
with -1 <= code <= 127) corresponding to a glyph to be plotted at
@@ -3547,14 +3962,14 @@
n (PLINT, input) : Number of points in the x and y arrays.
- x (PLFLT *, input) : Pointer to an array with X coordinates of
- points.
+ x (const PLFLT *, input) : Pointer to an array with X coordinates
+ of points.
- y (PLFLT *, input) : Pointer to an array with Y coordinates of
- points.
+ y (const PLFLT *, input) : Pointer to an array with Y coordinates
+ of points.
- z (PLFLT *, input) : Pointer to an array with Z coordinates of
- points.
+ z (const PLFLT *, input) : Pointer to an array with Z coordinates
+ of points.
code (PLINT, input) : Hershey symbol code (in \"ascii-indexed\" form
with -1 <= code <= 127) corresponding to a glyph to be plotted at
@@ -3600,15 +4015,18 @@
n (PLINT, input) : Number of points defining line.
- x (PLFLT *, input) : Pointer to array with x coordinates of points.
+ x (const PLFLT *, input) : Pointer to array with x coordinates of
+ points.
- y (PLFLT *, input) : Pointer to array with y coordinates of points.
+ y (const PLFLT *, input) : Pointer to array with y coordinates of
+ points.
- z (PLFLT *, input) : Pointer to array with z coordinates of points.
+ z (const PLFLT *, input) : Pointer to array with z coordinates of
+ points.
- draw (PLBOOL *, input) : Pointer to array which controls drawing
- the segments of the polygon. If draw[i] is true, then the polygon
- segment from index [i] to [i+1] is drawn, otherwise, not.
+ draw (const PLBOOL *, input) : Pointer to array which controls
+ drawing the segments of the polygon. If draw[i] is true, then the
+ polygon segment from index [i] to [i+1] is drawn, otherwise, not.
ifcc (PLBOOL, input) : If ifcc is true the directionality of the
polygon is determined by assuming the points are laid out in a
@@ -3624,7 +4042,7 @@
Sets the number of places after the decimal point in numeric labels.
- Redacted form: plprec(set, prec)
+ Redacted form: plprec(setp, prec)
This function is used in example 29.
@@ -3632,14 +4050,14 @@
SYNOPSIS:
-plprec(set, prec)
+plprec(setp, prec)
ARGUMENTS:
- set (PLINT, input) : If set is equal to 0 then PLplot automatically
- determines the number of places to use after the decimal point in
- numeric labels (like those used to label axes). If set is 1 then
- prec se...
[truncated message content] |
|
From: <ai...@us...> - 2014-03-04 17:52:04
|
Revision: 13034
http://sourceforge.net/p/plplot/code/13034
Author: airwin
Date: 2014-03-04 17:52:01 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
Fix parentheses error introduced by last commit.
Modified Paths:
--------------
trunk/examples/octave/x28c.m
Modified: trunk/examples/octave/x28c.m
===================================================================
--- trunk/examples/octave/x28c.m 2014-03-04 10:02:23 UTC (rev 13033)
+++ trunk/examples/octave/x28c.m 2014-03-04 17:52:01 UTC (rev 13034)
@@ -285,7 +285,7 @@
y_shear = 0.5*yrange*cos_omega;
x_shear = 0.5*xrange*sin_omega;
ys = ysmax-dysshear*i;
- plptex3
+ plptex3(
xmid, ys, zmin,
x_inclination, y_inclination, z_inclination,
x_shear, y_shear, z_shear,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phi...@us...> - 2014-03-04 10:02:25
|
Revision: 13033
http://sourceforge.net/p/plplot/code/13033
Author: philrosenberg
Date: 2014-03-04 10:02:23 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
New findwxWidgets module taken from nightly build of CMake. This provides support for wxWidgets 2.9 and 3.0. It also attempts to get the selection of 32 and 64 bit libraries correct by checking CMAKE_CL_64, however, for me this doesn't work. I have added a check for generators ending Win64 which gives correct selection for visual studio, but currently the NMake genrator always gets the 32 bit version. I'm awaiting feedback from CMake devs.
Added Paths:
-----------
trunk/cmake/modules/FindwxWidgets.cmake
Added: trunk/cmake/modules/FindwxWidgets.cmake
===================================================================
--- trunk/cmake/modules/FindwxWidgets.cmake (rev 0)
+++ trunk/cmake/modules/FindwxWidgets.cmake 2014-03-04 10:02:23 UTC (rev 13033)
@@ -0,0 +1,1089 @@
+#.rst:
+# FindwxWidgets
+# -------------
+#
+# Find a wxWidgets (a.k.a., wxWindows) installation.
+#
+# This module finds if wxWidgets is installed and selects a default
+# configuration to use. wxWidgets is a modular library. To specify the
+# modules that you will use, you need to name them as components to the
+# package:
+#
+# find_package(wxWidgets COMPONENTS core base ...)
+#
+# There are two search branches: a windows style and a unix style. For
+# windows, the following variables are searched for and set to defaults
+# in case of multiple choices. Change them if the defaults are not
+# desired (i.e., these are the only variables you should change to
+# select a configuration):
+#
+# ::
+#
+# wxWidgets_ROOT_DIR - Base wxWidgets directory
+# (e.g., C:/wxWidgets-2.6.3).
+# wxWidgets_LIB_DIR - Path to wxWidgets libraries
+# (e.g., C:/wxWidgets-2.6.3/lib/vc_lib).
+# wxWidgets_CONFIGURATION - Configuration to use
+# (e.g., msw, mswd, mswu, mswunivud, etc.)
+# wxWidgets_EXCLUDE_COMMON_LIBRARIES
+# - Set to TRUE to exclude linking of
+# commonly required libs (e.g., png tiff
+# jpeg zlib regex expat).
+#
+#
+#
+# For unix style it uses the wx-config utility. You can select between
+# debug/release, unicode/ansi, universal/non-universal, and
+# static/shared in the QtDialog or ccmake interfaces by turning ON/OFF
+# the following variables:
+#
+# ::
+#
+# wxWidgets_USE_DEBUG
+# wxWidgets_USE_UNICODE
+# wxWidgets_USE_UNIVERSAL
+# wxWidgets_USE_STATIC
+#
+#
+#
+# There is also a wxWidgets_CONFIG_OPTIONS variable for all other
+# options that need to be passed to the wx-config utility. For example,
+# to use the base toolkit found in the /usr/local path, set the variable
+# (before calling the FIND_PACKAGE command) as such:
+#
+# ::
+#
+# set(wxWidgets_CONFIG_OPTIONS --toolkit=base --prefix=/usr)
+#
+#
+#
+# The following are set after the configuration is done for both windows
+# and unix style:
+#
+# ::
+#
+# wxWidgets_FOUND - Set to TRUE if wxWidgets was found.
+# wxWidgets_INCLUDE_DIRS - Include directories for WIN32
+# i.e., where to find "wx/wx.h" and
+# "wx/setup.h"; possibly empty for unices.
+# wxWidgets_LIBRARIES - Path to the wxWidgets libraries.
+# wxWidgets_LIBRARY_DIRS - compile time link dirs, useful for
+# rpath on UNIX. Typically an empty string
+# in WIN32 environment.
+# wxWidgets_DEFINITIONS - Contains defines required to compile/link
+# against WX, e.g. WXUSINGDLL
+# wxWidgets_DEFINITIONS_DEBUG- Contains defines required to compile/link
+# against WX debug builds, e.g. __WXDEBUG__
+# wxWidgets_CXX_FLAGS - Include dirs and compiler flags for
+# unices, empty on WIN32. Essentially
+# "`wx-config --cxxflags`".
+# wxWidgets_USE_FILE - Convenience include file.
+#
+#
+#
+# Sample usage:
+#
+# ::
+#
+# # Note that for MinGW users the order of libs is important!
+# find_package(wxWidgets COMPONENTS net gl core base)
+# if(wxWidgets_FOUND)
+# include(${wxWidgets_USE_FILE})
+# # and for each of your dependent executable/library targets:
+# target_link_libraries(<YourTarget> ${wxWidgets_LIBRARIES})
+# endif()
+#
+#
+#
+# If wxWidgets is required (i.e., not an optional part):
+#
+# ::
+#
+# find_package(wxWidgets REQUIRED net gl core base)
+# include(${wxWidgets_USE_FILE})
+# # and for each of your dependent executable/library targets:
+# target_link_libraries(<YourTarget> ${wxWidgets_LIBRARIES})
+
+#=============================================================================
+# Copyright 2004-2009 Kitware, Inc.
+# Copyright 2007-2009 Miguel A. Figueroa-Villanueva <miguelf at ieee dot org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+#
+# FIXME: check this and provide a correct sample usage...
+# Remember to connect back to the upper text.
+# Sample usage with monolithic wx build:
+#
+# find_package(wxWidgets COMPONENTS mono)
+# ...
+
+# NOTES
+#
+# This module has been tested on the WIN32 platform with wxWidgets
+# 2.6.2, 2.6.3, and 2.5.3. However, it has been designed to
+# easily extend support to all possible builds, e.g., static/shared,
+# debug/release, unicode, universal, multilib/monolithic, etc..
+#
+# If you want to use the module and your build type is not supported
+# out-of-the-box, please contact me to exchange information on how
+# your system is setup and I'll try to add support for it.
+#
+# AUTHOR
+#
+# Miguel A. Figueroa-Villanueva (miguelf at ieee dot org).
+# Jan Woetzel (jw at mip.informatik.uni-kiel.de).
+#
+# Based on previous works of:
+# Jan Woetzel (FindwxWindows.cmake),
+# Jorgen Bodde and Jerry Fath (FindwxWin.cmake).
+
+# TODO/ideas
+#
+# (1) Option/Setting to use all available wx libs
+# In contrast to expert developer who lists the
+# minimal set of required libs in wxWidgets_USE_LIBS
+# there is the newbie user:
+# - who just wants to link against WX with more 'magic'
+# - doesn't know the internal structure of WX or how it was built,
+# in particular if it is monolithic or not
+# - want to link against all available WX libs
+# Basically, the intent here is to mimic what wx-config would do by
+# default (i.e., `wx-config --libs`).
+#
+# Possible solution:
+# Add a reserved keyword "std" that initializes to what wx-config
+# would default to. If the user has not set the wxWidgets_USE_LIBS,
+# default to "std" instead of "base core" as it is now. To implement
+# "std" will basically boil down to a FOR_EACH lib-FOUND, but maybe
+# checking whether a minimal set was found.
+
+
+# FIXME: This and all the DBG_MSG calls should be removed after the
+# module stabilizes.
+#
+# Helper macro to control the debugging output globally. There are
+# two versions for controlling how verbose your output should be.
+macro(DBG_MSG _MSG)
+# message(STATUS
+# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
+endmacro()
+macro(DBG_MSG_V _MSG)
+# message(STATUS
+# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
+endmacro()
+
+# Clear return values in case the module is loaded more than once.
+set(wxWidgets_FOUND FALSE)
+set(wxWidgets_INCLUDE_DIRS "")
+set(wxWidgets_LIBRARIES "")
+set(wxWidgets_LIBRARY_DIRS "")
+set(wxWidgets_CXX_FLAGS "")
+
+# Using SYSTEM with INCLUDE_DIRECTORIES in conjunction with wxWidgets on
+# the Mac produces compiler errors. Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM
+# to prevent UsewxWidgets.cmake from using SYSTEM.
+#
+# See cmake mailing list discussions for more info:
+# http://www.cmake.org/pipermail/cmake/2008-April/021115.html
+# http://www.cmake.org/pipermail/cmake/2008-April/021146.html
+#
+if(APPLE OR CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD")
+ set(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
+endif()
+
+# DEPRECATED: This is a patch to support the DEPRECATED use of
+# wxWidgets_USE_LIBS.
+#
+# If wxWidgets_USE_LIBS is set:
+# - if using <components>, then override wxWidgets_USE_LIBS
+# - else set wxWidgets_FIND_COMPONENTS to wxWidgets_USE_LIBS
+if(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS)
+ set(wxWidgets_FIND_COMPONENTS ${wxWidgets_USE_LIBS})
+endif()
+DBG_MSG("wxWidgets_FIND_COMPONENTS : ${wxWidgets_FIND_COMPONENTS}")
+
+# Add the convenience use file if available.
+#
+# Get dir of this file which may reside in:
+# - CMAKE_MAKE_ROOT/Modules on CMake installation
+# - CMAKE_MODULE_PATH if user prefers his own specialized version
+set(wxWidgets_USE_FILE "")
+get_filename_component(
+ wxWidgets_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+# Prefer an existing customized version, but the user might override
+# the FindwxWidgets module and not the UsewxWidgets one.
+if(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+ set(wxWidgets_USE_FILE
+ "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
+else()
+ set(wxWidgets_USE_FILE UsewxWidgets)
+endif()
+
+#=====================================================================
+#=====================================================================
+if(WIN32 AND NOT CYGWIN AND NOT MSYS)
+ set(wxWidgets_FIND_STYLE "win32")
+else()
+ if(UNIX OR MSYS)
+ set(wxWidgets_FIND_STYLE "unix")
+ endif()
+endif()
+
+#=====================================================================
+# WIN32_FIND_STYLE
+#=====================================================================
+if(wxWidgets_FIND_STYLE STREQUAL "win32")
+ # Useful common wx libs needed by almost all components.
+ set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
+
+ # DEPRECATED: Use find_package(wxWidgets COMPONENTS mono) instead.
+ if(NOT wxWidgets_FIND_COMPONENTS)
+ if(wxWidgets_USE_MONOLITHIC)
+ set(wxWidgets_FIND_COMPONENTS mono)
+ else()
+ set(wxWidgets_FIND_COMPONENTS core base) # this is default
+ endif()
+ endif()
+
+ # Add the common (usually required libs) unless
+ # wxWidgets_EXCLUDE_COMMON_LIBRARIES has been set.
+ if(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
+ list(APPEND wxWidgets_FIND_COMPONENTS
+ ${wxWidgets_COMMON_LIBRARIES})
+ endif()
+
+ #-------------------------------------------------------------------
+ # WIN32: Helper MACROS
+ #-------------------------------------------------------------------
+ #
+ # Get filename components for a configuration. For example,
+ # if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d
+ # if _CONFIGURATION = mswu, then _UNV="", _UCD=u _DBG=""
+ #
+ macro(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG)
+ string(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}")
+ string(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}")
+ if(${_UCD} STREQUAL ${_CONFIGURATION})
+ set(${_UCD} "")
+ endif()
+ string(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}")
+ endmacro()
+
+ #
+ # Find libraries associated to a configuration.
+ #
+ macro(WX_FIND_LIBS _UNV _UCD _DBG)
+ DBG_MSG_V("m_unv = ${_UNV}")
+ DBG_MSG_V("m_ucd = ${_UCD}")
+ DBG_MSG_V("m_dbg = ${_DBG}")
+
+ # FIXME: What if both regex libs are available. regex should be
+ # found outside the loop and only wx${LIB}${_UCD}${_DBG}.
+ # Find wxWidgets common libraries.
+ foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
+ find_library(WX_${LIB}${_DBG}
+ NAMES
+ wx${LIB}${_UCD}${_DBG} # for regex
+ wx${LIB}${_DBG}
+ PATHS ${WX_LIB_DIR}
+ NO_DEFAULT_PATH
+ )
+ mark_as_advanced(WX_${LIB}${_DBG})
+ endforeach()
+
+ # Find wxWidgets multilib base libraries.
+ find_library(WX_base${_DBG}
+ NAMES
+ wxbase30${_UCD}${_DBG}
+ wxbase29${_UCD}${_DBG}
+ wxbase28${_UCD}${_DBG}
+ wxbase27${_UCD}${_DBG}
+ wxbase26${_UCD}${_DBG}
+ wxbase25${_UCD}${_DBG}
+ PATHS ${WX_LIB_DIR}
+ NO_DEFAULT_PATH
+ )
+ mark_as_advanced(WX_base${_DBG})
+ foreach(LIB net odbc xml)
+ find_library(WX_${LIB}${_DBG}
+ NAMES
+ wxbase30${_UCD}${_DBG}_${LIB}
+ wxbase29${_UCD}${_DBG}_${LIB}
+ wxbase28${_UCD}${_DBG}_${LIB}
+ wxbase27${_UCD}${_DBG}_${LIB}
+ wxbase26${_UCD}${_DBG}_${LIB}
+ wxbase25${_UCD}${_DBG}_${LIB}
+ PATHS ${WX_LIB_DIR}
+ NO_DEFAULT_PATH
+ )
+ mark_as_advanced(WX_${LIB}${_DBG})
+ endforeach()
+
+ # Find wxWidgets monolithic library.
+ find_library(WX_mono${_DBG}
+ NAMES
+ wxmsw${_UNV}30${_UCD}${_DBG}
+ wxmsw${_UNV}29${_UCD}${_DBG}
+ wxmsw${_UNV}28${_UCD}${_DBG}
+ wxmsw${_UNV}27${_UCD}${_DBG}
+ wxmsw${_UNV}26${_UCD}${_DBG}
+ wxmsw${_UNV}25${_UCD}${_DBG}
+ PATHS ${WX_LIB_DIR}
+ NO_DEFAULT_PATH
+ )
+ mark_as_advanced(WX_mono${_DBG})
+
+ # Find wxWidgets multilib libraries.
+ foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
+ stc ribbon propgrid webview)
+ find_library(WX_${LIB}${_DBG}
+ NAMES
+ wxmsw${_UNV}30${_UCD}${_DBG}_${LIB}
+ wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}
+ wxmsw${_UNV}28${_UCD}${_DBG}_${LIB}
+ wxmsw${_UNV}27${_UCD}${_DBG}_${LIB}
+ wxmsw${_UNV}26${_UCD}${_DBG}_${LIB}
+ wxmsw${_UNV}25${_UCD}${_DBG}_${LIB}
+ PATHS ${WX_LIB_DIR}
+ NO_DEFAULT_PATH
+ )
+ mark_as_advanced(WX_${LIB}${_DBG})
+ endforeach()
+ endmacro()
+
+ #
+ # Clear all library paths, so that FIND_LIBRARY refinds them.
+ #
+ # Clear a lib, reset its found flag, and mark as advanced.
+ macro(WX_CLEAR_LIB _LIB)
+ set(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE)
+ set(${_LIB}_FOUND FALSE)
+ mark_as_advanced(${_LIB})
+ endmacro()
+ # Clear all debug or release library paths (arguments are "d" or "").
+ macro(WX_CLEAR_ALL_LIBS _DBG)
+ # Clear wxWidgets common libraries.
+ foreach(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
+ WX_CLEAR_LIB(WX_${LIB}${_DBG})
+ endforeach()
+
+ # Clear wxWidgets multilib base libraries.
+ WX_CLEAR_LIB(WX_base${_DBG})
+ foreach(LIB net odbc xml)
+ WX_CLEAR_LIB(WX_${LIB}${_DBG})
+ endforeach()
+
+ # Clear wxWidgets monolithic library.
+ WX_CLEAR_LIB(WX_mono${_DBG})
+
+ # Clear wxWidgets multilib libraries.
+ foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
+ stc ribbon propgrid)
+ WX_CLEAR_LIB(WX_${LIB}${_DBG})
+ endforeach()
+ endmacro()
+ # Clear all wxWidgets debug libraries.
+ macro(WX_CLEAR_ALL_DBG_LIBS)
+ WX_CLEAR_ALL_LIBS("d")
+ endmacro()
+ # Clear all wxWidgets release libraries.
+ macro(WX_CLEAR_ALL_REL_LIBS)
+ WX_CLEAR_ALL_LIBS("")
+ endmacro()
+
+ #
+ # Set the wxWidgets_LIBRARIES variable.
+ # Also, Sets output variable wxWidgets_FOUND to FALSE if it fails.
+ #
+ macro(WX_SET_LIBRARIES _LIBS _DBG)
+ DBG_MSG_V("Looking for ${${_LIBS}}")
+ if(WX_USE_REL_AND_DBG)
+ foreach(LIB ${${_LIBS}})
+ DBG_MSG_V("Searching for ${LIB} and ${LIB}d")
+ DBG_MSG_V("WX_${LIB} : ${WX_${LIB}}")
+ DBG_MSG_V("WX_${LIB}d : ${WX_${LIB}d}")
+ if(WX_${LIB} AND WX_${LIB}d)
+ DBG_MSG_V("Found ${LIB} and ${LIB}d")
+ list(APPEND wxWidgets_LIBRARIES
+ debug ${WX_${LIB}d} optimized ${WX_${LIB}}
+ )
+ else()
+ DBG_MSG_V("- not found due to missing WX_${LIB}=${WX_${LIB}} or WX_${LIB}d=${WX_${LIB}d}")
+ set(wxWidgets_FOUND FALSE)
+ endif()
+ endforeach()
+ else()
+ foreach(LIB ${${_LIBS}})
+ DBG_MSG_V("Searching for ${LIB}${_DBG}")
+ DBG_MSG_V("WX_${LIB}${_DBG} : ${WX_${LIB}${_DBG}}")
+ if(WX_${LIB}${_DBG})
+ DBG_MSG_V("Found ${LIB}${_DBG}")
+ list(APPEND wxWidgets_LIBRARIES ${WX_${LIB}${_DBG}})
+ else()
+ DBG_MSG_V(
+ "- not found due to missing WX_${LIB}${_DBG}=${WX_${LIB}${_DBG}}")
+ set(wxWidgets_FOUND FALSE)
+ endif()
+ endforeach()
+ endif()
+
+ DBG_MSG_V("OpenGL")
+ list(FIND ${_LIBS} gl WX_USE_GL)
+ if(NOT WX_USE_GL EQUAL -1)
+ DBG_MSG_V("- is required.")
+ list(APPEND wxWidgets_LIBRARIES opengl32 glu32)
+ endif()
+
+ list(APPEND wxWidgets_LIBRARIES winmm comctl32 rpcrt4 wsock32)
+ endmacro()
+
+ #-------------------------------------------------------------------
+ # WIN32: Start actual work.
+ #-------------------------------------------------------------------
+
+ # Look for an installation tree.
+ find_path(wxWidgets_ROOT_DIR
+ NAMES include/wx/wx.h
+ PATHS
+ ENV wxWidgets_ROOT_DIR
+ ENV WXWIN
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]" # WX 2.6.x
+ C:/
+ D:/
+ ENV ProgramFiles
+ PATH_SUFFIXES
+ wxWidgets-3.0.0
+ wxWidgets-2.9.5
+ wxWidgets-2.9.4
+ wxWidgets-2.9.3
+ wxWidgets-2.9.2
+ wxWidgets-2.9.1
+ wxWidgets-2.9.0
+ wxWidgets-2.8.9
+ wxWidgets-2.8.8
+ wxWidgets-2.8.7
+ wxWidgets-2.8.6
+ wxWidgets-2.8.5
+ wxWidgets-2.8.4
+ wxWidgets-2.8.3
+ wxWidgets-2.8.2
+ wxWidgets-2.8.1
+ wxWidgets-2.8.0
+ wxWidgets-2.7.4
+ wxWidgets-2.7.3
+ wxWidgets-2.7.2
+ wxWidgets-2.7.1
+ wxWidgets-2.7.0
+ wxWidgets-2.7.0-1
+ wxWidgets-2.6.4
+ wxWidgets-2.6.3
+ wxWidgets-2.6.2
+ wxWidgets-2.6.1
+ wxWidgets-2.5.4
+ wxWidgets-2.5.3
+ wxWidgets-2.5.2
+ wxWidgets-2.5.1
+ wxWidgets
+ DOC "wxWidgets base/installation directory"
+ )
+
+ # If wxWidgets_ROOT_DIR changed, clear lib dir.
+ if(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
+ set(WX_ROOT_DIR ${wxWidgets_ROOT_DIR}
+ CACHE INTERNAL "wxWidgets_ROOT_DIR")
+ set(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND"
+ CACHE PATH "Cleared." FORCE)
+ endif()
+ #include(CMakeDetermineCCompiler)
+ #message(STATUS "CMAKE_CROSSCOMPILING = ${CMAKE_CROSSCOMPILING}")
+ #message(STATUS "CMAKE_C_COMPILER = ${CMAKE_C_COMPILER}")
+ #message(STATUS "MSVC_C_ARCHITECTURE_ID = ${MSVC_C_ARCHITECTURE_ID}")
+ #message(STATUS "MSVC_CXX_ARCHITECTURE_ID = ${MSVC_CXX_ARCHITECTURE_ID}")
+ #message(STATUS "CMAKE_CL_64 = ${CMAKE_CL_64}")
+ if(WX_ROOT_DIR)
+ # Select one default tree inside the already determined wx tree.
+ # Prefer static/shared order usually consistent with build
+ # settings.
+ if(MINGW)
+ set(WX_LIB_DIR_PREFIX gcc)
+ #Check for use of 64 bit NMake Makefile generator or a Visual Studio XX Win64 generator
+ elseif(CMAKE_CL_64 OR ${CMAKE_GENERATOR} MATCHES "Win64$")
+ set(WX_LIB_DIR_PREFIX vc_x64)
+ else()
+ set(WX_LIB_DIR_PREFIX vc)
+ endif()
+ if(BUILD_SHARED_LIBS)
+ find_path(wxWidgets_LIB_DIR
+ NAMES
+ msw/wx/setup.h
+ mswd/wx/setup.h
+ mswu/wx/setup.h
+ mswud/wx/setup.h
+ mswuniv/wx/setup.h
+ mswunivd/wx/setup.h
+ mswunivu/wx/setup.h
+ mswunivud/wx/setup.h
+ PATHS
+ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared
+ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib
+ DOC "Path to wxWidgets libraries"
+ NO_DEFAULT_PATH
+ )
+ else()
+ find_path(wxWidgets_LIB_DIR
+ NAMES
+ msw/wx/setup.h
+ mswd/wx/setup.h
+ mswu/wx/setup.h
+ mswud/wx/setup.h
+ mswuniv/wx/setup.h
+ mswunivd/wx/setup.h
+ mswunivu/wx/setup.h
+ mswunivud/wx/setup.h
+ PATHS
+ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static
+ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll
+ DOC "Path to wxWidgets libraries"
+ NO_DEFAULT_PATH
+ )
+ endif()
+
+ # If wxWidgets_LIB_DIR changed, clear all libraries.
+ if(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR)
+ set(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR")
+ WX_CLEAR_ALL_DBG_LIBS()
+ WX_CLEAR_ALL_REL_LIBS()
+ endif()
+
+ if(WX_LIB_DIR)
+ # If building shared libs, define WXUSINGDLL to use dllimport.
+ if(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
+ set(wxWidgets_DEFINITIONS WXUSINGDLL)
+ DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}")
+ endif()
+
+ # Search for available configuration types.
+ foreach(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw)
+ set(WX_${CFG}_FOUND FALSE)
+ if(EXISTS ${WX_LIB_DIR}/${CFG})
+ list(APPEND WX_CONFIGURATION_LIST ${CFG})
+ set(WX_${CFG}_FOUND TRUE)
+ set(WX_CONFIGURATION ${CFG})
+ endif()
+ endforeach()
+ DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}")
+
+ if(WX_CONFIGURATION)
+ set(wxWidgets_FOUND TRUE)
+
+ # If the selected configuration wasn't found force the default
+ # one. Otherwise, use it but still force a refresh for
+ # updating the doc string with the current list of available
+ # configurations.
+ if(NOT WX_${wxWidgets_CONFIGURATION}_FOUND)
+ set(wxWidgets_CONFIGURATION ${WX_CONFIGURATION} CACHE STRING
+ "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
+ else()
+ set(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION} CACHE STRING
+ "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE)
+ endif()
+
+ # If release config selected, and both release/debug exist.
+ if(WX_${wxWidgets_CONFIGURATION}d_FOUND)
+ option(wxWidgets_USE_REL_AND_DBG
+ "Use release and debug configurations?" TRUE)
+ set(WX_USE_REL_AND_DBG ${wxWidgets_USE_REL_AND_DBG})
+ else()
+ # If the option exists (already in cache), force it false.
+ if(wxWidgets_USE_REL_AND_DBG)
+ set(wxWidgets_USE_REL_AND_DBG FALSE CACHE BOOL
+ "No ${wxWidgets_CONFIGURATION}d found." FORCE)
+ endif()
+ set(WX_USE_REL_AND_DBG FALSE)
+ endif()
+
+ # Get configuration parameters from the name.
+ WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG)
+
+ # Set wxWidgets lib setup include directory.
+ if(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h)
+ set(wxWidgets_INCLUDE_DIRS
+ ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION})
+ else()
+ DBG_MSG("wxWidgets_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.")
+ set(wxWidgets_FOUND FALSE)
+ endif()
+
+ # Set wxWidgets main include directory.
+ if(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h)
+ list(APPEND wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include)
+ else()
+ DBG_MSG("wxWidgets_FOUND FALSE because WX_ROOT_DIR=${WX_ROOT_DIR} has no ${WX_ROOT_DIR}/include/wx/wx.h")
+ set(wxWidgets_FOUND FALSE)
+ endif()
+
+ # Find wxWidgets libraries.
+ WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}")
+ if(WX_USE_REL_AND_DBG)
+ WX_FIND_LIBS("${UNV}" "${UCD}" "d")
+ endif()
+
+ # Settings for requested libs (i.e., include dir, libraries, etc.).
+ WX_SET_LIBRARIES(wxWidgets_FIND_COMPONENTS "${DBG}")
+
+ # Add necessary definitions for unicode builds
+ if("${UCD}" STREQUAL "u")
+ list(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE)
+ endif()
+
+ # Add necessary definitions for debug builds
+ set(wxWidgets_DEFINITIONS_DEBUG _DEBUG __WXDEBUG__)
+
+ endif()
+ endif()
+ endif()
+
+#=====================================================================
+# UNIX_FIND_STYLE
+#=====================================================================
+else()
+ if(wxWidgets_FIND_STYLE STREQUAL "unix")
+ #-----------------------------------------------------------------
+ # UNIX: Helper MACROS
+ #-----------------------------------------------------------------
+ #
+ # Set the default values based on "wx-config --selected-config".
+ #
+ macro(WX_CONFIG_SELECT_GET_DEFAULT)
+ execute_process(
+ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
+ ${wxWidgets_CONFIG_OPTIONS} --selected-config
+ OUTPUT_VARIABLE _wx_selected_config
+ RESULT_VARIABLE _wx_result
+ ERROR_QUIET
+ )
+ if(_wx_result EQUAL 0)
+ foreach(_opt_name debug static unicode universal)
+ string(TOUPPER ${_opt_name} _upper_opt_name)
+ if(_wx_selected_config MATCHES ".*${_opt_name}.*")
+ set(wxWidgets_DEFAULT_${_upper_opt_name} ON)
+ else()
+ set(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
+ endif()
+ endforeach()
+ else()
+ foreach(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL)
+ set(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
+ endforeach()
+ endif()
+ endmacro()
+
+ #
+ # Query a boolean configuration option to determine if the system
+ # has both builds available. If so, provide the selection option
+ # to the user.
+ #
+ macro(WX_CONFIG_SELECT_QUERY_BOOL _OPT_NAME _OPT_HELP)
+ execute_process(
+ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
+ ${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=yes
+ RESULT_VARIABLE _wx_result_yes
+ OUTPUT_QUIET
+ ERROR_QUIET
+ )
+ execute_process(
+ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
+ ${wxWidgets_CONFIG_OPTIONS} --${_OPT_NAME}=no
+ RESULT_VARIABLE _wx_result_no
+ OUTPUT_QUIET
+ ERROR_QUIET
+ )
+ string(TOUPPER ${_OPT_NAME} _UPPER_OPT_NAME)
+ if(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0)
+ option(wxWidgets_USE_${_UPPER_OPT_NAME}
+ ${_OPT_HELP} ${wxWidgets_DEFAULT_${_UPPER_OPT_NAME}})
+ else()
+ # If option exists (already in cache), force to available one.
+ if(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME})
+ if(_wx_result_yes EQUAL 0)
+ set(wxWidgets_USE_${_UPPER_OPT_NAME} ON CACHE BOOL ${_OPT_HELP} FORCE)
+ else()
+ set(wxWidgets_USE_${_UPPER_OPT_NAME} OFF CACHE BOOL ${_OPT_HELP} FORCE)
+ endif()
+ endif()
+ endif()
+ endmacro()
+
+ #
+ # Set wxWidgets_SELECT_OPTIONS to wx-config options for selecting
+ # among multiple builds.
+ #
+ macro(WX_CONFIG_SELECT_SET_OPTIONS)
+ set(wxWidgets_SELECT_OPTIONS ${wxWidgets_CONFIG_OPTIONS})
+ foreach(_opt_name debug static unicode universal)
+ string(TOUPPER ${_opt_name} _upper_opt_name)
+ if(DEFINED wxWidgets_USE_${_upper_opt_name})
+ if(wxWidgets_USE_${_upper_opt_name})
+ list(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=yes)
+ else()
+ list(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=no)
+ endif()
+ endif()
+ endforeach()
+ endmacro()
+
+ #-----------------------------------------------------------------
+ # UNIX: Start actual work.
+ #-----------------------------------------------------------------
+ # Support cross-compiling, only search in the target platform.
+ find_program(wxWidgets_CONFIG_EXECUTABLE wx-config
+ DOC "Location of wxWidgets library configuration provider binary (wx-config)."
+ ONLY_CMAKE_FIND_ROOT_PATH
+ )
+
+ if(wxWidgets_CONFIG_EXECUTABLE)
+ set(wxWidgets_FOUND TRUE)
+
+ # get defaults based on "wx-config --selected-config"
+ WX_CONFIG_SELECT_GET_DEFAULT()
+
+ # for each option: if both builds are available, provide option
+ WX_CONFIG_SELECT_QUERY_BOOL(debug "Use debug build?")
+ WX_CONFIG_SELECT_QUERY_BOOL(unicode "Use unicode build?")
+ WX_CONFIG_SELECT_QUERY_BOOL(universal "Use universal build?")
+ WX_CONFIG_SELECT_QUERY_BOOL(static "Link libraries statically?")
+
+ # process selection to set wxWidgets_SELECT_OPTIONS
+ WX_CONFIG_SELECT_SET_OPTIONS()
+ DBG_MSG("wxWidgets_SELECT_OPTIONS=${wxWidgets_SELECT_OPTIONS}")
+
+ # run the wx-config program to get cxxflags
+ execute_process(
+ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
+ ${wxWidgets_SELECT_OPTIONS} --cxxflags
+ OUTPUT_VARIABLE wxWidgets_CXX_FLAGS
+ RESULT_VARIABLE RET
+ ERROR_QUIET
+ )
+ if(RET EQUAL 0)
+ string(STRIP "${wxWidgets_CXX_FLAGS}" wxWidgets_CXX_FLAGS)
+ separate_arguments(wxWidgets_CXX_FLAGS)
+
+ DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
+
+ # parse definitions from cxxflags;
+ # drop -D* from CXXFLAGS and the -D prefix
+ string(REGEX MATCHALL "-D[^;]+"
+ wxWidgets_DEFINITIONS "${wxWidgets_CXX_FLAGS}")
+ string(REGEX REPLACE "-D[^;]+(;|$)" ""
+ wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
+ string(REGEX REPLACE ";$" ""
+ wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
+ string(REPLACE "-D" ""
+ wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}")
+
+ # parse include dirs from cxxflags; drop -I prefix
+ string(REGEX MATCHALL "-I[^;]+"
+ wxWidgets_INCLUDE_DIRS "${wxWidgets_CXX_FLAGS}")
+ string(REGEX REPLACE "-I[^;]+;" ""
+ wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
+ string(REPLACE "-I" ""
+ wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}")
+
+ DBG_MSG_V("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}")
+ DBG_MSG_V("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}")
+ DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
+
+ else()
+ set(wxWidgets_FOUND FALSE)
+ DBG_MSG_V(
+ "${wxWidgets_CONFIG_EXECUTABLE} --cxxflags FAILED with RET=${RET}")
+ endif()
+
+ # run the wx-config program to get the libs
+ # - NOTE: wx-config doesn't verify that the libs requested exist
+ # it just produces the names. Maybe a TRY_COMPILE would
+ # be useful here...
+ string(REPLACE ";" ","
+ wxWidgets_FIND_COMPONENTS "${wxWidgets_FIND_COMPONENTS}")
+ execute_process(
+ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
+ ${wxWidgets_SELECT_OPTIONS} --libs ${wxWidgets_FIND_COMPONENTS}
+ OUTPUT_VARIABLE wxWidgets_LIBRARIES
+ RESULT_VARIABLE RET
+ ERROR_QUIET
+ )
+ if(RET EQUAL 0)
+ string(STRIP "${wxWidgets_LIBRARIES}" wxWidgets_LIBRARIES)
+ separate_arguments(wxWidgets_LIBRARIES)
+ string(REPLACE "-framework;" "-framework "
+ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
+ string(REPLACE "-arch;" "-arch "
+ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
+ string(REPLACE "-isysroot;" "-isysroot "
+ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}")
+
+ # extract linkdirs (-L) for rpath (i.e., LINK_DIRECTORIES)
+ string(REGEX MATCHALL "-L[^;]+"
+ wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARIES}")
+ string(REPLACE "-L" ""
+ wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARY_DIRS}")
+
+ DBG_MSG_V("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}")
+ DBG_MSG_V("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}")
+
+ else()
+ set(wxWidgets_FOUND FALSE)
+ DBG_MSG("${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_FIND_COMPONENTS} FAILED with RET=${RET}")
+ endif()
+ endif()
+
+#=====================================================================
+# Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE
+#=====================================================================
+ else()
+ if(NOT wxWidgets_FIND_QUIETLY)
+ message(STATUS
+ "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n"
+ " Platform unknown/unsupported. It's neither WIN32 nor UNIX "
+ "find style."
+ )
+ endif()
+ endif()
+endif()
+
+# Debug output:
+DBG_MSG("wxWidgets_FOUND : ${wxWidgets_FOUND}")
+DBG_MSG("wxWidgets_INCLUDE_DIRS : ${wxWidgets_INCLUDE_DIRS}")
+DBG_MSG("wxWidgets_LIBRARY_DIRS : ${wxWidgets_LIBRARY_DIRS}")
+DBG_MSG("wxWidgets_LIBRARIES : ${wxWidgets_LIBRARIES}")
+DBG_MSG("wxWidgets_CXX_FLAGS : ${wxWidgets_CXX_FLAGS}")
+DBG_MSG("wxWidgets_USE_FILE : ${wxWidgets_USE_FILE}")
+
+#=====================================================================
+#=====================================================================
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(wxWidgets DEFAULT_MSG wxWidgets_FOUND)
+# Maintain consistency with all other variables.
+set(wxWidgets_FOUND ${WXWIDGETS_FOUND})
+
+#=====================================================================
+# Macros for use in wxWidgets apps.
+# - This module will not fail to find wxWidgets based on the code
+# below. Hence, it's required to check for validity of:
+#
+# wxWidgets_wxrc_EXECUTABLE
+#=====================================================================
+
+# Resource file compiler.
+find_program(wxWidgets_wxrc_EXECUTABLE wxrc
+ ${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw
+ DOC "Location of wxWidgets resource file compiler binary (wxrc)"
+ )
+
+#
+# WX_SPLIT_ARGUMENTS_ON(<keyword> <left> <right> <arg1> <arg2> ...)
+#
+# Sets <left> and <right> to contain arguments to the left and right,
+# respectively, of <keyword>.
+#
+# Example usage:
+# function(WXWIDGETS_ADD_RESOURCES outfiles)
+# WX_SPLIT_ARGUMENTS_ON(OPTIONS wxrc_files wxrc_options ${ARGN})
+# ...
+# endfunction()
+#
+# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o file.C)
+#
+# NOTE: This is a generic piece of code that should be renamed to
+# SPLIT_ARGUMENTS_ON and put in a file serving the same purpose as
+# FindPackageStandardArgs.cmake. At the time of this writing
+# FindQt4.cmake has a QT4_EXTRACT_OPTIONS, which I basically copied
+# here a bit more generalized. So, there are already two find modules
+# using this approach.
+#
+function(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar)
+ # FIXME: Document that the input variables will be cleared.
+ #list(APPEND ${_leftvar} "")
+ #list(APPEND ${_rightvar} "")
+ set(${_leftvar} "")
+ set(${_rightvar} "")
+
+ set(_doing_right FALSE)
+ foreach(element ${ARGN})
+ if("${element}" STREQUAL "${_keyword}")
+ set(_doing_right TRUE)
+ else()
+ if(_doing_right)
+ list(APPEND ${_rightvar} "${element}")
+ else()
+ list(APPEND ${_leftvar} "${element}")
+ endif()
+ endif()
+ endforeach()
+
+ set(${_leftvar} ${${_leftvar}} PARENT_SCOPE)
+ set(${_rightvar} ${${_rightvar}} PARENT_SCOPE)
+endfunction()
+
+#
+# WX_GET_DEPENDENCIES_FROM_XML(
+# <depends>
+# <match_pattern>
+# <clean_pattern>
+# <xml_contents>
+# <depends_path>
+# )
+#
+# FIXME: Add documentation here...
+#
+function(WX_GET_DEPENDENCIES_FROM_XML
+ _depends
+ _match_patt
+ _clean_patt
+ _xml_contents
+ _depends_path
+ )
+
+ string(REGEX MATCHALL
+ ${_match_patt}
+ dep_file_list
+ "${${_xml_contents}}"
+ )
+ foreach(dep_file ${dep_file_list})
+ string(REGEX REPLACE ${_clean_patt} "" dep_file "${dep_file}")
+
+ # make the file have an absolute path
+ if(NOT IS_ABSOLUTE "${dep_file}")
+ set(dep_file "${${_depends_path}}/${dep_file}")
+ endif()
+
+ # append file to dependency list
+ list(APPEND ${_depends} "${dep_file}")
+ endforeach()
+
+ set(${_depends} ${${_depends}} PARENT_SCOPE)
+endfunction()
+
+#
+# WXWIDGETS_ADD_RESOURCES(<sources> <xrc_files>
+# OPTIONS <options> [NO_CPP_CODE])
+#
+# Adds a custom command for resource file compilation of the
+# <xrc_files> and appends the output files to <sources>.
+#
+# Example usages:
+# WXWIDGETS_ADD_RESOURCES(sources xrc/main_frame.xrc)
+# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o altname.cxx)
+#
+function(WXWIDGETS_ADD_RESOURCES _outfiles)
+ WX_SPLIT_ARGUMENTS_ON(OPTIONS rc_file_list rc_options ${ARGN})
+
+ # Parse files for dependencies.
+ set(rc_file_list_abs "")
+ set(rc_depends "")
+ foreach(rc_file ${rc_file_list})
+ get_filename_component(depends_path ${rc_file} PATH)
+
+ get_filename_component(rc_file_abs ${rc_file} ABSOLUTE)
+ list(APPEND rc_file_list_abs "${rc_file_abs}")
+
+ # All files have absolute paths or paths relative to the location
+ # of the rc file.
+ file(READ "${rc_file_abs}" rc_file_contents)
+
+ # get bitmap/bitmap2 files
+ WX_GET_DEPENDENCIES_FROM_XML(
+ rc_depends
+ "<bitmap[^<]+"
+ "^<bitmap[^>]*>"
+ rc_file_contents
+ depends_path
+ )
+
+ # get url files
+ WX_GET_DEPENDENCIES_FROM_XML(
+ rc_depends
+ "<url[^<]+"
+ "^<url[^>]*>"
+ rc_file_contents
+ depends_path
+ )
+
+ # get wxIcon files
+ WX_GET_DEPENDENCIES_FROM_XML(
+ rc_depends
+ "<object[^>]*class=\"wxIcon\"[^<]+"
+ "^<object[^>]*>"
+ rc_file_contents
+ depends_path
+ )
+ endforeach()
+
+ #
+ # Parse options.
+ #
+ # If NO_CPP_CODE option specified, then produce .xrs file rather
+ # than a .cpp file (i.e., don't add the default --cpp-code option).
+ list(FIND rc_options NO_CPP_CODE index)
+ if(index EQUAL -1)
+ list(APPEND rc_options --cpp-code)
+ # wxrc's default output filename for cpp code.
+ set(outfile resource.cpp)
+ else()
+ list(REMOVE_AT rc_options ${index})
+ # wxrc's default output filename for xrs file.
+ set(outfile resource.xrs)
+ endif()
+
+ # Get output name for use in ADD_CUSTOM_COMMAND.
+ # - short option scanning
+ list(FIND rc_options -o index)
+ if(NOT index EQUAL -1)
+ math(EXPR filename_index "${index} + 1")
+ list(GET rc_options ${filename_index} outfile)
+ #list(REMOVE_AT rc_options ${index} ${filename_index})
+ endif()
+ # - long option scanning
+ string(REGEX MATCH "--output=[^;]*" outfile_opt "${rc_options}")
+ if(outfile_opt)
+ string(REPLACE "--output=" "" outfile "${outfile_opt}")
+ endif()
+ #string(REGEX REPLACE "--output=[^;]*;?" "" rc_options "${rc_options}")
+ #string(REGEX REPLACE ";$" "" rc_options "${rc_options}")
+
+ if(NOT IS_ABSOLUTE "${outfile}")
+ set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
+ endif()
+ add_custom_command(
+ OUTPUT "${outfile}"
+ COMMAND ${wxWidgets_wxrc_EXECUTABLE} ${rc_options} ${rc_file_list_abs}
+ DEPENDS ${rc_file_list_abs} ${rc_depends}
+ )
+
+ # Add generated header to output file list.
+ list(FIND rc_options -e short_index)
+ list(FIND rc_options --extra-cpp-code long_index)
+ if(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1)
+ get_filename_component(outfile_ext ${outfile} EXT)
+ string(REPLACE "${outfile_ext}" ".h" outfile_header "${outfile}")
+ list(APPEND ${_outfiles} "${outfile_header}")
+ set_source_files_properties(
+ "${outfile_header}" PROPERTIES GENERATED TRUE
+ )
+ endif()
+
+ # Add generated file to output file list.
+ list(APPEND ${_outfiles} "${outfile}")
+
+ set(${_outfiles} ${${_outfiles}} PARENT_SCOPE)
+endfunction()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Alan W. I. <ir...@be...> - 2014-03-04 01:04:32
|
I forgot that the plplot-cvs mailing list has to be reconfigured whenever somebody new joins the core team. As a result details of Phil's first commit were not correctly propagated to the plplot-cvs mailing list (see attached). I have now fixed that issue so his further commits should automatically (I hope) have the details propagated to this list without me having to intervene as plplot-cvs mailing-list admin. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); the Time Ephemerides project (timeephem.sf.net); PLplot scientific plotting software package (plplot.sf.net); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________ |
|
From: <ai...@us...> - 2014-02-28 20:25:51
|
Revision: 13031
http://sourceforge.net/p/plplot/code/13031
Author: airwin
Date: 2014-02-28 20:25:47 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Display last page of example 27.
Modified Paths:
--------------
trunk/www/examples.php
Modified: trunk/www/examples.php
===================================================================
--- trunk/www/examples.php 2014-02-28 13:20:26 UTC (rev 13030)
+++ trunk/www/examples.php 2014-02-28 20:25:47 UTC (rev 13031)
@@ -91,7 +91,7 @@
array(26, 2, 1, "
<p>Demo of multi-lingual unicode versions of the first page of example 4.</p>
\n", array_fill( 0, 2, 1)),
- array(27, 19, 1, "
+ array(27, 20, 1, "
<p>Demo of drawing and filling 'spirograph' curves -
epitrochoids, cycolids, roulettes. We have specified the general
PLplot option '-eofill' when generating these figures. That means the
@@ -102,7 +102,7 @@
much larger fraction of the complex spirographic curve would be
filled).
</p>
- \n", array_fill( 0, 19, 1)),
+ \n", array_fill( 0, 20, 1)),
array(28, 5, 1, "
<p>Demo of 3-d writing of text (plmtex3 and plptex3).</p>
\n", array_fill( 0, 5, 1)),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2014-02-28 13:20:29
|
Revision: 13030
http://sourceforge.net/p/plplot/code/13030
Author: andrewross
Date: 2014-02-28 13:20:26 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Update Debian package support for 5.9.10. Note this won't currently work on sid as it requires swig-2.0.12 which is not yet available.
Modified Paths:
--------------
trunk/debian/patches/fix-lua-includes.diff
trunk/debian/patches/series
Added Paths:
-----------
trunk/debian/patches/octave_3.8_support.diff
Removed Paths:
-------------
trunk/debian/patches/fix-d-examples.diff
trunk/debian/patches/fix-python-exec-bit.diff
Deleted: trunk/debian/patches/fix-d-examples.diff
===================================================================
--- trunk/debian/patches/fix-d-examples.diff 2014-02-28 13:18:53 UTC (rev 13029)
+++ trunk/debian/patches/fix-d-examples.diff 2014-02-28 13:20:26 UTC (rev 13030)
@@ -1,15 +0,0 @@
-Description: Fix D examples
-Author: Andrew Ross <and...@us...>
-Origin: upstream
-Index: plplot-5.9.10/examples/d/x20d.d
-===================================================================
---- plplot-5.9.10.orig/examples/d/x20d.d 2013-10-02 10:27:39.162480034 +0100
-+++ plplot-5.9.10/examples/d/x20d.d 2013-10-02 10:29:03.410477825 +0100
-@@ -6,6 +6,7 @@
-
- import std.math;
- import std.stdio;
-+import std.file;
-
- import plplot;
-
Modified: trunk/debian/patches/fix-lua-includes.diff
===================================================================
--- trunk/debian/patches/fix-lua-includes.diff 2014-02-28 13:18:53 UTC (rev 13029)
+++ trunk/debian/patches/fix-lua-includes.diff 2014-02-28 13:20:26 UTC (rev 13030)
@@ -3,10 +3,10 @@
Last-Update: 2012-07-19
===================================================================
-Index: plplot-5.9.10/cmake/modules/lua.cmake
+Index: plplot-5.10.0/cmake/modules/lua.cmake
===================================================================
---- plplot-5.9.10.orig/cmake/modules/lua.cmake 2013-10-01 13:10:33.183293316 +0100
-+++ plplot-5.9.10/cmake/modules/lua.cmake 2013-10-01 13:10:33.171293317 +0100
+--- plplot-5.10.0.orig/cmake/modules/lua.cmake 2013-05-03 03:41:21.000000000 +0100
++++ plplot-5.10.0/cmake/modules/lua.cmake 2014-02-28 09:52:40.000000000 +0000
@@ -86,3 +86,11 @@
set(LUA_DIR ${LIB_DIR}/lua/${LUA_VERSION}/plplot)
endif(LUA_VERSION MATCHES "5\\.0")
Deleted: trunk/debian/patches/fix-python-exec-bit.diff
===================================================================
--- trunk/debian/patches/fix-python-exec-bit.diff 2014-02-28 13:18:53 UTC (rev 13029)
+++ trunk/debian/patches/fix-python-exec-bit.diff 2014-02-28 13:20:26 UTC (rev 13030)
@@ -1,23 +0,0 @@
-Description: Fix incorrect executable bit on python script
-Author: Andrew Ross <and...@us...>
-Origin: upstream
-Index: plplot-5.9.10/examples/python/CMakeLists.txt
-===================================================================
---- plplot-5.9.10.orig/examples/python/CMakeLists.txt 2013-10-01 13:10:53.000000000 +0100
-+++ plplot-5.9.10/examples/python/CMakeLists.txt 2013-10-03 09:21:13.601454559 +0100
-@@ -79,7 +79,6 @@
- xw17.py
- xw31.py
- plplot_logo.py
-- plplot_py_demos.py
- test_circle.py
- test_axis_precision.py
- test_symbol_clip.py
-@@ -142,6 +141,7 @@
- set(
- python_DATA
- ${python_DATA}
-+ plplot_py_demos.py
- README.pythondemos
- README.rendering_tests
- README.logo
Added: trunk/debian/patches/octave_3.8_support.diff
===================================================================
--- trunk/debian/patches/octave_3.8_support.diff (rev 0)
+++ trunk/debian/patches/octave_3.8_support.diff 2014-02-28 13:20:26 UTC (rev 13030)
@@ -0,0 +1,832 @@
+--- a/examples/octave/x23c.m
++++ b/examples/octave/x23c.m
+@@ -1,5 +1,3 @@
+-## $Id: x23c.m 11680 2011-03-27 17:57:51Z airwin $
+-##
+ ## Displays Greek letters and mathematically interesting Unicode ranges
+ ## Copyright (C) 2005 Alan Irwin
+ ## Copyright (C) 2005 Andrew Ross
+@@ -34,186 +32,186 @@
+ endif
+
+
+- Greek = [\
+-"#gA";"#gB";"#gG";"#gD";"#gE";"#gZ";"#gY";"#gH";"#gI";"#gK";"#gL";"#gM";\
+-"#gN";"#gC";"#gO";"#gP";"#gR";"#gS";"#gT";"#gU";"#gF";"#gX";"#gQ";"#gW";\
+-"#ga";"#gb";"#gg";"#gd";"#ge";"#gz";"#gy";"#gh";"#gi";"#gk";"#gl";"#gm";\
+-"#gn";"#gc";"#go";"#gp";"#gr";"#gs";"#gt";"#gu";"#gf";"#gx";"#gq";"#gw";\
++ Greek = [...
++"#gA";"#gB";"#gG";"#gD";"#gE";"#gZ";"#gY";"#gH";"#gI";"#gK";"#gL";"#gM";
++"#gN";"#gC";"#gO";"#gP";"#gR";"#gS";"#gT";"#gU";"#gF";"#gX";"#gQ";"#gW";
++"#ga";"#gb";"#gg";"#gd";"#ge";"#gz";"#gy";"#gh";"#gi";"#gk";"#gl";"#gm";
++"#gn";"#gc";"#go";"#gp";"#gr";"#gs";"#gt";"#gu";"#gf";"#gx";"#gq";"#gw";
+ ];
+
+- Type1 = [\
+-0x0020,0x0021,0x0023,0x0025,0x0026,\
+-0x0028,0x0029,0x002b,0x002c,0x002e,\
+-0x002f,0x0030,0x0031,0x0032,0x0033,\
+-0x0034,0x0035,0x0036,0x0037,0x0038,\
+-0x0039,0x003a,0x003b,0x003c,0x003d,\
+-0x003e,0x003f,0x005b,0x005d,0x005f,\
+-0x007b,0x007c,0x007d,0x00a9,0x00ac,\
+-0x00ae,0x00b0,0x00b1,0x00d7,0x00f7,\
+-0x0192,0x0391,0x0392,0x0393,0x0394,\
+-0x0395,0x0396,0x0397,0x0398,0x0399,\
+-0x039a,0x039b,0x039c,0x039d,0x039e,\
+-0x039f,0x03a0,0x03a1,0x03a3,0x03a4,\
+-0x03a5,0x03a6,0x03a7,0x03a8,0x03a9,\
+-0x03b1,0x03b2,0x03b3,0x03b4,0x03b5,\
+-0x03b6,0x03b7,0x03b8,0x03b9,0x03ba,\
+-0x03bb,0x03bc,0x03bd,0x03be,0x03bf,\
+-0x03c0,0x03c1,0x03c2,0x03c3,0x03c4,\
+-0x03c5,0x03c6,0x03c7,0x03c8,0x03c9,\
+-0x03d1,0x03d2,0x03d5,0x03d6,0x2022,\
+-0x2026,0x2032,0x2033,0x203e,0x2044,\
+-0x2111,0x2118,0x211c,0x2122,0x2126,\
+-0x2135,0x2190,0x2191,0x2192,0x2193,\
+-0x2194,0x21b5,0x21d0,0x21d1,0x21d2,\
+-0x21d3,0x21d4,0x2200,0x2202,0x2203,\
+-0x2205,0x2206,0x2207,0x2208,0x2209,\
+-0x220b,0x220f,0x2211,0x2212,0x2215,\
+-0x2217,0x221a,0x221d,0x221e,0x2220,\
+-0x2227,0x2228,0x2229,0x222a,0x222b,\
+-0x2234,0x223c,0x2245,0x2248,0x2260,\
+-0x2261,0x2264,0x2265,0x2282,0x2283,\
+-0x2284,0x2286,0x2287,0x2295,0x2297,\
+-0x22a5,0x22c5,0x2320,0x2321,0x2329,\
+-0x232a,0x25ca,0x2660,0x2663,0x2665,\
+-0x2666,\
+-];
+-
+- title = {\
+-"#<0x10>PLplot Example 23 - Greek Letters";\
+-"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (a)";\
+-"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (b)";\
+-"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (c)";\
+-"#<0x10>PLplot Example 23 - Number Forms Unicode Block";\
+-"#<0x10>PLplot Example 23 - Arrows Unicode Block (a)";\
+-"#<0x10>PLplot Example 23 - Arrows Unicode Block (b)";\
+-"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (a)";\
+-"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (b)";\
+-"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (c)";\
+-"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (d)"\
++ Type1 = [...
++0x0020,0x0021,0x0023,0x0025,0x0026,...
++0x0028,0x0029,0x002b,0x002c,0x002e,...
++0x002f,0x0030,0x0031,0x0032,0x0033,...
++0x0034,0x0035,0x0036,0x0037,0x0038,...
++0x0039,0x003a,0x003b,0x003c,0x003d,...
++0x003e,0x003f,0x005b,0x005d,0x005f,...
++0x007b,0x007c,0x007d,0x00a9,0x00ac,...
++0x00ae,0x00b0,0x00b1,0x00d7,0x00f7,...
++0x0192,0x0391,0x0392,0x0393,0x0394,...
++0x0395,0x0396,0x0397,0x0398,0x0399,...
++0x039a,0x039b,0x039c,0x039d,0x039e,...
++0x039f,0x03a0,0x03a1,0x03a3,0x03a4,...
++0x03a5,0x03a6,0x03a7,0x03a8,0x03a9,...
++0x03b1,0x03b2,0x03b3,0x03b4,0x03b5,...
++0x03b6,0x03b7,0x03b8,0x03b9,0x03ba,...
++0x03bb,0x03bc,0x03bd,0x03be,0x03bf,...
++0x03c0,0x03c1,0x03c2,0x03c3,0x03c4,...
++0x03c5,0x03c6,0x03c7,0x03c8,0x03c9,...
++0x03d1,0x03d2,0x03d5,0x03d6,0x2022,...
++0x2026,0x2032,0x2033,0x203e,0x2044,...
++0x2111,0x2118,0x211c,0x2122,0x2126,...
++0x2135,0x2190,0x2191,0x2192,0x2193,...
++0x2194,0x21b5,0x21d0,0x21d1,0x21d2,...
++0x21d3,0x21d4,0x2200,0x2202,0x2203,...
++0x2205,0x2206,0x2207,0x2208,0x2209,...
++0x220b,0x220f,0x2211,0x2212,0x2215,...
++0x2217,0x221a,0x221d,0x221e,0x2220,...
++0x2227,0x2228,0x2229,0x222a,0x222b,...
++0x2234,0x223c,0x2245,0x2248,0x2260,...
++0x2261,0x2264,0x2265,0x2282,0x2283,...
++0x2284,0x2286,0x2287,0x2295,0x2297,...
++0x22a5,0x22c5,0x2320,0x2321,0x2329,...
++0x232a,0x25ca,0x2660,0x2663,0x2665,...
++0x2666,...
++];
++
++ title = {
++"#<0x10>PLplot Example 23 - Greek Letters";
++"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (a)";
++"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (b)";
++"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (c)";
++"#<0x10>PLplot Example 23 - Number Forms Unicode Block";
++"#<0x10>PLplot Example 23 - Arrows Unicode Block (a)";
++"#<0x10>PLplot Example 23 - Arrows Unicode Block (b)";
++"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (a)";
++"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (b)";
++"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (c)";
++"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (d)"
+ };
+
+- lo = [\
+-0x0,\
+-0x0,\
+-0x40,\
+-0x80,\
+-0x2153,\
+-0x2190,\
+-0x21d0,\
+-0x2200,\
+-0x2240,\
+-0x2280,\
+-0x22c0,\
+-];
+-
+- hi = [\
+-0x30,\
+-0x40,\
+-0x80,\
+-0xA6,\
+-0x2184,\
+-0x21d0,\
+-0x2200,\
+-0x2240,\
+-0x2280,\
+-0x22c0,\
+-0x2300,\
+-];
+-
+- nxcells = [\
+-12,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-];
+-
+-nycells = [\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
+-8,\
++ lo = [
++0x0,
++0x0,
++0x40,
++0x80,
++0x2153,
++0x2190,
++0x21d0,
++0x2200,
++0x2240,
++0x2280,
++0x22c0,
++];
++
++ hi = [
++0x30,
++0x40,
++0x80,
++0xA6,
++0x2184,
++0x21d0,
++0x2200,
++0x2240,
++0x2280,
++0x22c0,
++0x2300,
++];
++
++ nxcells = [
++12,
++8,
++8,
++8,
++8,
++8,
++8,
++8,
++8,
++8,
++8,
++];
++
++nycells = [
++8,
++8,
++8,
++8,
++8,
++8,
++8,
++8,
++8,
++8,
++8,
+ ];
+
+ ## non-zero values Must be consistent with nxcells and nycells.
+-offset = [\
+-0,\
+-0,\
+-64,\
+-128,\
+-0,\
+-0,\
+-0,\
+-0,\
+-0,\
+-0,\
+-0,\
++offset = [
++0,
++0,
++64,
++128,
++0,
++0,
++0,
++0,
++0,
++0,
++0,
+ ];
+
+ ## 30 possible FCI values.
+ FCI_COMBINATIONS = 30;
+
+-fci = [\
+-0x80000000,\
+-0x80000001,\
+-0x80000002,\
+-0x80000003,\
+-0x80000004,\
+-0x80000010,\
+-0x80000011,\
+-0x80000012,\
+-0x80000013,\
+-0x80000014,\
+-0x80000020,\
+-0x80000021,\
+-0x80000022,\
+-0x80000023,\
+-0x80000024,\
+-0x80000100,\
+-0x80000101,\
+-0x80000102,\
+-0x80000103,\
+-0x80000104,\
+-0x80000110,\
+-0x80000111,\
+-0x80000112,\
+-0x80000113,\
+-0x80000114,\
+-0x80000120,\
+-0x80000121,\
+-0x80000122,\
+-0x80000123,\
+-0x80000124,\
+-];
+-
+-family = [\
+- "sans-serif";\
+- "serif";\
+- "monospace";\
+- "script";\
+- "symbol"\
+-];
+-style = [\
+- "upright";\
+- "italic";\
+- "oblique"\
+-];
+-weight = [\
+- "medium";\
+- "bold"\
++fci = [
++0x80000000,
++0x80000001,
++0x80000002,
++0x80000003,
++0x80000004,
++0x80000010,
++0x80000011,
++0x80000012,
++0x80000013,
++0x80000014,
++0x80000020,
++0x80000021,
++0x80000022,
++0x80000023,
++0x80000024,
++0x80000100,
++0x80000101,
++0x80000102,
++0x80000103,
++0x80000104,
++0x80000110,
++0x80000111,
++0x80000112,
++0x80000113,
++0x80000114,
++0x80000120,
++0x80000121,
++0x80000122,
++0x80000123,
++0x80000124,
++];
++
++family = [
++ "sans-serif";
++ "serif";
++ "monospace";
++ "script";
++ "symbol"
++];
++style = [
++ "upright";
++ "italic";
++ "oblique"
++];
++weight = [
++ "medium";
++ "bold"
+ ];
+
+
+--- a/examples/octave/x28c.m
++++ b/examples/octave/x28c.m
+@@ -1,5 +1,3 @@
+-## $Id: x28c.m 11680 2011-03-27 17:57:51Z airwin $
+-##
+ ## plmtex3, plptex3 demo
+ ##
+ ## Copyright (C) 2007 Alan Irwin
+@@ -86,8 +84,8 @@
+ plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
+
+ plcol0(2);
+- plbox3("b", "", xrange, 0, \
+- "b", "", yrange, 0, \
++ plbox3("b", "", xrange, 0,
++ "b", "", yrange, 0,
+ "bcd", "", zrange, 0);
+
+ ## z = zmin.
+@@ -102,9 +100,9 @@
+ x_shear = -0.5*xrange*sin_omega;
+ y_shear = 0.5*yrange*cos_omega;
+ z_shear = 0.;
+- plptex3(xmid, ymid, zmin, \
+- x_inclination, y_inclination, z_inclination, \
+- x_shear, y_shear, z_shear, \
++ plptex3(xmid, ymid, zmin,
++ x_inclination, y_inclination, z_inclination,
++ x_shear, y_shear, z_shear,
+ 0.0, " revolution");
+ endfor
+ ## x = xmax.
+@@ -119,9 +117,9 @@
+ x_shear = 0.;
+ y_shear = 0.5*yrange*sin_omega;
+ z_shear = 0.5*zrange*cos_omega;
+- plptex3(xmax, ymid, zmid, \
+- x_inclination, y_inclination, z_inclination, \
+- x_shear, y_shear, z_shear, \
++ plptex3(xmax, ymid, zmid,
++ x_inclination, y_inclination, z_inclination,
++ x_shear, y_shear, z_shear,
+ 0.0, " revolution");
+ endfor
+
+@@ -137,10 +135,10 @@
+ x_shear = -0.5*xrange*sin_omega;
+ y_shear = 0.;
+ z_shear = 0.5*zrange*cos_omega;
+- plptex3( \
+- xmid, ymax, zmid, \
+- x_inclination, y_inclination, z_inclination, \
+- x_shear, y_shear, z_shear, \
++ plptex3(
++ xmid, ymax, zmid,
++ x_inclination, y_inclination, z_inclination,
++ x_shear, y_shear, z_shear,
+ 0.0, " revolution");
+ endfor
+ ## Draw minimal 3D grid to finish defining the 3D box.
+@@ -153,8 +151,8 @@
+ plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
+
+ plcol0(2);
+- plbox3("b", "", xrange, 0, \
+- "b", "", yrange, 0, \
++ plbox3("b", "", xrange, 0,
++ "b", "", yrange, 0,
+ "bcd", "", zrange, 0);
+
+ ## y = ymax.
+@@ -170,10 +168,10 @@
+ y_shear = 0.5*yrange*sin_omega;
+ z_shear = 0.5*zrange*cos_omega;
+ zs = zsmax - dzsrot*i;
+- plptex3( \
+- xmid, ymax, zs, \
+- x_inclination, y_inclination, z_inclination, \
+- x_shear, y_shear, z_shear, \
++ plptex3(
++ xmid, ymax, zs,
++ x_inclination, y_inclination, z_inclination,
++ x_shear, y_shear, z_shear,
+ 0.5, "rotation for y = y#dmax#u");
+ endfor
+
+@@ -190,10 +188,10 @@
+ x_shear = 0.5*xrange*sin_omega;
+ z_shear = 0.5*zrange*cos_omega;
+ zs = zsmax - dzsrot*i;
+- plptex3( \
+- xmax, ymid, zs, \
+- x_inclination, y_inclination, z_inclination, \
+- x_shear, y_shear, z_shear, \
++ plptex3(
++ xmax, ymid, zs,
++ x_inclination, y_inclination, z_inclination,
++ x_shear, y_shear, z_shear,
+ 0.5, "rotation for x = x#dmax#u");
+ endfor
+
+@@ -210,10 +208,10 @@
+ y_shear = 0.5*yrange*cos_omega;
+ z_shear = 0.5*zrange*sin_omega;
+ ys = ysmax - dysrot*i;
+- plptex3( \
+- xmid, ys, zmin, \
+- x_inclination, y_inclination, z_inclination, \
+- x_shear, y_shear, z_shear, \
++ plptex3(
++ xmid, ys, zmin,
++ x_inclination, y_inclination, z_inclination,
++ x_shear, y_shear, z_shear,
+ 0.5, "rotation for z = z#dmin#u");
+ endfor
+ ## Draw minimal 3D grid to finish defining the 3D box.
+@@ -230,8 +228,8 @@
+ plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
+
+ plcol0(2);
+- plbox3("b", "", xrange, 0, \
+- "b", "", yrange, 0, \
++ plbox3("b", "", xrange, 0,
++ "b", "", yrange, 0,
+ "bcd", "", zrange, 0);
+
+ ## y = ymax.
+@@ -247,10 +245,10 @@
+ x_shear = 0.5*xrange*sin_omega;
+ z_shear = 0.5*zrange*cos_omega;
+ zs = zsmax-dzsshear*i;
+- plptex3( \
+- xmid, ymax, zs, \
+- x_inclination, y_inclination, z_inclination, \
+- x_shear, y_shear, z_shear, \
++ plptex3(
++ xmid, ymax, zs,
++ x_inclination, y_inclination, z_inclination,
++ x_shear, y_shear, z_shear,
+ 0.5, "shear for y = y#dmax#u");
+ endfor
+
+@@ -267,10 +265,10 @@
+ y_shear = -0.5*yrange*sin_omega;
+ z_shear = 0.5*zrange*cos_omega;
+ zs = zsmax-dzsshear*i;
+- plptex3( \
+- xmax, ymid, zs, \
+- x_inclination, y_inclination, z_inclination, \
+- x_shear, y_shear, z_shear, \
++ plptex3(
++ xmax, ymid, zs,
++ x_inclination, y_inclination, z_inclination,
++ x_shear, y_shear, z_shear,
+ 0.5, "shear for x = x#dmax#u");
+ endfor
+
+@@ -287,10 +285,10 @@
+ y_shear = 0.5*yrange*cos_omega;
+ x_shear = 0.5*xrange*sin_omega;
+ ys = ysmax-dysshear*i;
+- plptex3( \
+- xmid, ys, zmin, \
+- x_inclination, y_inclination, z_inclination, \
+- x_shear, y_shear, z_shear, \
++ plptex3
++ xmid, ys, zmin,
++ x_inclination, y_inclination, z_inclination,
++ x_shear, y_shear, z_shear,
+ 0.5, "shear for z = z#dmin#u");
+ endfor
+ ## Draw minimal 3D grid to finish defining the 3D box.
+@@ -303,8 +301,8 @@
+ plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 40., -30.);
+
+ plcol0(2);
+- plbox3("b", "", xrange, 0, \
+- "b", "", yrange, 0, \
++ plbox3("b", "", xrange, 0,
++ "b", "", yrange, 0,
+ "bcd", "", zrange, 0);
+
+ plschr(0., 1.2);
+@@ -334,10 +332,10 @@
+ y_shear = 0.;
+ z_shear = 1.;
+ p1string = pstring(i:i);
+- plptex3( \
+- xpos, ypos, zpos, \
+- x_inclination, y_inclination, z_inclination, \
+- x_shear, y_shear, z_shear, \
++ plptex3(
++ xpos, ypos, zpos,
++ x_inclination, y_inclination, z_inclination,
++ x_shear, y_shear, z_shear,
+ 0.5, p1string);
+ omega += domega;
+ endfor
+@@ -351,8 +349,8 @@
+ plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
+
+ plcol0(2);
+- plbox3("b", "", xrange, 0, \
+- "b", "", yrange, 0, \
++ plbox3("b", "", xrange, 0,
++ "b", "", yrange, 0,
+ "bcd", "", zrange, 0);
+
+ plschr(0., 1.0);
+@@ -377,4 +375,4 @@
+
+ endfunction
+
+-ix28c
+\ No newline at end of file
++ix28c
+--- a/examples/octave/x33c.m
++++ b/examples/octave/x33c.m
+@@ -1,6 +1,4 @@
+-## -*- coding: utf-8; -*-
+-## $Id: x33c.m 12353 2013-06-02 20:07:07Z andrewross $
+-## Copyright (C) 2010 Alan W. Irwin
++## Copyright (C) 2010-2014 Alan W. Irwin
+ ##
+ ## Demonstrate most pllegend capability including unicode symbols.
+ ##
+@@ -195,12 +193,12 @@
+ plwind( 0.0, 1.0, 0.0, 1.0 );
+ # Set interesting background colour.
+ plscol0a( 15, 0, 0, 0, 0.20 );
+- [colorbar_width, colorbar_height] = plcolorbar( \
+- bitor(opt, bitor(PL_COLORBAR_BOUNDING_BOX, PL_COLORBAR_BACKGROUND)), \
+- position, x, y, x_length, y_length, \
+- 15, 1, 1, low_cap_color, high_cap_color, \
+- cont_color, cont_width, label_opts, label, \
+- axis_opts, ticks, sub_ticks, \
++ [colorbar_width, colorbar_height] = plcolorbar(
++ bitor(opt, bitor(PL_COLORBAR_BOUNDING_BOX, PL_COLORBAR_BACKGROUND)),
++ position, x, y, x_length, y_length,
++ 15, 1, 1, low_cap_color, high_cap_color,
++ cont_color, cont_width, label_opts, label,
++ axis_opts, ticks, sub_ticks,
+ n_values_array, values_array );
+
+ # Reset text and tick sizes
+@@ -313,7 +311,7 @@
+ line_colors(1) = 1 + mod(k, 8);
+ symbol_colors(1) = 1 + mod(k, 8);
+
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, 0.05, 0.05,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, 1.0, 2.0,
+ 1., text_colors, text,
+@@ -393,7 +391,7 @@
+ y = 0.1;
+ nrow = 1;
+ ncolumn = nlegend;
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
+ 1., text_colors, text,
+@@ -407,7 +405,7 @@
+ y = 0.1;
+ nrow = 1;
+ ncolumn = nlegend;
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
+ 1., text_colors, text,
+@@ -422,7 +420,7 @@
+ y = 0.;
+ nrow = nlegend;
+ ncolumn = 1;
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
+ 1., text_colors, text,
+@@ -436,7 +434,7 @@
+ y = 0.;
+ nrow = nlegend;
+ ncolumn = 1;
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
+ 1., text_colors, text,
+@@ -450,7 +448,7 @@
+ y = 0.;
+ nrow = 6;
+ ncolumn = 2;
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
+ 1., text_colors, text,
+@@ -464,7 +462,7 @@
+ y = 0.;
+ nrow = 6;
+ ncolumn = 2;
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
+ 1., text_colors, text,
+@@ -478,7 +476,7 @@
+ y = 0.;
+ nrow = 3;
+ ncolumn = 3;
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
+ 1., text_colors, text,
+@@ -568,7 +566,7 @@
+ nrow = min(3, nlegend);
+ ncolumn = 0;
+
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.025, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 1.5,
+ 1., text_colors, text,
+@@ -685,7 +683,7 @@
+
+ opt = opt_base;
+ plscol0a( 15, 32, 32, 32, 0.70 );
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
+ 0., text_colors, text,
+@@ -716,7 +714,7 @@
+ opt = opt_base;
+ x += legend_width;
+ plscol0a( 15, 32, 32, 32, 0.70 );
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
+ 0., text_colors, text,
+@@ -747,7 +745,7 @@
+ opt = opt_base;
+ x += legend_width;
+ plscol0a( 15, 32, 32, 32, 0.70 );
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
+ 0., text_colors, text,
+@@ -781,7 +779,7 @@
+ y += max_height;
+ max_height = 0.;
+ plscol0a( 15, 32, 32, 32, 0.70 );
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
+ 0., text_colors, text,
+@@ -812,7 +810,7 @@
+ opt = opt_base;
+ x += legend_width;
+ plscol0a( 15, 32, 32, 32, 0.70 );
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
+ 0., text_colors, text,
+@@ -843,7 +841,7 @@
+ opt = opt_base;
+ x += legend_width;
+ plscol0a( 15, 32, 32, 32, 0.70 );
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
+ 0., text_colors, text,
+@@ -878,7 +876,7 @@
+ y += max_height;
+ max_height = 0.;
+ plscol0a( 15, 32, 32, 32, 0.70 );
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
+ 0., text_colors, text',
+@@ -905,7 +903,7 @@
+ opt = opt_base;
+ x += legend_width;
+ plscol0a( 15, 32, 32, 32, 0.70 );
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
+ 0., text_colors, text',
+@@ -933,7 +931,7 @@
+ opt = opt_base;
+ x += legend_width;
+ plscol0a( 15, 32, 32, 32, 0.70 );
+- [legend_width, legend_height] = \
++ [legend_width, legend_height] = ...
+ pllegend( opt, position, x, y,
+ 0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
+ 0., text_colors, text',
+--- a/plplot_test/test_octave.sh.in
++++ b/plplot_test/test_octave.sh.in
+@@ -35,7 +35,12 @@
+ export LD_LIBRARY_PATH="$TOPDIR"/src:"$TOPDIR"/lib/csa:"$TOPDIR"/lib/nn
+
+ # Launch an Octave script that exercises all the demos
+-$octave -f -q -p "$octavedir" <<EOF 2> test.error
++$octave -f -q <<EOF 2> test.error
++
++# Disable warnings about shadowed functions - PLplot is _supposed_ to shadow the core functions
++warning("off","Octave:shadowed-function");
++
++addpath(getenv("octavedir"));
+
+ # Check verbose_test variable
+ if (strcmp(getenv("verbose_test"),"on") == 1)
+@@ -46,13 +51,15 @@
+
+ plplot_stub;
+ t = char(strsplit("$options", "-"));
+-if (t); t(1,:)=""; endif;
+-for i=1:rows(t)
+- tt = deblank (t(i,:)); len = length(tt);
+- ix = index(tt," ");
+- if (ix == 0); ix = len; len = 0; endif
+- plsetopt(tt(1:ix), tt(ix+1:len));
+-endfor
++if (t)
++ t(1,:)="";
++ for i=1:rows(t)
++ tt = deblank (t(i,:)); len = length(tt);
++ ix = index(tt," ");
++ if (ix == 0); ix = len; len = 0; endif
++ plsetopt(tt(1:ix), tt(ix+1:len));
++ endfor
++endif
+
+ # Subset of p examples selected that seem to work ok with noninteractive
+ # devices.
+@@ -80,13 +87,15 @@
+ printf("%s\n",cmd);
+ endif
+ t = char(strsplit("$options", "-"));
+- if (t) ; t(1,:)=""; endif
+- for j=1:rows(t)
+- tt = deblank (t(j,:)); len = length(tt);
+- ix = index(tt," ");
+- if (ix == 0); ix = len; len = 0; endif
+- plSetOpt(deblank(tt(1:ix)), tt(ix:len));
+- endfor
++ if (t)
++ t(1,:)="";
++ for j=1:rows(t)
++ tt = deblank (t(j,:)); len = length(tt);
++ ix = index(tt," ");
++ if (ix == 0); ix = len; len = 0; endif
++ plSetOpt(deblank(tt(1:ix)), tt(ix:len));
++ endfor
++ endif
+ device="$device";
+ plSetOpt("dev", device);
+ #o trailer on filename e.g., x01o.ps) to distinguish from other
Property changes on: trunk/debian/patches/octave_3.8_support.diff
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2014-02-28 13:18:53 UTC (rev 13029)
+++ trunk/debian/patches/series 2014-02-28 13:20:26 UTC (rev 13030)
@@ -2,7 +2,6 @@
#04_use-mkoctfile.diff
proper-path-handling.diff
fix-lua-includes.diff
-fix-d-examples.diff
-fix-python-exec-bit.diff
add-tcl-multiarch.diff
-support-javac-options.diff
+#support-javac-options.diff
+octave_3.8_support.diff
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2014-02-28 13:18:57
|
Revision: 13029
http://sourceforge.net/p/plplot/code/13029
Author: andrewross
Date: 2014-02-28 13:18:53 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Remove extraneous whitespace from examples.
Modified Paths:
--------------
trunk/examples/octave/x28c.m
trunk/examples/octave/x33c.m
Modified: trunk/examples/octave/x28c.m
===================================================================
--- trunk/examples/octave/x28c.m 2014-02-28 12:54:44 UTC (rev 13028)
+++ trunk/examples/octave/x28c.m 2014-02-28 13:18:53 UTC (rev 13029)
@@ -84,8 +84,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0,
- "b", "", yrange, 0,
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
## z = zmin.
@@ -100,9 +100,9 @@
x_shear = -0.5*xrange*sin_omega;
y_shear = 0.5*yrange*cos_omega;
z_shear = 0.;
- plptex3(xmid, ymid, zmin,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(xmid, ymid, zmin,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.0, " revolution");
endfor
## x = xmax.
@@ -117,9 +117,9 @@
x_shear = 0.;
y_shear = 0.5*yrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
- plptex3(xmax, ymid, zmid,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(xmax, ymid, zmid,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.0, " revolution");
endfor
@@ -135,10 +135,10 @@
x_shear = -0.5*xrange*sin_omega;
y_shear = 0.;
z_shear = 0.5*zrange*cos_omega;
- plptex3(
- xmid, ymax, zmid,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmid, ymax, zmid,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.0, " revolution");
endfor
## Draw minimal 3D grid to finish defining the 3D box.
@@ -151,8 +151,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0,
- "b", "", yrange, 0,
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
## y = ymax.
@@ -168,10 +168,10 @@
y_shear = 0.5*yrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax - dzsrot*i;
- plptex3(
- xmid, ymax, zs,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmid, ymax, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "rotation for y = y#dmax#u");
endfor
@@ -188,10 +188,10 @@
x_shear = 0.5*xrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax - dzsrot*i;
- plptex3(
- xmax, ymid, zs,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmax, ymid, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "rotation for x = x#dmax#u");
endfor
@@ -208,10 +208,10 @@
y_shear = 0.5*yrange*cos_omega;
z_shear = 0.5*zrange*sin_omega;
ys = ysmax - dysrot*i;
- plptex3(
- xmid, ys, zmin,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmid, ys, zmin,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "rotation for z = z#dmin#u");
endfor
## Draw minimal 3D grid to finish defining the 3D box.
@@ -228,8 +228,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0,
- "b", "", yrange, 0,
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
## y = ymax.
@@ -245,10 +245,10 @@
x_shear = 0.5*xrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax-dzsshear*i;
- plptex3(
- xmid, ymax, zs,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmid, ymax, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "shear for y = y#dmax#u");
endfor
@@ -265,10 +265,10 @@
y_shear = -0.5*yrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax-dzsshear*i;
- plptex3(
- xmax, ymid, zs,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xmax, ymid, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "shear for x = x#dmax#u");
endfor
@@ -285,10 +285,10 @@
y_shear = 0.5*yrange*cos_omega;
x_shear = 0.5*xrange*sin_omega;
ys = ysmax-dysshear*i;
- plptex3(
- xmid, ys, zmin,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3
+ xmid, ys, zmin,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "shear for z = z#dmin#u");
endfor
## Draw minimal 3D grid to finish defining the 3D box.
@@ -301,8 +301,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 40., -30.);
plcol0(2);
- plbox3("b", "", xrange, 0,
- "b", "", yrange, 0,
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
plschr(0., 1.2);
@@ -332,10 +332,10 @@
y_shear = 0.;
z_shear = 1.;
p1string = pstring(i:i);
- plptex3(
- xpos, ypos, zpos,
- x_inclination, y_inclination, z_inclination,
- x_shear, y_shear, z_shear,
+ plptex3(
+ xpos, ypos, zpos,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, p1string);
omega += domega;
endfor
@@ -349,8 +349,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0,
- "b", "", yrange, 0,
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
plschr(0., 1.0);
Modified: trunk/examples/octave/x33c.m
===================================================================
--- trunk/examples/octave/x33c.m 2014-02-28 12:54:44 UTC (rev 13028)
+++ trunk/examples/octave/x33c.m 2014-02-28 13:18:53 UTC (rev 13029)
@@ -193,12 +193,12 @@
plwind( 0.0, 1.0, 0.0, 1.0 );
# Set interesting background colour.
plscol0a( 15, 0, 0, 0, 0.20 );
- [colorbar_width, colorbar_height] = plcolorbar(
- bitor(opt, bitor(PL_COLORBAR_BOUNDING_BOX, PL_COLORBAR_BACKGROUND)),
- position, x, y, x_length, y_length,
- 15, 1, 1, low_cap_color, high_cap_color,
- cont_color, cont_width, label_opts, label,
- axis_opts, ticks, sub_ticks,
+ [colorbar_width, colorbar_height] = plcolorbar(
+ bitor(opt, bitor(PL_COLORBAR_BOUNDING_BOX, PL_COLORBAR_BACKGROUND)),
+ position, x, y, x_length, y_length,
+ 15, 1, 1, low_cap_color, high_cap_color,
+ cont_color, cont_width, label_opts, label,
+ axis_opts, ticks, sub_ticks,
n_values_array, values_array );
# Reset text and tick sizes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2014-02-28 12:54:47
|
Revision: 13028
http://sourceforge.net/p/plplot/code/13028
Author: andrewross
Date: 2014-02-28 12:54:44 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Fixes to octave examples + scripts to ensure they work with octave 3.8.
Modified Paths:
--------------
trunk/examples/octave/x23c.m
trunk/examples/octave/x28c.m
trunk/examples/octave/x33c.m
trunk/plplot_test/test_octave.sh.in
Modified: trunk/examples/octave/x23c.m
===================================================================
--- trunk/examples/octave/x23c.m 2014-02-28 01:43:31 UTC (rev 13027)
+++ trunk/examples/octave/x23c.m 2014-02-28 12:54:44 UTC (rev 13028)
@@ -32,186 +32,186 @@
endif
- Greek = [\
-"#gA";"#gB";"#gG";"#gD";"#gE";"#gZ";"#gY";"#gH";"#gI";"#gK";"#gL";"#gM";\
-"#gN";"#gC";"#gO";"#gP";"#gR";"#gS";"#gT";"#gU";"#gF";"#gX";"#gQ";"#gW";\
-"#ga";"#gb";"#gg";"#gd";"#ge";"#gz";"#gy";"#gh";"#gi";"#gk";"#gl";"#gm";\
-"#gn";"#gc";"#go";"#gp";"#gr";"#gs";"#gt";"#gu";"#gf";"#gx";"#gq";"#gw";\
+ Greek = [...
+"#gA";"#gB";"#gG";"#gD";"#gE";"#gZ";"#gY";"#gH";"#gI";"#gK";"#gL";"#gM";
+"#gN";"#gC";"#gO";"#gP";"#gR";"#gS";"#gT";"#gU";"#gF";"#gX";"#gQ";"#gW";
+"#ga";"#gb";"#gg";"#gd";"#ge";"#gz";"#gy";"#gh";"#gi";"#gk";"#gl";"#gm";
+"#gn";"#gc";"#go";"#gp";"#gr";"#gs";"#gt";"#gu";"#gf";"#gx";"#gq";"#gw";
];
- Type1 = [\
-0x0020,0x0021,0x0023,0x0025,0x0026,\
-0x0028,0x0029,0x002b,0x002c,0x002e,\
-0x002f,0x0030,0x0031,0x0032,0x0033,\
-0x0034,0x0035,0x0036,0x0037,0x0038,\
-0x0039,0x003a,0x003b,0x003c,0x003d,\
-0x003e,0x003f,0x005b,0x005d,0x005f,\
-0x007b,0x007c,0x007d,0x00a9,0x00ac,\
-0x00ae,0x00b0,0x00b1,0x00d7,0x00f7,\
-0x0192,0x0391,0x0392,0x0393,0x0394,\
-0x0395,0x0396,0x0397,0x0398,0x0399,\
-0x039a,0x039b,0x039c,0x039d,0x039e,\
-0x039f,0x03a0,0x03a1,0x03a3,0x03a4,\
-0x03a5,0x03a6,0x03a7,0x03a8,0x03a9,\
-0x03b1,0x03b2,0x03b3,0x03b4,0x03b5,\
-0x03b6,0x03b7,0x03b8,0x03b9,0x03ba,\
-0x03bb,0x03bc,0x03bd,0x03be,0x03bf,\
-0x03c0,0x03c1,0x03c2,0x03c3,0x03c4,\
-0x03c5,0x03c6,0x03c7,0x03c8,0x03c9,\
-0x03d1,0x03d2,0x03d5,0x03d6,0x2022,\
-0x2026,0x2032,0x2033,0x203e,0x2044,\
-0x2111,0x2118,0x211c,0x2122,0x2126,\
-0x2135,0x2190,0x2191,0x2192,0x2193,\
-0x2194,0x21b5,0x21d0,0x21d1,0x21d2,\
-0x21d3,0x21d4,0x2200,0x2202,0x2203,\
-0x2205,0x2206,0x2207,0x2208,0x2209,\
-0x220b,0x220f,0x2211,0x2212,0x2215,\
-0x2217,0x221a,0x221d,0x221e,0x2220,\
-0x2227,0x2228,0x2229,0x222a,0x222b,\
-0x2234,0x223c,0x2245,0x2248,0x2260,\
-0x2261,0x2264,0x2265,0x2282,0x2283,\
-0x2284,0x2286,0x2287,0x2295,0x2297,\
-0x22a5,0x22c5,0x2320,0x2321,0x2329,\
-0x232a,0x25ca,0x2660,0x2663,0x2665,\
-0x2666,\
+ Type1 = [...
+0x0020,0x0021,0x0023,0x0025,0x0026,...
+0x0028,0x0029,0x002b,0x002c,0x002e,...
+0x002f,0x0030,0x0031,0x0032,0x0033,...
+0x0034,0x0035,0x0036,0x0037,0x0038,...
+0x0039,0x003a,0x003b,0x003c,0x003d,...
+0x003e,0x003f,0x005b,0x005d,0x005f,...
+0x007b,0x007c,0x007d,0x00a9,0x00ac,...
+0x00ae,0x00b0,0x00b1,0x00d7,0x00f7,...
+0x0192,0x0391,0x0392,0x0393,0x0394,...
+0x0395,0x0396,0x0397,0x0398,0x0399,...
+0x039a,0x039b,0x039c,0x039d,0x039e,...
+0x039f,0x03a0,0x03a1,0x03a3,0x03a4,...
+0x03a5,0x03a6,0x03a7,0x03a8,0x03a9,...
+0x03b1,0x03b2,0x03b3,0x03b4,0x03b5,...
+0x03b6,0x03b7,0x03b8,0x03b9,0x03ba,...
+0x03bb,0x03bc,0x03bd,0x03be,0x03bf,...
+0x03c0,0x03c1,0x03c2,0x03c3,0x03c4,...
+0x03c5,0x03c6,0x03c7,0x03c8,0x03c9,...
+0x03d1,0x03d2,0x03d5,0x03d6,0x2022,...
+0x2026,0x2032,0x2033,0x203e,0x2044,...
+0x2111,0x2118,0x211c,0x2122,0x2126,...
+0x2135,0x2190,0x2191,0x2192,0x2193,...
+0x2194,0x21b5,0x21d0,0x21d1,0x21d2,...
+0x21d3,0x21d4,0x2200,0x2202,0x2203,...
+0x2205,0x2206,0x2207,0x2208,0x2209,...
+0x220b,0x220f,0x2211,0x2212,0x2215,...
+0x2217,0x221a,0x221d,0x221e,0x2220,...
+0x2227,0x2228,0x2229,0x222a,0x222b,...
+0x2234,0x223c,0x2245,0x2248,0x2260,...
+0x2261,0x2264,0x2265,0x2282,0x2283,...
+0x2284,0x2286,0x2287,0x2295,0x2297,...
+0x22a5,0x22c5,0x2320,0x2321,0x2329,...
+0x232a,0x25ca,0x2660,0x2663,0x2665,...
+0x2666,...
];
- title = {\
-"#<0x10>PLplot Example 23 - Greek Letters";\
-"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (a)";\
-"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (b)";\
-"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (c)";\
-"#<0x10>PLplot Example 23 - Number Forms Unicode Block";\
-"#<0x10>PLplot Example 23 - Arrows Unicode Block (a)";\
-"#<0x10>PLplot Example 23 - Arrows Unicode Block (b)";\
-"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (a)";\
-"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (b)";\
-"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (c)";\
-"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (d)"\
+ title = {
+"#<0x10>PLplot Example 23 - Greek Letters";
+"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (a)";
+"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (b)";
+"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (c)";
+"#<0x10>PLplot Example 23 - Number Forms Unicode Block";
+"#<0x10>PLplot Example 23 - Arrows Unicode Block (a)";
+"#<0x10>PLplot Example 23 - Arrows Unicode Block (b)";
+"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (a)";
+"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (b)";
+"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (c)";
+"#<0x10>PLplot Example 23 - Mathematical Operators Unicode Block (d)"
};
- lo = [\
-0x0,\
-0x0,\
-0x40,\
-0x80,\
-0x2153,\
-0x2190,\
-0x21d0,\
-0x2200,\
-0x2240,\
-0x2280,\
-0x22c0,\
+ lo = [
+0x0,
+0x0,
+0x40,
+0x80,
+0x2153,
+0x2190,
+0x21d0,
+0x2200,
+0x2240,
+0x2280,
+0x22c0,
];
- hi = [\
-0x30,\
-0x40,\
-0x80,\
-0xA6,\
-0x2184,\
-0x21d0,\
-0x2200,\
-0x2240,\
-0x2280,\
-0x22c0,\
-0x2300,\
+ hi = [
+0x30,
+0x40,
+0x80,
+0xA6,
+0x2184,
+0x21d0,
+0x2200,
+0x2240,
+0x2280,
+0x22c0,
+0x2300,
];
- nxcells = [\
-12,\
-8,\
-8,\
-8,\
-8,\
-8,\
-8,\
-8,\
-8,\
-8,\
-8,\
+ nxcells = [
+12,
+8,
+8,
+8,
+8,
+8,
+8,
+8,
+8,
+8,
+8,
];
-nycells = [\
-8,\
-8,\
-8,\
-8,\
-8,\
-8,\
-8,\
-8,\
-8,\
-8,\
-8,\
+nycells = [
+8,
+8,
+8,
+8,
+8,
+8,
+8,
+8,
+8,
+8,
+8,
];
## non-zero values Must be consistent with nxcells and nycells.
-offset = [\
-0,\
-0,\
-64,\
-128,\
-0,\
-0,\
-0,\
-0,\
-0,\
-0,\
-0,\
+offset = [
+0,
+0,
+64,
+128,
+0,
+0,
+0,
+0,
+0,
+0,
+0,
];
## 30 possible FCI values.
FCI_COMBINATIONS = 30;
-fci = [\
-0x80000000,\
-0x80000001,\
-0x80000002,\
-0x80000003,\
-0x80000004,\
-0x80000010,\
-0x80000011,\
-0x80000012,\
-0x80000013,\
-0x80000014,\
-0x80000020,\
-0x80000021,\
-0x80000022,\
-0x80000023,\
-0x80000024,\
-0x80000100,\
-0x80000101,\
-0x80000102,\
-0x80000103,\
-0x80000104,\
-0x80000110,\
-0x80000111,\
-0x80000112,\
-0x80000113,\
-0x80000114,\
-0x80000120,\
-0x80000121,\
-0x80000122,\
-0x80000123,\
-0x80000124,\
+fci = [
+0x80000000,
+0x80000001,
+0x80000002,
+0x80000003,
+0x80000004,
+0x80000010,
+0x80000011,
+0x80000012,
+0x80000013,
+0x80000014,
+0x80000020,
+0x80000021,
+0x80000022,
+0x80000023,
+0x80000024,
+0x80000100,
+0x80000101,
+0x80000102,
+0x80000103,
+0x80000104,
+0x80000110,
+0x80000111,
+0x80000112,
+0x80000113,
+0x80000114,
+0x80000120,
+0x80000121,
+0x80000122,
+0x80000123,
+0x80000124,
];
-family = [\
- "sans-serif";\
- "serif";\
- "monospace";\
- "script";\
- "symbol"\
+family = [
+ "sans-serif";
+ "serif";
+ "monospace";
+ "script";
+ "symbol"
];
-style = [\
- "upright";\
- "italic";\
- "oblique"\
+style = [
+ "upright";
+ "italic";
+ "oblique"
];
-weight = [\
- "medium";\
- "bold"\
+weight = [
+ "medium";
+ "bold"
];
Modified: trunk/examples/octave/x28c.m
===================================================================
--- trunk/examples/octave/x28c.m 2014-02-28 01:43:31 UTC (rev 13027)
+++ trunk/examples/octave/x28c.m 2014-02-28 12:54:44 UTC (rev 13028)
@@ -84,8 +84,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0, \
- "b", "", yrange, 0, \
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
## z = zmin.
@@ -100,9 +100,9 @@
x_shear = -0.5*xrange*sin_omega;
y_shear = 0.5*yrange*cos_omega;
z_shear = 0.;
- plptex3(xmid, ymid, zmin, \
- x_inclination, y_inclination, z_inclination, \
- x_shear, y_shear, z_shear, \
+ plptex3(xmid, ymid, zmin,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.0, " revolution");
endfor
## x = xmax.
@@ -117,9 +117,9 @@
x_shear = 0.;
y_shear = 0.5*yrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
- plptex3(xmax, ymid, zmid, \
- x_inclination, y_inclination, z_inclination, \
- x_shear, y_shear, z_shear, \
+ plptex3(xmax, ymid, zmid,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.0, " revolution");
endfor
@@ -135,10 +135,10 @@
x_shear = -0.5*xrange*sin_omega;
y_shear = 0.;
z_shear = 0.5*zrange*cos_omega;
- plptex3( \
- xmid, ymax, zmid, \
- x_inclination, y_inclination, z_inclination, \
- x_shear, y_shear, z_shear, \
+ plptex3(
+ xmid, ymax, zmid,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.0, " revolution");
endfor
## Draw minimal 3D grid to finish defining the 3D box.
@@ -151,8 +151,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0, \
- "b", "", yrange, 0, \
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
## y = ymax.
@@ -168,10 +168,10 @@
y_shear = 0.5*yrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax - dzsrot*i;
- plptex3( \
- xmid, ymax, zs, \
- x_inclination, y_inclination, z_inclination, \
- x_shear, y_shear, z_shear, \
+ plptex3(
+ xmid, ymax, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "rotation for y = y#dmax#u");
endfor
@@ -188,10 +188,10 @@
x_shear = 0.5*xrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax - dzsrot*i;
- plptex3( \
- xmax, ymid, zs, \
- x_inclination, y_inclination, z_inclination, \
- x_shear, y_shear, z_shear, \
+ plptex3(
+ xmax, ymid, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "rotation for x = x#dmax#u");
endfor
@@ -208,10 +208,10 @@
y_shear = 0.5*yrange*cos_omega;
z_shear = 0.5*zrange*sin_omega;
ys = ysmax - dysrot*i;
- plptex3( \
- xmid, ys, zmin, \
- x_inclination, y_inclination, z_inclination, \
- x_shear, y_shear, z_shear, \
+ plptex3(
+ xmid, ys, zmin,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "rotation for z = z#dmin#u");
endfor
## Draw minimal 3D grid to finish defining the 3D box.
@@ -228,8 +228,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0, \
- "b", "", yrange, 0, \
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
## y = ymax.
@@ -245,10 +245,10 @@
x_shear = 0.5*xrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax-dzsshear*i;
- plptex3( \
- xmid, ymax, zs, \
- x_inclination, y_inclination, z_inclination, \
- x_shear, y_shear, z_shear, \
+ plptex3(
+ xmid, ymax, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "shear for y = y#dmax#u");
endfor
@@ -265,10 +265,10 @@
y_shear = -0.5*yrange*sin_omega;
z_shear = 0.5*zrange*cos_omega;
zs = zsmax-dzsshear*i;
- plptex3( \
- xmax, ymid, zs, \
- x_inclination, y_inclination, z_inclination, \
- x_shear, y_shear, z_shear, \
+ plptex3(
+ xmax, ymid, zs,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "shear for x = x#dmax#u");
endfor
@@ -285,10 +285,10 @@
y_shear = 0.5*yrange*cos_omega;
x_shear = 0.5*xrange*sin_omega;
ys = ysmax-dysshear*i;
- plptex3( \
- xmid, ys, zmin, \
- x_inclination, y_inclination, z_inclination, \
- x_shear, y_shear, z_shear, \
+ plptex3(
+ xmid, ys, zmin,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, "shear for z = z#dmin#u");
endfor
## Draw minimal 3D grid to finish defining the 3D box.
@@ -301,8 +301,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 40., -30.);
plcol0(2);
- plbox3("b", "", xrange, 0, \
- "b", "", yrange, 0, \
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
plschr(0., 1.2);
@@ -332,10 +332,10 @@
y_shear = 0.;
z_shear = 1.;
p1string = pstring(i:i);
- plptex3( \
- xpos, ypos, zpos, \
- x_inclination, y_inclination, z_inclination, \
- x_shear, y_shear, z_shear, \
+ plptex3(
+ xpos, ypos, zpos,
+ x_inclination, y_inclination, z_inclination,
+ x_shear, y_shear, z_shear,
0.5, p1string);
omega += domega;
endfor
@@ -349,8 +349,8 @@
plw3d(1.0, 1.0, 1.0, xmin, xmax, ymin, ymax, zmin, zmax, 20., 45.);
plcol0(2);
- plbox3("b", "", xrange, 0, \
- "b", "", yrange, 0, \
+ plbox3("b", "", xrange, 0,
+ "b", "", yrange, 0,
"bcd", "", zrange, 0);
plschr(0., 1.0);
Modified: trunk/examples/octave/x33c.m
===================================================================
--- trunk/examples/octave/x33c.m 2014-02-28 01:43:31 UTC (rev 13027)
+++ trunk/examples/octave/x33c.m 2014-02-28 12:54:44 UTC (rev 13028)
@@ -193,12 +193,12 @@
plwind( 0.0, 1.0, 0.0, 1.0 );
# Set interesting background colour.
plscol0a( 15, 0, 0, 0, 0.20 );
- [colorbar_width, colorbar_height] = plcolorbar( \
- bitor(opt, bitor(PL_COLORBAR_BOUNDING_BOX, PL_COLORBAR_BACKGROUND)), \
- position, x, y, x_length, y_length, \
- 15, 1, 1, low_cap_color, high_cap_color, \
- cont_color, cont_width, label_opts, label, \
- axis_opts, ticks, sub_ticks, \
+ [colorbar_width, colorbar_height] = plcolorbar(
+ bitor(opt, bitor(PL_COLORBAR_BOUNDING_BOX, PL_COLORBAR_BACKGROUND)),
+ position, x, y, x_length, y_length,
+ 15, 1, 1, low_cap_color, high_cap_color,
+ cont_color, cont_width, label_opts, label,
+ axis_opts, ticks, sub_ticks,
n_values_array, values_array );
# Reset text and tick sizes
@@ -311,7 +311,7 @@
line_colors(1) = 1 + mod(k, 8);
symbol_colors(1) = 1 + mod(k, 8);
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, 0.05, 0.05,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, 1.0, 2.0,
1., text_colors, text,
@@ -391,7 +391,7 @@
y = 0.1;
nrow = 1;
ncolumn = nlegend;
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
1., text_colors, text,
@@ -405,7 +405,7 @@
y = 0.1;
nrow = 1;
ncolumn = nlegend;
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
1., text_colors, text,
@@ -420,7 +420,7 @@
y = 0.;
nrow = nlegend;
ncolumn = 1;
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
1., text_colors, text,
@@ -434,7 +434,7 @@
y = 0.;
nrow = nlegend;
ncolumn = 1;
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
1., text_colors, text,
@@ -448,7 +448,7 @@
y = 0.;
nrow = 6;
ncolumn = 2;
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
1., text_colors, text,
@@ -462,7 +462,7 @@
y = 0.;
nrow = 6;
ncolumn = 2;
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
1., text_colors, text,
@@ -476,7 +476,7 @@
y = 0.;
nrow = 3;
ncolumn = 3;
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 2.0,
1., text_colors, text,
@@ -566,7 +566,7 @@
nrow = min(3, nlegend);
ncolumn = 0;
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.025, 15, 1, 1, nrow, ncolumn, opt_array, 1.0, 1.0, 1.5,
1., text_colors, text,
@@ -683,7 +683,7 @@
opt = opt_base;
plscol0a( 15, 32, 32, 32, 0.70 );
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
0., text_colors, text,
@@ -714,7 +714,7 @@
opt = opt_base;
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
0., text_colors, text,
@@ -745,7 +745,7 @@
opt = opt_base;
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
0., text_colors, text,
@@ -779,7 +779,7 @@
y += max_height;
max_height = 0.;
plscol0a( 15, 32, 32, 32, 0.70 );
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
0., text_colors, text,
@@ -810,7 +810,7 @@
opt = opt_base;
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
0., text_colors, text,
@@ -841,7 +841,7 @@
opt = opt_base;
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
0., text_colors, text,
@@ -876,7 +876,7 @@
y += max_height;
max_height = 0.;
plscol0a( 15, 32, 32, 32, 0.70 );
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
0., text_colors, text',
@@ -903,7 +903,7 @@
opt = opt_base;
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
0., text_colors, text',
@@ -931,7 +931,7 @@
opt = opt_base;
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- [legend_width, legend_height] = \
+ [legend_width, legend_height] = ...
pllegend( opt, position, x, y,
0.1, 15, 1, 1, 0, 0, opt_array, 1.0, text_scale, 2.0,
0., text_colors, text',
Modified: trunk/plplot_test/test_octave.sh.in
===================================================================
--- trunk/plplot_test/test_octave.sh.in 2014-02-28 01:43:31 UTC (rev 13027)
+++ trunk/plplot_test/test_octave.sh.in 2014-02-28 12:54:44 UTC (rev 13028)
@@ -35,8 +35,13 @@
export LD_LIBRARY_PATH="$TOPDIR"/src:"$TOPDIR"/lib/csa:"$TOPDIR"/lib/nn
# Launch an Octave script that exercises all the demos
-$octave -f -q -p "$octavedir" <<EOF 2> test.error
+$octave -f -q <<EOF 2> test.error
+# Disable warnings about shadowed functions - PLplot is _supposed_ to shadow the core functions
+warning("off","Octave:shadowed-function");
+
+addpath(getenv("octavedir"));
+
# Check verbose_test variable
if (strcmp(getenv("verbose_test"),"on") == 1)
verbose_test = 1;
@@ -46,13 +51,15 @@
plplot_stub;
t = char(strsplit("$options", "-"));
-if (t); t(1,:)=""; endif;
-for i=1:rows(t)
- tt = deblank (t(i,:)); len = length(tt);
- ix = index(tt," ");
- if (ix == 0); ix = len; len = 0; endif
- plsetopt(tt(1:ix), tt(ix+1:len));
-endfor
+if (t)
+ t(1,:)="";
+ for i=1:rows(t)
+ tt = deblank (t(i,:)); len = length(tt);
+ ix = index(tt," ");
+ if (ix == 0); ix = len; len = 0; endif
+ plsetopt(tt(1:ix), tt(ix+1:len));
+ endfor
+endif
# Subset of p examples selected that seem to work ok with noninteractive
# devices.
@@ -80,13 +87,15 @@
printf("%s\n",cmd);
endif
t = char(strsplit("$options", "-"));
- if (t) ; t(1,:)=""; endif
- for j=1:rows(t)
- tt = deblank (t(j,:)); len = length(tt);
- ix = index(tt," ");
- if (ix == 0); ix = len; len = 0; endif
- plSetOpt(deblank(tt(1:ix)), tt(ix:len));
- endfor
+ if (t)
+ t(1,:)="";
+ for j=1:rows(t)
+ tt = deblank (t(j,:)); len = length(tt);
+ ix = index(tt," ");
+ if (ix == 0); ix = len; len = 0; endif
+ plSetOpt(deblank(tt(1:ix)), tt(ix:len));
+ endfor
+ endif
device="$device";
plSetOpt("dev", device);
#o trailer on filename e.g., x01o.ps) to distinguish from other
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hba...@us...> - 2014-02-28 01:43:36
|
Revision: 13027
http://sourceforge.net/p/plplot/code/13027
Author: hbabcock
Date: 2014-02-28 01:43:31 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Fix divide by zero error in the case where umax or vmax are all zero.
Modified Paths:
--------------
trunk/src/plvect.c
Modified: trunk/src/plvect.c
===================================================================
--- trunk/src/plvect.c 2014-02-26 01:14:43 UTC (rev 13026)
+++ trunk/src/plvect.c 2014-02-28 01:43:31 UTC (rev 13027)
@@ -200,7 +200,21 @@
vmax = ( v[i][j] > vmax ) ? v[i][j] : vmax;
}
}
- lscale = 1.5 * MIN( dxmin / umax, dymin / vmax );
+ if (umax != 0.0)
+ {
+ dxmin = dxmin / umax;
+ }
+ else {
+ dxmin = 10E10;
+ }
+ if (vmax != 0.0)
+ {
+ dymin = dymin / vmax;
+ }
+ else {
+ dymin = 10E10;
+ }
+ lscale = 1.5 * MIN( dxmin, dymin);
if ( scale < 0.0 )
{
scale = -scale * lscale;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-26 01:14:51
|
Revision: 13026
http://sourceforge.net/p/plplot/code/13026
Author: airwin
Date: 2014-02-26 01:14:43 +0000 (Wed, 26 Feb 2014)
Log Message:
-----------
Update shapelib find module to remove additional find paths (which are
normally not required and which can add trouble on certain platforms)
and to look for both "shp" and "shapelib" for the name of the library.
(Thanks to Phil Rosenberg for the latter suggestion.)
Modified Paths:
--------------
trunk/cmake/modules/FindShapelib.cmake
Modified: trunk/cmake/modules/FindShapelib.cmake
===================================================================
--- trunk/cmake/modules/FindShapelib.cmake 2014-02-26 00:38:44 UTC (rev 13025)
+++ trunk/cmake/modules/FindShapelib.cmake 2014-02-26 01:14:43 UTC (rev 13026)
@@ -8,12 +8,11 @@
# library.
# SHAPELIB_LIBRARY_DIRS, the directory where the shapelib library is found.
-find_path(SHAPELIB_INCLUDE_DIR shapefil.h /usr/local/include /usr/include)
+find_path(SHAPELIB_INCLUDE_DIR shapefil.h)
if(SHAPELIB_INCLUDE_DIR)
find_library(SHAPELIB_LIBRARY
- NAMES shp
- PATHS /usr/local/lib /usr/lib
+ NAMES shp shapelib
)
if(SHAPELIB_LIBRARY)
# Set uncached variables as per standard.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-26 00:38:51
|
Revision: 13025
http://sourceforge.net/p/plplot/code/13025
Author: airwin
Date: 2014-02-26 00:38:44 +0000 (Wed, 26 Feb 2014)
Log Message:
-----------
Use version of FindFreetype.cmake that is officially distributed with
CMake.
Tested on Linux with a build test and also a run-time test with
-dev wxwidgets -drvopt freetype=1,backend=0
for example 24 which gave the usual crummy plfreetype results
for that example.
These tests exclude the gd and gcw devices (deprecated/retired)
and the wingcc device (not available on Linux).
Modified Paths:
--------------
trunk/cmake/modules/freetype.cmake
trunk/cmake/modules/gcw.cmake
trunk/cmake/modules/gd.cmake
trunk/cmake/modules/wingcc.cmake
trunk/cmake/modules/wxwidgets.cmake
trunk/src/CMakeLists.txt
Removed Paths:
-------------
trunk/cmake/modules/FindFreetype.cmake
Deleted: trunk/cmake/modules/FindFreetype.cmake
===================================================================
--- trunk/cmake/modules/FindFreetype.cmake 2014-02-25 00:27:53 UTC (rev 13024)
+++ trunk/cmake/modules/FindFreetype.cmake 2014-02-26 00:38:44 UTC (rev 13025)
@@ -1,26 +0,0 @@
-# - Find Freetype
-# Find the native freetype includes and library
-# This module defines
-# FREETYPE_INCLUDE_DIR, where to find freetype header files.
-# FREETYPE_LIBRARIES, the libraries needed to use freetype.
-# FREETYPE_FOUND, If false, do not try to use freetype.
-# also defined, but not for general use are
-# FREETYPE_LIBRARY, where to find the freetype library.
-
-FIND_PATH(FREETYPE_INCLUDE_DIR freetype/config/ftheader.h
-/usr/local/include/freetype2
-/usr/include/freetype2
-)
-
-SET(FREETYPE_NAMES ${FREETYPE_NAMES} freetype)
-FIND_LIBRARY(FREETYPE_LIBRARY
- NAMES ${FREETYPE_NAMES}
- PATHS /usr/local/lib /usr/lib
- )
-
-IF (FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIR)
- SET(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
- SET(FREETYPE_FOUND "YES")
-ELSE (FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIR)
- SET(FREETYPE_FOUND "NO")
-ENDIF (FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIR)
Modified: trunk/cmake/modules/freetype.cmake
===================================================================
--- trunk/cmake/modules/freetype.cmake 2014-02-25 00:27:53 UTC (rev 13024)
+++ trunk/cmake/modules/freetype.cmake 2014-02-26 00:38:44 UTC (rev 13025)
@@ -1,6 +1,7 @@
# cmake/modules/freetype.cmake
#
# Copyright (C) 2006 Andrew Ross
+# Copyright (C) 2014 Alan W. Irwin
#
# This file is part of PLplot.
#
@@ -29,7 +30,10 @@
if (WITH_FREETYPE)
find_package(Freetype)
if (FREETYPE_FOUND)
- message(STATUS "FREETYPE_INCLUDE_DIR = ${FREETYPE_INCLUDE_DIR}")
+ #message(STATUS "FREETYPE_INCLUDE_DIRS = ${FREETYPE_INCLUDE_DIRS}")
+ string(REGEX REPLACE ";" " -I" FREETYPE_INCLUDE_CFLAGS "-I${FREETYPE_INCLUDE_DIRS}")
+ message(STATUS "FREETYPE_CFLAGS = ${FREETYPE_INCLUDE_CFLAGS}")
+
message(STATUS "FREETYPE_LIBRARIES = ${FREETYPE_LIBRARIES}")
else (FREETYPE_FOUND)
set(WITH_FREETYPE OFF
Modified: trunk/cmake/modules/gcw.cmake
===================================================================
--- trunk/cmake/modules/gcw.cmake 2014-02-25 00:27:53 UTC (rev 13024)
+++ trunk/cmake/modules/gcw.cmake 2014-02-26 00:38:44 UTC (rev 13025)
@@ -57,9 +57,7 @@
set(gcw_LINK_FLAGS "${linkflags1}")
# Add freetype includes / libraries if required
if (WITH_FREETYPE)
- foreach(DIR ${FREETYPE_INCLUDE_DIR})
- set(gcw_COMPILE_FLAGS "${gcw_COMPILE_FLAGS} -I${DIR}")
- endforeach(DIR ${FREETYPE_INCLUDE_DIR})
+ set(gcw_COMPILE_FLAGS "${gcw_COMPILE_FLAGS} ${FREETYPE_INCLUDE_CFLAGS}")
set(gcw_LINK_FLAGS ${gcw_LINK_FLAGS} ${FREETYPE_LIBRARIES})
endif (WITH_FREETYPE)
else(linkflags1)
Modified: trunk/cmake/modules/gd.cmake
===================================================================
--- trunk/cmake/modules/gd.cmake 2014-02-25 00:27:53 UTC (rev 13024)
+++ trunk/cmake/modules/gd.cmake 2014-02-26 00:38:44 UTC (rev 13025)
@@ -45,7 +45,7 @@
else (NOT GD_FOUND)
if (WITH_FREETYPE)
- set(GD_INCLUDE_DIR ${GD_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIR})
+ set(GD_INCLUDE_DIR ${GD_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
set(GD_LIBRARIES ${GD_LIBRARIES} ${FREETYPE_LIBRARIES})
endif (WITH_FREETYPE)
endif (NOT GD_FOUND)
Modified: trunk/cmake/modules/wingcc.cmake
===================================================================
--- trunk/cmake/modules/wingcc.cmake 2014-02-25 00:27:53 UTC (rev 13024)
+++ trunk/cmake/modules/wingcc.cmake 2014-02-26 00:38:44 UTC (rev 13025)
@@ -44,7 +44,7 @@
if(WITH_FREETYPE)
set(
wingcc_COMPILE_FLAGS
- "${wingcc_COMPILE_FLAGS} -I${FREETYPE_INCLUDE_DIR}"
+ "${wingcc_COMPILE_FLAGS} ${FREETYPE_INCLUDE_CFLAGS}"
)
set(
wingcc_LINK_FLAGS
Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake 2014-02-25 00:27:53 UTC (rev 13024)
+++ trunk/cmake/modules/wxwidgets.cmake 2014-02-26 00:38:44 UTC (rev 13025)
@@ -109,7 +109,7 @@
endif(HAVE_AGG)
set(
wxwidgets_COMPILE_FLAGS
- "${wxwidgets_COMPILE_FLAGS} -I${FREETYPE_INCLUDE_DIR}"
+ "${wxwidgets_COMPILE_FLAGS} ${FREETYPE_INCLUDE_CFLAGS}"
)
set(
wxwidgets_LINK_FLAGS
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2014-02-25 00:27:53 UTC (rev 13024)
+++ trunk/src/CMakeLists.txt 2014-02-26 00:38:44 UTC (rev 13025)
@@ -244,7 +244,7 @@
if(NOT PLFREETYPE_COMPILE_PROPS)
set(PLFREETYPE_COMPILE_PROPS)
endif(NOT PLFREETYPE_COMPILE_PROPS)
- set_source_files_properties(plfreetype.c PROPERTIES COMPILE_FLAGS "${PLFREETYPE_COMPILE_PROPS} -I${FREETYPE_INCLUDE_DIR}")
+ set_source_files_properties(plfreetype.c PROPERTIES COMPILE_FLAGS "${PLFREETYPE_COMPILE_PROPS} ${FREETYPE_INCLUDE_CFLAGS}")
list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES ${FREETYPE_LIBRARIES})
endif(WITH_FREETYPE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-25 00:27:57
|
Revision: 13024
http://sourceforge.net/p/plplot/code/13024
Author: airwin
Date: 2014-02-25 00:27:53 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------
Suppress warnings about "wide" UTF-8 characters in man results.
Those characters display without issues using the man command,
but for some reason, there are display issues for the corresponding
nroff -man command. Of course, it is the official man results that
we want so the strange nroff results for UTF-8 characters should be
regarded as a curiosity until we can figure out the nroff options
to display those properly.
Modified Paths:
--------------
trunk/doc/docbook/bin/api2man.pl.in
Modified: trunk/doc/docbook/bin/api2man.pl.in
===================================================================
--- trunk/doc/docbook/bin/api2man.pl.in 2014-02-24 23:53:42 UTC (rev 13023)
+++ trunk/doc/docbook/bin/api2man.pl.in 2014-02-25 00:27:53 UTC (rev 13024)
@@ -202,7 +202,11 @@
}
}
}
+
open (MAN, "> $name.$manvol");
+ # Suppress warnings about UTF-8 in MAN.
+ binmode MAN, ':utf8';
+
print MAN $opening;
print MAN ".TH " . uc ($name) . ' 3plplot "' . $date . '" "" "PLplot API"' . "\n";
$titles .= "\n.TP\n$title";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-24 23:53:48
|
Revision: 13023
http://sourceforge.net/p/plplot/code/13023
Author: airwin
Date: 2014-02-24 23:53:42 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
Remove unneeded "coding: utf-8" comments. Previously these occurred
inconsistently (i.e., not for all utf-8 examples) for all languages
other than Python demonstrating these comments are not needed for
non-Python examples. As a result of this commit the only such comments
left are for Python files where such comments are absolutely required
by that language.
Modified Paths:
--------------
trunk/examples/c/x18c.c
trunk/examples/c/x26c.c
trunk/examples/c/x33c.c
trunk/examples/d/x26d.d
trunk/examples/d/x33d.d
trunk/examples/f95/x26f.f90
trunk/examples/f95/x33f.f90
trunk/examples/perl/x26.pl
trunk/examples/perl/x33.pl
trunk/examples/tcl/x26.tcl
Modified: trunk/examples/c/x18c.c
===================================================================
--- trunk/examples/c/x18c.c 2014-02-24 23:26:54 UTC (rev 13022)
+++ trunk/examples/c/x18c.c 2014-02-24 23:53:42 UTC (rev 13023)
@@ -1,5 +1,3 @@
-// -*- coding: utf-8; -*-
-//
// 3-d line and point plot demo. Adapted from x08c.c.
//
Modified: trunk/examples/c/x26c.c
===================================================================
--- trunk/examples/c/x26c.c 2014-02-24 23:26:54 UTC (rev 13022)
+++ trunk/examples/c/x26c.c 2014-02-24 23:53:42 UTC (rev 13023)
@@ -1,5 +1,3 @@
-// -*- coding: utf-8; -*-
-//
// Multi-lingual version of the first page of example 4.
//
// Copyright (C) 2006 Alan Irwin
Modified: trunk/examples/c/x33c.c
===================================================================
--- trunk/examples/c/x33c.c 2014-02-24 23:26:54 UTC (rev 13022)
+++ trunk/examples/c/x33c.c 2014-02-24 23:53:42 UTC (rev 13023)
@@ -1,5 +1,3 @@
-// -*- coding: utf-8; -*-
-//
// Demonstrate most pllegend capability including unicode symbols.
//
// Copyright (C) 2010 Alan Irwin
Modified: trunk/examples/d/x26d.d
===================================================================
--- trunk/examples/d/x26d.d 2014-02-24 23:26:54 UTC (rev 13022)
+++ trunk/examples/d/x26d.d 2014-02-24 23:53:42 UTC (rev 13023)
@@ -1,5 +1,3 @@
-// -*- coding: utf-8; -*-
-//
// Multi-lingual version of the first page of example 4.
//
// Copyright (C) 2009 Werner Smekal
Modified: trunk/examples/d/x33d.d
===================================================================
--- trunk/examples/d/x33d.d 2014-02-24 23:26:54 UTC (rev 13022)
+++ trunk/examples/d/x33d.d 2014-02-24 23:53:42 UTC (rev 13023)
@@ -1,5 +1,3 @@
-// -*- coding: utf-8; -*-
-//
// Demonstrate most pllegend capability including unicode symbols.
//
// Copyright (C) 2010 Alan W. Irwin
Modified: trunk/examples/f95/x26f.f90
===================================================================
--- trunk/examples/f95/x26f.f90 2014-02-24 23:26:54 UTC (rev 13022)
+++ trunk/examples/f95/x26f.f90 2014-02-24 23:53:42 UTC (rev 13023)
@@ -1,5 +1,3 @@
-! -*- coding: utf-8; -*-
-!
! Multi-lingual version of the first page of example 4.
!
! Copyright (C) 2006 Alan Irwin
Modified: trunk/examples/f95/x33f.f90
===================================================================
--- trunk/examples/f95/x33f.f90 2014-02-24 23:26:54 UTC (rev 13022)
+++ trunk/examples/f95/x33f.f90 2014-02-24 23:53:42 UTC (rev 13023)
@@ -1,5 +1,3 @@
-! -*- coding: utf-8; -*-
-!
! Demonstrate most pllegend capability including unicode symbols.
!
! Copyright (C) 2010 Alan Irwin
Modified: trunk/examples/perl/x26.pl
===================================================================
--- trunk/examples/perl/x26.pl 2014-02-24 23:26:54 UTC (rev 13022)
+++ trunk/examples/perl/x26.pl 2014-02-24 23:53:42 UTC (rev 13023)
@@ -1,6 +1,4 @@
#! /usr/bin/env perl
-#
-# -*- coding: utf-8; -*-
#
# Demo x26 for the PLplot PDL binding
#
Modified: trunk/examples/perl/x33.pl
===================================================================
--- trunk/examples/perl/x33.pl 2014-02-24 23:26:54 UTC (rev 13022)
+++ trunk/examples/perl/x33.pl 2014-02-24 23:53:42 UTC (rev 13023)
@@ -1,5 +1,4 @@
#! /usr/bin/env perl
-# -*- coding: utf-8; -*-
#
# Demonstrate most pllegend capability including unicode symbols.
#
Modified: trunk/examples/tcl/x26.tcl
===================================================================
--- trunk/examples/tcl/x26.tcl 2014-02-24 23:26:54 UTC (rev 13022)
+++ trunk/examples/tcl/x26.tcl 2014-02-24 23:53:42 UTC (rev 13023)
@@ -1,5 +1,3 @@
-# -*- coding: utf-8; -*-
-#
# Multi-lingual version of the first page of example 4.
#
# Copyright (C) 2006 Alan Irwin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-24 23:26:58
|
Revision: 13022
http://sourceforge.net/p/plplot/code/13022
Author: airwin
Date: 2014-02-24 23:26:54 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
More simplification of the Octave build.
Remove the generation (done by api2text.pl) of Octave text
documentation files in bindings/plplot_octave_txt since those
documentation files are no longer used to build the Octave binding.
Instead, the on-line help for the Octave (and Python) bindings is now
produced by swig using bindings/swig-support/swig_documentation.i.
That file is generated using api2swigdoc.pl which was derived from the
(now removed) api2text.pl script.
These changes were tested on Linux using the method specified in
README.Release_Manager_Cookbook to create and test the release tarball.
That tarball creation includes generating all PLplot documentation
and sticking it in the created tarball.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/bindings/octave/CMakeLists.txt
trunk/bindings/swig-support/CMakeLists.txt
trunk/doc/docbook/README.developers
trunk/scripts/parity_bit_check.exclude
Removed Paths:
-------------
trunk/doc/docbook/bin/api2text.pl
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2014-02-24 21:21:59 UTC (rev 13021)
+++ trunk/CMakeLists.txt 2014-02-24 23:26:54 UTC (rev 13022)
@@ -206,10 +206,6 @@
# List of targets that must be (pre-)built.
set(DIST_TARGETS)
- if(ENABLE_octave)
- list(APPEND DIST_TARGETS make_documentation)
- endif(ENABLE_octave)
-
if(BUILD_PRINT)
list(APPEND DIST_TARGETS print)
endif(BUILD_PRINT)
@@ -239,11 +235,6 @@
add_custom_target(
prebuild_dist
COMMAND ${CMAKE_COMMAND} -E remove_directory
- ${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave_txt
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_BINARY_DIR}/bindings/octave/plplot_octave_txt
- ${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave_txt
- COMMAND ${CMAKE_COMMAND} -E remove_directory
${CMAKE_SOURCE_DIR}/doc/doxygen
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_BINARY_DIR}/doc/doxygen
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2014-02-24 21:21:59 UTC (rev 13021)
+++ trunk/bindings/octave/CMakeLists.txt 2014-02-24 23:26:54 UTC (rev 13022)
@@ -38,71 +38,6 @@
install(FILES ${doc} DESTINATION ${DOC_DIR} RENAME ${doc}.octave)
endforeach(doc ${docfiles})
- # This is a representative generated (or prebuilt) octave documentation file.
- # There are more than a hundred of these *.txt files. If the (unlikely)
- # event that the plinit command is no longer part of the PLplot API, this
- # representative file would have to be changed.
- set(rep_doc plinit.txt)
-
- if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_txt/${rep_doc})
- # Octave documentation has been prebuilt in the (tarball) source tree.
- # Copy it to the build tree if that tree is different from source tree.
- if(NOT CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave_txt
- ${CMAKE_BINARY_DIR}/bindings/octave/plplot_octave_txt
- )
- endif(NOT CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
- set(make_documentation_DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
- )
- else(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_txt/${rep_doc})
- # Generate full on-line help for plplot_octave
- file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt)
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
- COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_CURRENT_SOURCE_DIR}/etc/plplot.doc
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/etc/plplot.doc
- )
- if(PERL_XML_DOM AND PERL_XML_PARSER)
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
- COMMAND ${PERL_EXECUTABLE}
- ${CMAKE_SOURCE_DIR}/doc/docbook/bin/api2text.pl
- ${CMAKE_SOURCE_DIR}/doc/docbook/src/plplotdoc.xml.in
- ${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
- ${CMAKE_SOURCE_DIR}/doc/docbook/bin/api2text.pl
- ${CMAKE_SOURCE_DIR}/doc/docbook/src/plplotdoc.xml.in
- ${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt
- )
-
- set(make_documentation_DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
- )
- else(PERL_XML_DOM AND PERL_XML_PARSER)
- message(STATUS
- "WARNING: Perl modules XML::Parser and/or XML::DOM not available\n"
- " so cannot generate full online help for plplot_octave"
- )
- set(make_documentation_DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
- )
- endif(PERL_XML_DOM AND PERL_XML_PARSER)
- endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_txt/${rep_doc})
-
- add_custom_target(
- make_documentation ALL
- DEPENDS ${make_documentation_DEPENDS}
- )
-
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/octave_version.pl.in
${CMAKE_CURRENT_BINARY_DIR}/octave_version.pl
Modified: trunk/bindings/swig-support/CMakeLists.txt
===================================================================
--- trunk/bindings/swig-support/CMakeLists.txt 2014-02-24 21:21:59 UTC (rev 13021)
+++ trunk/bindings/swig-support/CMakeLists.txt 2014-02-24 23:26:54 UTC (rev 13022)
@@ -39,9 +39,6 @@
add_dependencies(check_all check_swig_documentation)
- set(make_documentation_DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
- )
else(PERL_XML_DOM AND PERL_XML_PARSER)
message(STATUS
"WARNING: Perl modules XML::Parser and/or XML::DOM not available\n"
Modified: trunk/doc/docbook/README.developers
===================================================================
--- trunk/doc/docbook/README.developers 2014-02-24 21:21:59 UTC (rev 13021)
+++ trunk/doc/docbook/README.developers 2014-02-24 23:26:54 UTC (rev 13022)
@@ -58,6 +58,14 @@
library's API) to obtain the information used to generate the man
pages.
+(Aside. The bin subdirectory also contained at one time api2text.pl which
+was used by the non-swig version of the Octave bindings to generate
+text documentation for the octave PLplot commands. That script has
+now been removed and replaced by the closely related
+api2swigdoc.pl which generates bindings/swig-support/swig_documentation.i
+API documentation in a form which can be used by swig (for both
+the Python and Octave bindings).
+
2. info pages.
Our info pages are generated by a combination of
Deleted: trunk/doc/docbook/bin/api2text.pl
===================================================================
--- trunk/doc/docbook/bin/api2text.pl 2014-02-24 21:21:59 UTC (rev 13021)
+++ trunk/doc/docbook/bin/api2text.pl 2014-02-24 23:26:54 UTC (rev 13022)
@@ -1,204 +0,0 @@
-#!/usr/bin/perl
-# File: api2man.pl
-# Description: Convert the PLplot API chapter (file api.xml of the DocBook
-# manual) into a series of man pages.
-# Author: Rafael Laboissière <ra...@de...>
-#
-# Copyright (C) 2000, 2003 Rafael Laboissiere
-#
-# This script relies on the present structure of the API chapter (file
-# ../src/api.xml), where each API function is documented in its own
-# section. Here is the typical structure of a section:
-#
-# <sect1 id="NAME">
-# <title><function>NAME</function>: DESCRIPTION</title>
-#
-# <para>
-# <funcsynopsis>
-# <funcprototype>
-# <funcdef>
-# <function>NAME</function>
-# </funcdef>
-# <paramdef><parameter>ARG1</parameter></paramdef>
-# <paramdef><parameter>ARG2</parameter></paramdef>
-# ...
-# </funcprototype>
-# </funcsynopsis>
-# </para>
-#
-# <para>
-# DESCRIPTION
-# </para>
-#
-# <variablelist>
-# <varlistentry>
-# <term>
-# <parameter>ARG1</parameter>
-# TYPE
-# </term>
-# <listitem>
-# <para>
-# ARG1 DESCRIPTION
-# </para>
-# </listitem>
-# </varlistentry>
-# ...
-# </variablelist>
-#
-# </sect1>
-
-# Call this script by ginving the master file (typically
-# plplotdoc.xml) as the first argument, the API chapter file
-# (typically api.xml) as second argument, and the man volume
-# (typicvally 3plplot) as third.
-
-use XML::Parser;
-use XML::DOM;
-use Text::Wrap;
-$Text::Wrap::columns = 75;
-use Text::Tabs;
-$tabstop = 4;
-
-$api = "";
-open (MASTER, "< $ARGV[0]");
-while (<MASTER>) {
- if (/^(<!DOCTYPE.*)\[/) {
- $api .= "$1 [\n";
- }
- elsif (/^<\?xml/) {
- $api .= '<?xml version="1.0" standalone="yes"?>
-';
- }
- elsif (/^<!ENTITY pl/) {
- $api .= $_;
- }
-}
-$api .= "<!ENTITY amp '#38;#38;'>
-<!ENTITY deg ' degrees'>
-<!ENTITY gt '>'>
-<!ENTITY leq '&#60;='>
-<!ENTITY lt '&#60;'>
-<!ENTITY ndash '--'>
-]>\n";
-close MASTER;
-
-open (API, "< $ARGV[1]");
-$/ = undef;
-$api .= <API>;
-close API;
-
-sub process_node {
- my $ret = "";
- my $t = shift;
- my $c = $t->getChildNodes;
- my $m = $c->getLength;
- for (my $j = 0; $j < $m; $j++) {
- my $e = $c->item($j);
- my $nt = $e->getNodeType;
- if ($nt == TEXT_NODE) {
- my $a = $e->getData;
- $a =~ s/^\s+/ /;
- $a =~ s/^\s+$//;
- $a =~ s/\n\s+/ /g;
- $ret .= $a;
- }
- elsif ($nt == ELEMENT_NODE) {
- my $tag = $e->getTagName;
- if ($tag eq "parameter") {
- $ret .= "\n" . process_node ($e);
- }
- elsif ($tag eq "function") {
- $ret .= process_node ($e);
- }
- elsif ($tag eq "link") {
- $ret .= process_node ($e) ;
- }
- elsif ($tag eq "funcprototype") {
- $startproto = 1;
- my $p = process_node ($e);
- $p =~ s/ +$//;
- $ret .= $p . ")";
- }
- elsif ($tag eq "paramdef") {
- my $p = process_node ($e);
- $p =~ s/ +$//;
- $ret .= ($startproto ? "(" : ", ") . $p;
- $startproto = 0;
- }
- elsif ($tag eq "term") {
- $ret .= "\n" . process_node ($e) . ":";
- }
- elsif ($tag eq "listitem") {
- $ret .= "\t" . process_node ($e) . "\n";
- }
- elsif ($tag eq "xref") {
- $ret .= "the PLplot documentation";
- }
- elsif ($tag eq "varlistentry") {
- $ret .= "\n" . process_node ($e);
- }
- else {
- $ret .= process_node ($e);
- }
- }
- else {
- $ret .= process_node ($e);
- }
- }
- $ret =~ s/^\s+//;
- return $ret;
-}
-
-$p = new XML::DOM::Parser;
-$sects = $p->parse ($api)->getElementsByTagName ("sect1");
-my $ns = $sects->getLength;
-$titles = "";
-
-for ($i = 0; $i < $ns; $i++) {
- $fun = $sects->item ($i);
- $name = $fun->getAttribute ("id");
- $c = $fun->getChildNodes;
- $nc = $c->getLength;
- $desc = "";
- $varlist = "";
- $got_synopsis = 0;
- for ($j = 0; $j < $nc; $j++) {
- $part = $c->item($j);
- if ($part->getNodeType == ELEMENT_NODE) {
- $contents = process_node ($part);
- $node = $part->getTagName;
- if ($node eq "title") {
- $title = $contents;
- }
- elsif ($node eq "para") {
- if ($got_synopsis) {
- $desc = $contents;
- }
- else {
- $synopsis = $contents;
- $got_synopsis = 1;
- }
- }
- elsif ($node eq "variablelist") {
- $varlist = $contents;
- }
- }
- }
- $indent = ' ';
- $desc = wrap ($indent, $indent, split(/\n\s*\n/, $desc));
- $varlist = join ("\n", map {
- s/\t/ /g;
- /(^\s+)/;
- $_ = wrap ($indent . $1,
- $indent . $1 . $indent, $_);
- s/\t/ /g;
- $_;
- } split ("\n", $varlist));
- open (MAN, "> $name.txt");
- print MAN "\n$title\n";
- print MAN "\nDESCRIPTION:\n\n$desc\n";
- print MAN "\nSYNOPSIS:\n\n$synopsis\n";
- print MAN "\nARGUMENTS:\n\n$varlist\n"
- if not $varlist eq "";
- close MAN;
-}
Modified: trunk/scripts/parity_bit_check.exclude
===================================================================
--- trunk/scripts/parity_bit_check.exclude 2014-02-24 21:21:59 UTC (rev 13021)
+++ trunk/scripts/parity_bit_check.exclude 2014-02-24 23:26:54 UTC (rev 13022)
@@ -26,7 +26,6 @@
qsastime.xml
README.deltaT.dat
api2man.pl.in
-api2text.pl
docbook/AUTHORS
__pl_pltext.m
plplot_auxiliary.adb
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-24 21:22:05
|
Revision: 13021
http://sourceforge.net/p/plplot/code/13021
Author: airwin
Date: 2014-02-24 21:21:59 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
More simplification of the octave build.
Remove unused massage.c and all references to that file.
Modified Paths:
--------------
trunk/scripts/style_source.sh
Removed Paths:
-------------
trunk/bindings/octave/massage.c
Deleted: trunk/bindings/octave/massage.c
===================================================================
--- trunk/bindings/octave/massage.c 2014-02-24 21:19:51 UTC (rev 13020)
+++ trunk/bindings/octave/massage.c 2014-02-24 21:21:59 UTC (rev 13021)
@@ -1,133 +0,0 @@
-//
-//## Copyright (C) 1998-2003 Joao Cardoso.
-//##
-//## This program is free software; you can redistribute it and/or modify it
-//## under the terms of the GNU General Public License as published by the
-//## Free Software Foundation; either version 2 of the License, or (at your
-//## option) any later version.
-//##
-//## This program is distributed in the hope that it will be useful, but
-//## WITHOUT ANY WARRANTY; without even the implied warranty of
-//## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-//## General Public License for more details.
-//##
-//## This file is part of plplot_octave.
-//
-
-//
-// Add online help to functions, parsing 'tmp_stub' and looking for
-// function definitions; for each function found, scans directory
-// 'plplot_octave_txt' for a file with the same basename as function
-// and extension '.txt'; if found, incorporates it as the function
-// online help, else, looks in 'plplot.doc' for a one-line description
-// of the function and adds it. If not even found in 'plplot.doc', ask
-// the user to write the docs! No free lunches!
-//
-
-#include "stdio.h"
-#include "string.h"
-#include "stdlib.h"
-#include <sys/stat.h>
-#include "errno.h"
-
-int
-main()
-{
- char *p1, *p2;
- char doc[150][1024], b[1024], tok[80];
- int item = 0, j;
- FILE *fp, *fp1;
- struct stat buf;
-
- if ( ( fp = fopen( "plplot_octave_txt/plplot.doc", "r" ) ) == NULL )
- {
- perror( "plplot.doc not found:" );
- exit( 1 );
- }
-
- while ( !feof( fp ) && fgets( b, sizeof ( b ), fp ) != NULL )
- {
- if ( strchr( b, '-' ) )
- strcpy( doc[item++], b );
- }
- fclose( fp );
-
- if ( ( fp = fopen( "tmp_stub", "r" ) ) == NULL )
- {
- perror( "tmp_stub not found:" );
- exit( 1 );
- }
-
- while ( !feof( fp ) && fgets( b, sizeof ( b ), fp ) != NULL )
- {
- if ( ( p2 = strchr( b, '(' ) ) ) // function ... = ...(
- {
- p1 = p2;
- while ( *p1-- != ' ' )
- ;
- p1 += 2;
- if ( *( p1 + 1 ) == '_' ) // c_...
- p1 += 2;
- strncpy( tok, p1, p2 - p1 );
- *( tok + (int) ( p2 - p1 ) ) = '\0';
- printf( "%s", b );
- if ( fgets( b, sizeof ( b ), fp ) == NULL )
- {
- fprintf( stderr, "Error reading line\n" );
- return 1;
- }
- printf( "%s%%\n", b ); // % function ... = ...(
-
- sprintf( b, "plplot_octave_txt/%s.txt", tok );
- if ( stat( b, &buf ) && errno == ENOENT )
- {
- fprintf( stderr, "%s not found, trying plplot.doc... ", b );
- strcat( tok, "\t" );
- for ( j = 0; j < item; j++ )
- {
- if ( strncmp( doc[j], tok, strlen( tok ) ) == 0 )
- {
- printf( "%% %s", &doc[j][strlen( tok ) + 4] ); // strip func --
- break;
- }
- }
- if ( j == item )
- {
- fprintf( stderr, "%s not found\n", tok );
- printf( "%% No online help available. Help me, write and submit the documentation, or at least write a one line descriptive text.\n" );
- }
- else
- fprintf( stderr, "%s OK\n", tok );
- }
- else
- {
- printf( "%% Original PLplot call documentation:\n%%\n" );
- fp1 = fopen( b, "r" );
- while ( !feof( fp1 ) && fgets( b, sizeof ( b ), fp1 ) != NULL )
- {
- printf( "%% %s", b );
- }
- fclose( fp1 );
- }
- if ( fgets( b, sizeof ( b ), fp ) == NULL ) // % No doc...
- {
- fprintf( stderr, "Error reading line\n" );
- return 1;
- }
- if ( fgets( b, sizeof ( b ), fp ) == NULL )
- {
- fprintf( stderr, "Error reading line\n" );
- return 1;
- }
- printf( "%s", b ); // plplot_oct...
- if ( fgets( b, sizeof ( b ), fp ) == NULL )
- {
- fprintf( stderr, "Error reading line\n" );
- return 1;
- }
- printf( "%s\n", b ); // endfunction
- }
- }
- fclose( fp );
- exit( 0 );
-}
Modified: trunk/scripts/style_source.sh
===================================================================
--- trunk/scripts/style_source.sh 2014-02-24 21:19:51 UTC (rev 13020)
+++ trunk/scripts/style_source.sh 2014-02-24 21:21:59 UTC (rev 13021)
@@ -214,7 +214,7 @@
# C source in utils.
csource_LIST="$csource_LIST utils/*.c"
-csource_LIST="$csource_LIST bindings/tcl/*.[ch] bindings/f95/*.c bindings/f95/plstubs.h bindings/gnome2/*/*.c bindings/ocaml/plplot_impl.c bindings/ocaml/plcairo/plcairo_impl.c bindings/python/plplot_widgetmodule.c bindings/tk/*.[ch] bindings/tk-x-plat/*.[ch] bindings/octave/massage.c"
+csource_LIST="$csource_LIST bindings/tcl/*.[ch] bindings/f95/*.c bindings/f95/plstubs.h bindings/gnome2/*/*.c bindings/ocaml/plplot_impl.c bindings/ocaml/plcairo/plcairo_impl.c bindings/python/plplot_widgetmodule.c bindings/tk/*.[ch] bindings/tk-x-plat/*.[ch]
export cppsource_LIST
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-24 21:19:54
|
Revision: 13020
http://sourceforge.net/p/plplot/code/13020
Author: airwin
Date: 2014-02-24 21:19:51 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
Replace autotools part of the instructions with the equivalent CMake-based
instructions.
Modified Paths:
--------------
trunk/bindings/octave/INSTALL
Modified: trunk/bindings/octave/INSTALL
===================================================================
--- trunk/bindings/octave/INSTALL 2014-02-24 20:06:57 UTC (rev 13019)
+++ trunk/bindings/octave/INSTALL 2014-02-24 21:19:51 UTC (rev 13020)
@@ -1,43 +1,35 @@
-This instructions are somehow out of date. Read also the USAGE file.
+Read also the USAGE file.
+Build and install:
-Install:
+The Octave binding for PLplot is now automatically generated with swig.
-plplot_octave_org.h is the main important file. It is a massaged version
-of plplot's plplot.h file, ready for use with Holt's matwrap, which you
-can find at
+Simply use the normal cmake command to configure PLplot, then
- http://lnc.usc.edu/~holt/matwrap/
+<build_tool> install
-As usual, you should get the last version, 0.57 at the time of this
-writing. You also need perl.
-If you don't have Holt's matwrap, don't worry, a copy is available
-in this distribution and will be automatically used.
+to build PLplot including its Octave binding, and install PLplot including
+its Octave binding and associated Octave examples.
-You must compile PLplot with shared libraries, which 'configure' does
-by default if your OS is supported.
+N.B. <build_tool> is typically the make command, but CMake allows for
+many others.
-Make sure that you have octave-2.0.16 or latter, matwrap and perl.
-Make sure that you have a correctly installed octave, configured with
---enable-shared and --enable-dl. The command
+Automatic Testing:
- ldd `which octave`
+In the build tree anytime after the cmake command is executed with
+the -DBUILD_TEST=ON option execute
-should report octave dynamic libs, liboctave.so, libcruft.so and
-liboctinterp.so
+<build_tool> help |grep octave
-Configure PLplot with the --enable-octave, which is the default,
-plus any other options in the main directory, e.g.,
+to find all test targets associated with octave. Generally, those targets
+have names which remind what they do. So, e.g., test_octave_psc tests
+all our standard Octave examples using -dev psc and
+test_octave_xwin tests some special interactive Octave examples using
+-dev xwin.
- ./configure --enable-octave
+Hand Testing (these direction may be out of date because automatic testing is
+so convenient):
-and then type 'make'.
-
-Testing:
-
-Before installing, you can test plplot_octave:
-[you must install PLplot before, this will change soon]
-
'cd' to the directory bindings/octave within the build tree.
If you have another version of plplot installed, check, after invoking
@@ -68,21 +60,19 @@
~/.octaverc Octave startup file (see below). This is being corrected
in plplot_octave, meanwhile keep remembering me :-).
-
Using:
-After testing, type "make install". The default path to instalation is
-$prefix/share/plplot_octave. If you don't like it, reconfigure PLplot
-using the configure option --prefix=<preferred path> and rebuild and
-install, or try "make install PREFIX=<install path>"; this last option
-might not yet work. In the following discussion the default prefix of
-/usr/local is used.
+After testing, type "make install". The default path to installation
+is <installation prefix>/share/share/plplot_octave. If you don't like
+the default <installation prefix> which is /usr/local, reconfigure
+PLplot using your preferred -DCMAKE_INSTALL_PREFIX=<installation
+prefix> option for CMake.
There are three paths that you can add to LOADPATH:
-1-The *needed* path is /usr/local/share/plplot_octave//
-2-The demos path is /usr/local/lib/plplotx.y.z/examples/octave//
-3-The path to switch between PLplot and gnuplot is /usr/local/share/octave//
+1-The *needed* path is <installation prefix>/share/plplot_octave//
+2-The demos path is <installation prefix>/lib/plplotx.y.z/examples/octave//
+3-The path to switch between PLplot and gnuplot is <installation prefix>/share/octave//
Note: If you are using octave2.9 then LOADPATH is obsolete and you must
use addpath instead. Note also that a trailing // no longer includes
@@ -92,8 +82,8 @@
If you want to test the installation with the demos, call octave and
set the LOADPATH as in
-LOADPATH ="/usr/local/lib/plplotx.y.z/examples/octave//:\
-/usr/local/share/plplot_octave//:"
+LOADPATH ="<installation prefix>/lib/plplotx.y.z/examples/octave//:\
+<installation prefix>/share/plplot_octave//:"
You can now repeat the demos you already tried. Or just type 'p1'<CR>,
'p2'<CR> ... my preferred test is "plot(sin(1:10),'-o')". As usual,
@@ -104,18 +94,18 @@
is to use the file ~/.octaverc to set it up. Add the following line to
it, using of course the real install prefix:
-LOADPATH="/usr/local/share/plplot_octave//:<other path>:<other path>";
+LOADPATH="<installation prefix>/share/plplot_octave//:<other path>:<other path>";
You can use the standard Octave plot commands if in the LOADPATH a
":" appears *before* the plplot_octave path, as in
-LOADPATH=":/usr/local/share/plplot_octave//:<other path>:<other path>";
+LOADPATH=":<installation prefix>/share/plplot_octave//:<other path>:<other path>";
You can use the command toggle_plplot_use to change between the two
sets of commands, but for this you must set an additional path in LOADPATH.
It must be set as:
-LOADPATH="/usr/local/share/plplot_octave//:/usr/local/share/octave//:"
+LOADPATH="<installation prefix>/share/plplot_octave//:<installation prefix>/share/octave//:"
You are done. You can now use almost all the standard Octave plot
commands plus a whole bunch of new ones.
@@ -162,7 +152,7 @@
documentation is built from the main documentation file, api.xml.
You have the directory where the README, INSTALL, PROBLEMS,
-BUGS, ToDo, are, plus 'plplot_octave_org.h', massage.c, etc.
+BUGS, ToDo, are, plus 'plplot_octave_org.h', etc.
As with every program, except D. Knuth ones, the programs in this
package are not finished nor bug free. Please report bugs and send
@@ -173,3 +163,4 @@
Joao
Update for octave 2.9 by Andrew Ross.
+Update for CMake by Alan W. Irwin.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-24 20:07:32
|
Revision: 13019
http://sourceforge.net/p/plplot/code/13019
Author: airwin
Date: 2014-02-24 20:06:57 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
As alluded to previously on list, remove $Id keyword from files and
remove all svn:keywords properties and all "keywords" properties
(historically set in error instead of svn:keywords) from files. This
change should completely get rid of the previous issue that an svn
commit would change some file contents and thus automatically
(and unexpectedly) regenerate parts of the build.
Tested on Linux using
svn diff -x -w |grep '^[+-]' |grep -v Id |grep -v '+++' \
|grep -v '\-\-\-' |grep -v Copyright |less
to check for editing errors.
Tested on Linux using the test_interactive and test_noninteractive
targets in the build tree for the shared libraries/dynamic devices
case. This test should test most source code, but does not test
documentation files for any editing mistakes where we must rely on the
previous test.
Modified Paths:
--------------
trunk/bindings/ada/plplot.adb
trunk/bindings/ada/plplot.ads
trunk/bindings/ada/plplot_auxiliary.adb
trunk/bindings/ada/plplot_auxiliary.ads
trunk/bindings/ada/plplot_thin.adb
trunk/bindings/ada/plplot_thin.ads
trunk/bindings/ada/plplot_traditional.adb
trunk/bindings/ada/plplot_traditional.ads
trunk/bindings/c++/plstream.cc
trunk/bindings/c++/plstream.h
trunk/bindings/f95/configurable.f90
trunk/bindings/f95/plstubs.h
trunk/bindings/f95/sc3d.c
trunk/bindings/f95/sccont.c
trunk/bindings/f95/scstubs.c
trunk/bindings/f95/sfstubs.f90
trunk/bindings/f95/sfstubsf95.f90
trunk/bindings/f95/strutil.f90
trunk/bindings/tcl/matrixInit.c
trunk/bindings/tcl/pkgIndex.tcl.in
trunk/bindings/tcl/plapi.tpl
trunk/bindings/tcl/plitclgen
trunk/bindings/tcl/plitclgen.tcl
trunk/bindings/tcl/pltcl.c
trunk/bindings/tcl/pltcl.h
trunk/bindings/tcl/pltclgen
trunk/bindings/tcl/pltclgen.tcl
trunk/bindings/tcl/tclAPI.c
trunk/bindings/tcl/tclMain.c
trunk/bindings/tcl/tclMatrix.c
trunk/bindings/tcl/tclMatrix.h
trunk/bindings/tk/FileSelector.tcl
trunk/bindings/tk/PLWin.itk
trunk/bindings/tk/PLXWin.itk
trunk/bindings/tk/Pltk_Init.c
trunk/bindings/tk/Pltkwin.tcl
trunk/bindings/tk/about.tcl
trunk/bindings/tk/help_gui.tcl
trunk/bindings/tk/help_keys.tcl
trunk/bindings/tk/help_tcltk.tcl
trunk/bindings/tk/pkgIndex.tcl.in
trunk/bindings/tk/plclient.tcl
trunk/bindings/tk/plcolor.tcl
trunk/bindings/tk/plconfig.tcl
trunk/bindings/tk/pldefaults.tcl
trunk/bindings/tk/plframe.c
trunk/bindings/tk/plr.c
trunk/bindings/tk/plserver.c
trunk/bindings/tk/plserver.h
trunk/bindings/tk/plserver.tcl
trunk/bindings/tk/pltk.h
trunk/bindings/tk/pltkd.h
trunk/bindings/tk/pltools.tcl
trunk/bindings/tk/plwidget.tcl
trunk/bindings/tk/tcpip.c
trunk/bindings/tk/tcpip.h
trunk/bindings/tk/tkMain.c
trunk/bindings/tk/tkshell.c
trunk/bindings/tk-x-plat/Plplotter_Init.c
trunk/bindings/tk-x-plat/Plwindow.tcl
trunk/bindings/tk-x-plat/pkgIndex.tcl.in
trunk/bindings/tk-x-plat/plplotter.c
trunk/bindings/tk-x-plat/pltkwd.h
trunk/bindings/tk-x-plat/plwidget2.tcl
trunk/bindings/wxwidgets/wxPLplotstream.cpp
trunk/bindings/wxwidgets/wxPLplotstream.h.in
trunk/bindings/wxwidgets/wxPLplotwindow.cpp
trunk/bindings/wxwidgets/wxPLplotwindow.h
trunk/doc/docbook/README.developers
trunk/doc/docbook/bin/api2man.pl.in
trunk/doc/docbook/bin/api2swigdoc.pl
trunk/doc/docbook/bin/api2text.pl
trunk/drivers/cgm.c
trunk/drivers/dg300.c
trunk/drivers/gd.c
trunk/drivers/hpgl.c
trunk/drivers/impress.c
trunk/drivers/linuxvga.c
trunk/drivers/ljii.c
trunk/drivers/ljiip.c
trunk/drivers/mem.c
trunk/drivers/ntk.c
trunk/drivers/null.c
trunk/drivers/pbm.c
trunk/drivers/pdf.c
trunk/drivers/plmeta.c
trunk/drivers/ps.c
trunk/drivers/pstex.c
trunk/drivers/psttf.cc
trunk/drivers/tek.c
trunk/drivers/tk.c
trunk/drivers/tkwin.c
trunk/drivers/wingcc.c
trunk/drivers/wxwidgets.cpp
trunk/drivers/wxwidgets.h
trunk/drivers/wxwidgets_agg.cpp
trunk/drivers/wxwidgets_app.cpp
trunk/drivers/wxwidgets_dc.cpp
trunk/drivers/wxwidgets_gc.cpp
trunk/drivers/xfig.c
trunk/drivers/xwin.c
trunk/examples/ada/x00_easy_a.adb
trunk/examples/ada/x00a.adb
trunk/examples/ada/x01a.adb
trunk/examples/ada/x02a.adb
trunk/examples/ada/x03a.adb
trunk/examples/ada/x04a.adb
trunk/examples/ada/x05a.adb
trunk/examples/ada/x06a.adb
trunk/examples/ada/x07a.adb
trunk/examples/ada/x08a.adb
trunk/examples/ada/x09a.adb
trunk/examples/ada/x10a.adb
trunk/examples/ada/x11a.adb
trunk/examples/ada/x12a.adb
trunk/examples/ada/x13a.adb
trunk/examples/ada/x14a.adb
trunk/examples/ada/x15a.adb
trunk/examples/ada/x16a.adb
trunk/examples/ada/x17a.adb
trunk/examples/ada/x18a.adb
trunk/examples/ada/x19a.adb
trunk/examples/ada/x20a.adb
trunk/examples/ada/x21a.adb
trunk/examples/ada/x22a.adb
trunk/examples/ada/x23a.adb
trunk/examples/ada/x24a.adb
trunk/examples/ada/x25a.adb
trunk/examples/ada/x26a.adb
trunk/examples/ada/x27a.adb
trunk/examples/ada/x28a.adb
trunk/examples/ada/x29a.adb
trunk/examples/ada/x30a.adb
trunk/examples/ada/x31a.adb
trunk/examples/ada/x33a.adb
trunk/examples/ada/xthick00a.adb
trunk/examples/ada/xthick01a.adb
trunk/examples/ada/xthick02a.adb
trunk/examples/ada/xthick03a.adb
trunk/examples/ada/xthick04a.adb
trunk/examples/ada/xthick05a.adb
trunk/examples/ada/xthick06a.adb
trunk/examples/ada/xthick07a.adb
trunk/examples/ada/xthick08a.adb
trunk/examples/ada/xthick09a.adb
trunk/examples/ada/xthick10a.adb
trunk/examples/ada/xthick11a.adb
trunk/examples/ada/xthick12a.adb
trunk/examples/ada/xthick13a.adb
trunk/examples/ada/xthick14a.adb
trunk/examples/ada/xthick15a.adb
trunk/examples/ada/xthick16a.adb
trunk/examples/ada/xthick17a.adb
trunk/examples/ada/xthick18a.adb
trunk/examples/ada/xthick19a.adb
trunk/examples/ada/xthick20a.adb
trunk/examples/ada/xthick21a.adb
trunk/examples/ada/xthick22a.adb
trunk/examples/ada/xthick23a.adb
trunk/examples/ada/xthick24a.adb
trunk/examples/ada/xthick25a.adb
trunk/examples/ada/xthick26a.adb
trunk/examples/ada/xthick27a.adb
trunk/examples/ada/xthick28a.adb
trunk/examples/ada/xthick29a.adb
trunk/examples/ada/xthick30a.adb
trunk/examples/ada/xthick31a.adb
trunk/examples/ada/xthick33a.adb
trunk/examples/c/plcdemos.h
trunk/examples/c/test_plend.c
trunk/examples/c/tutor.c
trunk/examples/c/x00c.c
trunk/examples/c/x01c.c
trunk/examples/c/x02c.c
trunk/examples/c/x03c.c
trunk/examples/c/x04c.c
trunk/examples/c/x05c.c
trunk/examples/c/x06c.c
trunk/examples/c/x07c.c
trunk/examples/c/x08c.c
trunk/examples/c/x09c.c
trunk/examples/c/x10c.c
trunk/examples/c/x11c.c
trunk/examples/c/x12c.c
trunk/examples/c/x13c.c
trunk/examples/c/x14c.c
trunk/examples/c/x15c.c
trunk/examples/c/x16c.c
trunk/examples/c/x17c.c
trunk/examples/c/x18c.c
trunk/examples/c/x19c.c
trunk/examples/c/x20c.c
trunk/examples/c/x21c.c
trunk/examples/c/x22c.c
trunk/examples/c/x25c.c
trunk/examples/c/x26c.c
trunk/examples/c/x27c.c
trunk/examples/c/x28c.c
trunk/examples/c/x29c.c
trunk/examples/c/x31c.c
trunk/examples/c/x32c.c
trunk/examples/c/x33c.c
trunk/examples/c/x34c.c
trunk/examples/c++/plc++demos.h
trunk/examples/c++/wxPLplotDemo.cpp
trunk/examples/c++/x00.cc
trunk/examples/c++/x01.cc
trunk/examples/c++/x01cc.cc
trunk/examples/c++/x02.cc
trunk/examples/c++/x03.cc
trunk/examples/c++/x04.cc
trunk/examples/c++/x05.cc
trunk/examples/c++/x06.cc
trunk/examples/c++/x07.cc
trunk/examples/c++/x08.cc
trunk/examples/c++/x09.cc
trunk/examples/c++/x10.cc
trunk/examples/c++/x11.cc
trunk/examples/c++/x12.cc
trunk/examples/c++/x13.cc
trunk/examples/c++/x14.cc
trunk/examples/c++/x15.cc
trunk/examples/c++/x16.cc
trunk/examples/c++/x17.cc
trunk/examples/c++/x18.cc
trunk/examples/c++/x19.cc
trunk/examples/c++/x20.cc
trunk/examples/c++/x21.cc
trunk/examples/c++/x22.cc
trunk/examples/c++/x23.cc
trunk/examples/c++/x25.cc
trunk/examples/c++/x26.cc
trunk/examples/c++/x27.cc
trunk/examples/c++/x28.cc
trunk/examples/c++/x29.cc
trunk/examples/c++/x30.cc
trunk/examples/c++/x31.cc
trunk/examples/c++/x33.cc
trunk/examples/d/x00d.d
trunk/examples/d/x01d.d
trunk/examples/d/x02d.d
trunk/examples/d/x03d.d
trunk/examples/d/x04d.d
trunk/examples/d/x05d.d
trunk/examples/d/x06d.d
trunk/examples/d/x07d.d
trunk/examples/d/x08d.d
trunk/examples/d/x09d.d
trunk/examples/d/x10d.d
trunk/examples/d/x11d.d
trunk/examples/d/x12d.d
trunk/examples/d/x13d.d
trunk/examples/d/x14d.d
trunk/examples/d/x15d.d
trunk/examples/d/x16d.d
trunk/examples/d/x17d.d
trunk/examples/d/x18d.d
trunk/examples/d/x19d.d
trunk/examples/d/x20d.d
trunk/examples/d/x21d.d
trunk/examples/d/x22d.d
trunk/examples/d/x23d.d
trunk/examples/d/x24d.d
trunk/examples/d/x25d.d
trunk/examples/d/x26d.d
trunk/examples/d/x27d.d
trunk/examples/d/x28d.d
trunk/examples/d/x29d.d
trunk/examples/d/x30d.d
trunk/examples/d/x31d.d
trunk/examples/d/x33d.d
trunk/examples/f95/plf95demolib.f90
trunk/examples/f95/x00f.f90
trunk/examples/f95/x01f.f90
trunk/examples/f95/x02f.f90
trunk/examples/f95/x03f.f90
trunk/examples/f95/x04f.f90
trunk/examples/f95/x05f.f90
trunk/examples/f95/x06f.f90
trunk/examples/f95/x07f.f90
trunk/examples/f95/x08f.f90
trunk/examples/f95/x09f.f90
trunk/examples/f95/x10f.f90
trunk/examples/f95/x11f.f90
trunk/examples/f95/x12f.f90
trunk/examples/f95/x13f.f90
trunk/examples/f95/x14f.f90
trunk/examples/f95/x15f.f90
trunk/examples/f95/x16af.f90
trunk/examples/f95/x16f.f90
trunk/examples/f95/x17f.f90
trunk/examples/f95/x18f.f90
trunk/examples/f95/x19f.f90
trunk/examples/f95/x20f.f90
trunk/examples/f95/x21f.f90
trunk/examples/f95/x22f.f90
trunk/examples/f95/x23f.f90
trunk/examples/f95/x24f.f90
trunk/examples/f95/x25f.f90
trunk/examples/f95/x26f.f90
trunk/examples/f95/x27f.f90
trunk/examples/f95/x28f.f90
trunk/examples/f95/x29f.f90
trunk/examples/f95/x30f.f90
trunk/examples/f95/x31f.f90
trunk/examples/f95/x33f.f90
trunk/examples/java/x00.java
trunk/examples/java/x01.java
trunk/examples/java/x02.java
trunk/examples/java/x03.java
trunk/examples/java/x04.java
trunk/examples/java/x05.java
trunk/examples/java/x06.java
trunk/examples/java/x07.java
trunk/examples/java/x08.java
trunk/examples/java/x09.java
trunk/examples/java/x10.java
trunk/examples/java/x11.java
trunk/examples/java/x12.java
trunk/examples/java/x13.java
trunk/examples/java/x14.java
trunk/examples/java/x15.java
trunk/examples/java/x16.java
trunk/examples/java/x17.java
trunk/examples/java/x18.java
trunk/examples/java/x19.java
trunk/examples/java/x20.java
trunk/examples/java/x21.java
trunk/examples/java/x22.java
trunk/examples/java/x23.java
trunk/examples/java/x24.java
trunk/examples/java/x25.java
trunk/examples/java/x26.java
trunk/examples/java/x27.java
trunk/examples/java/x28.java
trunk/examples/java/x29.java
trunk/examples/java/x30.java
trunk/examples/java/x31.java
trunk/examples/java/x33.java
trunk/examples/lua/x00.lua
trunk/examples/lua/x01.lua
trunk/examples/lua/x02.lua
trunk/examples/lua/x03.lua
trunk/examples/lua/x04.lua
trunk/examples/lua/x05.lua
trunk/examples/lua/x06.lua
trunk/examples/lua/x07.lua
trunk/examples/lua/x08.lua
trunk/examples/lua/x09.lua
trunk/examples/lua/x10.lua
trunk/examples/lua/x11.lua
trunk/examples/lua/x12.lua
trunk/examples/lua/x13.lua
trunk/examples/lua/x14.lua
trunk/examples/lua/x15.lua
trunk/examples/lua/x16.lua
trunk/examples/lua/x17.lua
trunk/examples/lua/x18.lua
trunk/examples/lua/x19.lua
trunk/examples/lua/x20.lua
trunk/examples/lua/x21.lua
trunk/examples/lua/x22.lua
trunk/examples/lua/x23.lua
trunk/examples/lua/x24.lua
trunk/examples/lua/x25.lua
trunk/examples/lua/x26.lua
trunk/examples/lua/x27.lua
trunk/examples/lua/x28.lua
trunk/examples/lua/x29.lua
trunk/examples/lua/x30.lua
trunk/examples/lua/x31.lua
trunk/examples/lua/x33.lua
trunk/examples/ocaml/x00.ml
trunk/examples/ocaml/x01.ml
trunk/examples/ocaml/x02.ml
trunk/examples/ocaml/x03.ml
trunk/examples/ocaml/x04.ml
trunk/examples/ocaml/x05.ml
trunk/examples/ocaml/x06.ml
trunk/examples/ocaml/x07.ml
trunk/examples/ocaml/x08.ml
trunk/examples/ocaml/x09.ml
trunk/examples/ocaml/x10.ml
trunk/examples/ocaml/x11.ml
trunk/examples/ocaml/x12.ml
trunk/examples/ocaml/x13.ml
trunk/examples/ocaml/x14.ml
trunk/examples/ocaml/x15.ml
trunk/examples/ocaml/x16.ml
trunk/examples/ocaml/x17.ml
trunk/examples/ocaml/x18.ml
trunk/examples/ocaml/x20.ml
trunk/examples/ocaml/x21.ml
trunk/examples/ocaml/x22.ml
trunk/examples/ocaml/x25.ml
trunk/examples/ocaml/x26.ml
trunk/examples/ocaml/x27.ml
trunk/examples/ocaml/x28.ml
trunk/examples/ocaml/x29.ml
trunk/examples/ocaml/x31.ml
trunk/examples/ocaml/x33.ml
trunk/examples/ocaml/x34.ml
trunk/examples/octave/x00c.m
trunk/examples/octave/x20c.m
trunk/examples/octave/x21c.m
trunk/examples/octave/x23c.m
trunk/examples/octave/x24c.m
trunk/examples/octave/x25c.m
trunk/examples/octave/x26c.m
trunk/examples/octave/x27c.m
trunk/examples/octave/x28c.m
trunk/examples/octave/x29c.m
trunk/examples/octave/x30c.m
trunk/examples/octave/x31c.m
trunk/examples/octave/x33c.m
trunk/examples/perl/x26.pl
trunk/examples/perl/x27.pl
trunk/examples/perl/x33.pl
trunk/examples/python/test_hebrew_diacritic.py
trunk/examples/python/test_type1.py
trunk/examples/python/xw00.py
trunk/examples/python/xw01.py
trunk/examples/python/xw02.py
trunk/examples/python/xw03.py
trunk/examples/python/xw04.py
trunk/examples/python/xw05.py
trunk/examples/python/xw06.py
trunk/examples/python/xw07.py
trunk/examples/python/xw08.py
trunk/examples/python/xw09.py
trunk/examples/python/xw10.py
trunk/examples/python/xw11.py
trunk/examples/python/xw12.py
trunk/examples/python/xw13.py
trunk/examples/python/xw14.py
trunk/examples/python/xw15.py
trunk/examples/python/xw16.py
trunk/examples/python/xw17.py
trunk/examples/python/xw18.py
trunk/examples/python/xw19.py
trunk/examples/python/xw20.py
trunk/examples/python/xw21.py
trunk/examples/python/xw22.py
trunk/examples/python/xw23.py
trunk/examples/python/xw24.py
trunk/examples/python/xw25.py
trunk/examples/python/xw26.py
trunk/examples/python/xw27.py
trunk/examples/python/xw28.py
trunk/examples/python/xw29.py
trunk/examples/python/xw30.py
trunk/examples/python/xw31.py
trunk/examples/python/xw33.py
trunk/examples/tcl/plgrid.tcl
trunk/examples/tcl/plot.tcl
trunk/examples/tcl/tcldemos.tcl
trunk/examples/tcl/x00
trunk/examples/tcl/x00.tcl
trunk/examples/tcl/x01
trunk/examples/tcl/x01.tcl
trunk/examples/tcl/x02
trunk/examples/tcl/x02.tcl
trunk/examples/tcl/x03
trunk/examples/tcl/x03.tcl
trunk/examples/tcl/x04
trunk/examples/tcl/x04.tcl
trunk/examples/tcl/x05
trunk/examples/tcl/x05.tcl
trunk/examples/tcl/x06
trunk/examples/tcl/x06.tcl
trunk/examples/tcl/x07
trunk/examples/tcl/x07.tcl
trunk/examples/tcl/x08
trunk/examples/tcl/x08.tcl
trunk/examples/tcl/x09
trunk/examples/tcl/x09.tcl
trunk/examples/tcl/x10
trunk/examples/tcl/x10.tcl
trunk/examples/tcl/x11
trunk/examples/tcl/x11.tcl
trunk/examples/tcl/x12
trunk/examples/tcl/x12.tcl
trunk/examples/tcl/x13
trunk/examples/tcl/x13.tcl
trunk/examples/tcl/x14
trunk/examples/tcl/x14.tcl
trunk/examples/tcl/x15
trunk/examples/tcl/x15.tcl
trunk/examples/tcl/x16
trunk/examples/tcl/x16.tcl
trunk/examples/tcl/x17
trunk/examples/tcl/x17.tcl
trunk/examples/tcl/x18
trunk/examples/tcl/x18.tcl
trunk/examples/tcl/x19
trunk/examples/tcl/x19.tcl
trunk/examples/tcl/x20
trunk/examples/tcl/x20.tcl
trunk/examples/tcl/x21
trunk/examples/tcl/x21.tcl
trunk/examples/tcl/x22
trunk/examples/tcl/x22.tcl
trunk/examples/tcl/x23
trunk/examples/tcl/x23.tcl
trunk/examples/tcl/x24
trunk/examples/tcl/x24.tcl
trunk/examples/tcl/x25
trunk/examples/tcl/x25.tcl
trunk/examples/tcl/x26
trunk/examples/tcl/x26.tcl
trunk/examples/tcl/x27
trunk/examples/tcl/x27.tcl
trunk/examples/tcl/x28
trunk/examples/tcl/x28.tcl
trunk/examples/tcl/x29
trunk/examples/tcl/x29.tcl
trunk/examples/tcl/x30
trunk/examples/tcl/x31
trunk/examples/tcl/x31.tcl
trunk/examples/tcl/x33
trunk/examples/tcl/x33.tcl
trunk/examples/tk/tk01.in
trunk/examples/tk/tk02.in
trunk/examples/tk/tk03.in
trunk/examples/tk/tk04.in
trunk/examples/tk/tkdemos.tcl
trunk/examples/tk/xtk01.c
trunk/examples/tk/xtk02.c
trunk/examples/tk/xtk04.c
trunk/fonts/font01.c
trunk/fonts/font02.c
trunk/fonts/font03.c
trunk/fonts/font04.c
trunk/fonts/font05.c
trunk/fonts/font06.c
trunk/fonts/font07.c
trunk/fonts/font08.c
trunk/fonts/font09.c
trunk/fonts/font10.c
trunk/fonts/font11.c
trunk/fonts/plhershey-unicode-gen.c
trunk/fonts/stndfont.c
trunk/fonts/xtndfont.c
trunk/include/disptab.h
trunk/include/drivers.h
trunk/include/ltdl_win32.h
trunk/include/metadefs.h
trunk/include/pdf.h
trunk/include/plConfig.h.in
trunk/include/plDevs.h.in
trunk/include/plcore.h
trunk/include/pldebug.h
trunk/include/plevent.h
trunk/include/plfreetype.h
trunk/include/plplot.h
trunk/include/plplotP.h
trunk/include/plstrm.h
trunk/include/plxwd.h
trunk/lib/qsastime/deltaT-gen.c
trunk/lib/qsastime/tai-utc-gen.c
trunk/pkgcfg/README
trunk/plplot_test/plplot-test-interactive.sh.in
trunk/plplot_test/plplot-test.sh.in
trunk/scripts/make_tarball.sh
trunk/scripts/mklinks
trunk/scripts/mktclIndex
trunk/scripts/parity_bit_check.sh
trunk/scripts/plm2gif
trunk/scripts/style_source.sh
trunk/src/ltdl_win32.c
trunk/src/plaffine.c
trunk/src/plargs.c
trunk/src/plbox.c
trunk/src/plbuf.c
trunk/src/plcont.c
trunk/src/plcore.c
trunk/src/plctrl.c
trunk/src/plcvt.c
trunk/src/pldeprecated.c
trunk/src/pldtik.c
trunk/src/plf2ops.c
trunk/src/plfill.c
trunk/src/plfreetype.c
trunk/src/plgradient.c
trunk/src/plgridd.c
trunk/src/plhist.c
trunk/src/pllegend.c
trunk/src/plline.c
trunk/src/plmap.c
trunk/src/plot3d.c
trunk/src/plpage.c
trunk/src/plsdef.c
trunk/src/plshade.c
trunk/src/plstdio.c
trunk/src/plstripc.c
trunk/src/plsym.c
trunk/src/pltick.c
trunk/src/pltime.c
trunk/src/plvect.c
trunk/src/plvpor.c
trunk/src/plwind.c
trunk/sys/win-tk/plConfig.h
trunk/sys/win-tk/plDevs.h
trunk/utils/plrender.c
trunk/utils/pltek.c
trunk/utils/tektest.c
trunk/utils/xform.c
trunk/www/README
trunk/www/announce/announce-plplot-5.3.0.xml
trunk/www/announce/announce-plplot-5.3.1.xml
Property Changed:
----------------
trunk/ABOUT
trunk/AUTHORS
trunk/CMakeLists.txt
trunk/COPYING.LIB
trunk/ChangeLog.release
trunk/Copyright
trunk/FAQ
trunk/INSTALL
trunk/NEWS
trunk/OLD-NEWS
trunk/OLD-README.release
trunk/OLDER-NEWS
trunk/PROBLEMS
trunk/README
trunk/README.Release_Manager_Cookbook
trunk/README.developers
trunk/README.emacs
trunk/README.release
trunk/SERVICE
trunk/ToDo
trunk/bindings/CMakeLists.txt
trunk/bindings/ada/CMakeLists.txt
trunk/bindings/ada/plplot.adb
trunk/bindings/ada/plplot.ads
trunk/bindings/ada/plplot_auxiliary.adb
trunk/bindings/ada/plplot_auxiliary.ads
trunk/bindings/ada/plplot_thin.adb
trunk/bindings/ada/plplot_thin.ads
trunk/bindings/ada/plplot_traditional.adb
trunk/bindings/ada/plplot_traditional.ads
trunk/bindings/c++/CMakeLists.txt
trunk/bindings/c++/plstream.cc
trunk/bindings/c++/plstream.h
trunk/bindings/d/CMakeLists.txt
trunk/bindings/d/plplot.d
trunk/bindings/f95/CMakeLists.txt
trunk/bindings/f95/configurable.f90
trunk/bindings/f95/plplot_parameters.h
trunk/bindings/f95/plplotf95.def
trunk/bindings/f95/plplotf95_mingw.def
trunk/bindings/f95/plstubs.h
trunk/bindings/f95/readme_f95.txt
trunk/bindings/f95/sc3d.c
trunk/bindings/f95/sccont.c
trunk/bindings/f95/scstubs.c
trunk/bindings/f95/sfstubs.f90
trunk/bindings/f95/sfstubsf95.f90
trunk/bindings/f95/strutil.f90
trunk/bindings/gnome2/CMakeLists.txt
trunk/bindings/gnome2/README
trunk/bindings/gnome2/lib/CMakeLists.txt
trunk/bindings/gnome2/lib/gcw-lib.c
trunk/bindings/gnome2/lib/plplotcanvas.c
trunk/bindings/gnome2/python/CMakeLists.txt
trunk/bindings/gnome2/python/README
trunk/bindings/gnome2/python/cplplotcanvas.override
trunk/bindings/gnome2/python/cplplotcanvasmodule.c
trunk/bindings/gnome2/python/gcw.override
trunk/bindings/gnome2/python/gcwmodule.c
trunk/bindings/gnome2/python/plplotcanvas.py
trunk/bindings/java/CMakeLists.txt
trunk/bindings/java/PLCallbackCT.java
trunk/bindings/java/PLCallbackMapform.java
trunk/bindings/java/PLStream.java
trunk/bindings/java/README.javaAPI
trunk/bindings/java/config.java.in
trunk/bindings/java/plplotjavac.i
trunk/bindings/lua/CMakeLists.txt
trunk/bindings/lua/plplotluac.i
trunk/bindings/ocaml/CMakeLists.txt
trunk/bindings/ocaml/META.in
trunk/bindings/ocaml/README
trunk/bindings/ocaml/plplot_h
trunk/bindings/ocaml/plplot_h.inc
trunk/bindings/ocaml/plplot_impl.c
trunk/bindings/ocaml/touchup.ml
trunk/bindings/octave/BUGS
trunk/bindings/octave/CMakeLists.txt
trunk/bindings/octave/FGA
trunk/bindings/octave/INSTALL
trunk/bindings/octave/PLplot/CMakeLists.txt
trunk/bindings/octave/PLplot/arrow.m
trunk/bindings/octave/PLplot/arrows.m
trunk/bindings/octave/PLplot/autostyle.m
trunk/bindings/octave/PLplot/axis.m
trunk/bindings/octave/PLplot/axis_set.m
trunk/bindings/octave/PLplot/bgr.m
trunk/bindings/octave/PLplot/blue.m
trunk/bindings/octave/PLplot/bone.m
trunk/bindings/octave/PLplot/bottom_title.m
trunk/bindings/octave/PLplot/clip.m
trunk/bindings/octave/PLplot/closeallfig.m
trunk/bindings/octave/PLplot/closefig.m
trunk/bindings/octave/PLplot/colormap.m
trunk/bindings/octave/PLplot/comet.m
trunk/bindings/octave/PLplot/contour.m
trunk/bindings/octave/PLplot/cool.m
trunk/bindings/octave/PLplot/copper.m
trunk/bindings/octave/PLplot/drawnow.m
trunk/bindings/octave/PLplot/fig.m
trunk/bindings/octave/PLplot/fig_raise.m
trunk/bindings/octave/PLplot/fig_state.m
trunk/bindings/octave/PLplot/figure.m
trunk/bindings/octave/PLplot/fill.m
trunk/bindings/octave/PLplot/free_fig.m
trunk/bindings/octave/PLplot/ginput.m
trunk/bindings/octave/PLplot/green.m
trunk/bindings/octave/PLplot/grid.m
trunk/bindings/octave/PLplot/griddata.m
trunk/bindings/octave/PLplot/gtext.m
trunk/bindings/octave/PLplot/hls2rgb.m
trunk/bindings/octave/PLplot/hot.m
trunk/bindings/octave/PLplot/hsv.m
trunk/bindings/octave/PLplot/label_plot.m
trunk/bindings/octave/PLplot/legend.m
trunk/bindings/octave/PLplot/loglog.m
trunk/bindings/octave/PLplot/lp_setup.m
trunk/bindings/octave/PLplot/mesh.m
trunk/bindings/octave/PLplot/meshc.m
trunk/bindings/octave/PLplot/meshz.m
trunk/bindings/octave/PLplot/mplot.m
trunk/bindings/octave/PLplot/multiplot.m
trunk/bindings/octave/PLplot/oneplot.m
trunk/bindings/octave/PLplot/peaks.m
trunk/bindings/octave/PLplot/pink.m
trunk/bindings/octave/PLplot/plclearplot.m
trunk/bindings/octave/PLplot/plclg.m
trunk/bindings/octave/PLplot/plcolormap.m
trunk/bindings/octave/PLplot/pldef.m
trunk/bindings/octave/PLplot/plimage.m
trunk/bindings/octave/PLplot/plot.m
trunk/bindings/octave/PLplot/plot3.m
trunk/bindings/octave/PLplot/plot_border.m
trunk/bindings/octave/PLplot/plot_margin.m
trunk/bindings/octave/PLplot/plplot_octave_path.m.in
trunk/bindings/octave/PLplot/plrb.m
trunk/bindings/octave/PLplot/plsetopt.m
trunk/bindings/octave/PLplot/polar.m
trunk/bindings/octave/PLplot/prism.m
trunk/bindings/octave/PLplot/red.m
trunk/bindings/octave/PLplot/rgb2hls.m
trunk/bindings/octave/PLplot/rgbplot.m
trunk/bindings/octave/PLplot/save_fig.m
trunk/bindings/octave/PLplot/semilogx.m
trunk/bindings/octave/PLplot/semilogy.m
trunk/bindings/octave/PLplot/set_view.m
trunk/bindings/octave/PLplot/shade.m
trunk/bindings/octave/PLplot/shading.m
trunk/bindings/octave/PLplot/shg.m
trunk/bindings/octave/PLplot/stopdraw.m
trunk/bindings/octave/PLplot/stripc.m
trunk/bindings/octave/PLplot/stripc_add.m
trunk/bindings/octave/PLplot/stripc_del.m
trunk/bindings/octave/PLplot/struct_contains.m
trunk/bindings/octave/PLplot/subplot.m
trunk/bindings/octave/PLplot/subwindow.m
trunk/bindings/octave/PLplot/support/CMakeLists.txt
trunk/bindings/octave/PLplot/support/__comet.m
trunk/bindings/octave/PLplot/support/__pl_contour.m
trunk/bindings/octave/PLplot/support/__pl_draw_legend.m
trunk/bindings/octave/PLplot/support/__pl_fill.m
trunk/bindings/octave/PLplot/support/__pl_init.m
trunk/bindings/octave/PLplot/support/__pl_logplotit.m
trunk/bindings/octave/PLplot/support/__pl_matstr.m
trunk/bindings/octave/PLplot/support/__pl_mesh.m
trunk/bindings/octave/PLplot/support/__pl_meshplotit.m
trunk/bindings/octave/PLplot/support/__pl_opt.m
trunk/bindings/octave/PLplot/support/__pl_plenv.m
trunk/bindings/octave/PLplot/support/__pl_plot3.m
trunk/bindings/octave/PLplot/support/__pl_plotit.m
trunk/bindings/octave/PLplot/support/__pl_polargrid.m
trunk/bindings/octave/PLplot/support/__pl_store.m
trunk/bindings/octave/PLplot/support/__plr1__.m
trunk/bindings/octave/PLplot/support/__plr2__.m
trunk/bindings/octave/PLplot/support/__plr__.m
trunk/bindings/octave/PLplot/support/__plt1__.m
trunk/bindings/octave/PLplot/support/__plt2__.m
trunk/bindings/octave/PLplot/support/__plt2mm__.m
trunk/bindings/octave/PLplot/support/__plt2mv__.m
trunk/bindings/octave/PLplot/support/__plt2ss__.m
trunk/bindings/octave/PLplot/support/__plt2vm__.m
trunk/bindings/octave/PLplot/support/__plt2vv__.m
trunk/bindings/octave/PLplot/support/__plt__.m
trunk/bindings/octave/PLplot/support/is_strmatrix.m
trunk/bindings/octave/PLplot/support/is_strvector.m
trunk/bindings/octave/PLplot/surf.m
trunk/bindings/octave/PLplot/surfc.m
trunk/bindings/octave/PLplot/surfl.m
trunk/bindings/octave/PLplot/tdeblank.m
trunk/bindings/octave/PLplot/text.m
trunk/bindings/octave/PLplot/title.m
trunk/bindings/octave/PLplot/toggle_plplot_use.m
trunk/bindings/octave/PLplot/top_title.m
trunk/bindings/octave/PLplot/use_plplot.m
trunk/bindings/octave/PLplot/xlabel.m
trunk/bindings/octave/PLplot/xticks.m
trunk/bindings/octave/PLplot/ylabel.m
trunk/bindings/octave/PLplot/yticks.m
trunk/bindings/octave/PLplot/zlabel.m
trunk/bindings/octave/PLplot/zoom.m
trunk/bindings/octave/README
trunk/bindings/octave/ToDo
trunk/bindings/octave/USAGE
trunk/bindings/octave/etc/plplot.doc
trunk/bindings/octave/globals-in-scripts
trunk/bindings/octave/massage.c
trunk/bindings/octave/misc/CMakeLists.txt
trunk/bindings/octave/misc/diffn.m
trunk/bindings/octave/misc/gradn.m
trunk/bindings/octave/misc/rosenbrock.m
trunk/bindings/octave/octaverc.in
trunk/bindings/octave/plplot_stub_hand_crafted.m
trunk/bindings/python/CMakeLists.txt
trunk/bindings/python/Plframe.py
trunk/bindings/python/README.pythonbuild
trunk/bindings/python/TclSup.py
trunk/bindings/python/fragments.i
trunk/bindings/python/makedocstrings.py
trunk/bindings/python/plplot_widgetmodule.c
trunk/bindings/python/plplotcmodule.i
trunk/bindings/qt_gui/plqt.cpp
trunk/bindings/swig-support/plplotcapi.i
trunk/bindings/tcl/CMakeLists.txt
trunk/bindings/tcl/README.tclAPI
trunk/bindings/tcl/matrixInit.c
trunk/bindings/tcl/pkgIndex.tcl.in
trunk/bindings/tcl/plapi.tpl
trunk/bindings/tcl/plitclgen
trunk/bindings/tcl/plplot_parameters.h
trunk/bindings/tcl/pltcl.c
trunk/bindings/tcl/pltcl.h
trunk/bindings/tcl/pltclgen
trunk/bindings/tcl/pltclgen.tcl
trunk/bindings/tcl/tclAPI.c
trunk/bindings/tcl/tclMain.c
trunk/bindings/tcl/tclMatrix.c
trunk/bindings/tcl/tclMatrix.h
trunk/bindings/tcl/tclcmd.tpl
trunk/bindings/tk/CMakeLists.txt
trunk/bindings/tk/FileSelector.tcl
trunk/bindings/tk/PLWin.itk
trunk/bindings/tk/PLXWin.itk
trunk/bindings/tk/Pltk_Init.c
trunk/bindings/tk/Pltkwin.tcl
trunk/bindings/tk/about.tcl
trunk/bindings/tk/app-defaults/PLplot.large.ad
trunk/bindings/tk/app-defaults/PLplot.medium.ad
trunk/bindings/tk/app-defaults/PLplot.small.ad
trunk/bindings/tk/app-defaults/README
trunk/bindings/tk/cmap0a.pal
trunk/bindings/tk/cmap1a.pal
trunk/bindings/tk/cmap1a1.pal
trunk/bindings/tk/cmap1b.pal
trunk/bindings/tk/cmap1c.pal
trunk/bindings/tk/cmap1d.pal
trunk/bindings/tk/help_gui.tcl
trunk/bindings/tk/help_keys.tcl
trunk/bindings/tk/help_tcltk.tcl
trunk/bindings/tk/pkgIndex.tcl.in
trunk/bindings/tk/plclient.tcl
trunk/bindings/tk/plcolor.tcl
trunk/bindings/tk/plconfig.tcl
trunk/bindings/tk/pldefaults.tcl
trunk/bindings/tk/plframe.c
trunk/bindings/tk/plplot.tcl
trunk/bindings/tk/plr.c
trunk/bindings/tk/plserver.c
trunk/bindings/tk/plserver.h
trunk/bindings/tk/plserver.tcl
trunk/bindings/tk/pltk.h
trunk/bindings/tk/pltkd.h
trunk/bindings/tk/pltools.tcl
trunk/bindings/tk/plwidget.tcl
trunk/bindings/tk/stupidtk.c
trunk/bindings/tk/tcpip.c
trunk/bindings/tk/tcpip.h
trunk/bindings/tk/tkMain.c
trunk/bindings/tk/tkshell.c
trunk/bindings/tk-x-plat/CMakeLists.txt
trunk/bindings/tk-x-plat/Memberscope.tcl
trunk/bindings/tk-x-plat/Plplotter_Init.c
trunk/bindings/tk-x-plat/Plplotwin.tcl
trunk/bindings/tk-x-plat/Plwindow.tcl
trunk/bindings/tk-x-plat/pkgIndex.tcl.in
trunk/bindings/tk-x-plat/plbarchart.tcl
trunk/bindings/tk-x-plat/plplotter.c
trunk/bindings/tk-x-plat/pltimeseries.tcl
trunk/bindings/tk-x-plat/pltkwd.h
trunk/bindings/tk-x-plat/plwidget2.tcl
trunk/bindings/tk-x-plat/tclIndex
trunk/bindings/wxwidgets/CMakeLists.txt
trunk/bindings/wxwidgets/wxPLplotstream.cpp
trunk/bindings/wxwidgets/wxPLplotstream.h.in
trunk/bindings/wxwidgets/wxPLplotwindow.cpp
trunk/bindings/wxwidgets/wxPLplotwindow.h
trunk/cmake/FindPLplot.cmake
trunk/cmake/README.cmake_doc
trunk/cmake/UserOverride.cmake
trunk/cmake/epa_build/gtk_transform.py
trunk/cmake/epa_build/gtk_xml_recursive_process.py
trunk/cmake/epa_build/libagg/libagg_CMakeLists.txt
trunk/cmake/epa_build/libqhull/src/CMakeLists.txt
trunk/cmake/epa_build/libqhull/src/libqhull.h
trunk/cmake/epa_build/libqhull/src/mem.h
trunk/cmake/epa_build/libqhull/src/unix.c
trunk/cmake/epa_build/setup/setup_linux_makefiles
trunk/cmake/epa_build/update_added_packages.sh
trunk/cmake/epa_build/update_pango_packages.sh
trunk/cmake/epa_build/xmlcatalog_wrapper.sh
trunk/cmake/modules/CheckDIRSymbolExists.cmake
trunk/cmake/modules/CheckDTD.cmake
trunk/cmake/modules/CheckPerlModules.cmake
trunk/cmake/modules/CheckPrototypeExists.cmake
trunk/cmake/modules/FindAGG.cmake
trunk/cmake/modules/FindAQT.cmake
trunk/cmake/modules/FindFreetype.cmake
trunk/cmake/modules/FindGD.cmake
trunk/cmake/modules/FindLTDL.cmake
trunk/cmake/modules/FindQHULL.cmake
trunk/cmake/modules/FindSWIG.cmake
trunk/cmake/modules/FindVGA.cmake
trunk/cmake/modules/Findhpdf.cmake
trunk/cmake/modules/TestBrokenIsnanCXX.cmake
trunk/cmake/modules/TestBrokenIsnanCXX.cxx
trunk/cmake/modules/TestForHighBitCharacters.c
trunk/cmake/modules/TestForHighBitCharacters.cmake
trunk/cmake/modules/TestForNamespace.cmake
trunk/cmake/modules/TestForNamespace.cxx
trunk/cmake/modules/TestForStandardHeaderwait.cmake
trunk/cmake/modules/TestForStdintCXX.cmake
trunk/cmake/modules/TestForStdintCXX.cxx
trunk/cmake/modules/TestFortranIsnan.cmake
trunk/cmake/modules/TestFortranIsnan.f
trunk/cmake/modules/TestNaNAware.c
trunk/cmake/modules/TestSignalType.c
trunk/cmake/modules/TestSignalType.cmake
trunk/cmake/modules/ada.cmake
trunk/cmake/modules/agg.cmake
trunk/cmake/modules/aqt.cmake
trunk/cmake/modules/c++.cmake
trunk/cmake/modules/cairo.cmake
trunk/cmake/modules/cgm.cmake
trunk/cmake/modules/csiro.cmake
trunk/cmake/modules/d.cmake
trunk/cmake/modules/docbook.cmake
trunk/cmake/modules/double.cmake
trunk/cmake/modules/drivers-finish.cmake
trunk/cmake/modules/drivers-init.cmake
trunk/cmake/modules/drivers.cmake
trunk/cmake/modules/fortran.cmake
trunk/cmake/modules/freetype.cmake
trunk/cmake/modules/gcw.cmake
trunk/cmake/modules/gd.cmake
trunk/cmake/modules/instdirs.cmake
trunk/cmake/modules/java.cmake
trunk/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in
trunk/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake
trunk/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in
trunk/cmake/modules/language_support/cmake/CMakeDInformation.cmake
trunk/cmake/modules/language_support/cmake/CMakeD_Copyright.txt
trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake
trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake
trunk/cmake/modules/language_support/cmake/CMakeTestAdaCompiler.cmake
trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
trunk/cmake/modules/language_support/cmake/Platform/Linux-dmd.cmake
trunk/cmake/modules/language_support/cmake/Platform/Linux-gdc.cmake
trunk/cmake/modules/language_support/cmake/Platform/Windows-dmd.cmake
trunk/cmake/modules/language_support/cmake/Platform/Windows-gdc.cmake
trunk/cmake/modules/linuxvga.cmake
trunk/cmake/modules/lua.cmake
trunk/cmake/modules/ocaml.cmake
trunk/cmake/modules/octave.cmake
trunk/cmake/modules/pango.cmake
trunk/cmake/modules/pdf.cmake
trunk/cmake/modules/pdl.cmake
trunk/cmake/modules/pkg-config.cmake
trunk/cmake/modules/plplot.cmake
trunk/cmake/modules/plplot_version.cmake
trunk/cmake/modules/pstex.cmake
trunk/cmake/modules/psttf.cmake
trunk/cmake/modules/python.cmake
trunk/cmake/modules/rpath.cmake
trunk/cmake/modules/summary.cmake
trunk/cmake/modules/tcl-related.cmake
trunk/cmake/modules/tk.cmake
trunk/cmake/modules/wingcc.cmake
trunk/cmake/modules/wxwidgets.cmake
trunk/cmake/modules/xwin.cmake
trunk/data/.dummy
trunk/data/CMakeLists.txt
trunk/debian/README.Debian
trunk/debian/Release
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/compat
trunk/debian/control.in
trunk/debian/copyright
trunk/debian/get-upstream-version.pl
trunk/debian/index.html.in
trunk/debian/install-www.sh
trunk/debian/libcsiro0.files
trunk/debian/libplplot-c++11.files
trunk/debian/libplplot-dev.files
trunk/debian/libplplot-fortran10.files
trunk/debian/libplplot-java.files
trunk/debian/libplplot12.files
trunk/debian/make-cvs-release.sh
trunk/debian/octave-plplot.files
trunk/debian/plplot-doc.doc-base
trunk/debian/plplot-doc.files
trunk/debian/plplot-tcl-dev.files
trunk/debian/plplot-tcl.files
trunk/debian/plplot12-driver-wxwidgets.files
trunk/debian/plplot12-driver-xwin.files
trunk/debian/python-plplot.files
trunk/debian/rules
trunk/debian/upload-debs.pl
trunk/debian/watch
trunk/doc/.indent.pro
trunk/doc/CMakeLists.txt
trunk/doc/README.local
trunk/doc/Xauthority
trunk/doc/abs.txt
trunk/doc/docbook/AUTHORS
trunk/doc/docbook/CMakeLists.txt
trunk/doc/docbook/COPYING
trunk/doc/docbook/ChangeLog
trunk/doc/docbook/NEWS
trunk/doc/docbook/README
trunk/doc/docbook/README.developers
trunk/doc/docbook/bin/CMakeLists.txt
trunk/doc/docbook/bin/ChangeLog
trunk/doc/docbook/bin/api2man.pl.in
trunk/doc/docbook/bin/api2text.pl
trunk/doc/docbook/bin/get-library-structs.pl
trunk/doc/docbook/bin/get-library-symbols.pl
trunk/doc/docbook/bin/info-clean.pl
trunk/doc/docbook/src/CMakeLists.txt
trunk/doc/docbook/src/ChangeLog
trunk/doc/docbook/src/advanced.xml
trunk/doc/docbook/src/api-c.xml
trunk/doc/docbook/src/api-compat.xml
trunk/doc/docbook/src/api-fortran95.xml
trunk/doc/docbook/src/api-internal.xml
trunk/doc/docbook/src/api-obsolete.xml
trunk/doc/docbook/src/api.xml
trunk/doc/docbook/src/bibliography.xml
trunk/doc/docbook/src/c.xml
trunk/doc/docbook/src/cplus.xml
trunk/doc/docbook/src/deploying.xml
trunk/doc/docbook/src/drivers.xml
trunk/doc/docbook/src/fortran95.xml
trunk/doc/docbook/src/gui.xml
trunk/doc/docbook/src/inline-html.ent
trunk/doc/docbook/src/inline-info.ent
trunk/doc/docbook/src/inline-print_dsl.ent
trunk/doc/docbook/src/intro.xml
trunk/doc/docbook/src/jadetex.cfg
trunk/doc/docbook/src/math.ent
trunk/doc/docbook/src/ocaml.xml
trunk/doc/docbook/src/os_notes.xml
trunk/doc/docbook/src/pdftex.map.in
trunk/doc/docbook/src/perl.xml
trunk/doc/docbook/src/plplotdoc-html.dsl.in
trunk/doc/docbook/src/plplotdoc-print.dsl.in
trunk/doc/docbook/src/plplotdoc.xml.in
trunk/doc/docbook/src/python.xml
trunk/doc/docbook/src/simple.xml
trunk/doc/docbook/src/stylesheet.css.dsssl.in
trunk/doc/docbook/src/tcl.xml
trunk/doc/docbook/src/wish.xml
trunk/doc/plm2gif.1
trunk/doc/plplot_libtool.1
trunk/doc/plpr.1
trunk/doc/plrender.1
trunk/doc/plserver.1
trunk/doc/pltcl.1
trunk/doc/pltek.1
trunk/doc/pstex2eps.1
trunk/drivers/CMakeLists.txt
trunk/drivers/README.drivers
trunk/drivers/README.wxwidgets
trunk/drivers/aqt.c
trunk/drivers/cairo.c
trunk/drivers/cgm.c
trunk/drivers/dg300.c
trunk/drivers/gcw.c
trunk/drivers/gd.c
trunk/drivers/hpgl.c
trunk/drivers/impress.c
trunk/drivers/linuxvga.c
trunk/drivers/ljii.c
trunk/drivers/ljiip.c
trunk/drivers/mem.c
trunk/drivers/ntk.c
trunk/drivers/null.c
trunk/drivers/pbm.c
trunk/drivers/pdf.c
trunk/drivers/plmeta.c
trunk/drivers/plplotcanvas-hacktext.c
trunk/drivers/ps.c
trunk/drivers/psttf.cc
trunk/drivers/qt.cpp
trunk/drivers/svg.c
trunk/drivers/tek.c
trunk/drivers/test-drv-info.c
trunk/drivers/tk.c
trunk/drivers/tkwin.c
trunk/drivers/wingcc.c
trunk/drivers/wxwidgets.cpp
trunk/drivers/wxwidgets.h
trunk/drivers/wxwidgets_agg.cpp
trunk/drivers/wxwidgets_app.cpp
trunk/drivers/wxwidgets_dc.cpp
trunk/drivers/wxwidgets_gc.cpp
trunk/drivers/xfig.c
trunk/drivers/xwin.c
trunk/examples/CMakeLists.txt
trunk/examples/Makefile.examples.in
trunk/examples/ada/CMakeLists.txt
trunk/examples/ada/x00_easy_a.adb
trunk/examples/ada/x00a.adb
trunk/examples/ada/x01a.adb
trunk/examples/ada/x02a.adb
trunk/examples/ada/x03a.adb
trunk/examples/ada/x04a.adb
trunk/examples/ada/x05a.adb
trunk/examples/ada/x06a.adb
trunk/examples/ada/x07a.adb
trunk/examples/ada/x08a.adb
trunk/examples/ada/x09a.adb
trunk/examples/ada/x10a.adb
trunk/examples/ada/x11a.adb
trunk/examples/ada/x12a.adb
trunk/examples/ada/x13a.adb
trunk/examples/ada/x14a.adb
trunk/examples/ada/x15a.adb
trunk/examples/ada/x16a.adb
trunk/examples/ada/x17a.adb
trunk/examples/ada/x18a.adb
trunk/examples/ada/x19a.adb
trunk/examples/ada/x20a.adb
trunk/examples/ada/x21a.adb
trunk/examples/ada/x22a.adb
trunk/examples/ada/x23a.adb
trunk/examples/ada/x24a.adb
trunk/examples/ada/x25a.adb
trunk/examples/ada/x26a.adb
trunk/examples/ada/x27a.adb
trunk/examples/ada/x28a.adb
trunk/examples/ada/x29a.adb
trunk/examples/ada/x30a.adb
trunk/examples/ada/x31a.adb
trunk/examples/ada/x33a.adb
trunk/examples/ada/xthick00a.adb
trunk/examples/ada/xthick01a.adb
trunk/examples/ada/xthick02a.adb
trunk/examples/ada/xthick03a.adb
trunk/examples/ada/xthick04a.adb
trunk/examples/ada/xthick05a.adb
trunk/examples/ada/xthick06a.adb
trunk/examples/ada/xthick07a.adb
trunk/examples/ada/xthick08a.adb
trunk/examples/ada/xthick09a.adb
trunk/examples/ada/xthick10a.adb
trunk/examples/ada/xthick11a.adb
trunk/examples/ada/xthick12a.adb
trunk/examples/ada/xthick13a.adb
trunk/examples/ada/xthick14a.adb
trunk/examples/ada/xthick15a.adb
trunk/examples/ada/xthick16a.adb
trunk/examples/ada/xthick17a.adb
trunk/examples/ada/xthick18a.adb
trunk/examples/ada/xthick19a.adb
trunk/examples/ada/xthick20a.adb
trunk/examples/ada/xthick21a.adb
trunk/examples/ada/xthick22a.adb
trunk/examples/ada/xthick23a.adb
trunk/examples/ada/xthick24a.adb
trunk/examples/ada/xthick25a.adb
trunk/examples/ada/xthick26a.adb
trunk/examples/ada/xthick27a.adb
trunk/examples/ada/xthick28a.adb
trunk/examples/ada/xthick29a.adb
trunk/examples/ada/xthick30a.adb
trunk/examples/ada/xthick31a.adb
trunk/examples/ada/xthick33a.adb
trunk/examples/c/CMakeLists.txt
trunk/examples/c/Makefile.examples.in
trunk/examples/c/README.cairo
trunk/examples/c/README.plplotcanvas
trunk/examples/c/ext-cairo-test.c
trunk/examples/c/extXdrawable_demo.c
trunk/examples/c/plcdemos.h
trunk/examples/c/plplotcanvas_animation.c
trunk/examples/c/plplotcanvas_demo.c
trunk/examples/c/test_plend.c
trunk/examples/c/tutor.c
trunk/examples/c/x00c.c
trunk/examples/c/x01c.c
trunk/examples/c/x02c.c
trunk/examples/c/x03c.c
trunk/examples/c/x04c.c
trunk/examples/c/x05c.c
trunk/examples/c/x06c.c
trunk/examples/c/x07c.c
trunk/examples/c/x08c.c
trunk/examples/c/x09c.c
trunk/examples/c/x10c.c
trunk/examples/c/x11c.c
trunk/examples/c/x12c.c
trunk/examples/c/x13c.c
trunk/examples/c/x14c.c
trunk/examples/c/x15c.c
trunk/examples/c/x16c.c
trunk/examples/c/x17c.c
trunk/examples/c/x18c.c
trunk/examples/c/x19c.c
trunk/examples/c/x20c.c
trunk/examples/c/x21c.c
trunk/examples/c/x22c.c
trunk/examples/c/x23c.c
trunk/examples/c/x24c.c
trunk/examples/c/x25c.c
trunk/examples/c/x26c.c
trunk/examples/c/x27c.c
trunk/examples/c/x28c.c
trunk/examples/c/x29c.c
trunk/examples/c/x31c.c
trunk/examples/c/x32c.c
trunk/examples/c/x33c.c
trunk/examples/c++/CMakeLists.txt
trunk/examples/c++/Makefile.examples.in
trunk/examples/c++/README.c++demos
trunk/examples/c++/plc++demos.h
trunk/examples/c++/qt_PlotWindow.cpp
trunk/examples/c++/qt_PlotWindow.h
trunk/examples/c++/qt_example.cpp
trunk/examples/c++/wxPLplotDemo.cpp
trunk/examples/c++/x00.cc
trunk/examples/c++/x01.cc
trunk/examples/c++/x01cc.cc
trunk/examples/c++/x02.cc
trunk/examples/c++/x03.cc
trunk/examples/c++/x04.cc
trunk/examples/c++/x05.cc
trunk/examples/c++/x06.cc
trunk/examples/c++/x07.cc
trunk/examples/c++/x08.cc
trunk/examples/c++/x09.cc
trunk/examples/c++/x10.cc
trunk/examples/c++/x11.cc
trunk/examples/c++/x12.cc
trunk/examples/c++/x13.cc
trunk/examples/c++/x14.cc
trunk/examples/c++/x15.cc
trunk/examples/c++/x16.cc
trunk/examples/c++/x17.cc
trunk/examples/c++/x18.cc
trunk/examples/c++/x19.cc
trunk/examples/c++/x20.cc
trunk/examples/c++/x21.cc
trunk/examples/c++/x22.cc
trunk/examples/c++/x23.cc
trunk/examples/c++/x24.cc
trunk/examples/c++/x25.cc
trunk/examples/c++/x26.cc
trunk/examples/c++/x27.cc
trunk/examples/c++/x28.cc
trunk/examples/c++/x29.cc
trunk/examples/c++/x30.cc
trunk/examples/c++/x31.cc
trunk/examples/c++/x33.cc
trunk/examples/d/CMakeLists.txt
trunk/examples/d/Makefile.examples.in
trunk/examples/d/x00d.d
trunk/examples/d/x01d.d
trunk/examples/d/x02d.d
trunk/examples/d/x03d.d
trunk/examples/d/x04d.d
trunk/examples/d/x05d.d
trunk/examples/d/x06d.d
trunk/examples/d/x07d.d
trunk/examples/d/x08d.d
trunk/examples/d/x09d.d
trunk/examples/d/x10d.d
trunk/examples/d/x11d.d
trunk/examples/d/x12d.d
trunk/examples/d/x13d.d
trunk/examples/d/x14d.d
trunk/examples/d/x15d.d
trunk/examples/d/x16d.d
trunk/examples/d/x17d.d
trunk/examples/d/x18d.d
trunk/examples/d/x19d.d
trunk/examples/d/x20d.d
trunk/examples/d/x21d.d
trunk/examples/d/x22d.d
trunk/examples/d/x23d.d
trunk/examples/d/x24d.d
trunk/examples/d/x25d.d
trunk/examples/d/x26d.d
trunk/examples/d/x27d.d
trunk/examples/d/x28d.d
trunk/examples/d/x29d.d
trunk/examples/d/x30d.d
trunk/examples/d/x31d.d
trunk/examples/d/x33d.d
trunk/examples/f95/CMakeLists.txt
trunk/examples/f95/Makefile.examples.in
trunk/examples/f95/cmake_workaround.f
trunk/examples/f95/plf95demos.inc.in
trunk/examples/f95/x00f.f90
trunk/examples/f95/x01f.f90
trunk/examples/f95/x02f.f90
trunk/examples/f95/x03f.f90
trunk/examples/f95/x04f.f90
trunk/examples/f95/x05f.f90
trunk/examples/f95/x06f.f90
trunk/examples/f95/x07f.f90
trunk/examples/f95/x08f.f90
trunk/examples/f95/x09f.f90
trunk/examples/f95/x10f.f90
trunk/examples/f95/x11f.f90
trunk/examples/f95/x12f.f90
trunk/examples/f95/x13f.f90
trunk/examples/f95/x14f.f90
trunk/examples/f95/x15f.f90
trunk/examples/f95/x16af.f90
trunk/examples/f95/x16f.f90
trunk/examples/f95/x17f.f90
trunk/examples/f95/x18f.f90
trunk/examples/f95/x19f.f90
trunk/examples/f95/x20f.f90
trunk/examples/f95/x21f.f90
trunk/examples/f95/x22f.f90
trunk/examples/f95/x23f.f90
trunk/examples/f95/x24f.f90
trunk/examples/f95/x25f.f90
trunk/examples/f95/x26f.f90
trunk/examples/f95/x27f.f90
trunk/examples/f95/x28f.f90
trunk/examples/f95/x29f.f90
trunk/examples/f95/x30f.f90
trunk/examples/f95/x31f.f90
trunk/examples/f95/x33f.f90
trunk/examples/java/CMakeLists.txt
trunk/examples/java/Makefile.examples.in
trunk/examples/java/README.javademos
trunk/examples/java/x00.java
trunk/examples/java/x01.java
trunk/examples/java/x02.java
trunk/examples/java/x03.java
trunk/examples/java/x04.java
trunk/examples/java/x05.java
trunk/examples/java/x06.java
trunk/examples/java/x07.java
trunk/examples/java/x08.java
trunk/examples/java/x09.java
trunk/examples/java/x10.java
trunk/examples/java/x11.java
trunk/examples/java/x12.java
trunk/examples/java/x13.java
trunk/examples/java/x14.java
trunk/examples/java/x15.java
trunk/examples/java/x16.java
trunk/examples/java/x17.java
trunk/examples/java/x18.java
trunk/examples/java/x19.java
trunk/examples/java/x20.java
trunk/examples/java/x21.java
trunk/examples/java/x22.java
trunk/examples/java/x23.java
trunk/examples/java/x24.java
trunk/examples/java/x25.java
trunk/examples/java/x26.java
trunk/examples/java/x27.java
trunk/examples/java/x28.java
trunk/examples/java/x29.java
trunk/examples/java/x30.java
trunk/examples/java/x31.java
trunk/examples/java/x33.java
trunk/examples/lua/x00.lua
trunk/examples/lua/x01.lua
trunk/examples/lua/x02.lua
trunk/examples/lua/x03.lua
trunk/examples/lua/x04.lua
trunk/examples/lua/x05.lua
trunk/examples/lua/x06.lua
trunk/examples/lua/x07.lua
trunk/examples/lua/x08.lua
trunk/examples/lua/x09.lua
trunk/examples/lua/x10.lua
trunk/examples/lua/x11.lua
trunk/examples/lua/x12.lua
trunk/examples/lua/x13.lua
trunk/examples/lua/x14.lua
trunk/examples/lua/x15.lua
trunk/examples/lua/x16.lua
trunk/examples/lua/x17.lua
trunk/examples/lua/x18.lua
trunk/examples/lua/x19.lua
trunk/examples/lua/x20.lua
trunk/examples/lua/x21.lua
trunk/examples/lua/x22.lua
trunk/examples/lua/x23.lua
trunk/examples/lua/x24.lua
trunk/examples/lua/x25.lua
trunk/examples/lua/x26.lua
trunk/examples/lua/x27.lua
trunk/examples/lua/x28.lua
trunk/examples/lua/x29.lua
trunk/examples/lua/x30.lua
trunk/examples/lua/x31.lua
trunk/examples/ocaml/CMakeLists.txt
trunk/examples/ocaml/Makefile.examples.in
trunk/examples/ocaml/x00.ml
trunk/examples/ocaml/x01.ml
trunk/examples/ocaml/x02.ml
trunk/examples/ocaml/x03.ml
trunk/examples/ocaml/x04.ml
trunk/examples/ocaml/x05.ml
trunk/examples/ocaml/x06.ml
trunk/examples/ocaml/x07.ml
trunk/examples/ocaml/x08.ml
trunk/examples/ocaml/x09.ml
trunk/examples/ocaml/x10.ml
trunk/examples/ocaml/x11.ml
trunk/examples/ocaml/x12.ml
trunk/examples/ocaml/x13.ml
trunk/examples/ocaml/x14.ml
trunk/examples/ocaml/x15.ml
trunk/examples/ocaml/x16.ml
trunk/examples/ocaml/x17.ml
trunk/examples/ocaml/x18.ml
trunk/examples/ocaml/x19.ml
trunk/examples/ocaml/x20.ml
trunk/examples/ocaml/x21.ml
trunk/examples/ocaml/x22.ml
trunk/examples/ocaml/x23.ml
trunk/examples/ocaml/x24.ml
trunk/examples/ocaml/x25.ml
trunk/examples/ocaml/x26.ml
trunk/examples/ocaml/x27.ml
trunk/examples/ocaml/x28.ml
trunk/examples/ocaml/x29.ml
trunk/examples/ocaml/x30.ml
trunk/examples/ocaml/x31.ml
trunk/examples/octave/CMakeLists.txt
trunk/examples/octave/p1.m
trunk/examples/octave/p10.m
trunk/examples/octave/p11.m
trunk/examples/octave/p12.m
trunk/examples/octave/p13.m
trunk/examples/octave/p14.m
trunk/examples/octave/p15.m
trunk/examples/octave/p16.m
trunk/examples/octave/p17.m
trunk/examples/octave/p18.m
trunk/examples/octave/p19.m
trunk/examples/octave/p2.m
trunk/examples/octave/p20.m
trunk/examples/octave/p21.m
trunk/examples/octave/p3.m
trunk/examples/octave/p4.m
trunk/examples/octave/p5.m
trunk/examples/octave/p6.m
trunk/examples/octave/p7.m
trunk/examples/octave/p8.m
trunk/examples/octave/p9.m
trunk/examples/octave/plplot_octave_demo.m
trunk/examples/octave/x00c.m
trunk/examples/octave/x01c.m
trunk/examples/octave/x02c.m
trunk/examples/octave/x03c.m
trunk/examples/octave/x04c.m
trunk/examples/octave/x05c.m
trunk/examples/octave/x06c.m
trunk/examples/octave/x07c.m
trunk/examples/octave/x08c.m
trunk/examples/octave/x09c.m
trunk/examples/octave/x10c.m
trunk/examples/octave/x11c.m
trunk/examples/octave/x12c.m
trunk/examples/octave/x13c.m
trunk/examples/octave/x14c.m
trunk/examples/octave/x15c.m
trunk/examples/octave/x16c.m
trunk/examples/octave/x17c.m
trunk/examples/octave/x18c.m
trunk/examples/octave/x19c.m
trunk/examples/octave/x20c.m
trunk/examples/octave/x21c.m
trunk/examples/octave/x22c.m
trunk/examples/octave/x23c.m
trunk/examples/octave/x24c.m
trunk/examples/octave/x25c.m
trunk/examples/octave/x26c.m
trunk/examples/octave/x27c.m
trunk/examples/octave/x28c.m
trunk/examples/octave/x29c.m
trunk/examples/octave/x30c.m
trunk/examples/octave/x31c.m
trunk/examples/octave/x33c.m
trunk/examples/perl/CMakeLists.txt
trunk/examples/perl/README.perldemos
trunk/examples/perl/check-sync.pl
trunk/examples/perl/x01.pl
trunk/examples/perl/x02.pl
trunk/examples/perl/x03.pl
trunk/examples/perl/x04.pl
trunk/examples/perl/x05.pl
trunk/examples/perl/x06.pl
trunk/examples/perl/x07.pl
trunk/examples/perl/x08.pl
trunk/examples/perl/x09.pl
trunk/examples/perl/x10.pl
trunk/examples/perl/x11.pl
trunk/examples/perl/x12.pl
trunk/examples/perl/x13.pl
trunk/examples/perl/x14.pl
trunk/examples/perl/x15.pl
trunk/examples/perl/x16.pl
trunk/examples/perl/x17.pl
trunk/examples/perl/x18.pl
trunk/examples/perl/x19.pl
trunk/examples/perl/x20.pl
trunk/examples/perl/x21.pl
trunk/examples/perl/x22.pl
trunk/examples/perl/x23.pl
trunk/examples/perl/x24.pl
trunk/examples/perl/x25.pl
trunk/examples/perl/x26.pl
trunk/examples/perl/x27.pl
trunk/examples/perl/x28.pl
trunk/examples/perl/x29.pl
trunk/examples/perl/x30.pl
trunk/examples/perl/x31.pl
trunk/examples/perl/x33.pl
trunk/examples/python/CMakeLists.txt
trunk/examples/python/README.plplotcanvas
trunk/examples/python/README.pythondemos
trunk/examples/python/plplot_logo.py
trunk/examples/python/plplot_py_demos.py
trunk/examples/python/plplot_python_start.py.in
trunk/examples/python/plplotcanvas_animation.py
trunk/examples/python/plplotcanvas_demo.py
trunk/examples/python/pythondemos.py
trunk/examples/python/pytkdemo
trunk/examples/python/test_axis_precision.py
trunk/examples/python/test_circle.py
trunk/examples/python/test_fill.py
trunk/examples/python/test_gradient.py
trunk/examples/python/test_hebrew_diacritic.py
trunk/examples/python/test_linebreak.py
trunk/examples/python/test_plplot_encodings.py
trunk/examples/python/test_style.py
trunk/examples/python/test_superscript_subscript.py
trunk/examples/python/test_symbol_clip.py
trunk/examples/python/test_type1.py
trunk/examples/python/testh.py
trunk/examples/python/tutor.py
trunk/examples/python/x00
trunk/examples/python/x01
trunk/examples/python/x01.py
trunk/examples/python/x02
trunk/examples/python/x02.py
trunk/examples/python/x03
trunk/examples/python/x03.py
trunk/examples/python/x04
trunk/examples/python/x04.py
trunk/examples/python/x05
trunk/examples/python/x05.py
trunk/examples/python/x06
trunk/examples/python/x06.py
trunk/examples/python/x07
trunk/examples/python/x07.py
trunk/examples/python/x08
trunk/examples/python/x08.py
trunk/examples/python/x09
trunk/examples/python/x09.py
trunk/examples/python/x10
trunk/examples/python/x10.py
trunk/examples/python/x11
trunk/examples/python/x11.py
trunk/examples/python/x12
trunk/examples/python/x12.py
trunk/examples/python/x13
trunk/examples/python/x13.py
trunk/examples/python/x14
trunk/examples/python/x14.py
trunk/examples/python/x15
trunk/examples/python/x15.py
trunk/examples/python/x16
trunk/examples/python/x16.py
trunk/examples/python/x17
trunk/examples/python/x17.py
trunk/examples/python/x18
trunk/examples/python/x18.py
trunk/examples/python/x19
trunk/examples/python/x19.py
trunk/examples/python/x20
trunk/examples/python/x21
trunk/examples/python/x22
trunk/examples/python/x23
trunk/examples/python/x24
trunk/examples/python/x25
trunk/examples/python/x26
trunk/examples/python/x27
trunk/examples/python/x28
trunk/examples/python/x29
trunk/examples/python/x30
trunk/examples/python/x31
trunk/examples/python/x33
trunk/examples/python/xtkpy
trunk/examples/python/xw00.py
trunk/examples/python/xw01.py
trunk/examples/python/xw02.py
trunk/examples/python/xw03.py
trunk/examples/python/xw04.py
trunk/examples/python/xw05.py
trunk/examples/python/xw06.py
trunk/examples/python/xw07.py
trunk/examples/python/xw08.py
trunk/examples/python/xw09.py
trunk/examples/python/xw10.py
trunk/examples/python/xw11.py
trunk/examples/python/xw12.py
trunk/examples/python/xw13.py
trunk/examples/python/xw14.py
trunk/examples/python/xw15.py
trunk/examples/python/xw16.py
trunk/examples/python/xw17.py
trunk/examples/python/xw18.py
trunk/examples/python/xw19.py
trunk/examples/python/xw20.py
trunk/examples/python/xw21.py
trunk/examples/python/xw22.py
trunk/examples/python/xw23.py
trunk/examples/python/xw24.py
trunk/examples/python/xw25.py
trunk/examples/python/xw26.py
trunk/examples/python/xw27.py
trunk/examples/python/xw28.py
trunk/examples/python/xw29.py
trunk/examples/python/xw30.py
trunk/examples/python/xw31.py
trunk/examples/python/xw33.py
trunk/examples/tcl/CMakeLists.txt
trunk/examples/tcl/README.tcldemos
trunk/examples/tcl/plgrid.tcl
trunk/examples/tcl/plot.dat
trunk/examples/tcl/plot.tcl
trunk/examples/tcl/pltcl_standard_examples.in
trunk/examples/tcl/r.dat
trunk/examples/tcl/stats.log
trunk/examples/tcl/tcldemos.tcl
trunk/examples/tcl/x00
trunk/examples/tcl/x00.tcl
trunk/examples/tcl/x01
trunk/examples/tcl/x01.tcl
trunk/examples/tcl/x02
trunk/examples/tcl/x02.tcl
trunk/examples/tcl/x03
trunk/examples/tcl/x03.tcl
trunk/examples/tcl/x04
trunk/examples/tcl/x04.tcl
trunk/examples/tcl/x05
trunk/examples/tcl/x05.tcl
trunk/examples/tcl/x06
trunk/examples/tcl/x06.tcl
trunk/examples/tcl/x07
trunk/examples/tcl/x07.tcl
trunk/examples/tcl/x08
trunk/examples/tcl/x08.tcl
trunk/examples/tcl/x09
trunk/examples/tcl/x09.tcl
trunk/examples/tcl/x10
trunk/examples/tcl/x10.tcl
trunk/examples/tcl/x11
trunk/examples/tcl/x11.tcl
trunk/examples/tcl/x12
trunk/examples/tcl/x12.tcl
trunk/examples/tcl/x13
trunk/examples/tcl/x13.tcl
trunk/examples/tcl/x14
trunk/examples/tcl/x14.tcl
trunk/examples/tcl/x15
trunk/examples/tcl/x15.tcl
trunk/examples/tcl/x16
trunk/examples/tcl/x16.tcl
trunk/examples/tcl/x17
trunk/examples/tcl/x17.tcl
trunk/examples/tcl/x18
trunk/examples/tcl/x18.tcl
trunk/examples/tcl/x19
trunk/examples/tcl/x19.tcl
trunk/examples/tcl/x20
trunk/examples/tcl/x20.tcl
trunk/examples/tcl/x21
trunk/examples/tcl/x21.tcl
trunk/examples/tcl/x22
trunk/examples/tcl/x22.tcl
trunk/examples/tcl/x23
trunk/examples/tcl/x23.tcl
trunk/examples/tcl/x24
trunk/examples/tcl/x24.tcl
trunk/examples/tcl/x25
trunk/examples/tcl/x25.tcl
trunk/examples/tcl/x26
trunk/examples/tcl/x26.tcl
trunk/examples/tcl/x27
trunk/examples/tcl/x27.tcl
trunk/examples/tcl/x28
trunk/examples/tcl/x28.tcl
trunk/examples/tcl/x29
trunk/examples/tcl/x29.tcl
trunk/examples/tcl/x30
trunk/examples/tcl/x30.tcl
trunk/examples/tcl/x31
trunk/examples/tcl/x31.tcl
trunk/examples/tcl/x33
trunk/examples/tcl/x33.tcl
trunk/examples/tk/CMakeLists.txt
trunk/examples/tk/Makefile.examples.in
trunk/examples/tk/README.tkdemos
trunk/examples/tk/plgrid.in
trunk/examples/tk/plserver_standard_examples.in
trunk/examples/tk/runAllDemos.tcl
trunk/examples/tk/runExtendedDemos.tcl
trunk/examples/tk/tk01.in
trunk/examples/tk/tk02.in
trunk/examples/tk/tk03.in
trunk/examples/tk/tk04.in
trunk/examples/tk/tkdemos.tcl
trunk/examples/tk/xtk01.c
trunk/examples/tk/xtk02.c
trunk/examples/tk/xtk04.c
trunk/fonts/CMakeLists.txt
trunk/fonts/README
trunk/fonts/font01.c
trunk/fonts/font02.c
tr...
[truncated message content] |
|
From: <ai...@us...> - 2014-02-23 21:14:24
|
Revision: 13018
http://sourceforge.net/p/plplot/code/13018
Author: airwin
Date: 2014-02-23 21:14:19 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
As alluded to on list, drop use of keywords that potentially could
be updated by svn. In this case remove $Revision, $Author, and $Date.
Modified Paths:
--------------
trunk/cmake/epa_build/libqhull/src/libqhull.h
trunk/cmake/epa_build/libqhull/src/mem.h
trunk/cmake/epa_build/libqhull/src/unix.c
trunk/doc/docbook/src/plplotdoc.xml.in
trunk/examples/c/plplotcanvas_animation.c
trunk/examples/c/plplotcanvas_demo.c
trunk/examples/python/plplotcanvas_animation.py
trunk/examples/python/plplotcanvas_demo.py
Modified: trunk/cmake/epa_build/libqhull/src/libqhull.h
===================================================================
--- trunk/cmake/epa_build/libqhull/src/libqhull.h 2014-02-23 20:54:04 UTC (rev 13017)
+++ trunk/cmake/epa_build/libqhull/src/libqhull.h 2014-02-23 21:14:19 UTC (rev 13018)
@@ -7,8 +7,6 @@
see qh-qhull.htm, qhull_a.h
copyright (c) 1993-2010 The Geometry Center.
- $Id$$Change: 1172 $
- $DateTime: 2010/01/09 21:42:16 $$Author$
NOTE: access to qh_qh is via the 'qh' macro. This allows
qh_qh to be either a pointer or a structure. An example
Modified: trunk/cmake/epa_build/libqhull/src/mem.h
===================================================================
--- trunk/cmake/epa_build/libqhull/src/mem.h 2014-02-23 20:54:04 UTC (rev 13017)
+++ trunk/cmake/epa_build/libqhull/src/mem.h 2014-02-23 21:14:19 UTC (rev 13018)
@@ -12,8 +12,6 @@
qh_errexit(qhmem_ERRqhull, NULL, NULL) otherwise
copyright (c) 1993-2010 The Geometry Center.
- $Id$$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author$
*/
#ifndef qhDEFmem
Modified: trunk/cmake/epa_build/libqhull/src/unix.c
===================================================================
--- trunk/cmake/epa_build/libqhull/src/unix.c 2014-02-23 20:54:04 UTC (rev 13017)
+++ trunk/cmake/epa_build/libqhull/src/unix.c 2014-02-23 21:14:19 UTC (rev 13018)
@@ -8,8 +8,6 @@
see qh-qhull.htm
copyright (c) 1993-2010 The Geometry Center.
- $Id$$Change: 1164 $
- $DateTime: 2010/01/07 21:52:00 $$Author$
*/
#include "libqhull.h"
Modified: trunk/doc/docbook/src/plplotdoc.xml.in
===================================================================
--- trunk/doc/docbook/src/plplotdoc.xml.in 2014-02-23 20:54:04 UTC (rev 13017)
+++ trunk/doc/docbook/src/plplotdoc.xml.in 2014-02-23 21:14:19 UTC (rev 13018)
@@ -43,7 +43,6 @@
<!DOCTYPE book PUBLIC "@DOCBOOK_DTD_PUBID@" "@DOCBOOK_DTD_SYSID@" [
<!ENTITY Project-Version "@PLPLOT_VERSION@">
-<!ENTITY Project-Date "$Date$">
<!ENTITY Release-Date "@RELEASE_DATE@">
<!ENTITY chap-intro SYSTEM "@CMAKE_CURRENT_SOURCE_DIR@/intro.xml">
Modified: trunk/examples/c/plplotcanvas_animation.c
===================================================================
--- trunk/examples/c/plplotcanvas_animation.c 2014-02-23 20:54:04 UTC (rev 13017)
+++ trunk/examples/c/plplotcanvas_animation.c 2014-02-23 21:14:19 UTC (rev 13018)
@@ -8,12 +8,6 @@
// Department of Physics and Atmospheric Science,
// Dalhousie University, Halifax, Nova Scotia, Canada, B3H 3J5
//
-// $Author$
-// $Revision$
-// $Date$
-// $Name$
-//
-//
// NOTICE
//
// This program is free software; you can redistribute it and/or modify
Modified: trunk/examples/c/plplotcanvas_demo.c
===================================================================
--- trunk/examples/c/plplotcanvas_demo.c 2014-02-23 20:54:04 UTC (rev 13017)
+++ trunk/examples/c/plplotcanvas_demo.c 2014-02-23 21:14:19 UTC (rev 13018)
@@ -8,12 +8,6 @@
// Department of Physics and Atmospheric Science,
// Dalhousie University, Halifax, Nova Scotia, Canada, B3H 3J5
//
-// $Author$
-// $Revision$
-// $Date$
-// $Name$
-//
-//
// NOTICE
//
// This program is free software; you can redistribute it and/or modify
Modified: trunk/examples/python/plplotcanvas_animation.py
===================================================================
--- trunk/examples/python/plplotcanvas_animation.py 2014-02-23 20:54:04 UTC (rev 13017)
+++ trunk/examples/python/plplotcanvas_animation.py 2014-02-23 21:14:19 UTC (rev 13018)
@@ -9,12 +9,6 @@
Department of Physics and Atmospheric Science,
Dalhousie University, Halifax, Nova Scotia, Canada, B3H 3J5
- $Author$
- $Revision$
- $Date$
- $Name$
-
-
NOTICE
This program is free software; you can redistribute it and/or modify
Modified: trunk/examples/python/plplotcanvas_demo.py
===================================================================
--- trunk/examples/python/plplotcanvas_demo.py 2014-02-23 20:54:04 UTC (rev 13017)
+++ trunk/examples/python/plplotcanvas_demo.py 2014-02-23 21:14:19 UTC (rev 13018)
@@ -9,12 +9,6 @@
Department of Physics and Atmospheric Science,
Dalhousie University, Halifax, Nova Scotia, Canada, B3H 3J5
- $Author$
- $Revision$
- $Date$
- $Name$
-
-
NOTICE
This program is free software; you can redistribute it and/or modify
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-23 20:54:06
|
Revision: 13017
http://sourceforge.net/p/plplot/code/13017
Author: airwin
Date: 2014-02-23 20:54:04 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
Quiet warnings about wide characters (due to UTF-8) in output.
This change does not change the actual results for api.xml that includes
UTF-8.
Modified Paths:
--------------
trunk/doc/docbook/bin/api2swigdoc.pl
Modified: trunk/doc/docbook/bin/api2swigdoc.pl
===================================================================
--- trunk/doc/docbook/bin/api2swigdoc.pl 2014-02-23 18:50:11 UTC (rev 13016)
+++ trunk/doc/docbook/bin/api2swigdoc.pl 2014-02-23 20:54:04 UTC (rev 13017)
@@ -172,6 +172,9 @@
$titles = "";
open (MAN, "> $ARGV[2]");
+# Suppress warnings about UTF-8 in MAN.
+binmode MAN, ':utf8';
+
print MAN "// This file is generated by doc/docbook/src/api2swigdoc.pl from\n";
print MAN "// doc/docbook/src/api.xml. Do not modify by hand since this file\n";
print MAN "// will be overwritten. Edit doc/docbook/src/api.xml instead.\n\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-23 18:50:15
|
Revision: 13016
http://sourceforge.net/p/plplot/code/13016
Author: airwin
Date: 2014-02-23 18:50:11 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
Implement "check_all" target which depends on all the check targets.
Improve run-time messages for each of the check targets.
Modified Paths:
--------------
trunk/bindings/f95/CMakeLists.txt
trunk/bindings/ocaml/CMakeLists.txt
trunk/bindings/swig-support/CMakeLists.txt
trunk/bindings/tcl/CMakeLists.txt
trunk/cmake/modules/plplot.cmake
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/bindings/f95/CMakeLists.txt
===================================================================
--- trunk/bindings/f95/CMakeLists.txt 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/bindings/f95/CMakeLists.txt 2014-02-23 18:50:11 UTC (rev 13016)
@@ -112,6 +112,7 @@
# Check consistency of plplot_parameters.h.
add_custom_target(
check_f95_parameters
+ ${CMAKE_COMMAND} -E echo "Check that bindings/f95/plplot_parameters.h is consistent with the #defines in bindings/swig-support/plplotcapi.i"
COMMAND ${CMAKE_COMMAND} -E remove -f
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
COMMAND
@@ -119,12 +120,13 @@
${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i >
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
COMMAND
- ${CMAKE_COMMAND} -E echo "Check that plplot_parameters.h is consistent with the #defines in bindings/swig-support/plplotcapi.i"
COMMAND
cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_parameters.h
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
)
+ add_dependencies(check_all check_f95_parameters)
+
set(plplotf95${LIB_TAG}_LIB_SRCS
strutil.f90
configurable.f90
Modified: trunk/bindings/ocaml/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/CMakeLists.txt 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/bindings/ocaml/CMakeLists.txt 2014-02-23 18:50:11 UTC (rev 13016)
@@ -57,16 +57,15 @@
if(GENERATE_PLPLOT_H_INC)
add_custom_target(
check_plplot_h.inc
- COMMAND
- ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
- COMMAND
- ${OCAML} ${CMAKE_CURRENT_SOURCE_DIR}/touchup.ml ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
- COMMAND
- ${CMAKE_COMMAND} -E echo "Check that plplot_h.inc is consistent with touchup.ml and plplot_h"
- COMMAND
- cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h.inc ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
+ COMMAND ${CMAKE_COMMAND} -E echo "Check that bindings/ocaml/plplot_h.inc is consistent with bindings/ocaml/touchup.ml and bindings/ocaml/plplot_h"
+ COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
+ COMMAND ${OCAML} ${CMAKE_CURRENT_SOURCE_DIR}/touchup.ml ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
+ COMMAND cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h.inc ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
+
+ add_dependencies(check_all check_plplot_h.inc)
+
endif(GENERATE_PLPLOT_H_INC)
#Detailed CMake logic to build ocaml bindings for PLplot.
Modified: trunk/bindings/swig-support/CMakeLists.txt
===================================================================
--- trunk/bindings/swig-support/CMakeLists.txt 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/bindings/swig-support/CMakeLists.txt 2014-02-23 18:50:11 UTC (rev 13016)
@@ -2,7 +2,7 @@
###
### Process this file with cmake to produce Makefile
###
-# Copyright (C) 2010 Alan W. Irwin
+# Copyright (C) 2010-2014 Alan W. Irwin
#
# This file is part of PLplot.
#
@@ -24,6 +24,7 @@
if(PERL_XML_DOM AND PERL_XML_PARSER)
add_custom_target(
check_swig_documentation
+ COMMAND ${CMAKE_COMMAND} -E echo "Check that bindings/swig-support/swig_documentation.i is consistent with doc/docbook/src/api.xml"
COMMAND ${CMAKE_COMMAND} -E remove -f
${CMAKE_CURRENT_BINARY_DIR}/swig_documentation.i_compare
COMMAND ${PERL_EXECUTABLE}
@@ -31,12 +32,13 @@
${CMAKE_SOURCE_DIR}/doc/docbook/src/plplotdoc.xml.in
${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
${CMAKE_CURRENT_BINARY_DIR}/swig_documentation.i_compare
- COMMAND ${CMAKE_COMMAND} -E echo "Check that swig_documentation.i is consistent with doc/docbook/src/api.xml"
COMMAND cmp
${CMAKE_CURRENT_SOURCE_DIR}/swig_documentation.i
${CMAKE_CURRENT_BINARY_DIR}/swig_documentation.i_compare
)
-
+
+ add_dependencies(check_all check_swig_documentation)
+
set(make_documentation_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
)
@@ -50,10 +52,13 @@
# Add (Unix) custom target to check numerical #defines in plplotcapi.i.
add_custom_target(
check_plplotcapi_defines
+ COMMAND ${CMAKE_COMMAND} -E echo "Check that numerical #defines in bindings/swig-support/plplotcapi.i are consistent with the numerical #defines in include/plplot.h"
+ COMMAND ${CMAKE_COMMAND} -E echo "An error for this target implies the numerical #defines section of bindings/swig-support/plplotcapi.i needs updating following the directions in that file"
COMMAND ${CMAKE_COMMAND} -E remove -f
${CMAKE_CURRENT_BINARY_DIR}/generated_plplotcapi_defines
COMMAND grep -E "^ *#define +[^ ]+ +[()-+0-9x]+" ${CMAKE_SOURCE_DIR}/include/plplot.h | grep -v plotsh3d > ${CMAKE_CURRENT_BINARY_DIR}/generated_plplotcapi_defines
- COMMAND ${CMAKE_COMMAND} -E echo "Non-NULL diff results below (which will be accompanied by an error for this target) imply the numerical #defines section of bindings/swig-support/plplotcapi.i needs updating following the directions in that file"
- COMMAND grep -E "^ *#define +[^ ]+ +[()-+0-9x]+" ${CMAKE_CURRENT_SOURCE_DIR}/plplotcapi.i | diff -auw - ${CMAKE_CURRENT_BINARY_DIR}/generated_plplotcapi_defines
+ COMMAND grep -E "^ *#define +[^ ]+ +[()-+0-9x]+" ${CMAKE_CURRENT_SOURCE_DIR}/plplotcapi.i | diff -qw - ${CMAKE_CURRENT_BINARY_DIR}/generated_plplotcapi_defines
VERBATIM
-)
\ No newline at end of file
+)
+
+add_dependencies(check_all check_plplotcapi_defines)
Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/bindings/tcl/CMakeLists.txt 2014-02-23 18:50:11 UTC (rev 13016)
@@ -23,6 +23,7 @@
# Check consistency of plplot_parameters.h.
add_custom_target(
check_tcl_parameters
+ ${CMAKE_COMMAND} -E echo "Check that bindings/tcl/plplot_parameters.h is consistent with the #defines in bindings/swig-support/plplotcapi.i"
COMMAND ${CMAKE_COMMAND} -E remove -f
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
COMMAND
@@ -30,12 +31,13 @@
${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i >
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
COMMAND
- ${CMAKE_COMMAND} -E echo "Check that plplot_parameters.h is consistent with the #defines in bindings/swig-support/plplotcapi.i"
COMMAND
cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_parameters.h
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
)
+ add_dependencies(check_all check_tcl_parameters)
+
# tclmatrix
set(tclmatrix${LIB_TAG}_LIB_SRCS
tclMatrix.c
Modified: trunk/cmake/modules/plplot.cmake
===================================================================
--- trunk/cmake/modules/plplot.cmake 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/cmake/modules/plplot.cmake 2014-02-23 18:50:11 UTC (rev 13016)
@@ -21,6 +21,9 @@
option(ADD_SPECIAL_CONSISTENCY_CHECKING "Add extra source-tree consistency checking targets that require special tools" OFF)
+# target that depends on all check targets.
+add_custom_target(check_all)
+
# libraries are all shared by default
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/doc/docbook/src/CMakeLists.txt 2014-02-23 18:50:11 UTC (rev 13016)
@@ -36,8 +36,12 @@
find_program(API_XML_CONSISTENCY_CHECKER api.xml_consistency_checker)
if(API_XML_CONSISTENCY_CHECKER)
add_custom_target(check_api_xml_consistency
+ COMMAND ${CMAKE_COMMAND} -E echo "Check that doc/docbook/src/api.xml is consistent with include/plplot.h"
COMMAND ${API_XML_CONSISTENCY_CHECKER} -header=${CMAKE_SOURCE_DIR}/include/plplot.h -incdir=${CMAKE_BINARY_DIR}/include -apixml=${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
)
+
+ add_dependencies(check_all check_api_xml_consistency)
+
else(API_XML_CONSISTENCY_CHECKER)
message(STATUS "WARNING: cannot find the api.xml_consistency_checker application so cannot check the consistency of api.xml with plplot.h")
endif(API_XML_CONSISTENCY_CHECKER)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-02-20 20:49:28
|
Revision: 13015
http://sourceforge.net/p/plplot/code/13015
Author: airwin
Date: 2014-02-20 20:49:23 +0000 (Thu, 20 Feb 2014)
Log Message:
-----------
Additional simplification of the build system for the Octave binding
of PLplot.
I discovered that bindings/octave/plplot_octave_rej.h and
bindings/octave/plplot_octave.h.in were not actually used any more by
our modern swig-based build system for the octave binding of PLplot,
so I removed those files and all references to them throughout our
build system.
Tested on Linux by running the test_octave_psc target.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
trunk/cmake/modules/octave.cmake
trunk/scripts/check_api_completeness.sh
trunk/scripts/style_source.sh
Removed Paths:
-------------
trunk/bindings/octave/plplot_octave.h.in
trunk/bindings/octave/plplot_octave_rej.h
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2014-02-18 21:07:37 UTC (rev 13014)
+++ trunk/bindings/octave/CMakeLists.txt 2014-02-20 20:49:23 UTC (rev 13015)
@@ -103,13 +103,7 @@
DEPENDS ${make_documentation_DEPENDS}
)
- # Configure source code for octave interface to PLplot.
configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
- @ONLY
- )
- configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/octave_version.pl.in
${CMAKE_CURRENT_BINARY_DIR}/octave_version.pl
@ONLY
Deleted: trunk/bindings/octave/plplot_octave.h.in
===================================================================
--- trunk/bindings/octave/plplot_octave.h.in 2014-02-18 21:07:37 UTC (rev 13014)
+++ trunk/bindings/octave/plplot_octave.h.in 2014-02-20 20:49:23 UTC (rev 13015)
@@ -1,1857 +0,0 @@
-// $Id$
-// jc: this is a massaged plplot.h
-//
-// Copyright (C) 2004 Joao Cardoso
-//
-// This file is part of PLplot_Octave.
-//
-// PLplot_Octave is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// PLplot_Octave is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with PLplot_Octave; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-//
-// Copyright (C) 1992 by
-// Maurice J. LeBrun, Geoff Furnish, Tony Richardson.
-//
-// Macros and prototypes for the PLplot package. This header file must
-// be included by all user codes.
-//
-// This software may be freely copied, modified and redistributed
-// without fee provided that this copyright notice is preserved intact
-// on all copies and modified copies.
-//
-// There is no warranty or other guarantee of fitness of this software.
-// It is provided solely "as is". The author(s) disclaim(s) all
-// responsibility and liability with respect to this software's usage
-// or its effect upon hardware or computer systems.
-//
-// Note: some systems allow the Fortran & C namespaces to clobber each
-// other. So for PLplot to work from Fortran, we do some rather nasty
-// things to the externally callable C function names. This shouldn't
-// affect any user programs in C as long as this file is included.
-//
-
-#ifndef __PLPLOT_H__
-#define __PLPLOT_H__
-
-//--------------------------------------------------------------------------
-// USING PLplot
-//
-// To use PLplot from C or C++, it is only necessary to
-//
-// #include "plplot.h"
-//
-// This file does all the necessary setup to make PLplot accessible to
-// your program as documented in the manual. Additionally, this file
-// allows you to request certain behavior by defining certain symbols
-// before inclusion. At the moment the only one is:
-//
-// #define DOUBLE or..
-// #define PL_DOUBLE
-//
-// This causes PLplot to use doubles instead of floats. Use the type
-// PLFLT everywhere in your code, and it will always be the right thing.
-//
-// Note: most of the functions visible here begin with "pl", while all
-// of the data types and switches begin with "PL". Eventually everything
-// will conform to this rule in order to keep namespace pollution of the
-// user code to a minimum. All the PLplot source files actually include
-// "plplotP.h", which includes this file as well as all the internally-
-// visible declarations, etc.
-//--------------------------------------------------------------------------
-
-// The majority of PLplot source files require these, so..
-// Under ANSI C, they can be included any number of times.
-
-#include <stdio.h>
-#include <stdlib.h>
-
-//--------------------------------------------------------------------------
-// SYSTEM IDENTIFICATION
-//
-// Several systems are supported directly by PLplot. In order to avoid
-// confusion, one id macro per system is used. Since different compilers
-// may predefine different system id macros, we need to check all the
-// possibilities, and then set the one we will be referencing. These are:
-//
-// __cplusplus Any C++ compiler
-// __unix Any Unix-like system
-// __hpux Any HP/UX system
-// __aix Any AIX system
-// __linux Linux for i386
-// (others...)
-//
-//--------------------------------------------------------------------------
-
-#ifdef unix // the old way
-#ifndef __unix
-#define __unix
-#endif
-#endif
-
-// Make sure Unix systems define "__unix"
-
-#if defined ( SX ) || /* NEC Super-UX */ \
- ( defined ( _IBMR2 ) && defined ( _AIX ) ) || /* AIX */ \
- defined ( __hpux ) || /* HP/UX */ \
- defined ( sun ) || /* SUN */ \
- defined ( CRAY ) || /* Cray */ \
- defined ( __convexc__ ) || /* CONVEX */ \
- ( defined ( __alpha ) && defined ( __osf__ ) ) // DEC Alpha AXP/OSF
-
-#ifndef __unix
-#define __unix
-#endif
-#endif
-
-// A wrapper used in some header files so they can be compiled with cc
-
-#define PLARGS( a ) a
-
-//--------------------------------------------------------------------------
-// Base types for PLplot
-//
-// Only those that are necessary for function prototypes are defined here.
-// Notes:
-//
-// PLINT is typedef'd to an int by default. This is a change from some
-// previous versions, where a long was used. Under MSDOS, a PLINT is
-// typedef'd to a long, since 16 bits is too inaccurate for some PLplot
-// functions. So under MSDOS you must use type PLINT for integer array
-// arguments to PLplot functions, but on other systems you can just use
-// an int.
-//
-// short is currently used for device page coordinates, so they are
-// bounded by (-32767, 32767). This gives a max resolution of about 3000
-// dpi, and improves performance in some areas over using a PLINT.
-//--------------------------------------------------------------------------
-
-@DEFINE_PL_DOUBLE@
-
-#if defined ( PL_DOUBLE ) || defined ( DOUBLE )
-typedef double PLFLT;
-#else
-typedef float PLFLT;
-#endif
-
-#if defined ( MSDOS )
-typedef long PLINT;
-typedef unsigned long PLUNICODE;
-#else
-typedef int PLINT;
-typedef unsigned PLUNICODE;
-#endif
-
-// For identifying logical (boolean) arguments
-typedef PLINT PLBOOL;
-
-// For passing user data, as with X's XtPointer
-
-typedef void* PLPointer;
-
-//--------------------------------------------------------------------------
-// Complex data types and other good stuff
-//--------------------------------------------------------------------------
-
-// Switches for escape function call.
-// Some of these are obsolete but are retained in order to process
-// old metafiles
-
-#define PLESC_SET_RGB 1 // obsolete
-#define PLESC_ALLOC_NCOL 2 // obsolete
-#define PLESC_SET_LPB 3 // obsolete
-#define PLESC_EXPOSE 4 // handle window expose
-#define PLESC_RESIZE 5 // handle window resize
-#define PLESC_REDRAW 6 // handle window redraw
-#define PLESC_TEXT 7 // switch to text screen
-#define PLESC_GRAPH 8 // switch to graphics screen
-#define PLESC_FILL 9 // fill polygon
-#define PLESC_DI 10 // handle DI command
-#define PLESC_FLUSH 11 // flush output
-#define PLESC_EH 12 // handle Window events
-#define PLESC_GETC 13 // get cursor position
-#define PLESC_SWIN 14 // set window parameters
-#define PLESC_DOUBLEBUFFERING 15 // configure double buffering
-#define PLESC_XORMOD 16 // jc: set xor mode
-#define PLESC_SET_COMPRESSION 17 // AFR: set compression
-#define PLESC_CLEAR 18 // RL: clear graphics region
-#define PLESC_DASH 19 // RL: draw dashed line
-
-// Window parameter tags
-
-#define PLSWIN_DEVICE 1 // device coordinates
-#define PLSWIN_WORLD 2 // world coordinates
-
-// PLplot Option table & support constants
-
-// Option-specific settings
-
-#define PL_OPT_ENABLED 0x0001 // Obsolete
-#define PL_OPT_ARG 0x0002 // Option has an argment
-#define PL_OPT_NODELETE 0x0004 // Don't delete after processing
-#define PL_OPT_INVISIBLE 0x0008 // Make invisible
-#define PL_OPT_DISABLED 0x0010 // Processing is disabled
-
-// Option-processing settings -- mutually exclusive
-
-#define PL_OPT_FUNC 0x0100 // Call handler function
-#define PL_OPT_BOOL 0x0200 // Set *var = 1
-#define PL_OPT_INT 0x0400 // Set *var = atoi(optarg)
-#define PL_OPT_FLOAT 0x0800 // Set *var = atof(optarg)
-#define PL_OPT_STRING 0x1000 // Set var = optarg
-
-// Global mode settings
-// These override per-option settings
-
-#define PL_PARSE_PARTIAL 0x0000 // For backward compatibility
-#define PL_PARSE_FULL 0x0001 // Process fully & exit if error
-#define PL_PARSE_QUIET 0x0002 // Don't issue messages
-#define PL_PARSE_NODELETE 0x0004 // Don't delete options after
- // processing
-#define PL_PARSE_SHOWALL 0x0008 // Show invisible options
-#define PL_PARSE_OVERRIDE 0x0010 // Obsolete
-#define PL_PARSE_NOPROGRAM 0x0020 // Program name NOT in *argv[0]..
-#define PL_PARSE_NODASH 0x0040 // Set if leading dash NOT required
-#define PL_PARSE_SKIP 0x0080 // Skip over unrecognized args
-
-// Obsolete names
-
-#define plParseInternalOpts( a, b, c ) plparseopts( a, b, c )
-#define plSetInternalOpt( a, b ) plSetOpt( a, b )
-
-// Option table definition
-
-typedef struct
-{
- char *opt;
- int ( *handler )( char *, char *, void * );
- void *client_data;
- void *var;
- long mode;
- char *syntax;
- char *desc;
-} PLOptionTable;
-
-// PLplot Graphics Input structure
-
-#define PL_MAXKEY 16
-
-typedef struct
-{
- int type; // of event (CURRENTLY UNUSED)
- unsigned int state; // key or button mask
- unsigned int keysym; // key selected
- unsigned int button; // mouse button selected
- PLINT subwindow; // subwindow (alias subpage, alias subplot) number
- char string[PL_MAXKEY]; // translated string
- int pX, pY; // absolute device coordinates of pointer
- PLFLT dX, dY; // relative device coordinates of pointer
- PLFLT wX, wY; // world coordinates of pointer
-} PLGraphicsIn;
-
-// Structure for describing the plot window
-
-#define PL_MAXWINDOWS 64 // Max number of windows/page tracked
-
-typedef struct
-{
- PLFLT dxmi, dxma, dymi, dyma; // min, max window rel dev coords
- PLFLT wxmi, wxma, wymi, wyma; // min, max window world coords
-} PLWindow;
-
-// Structure for doing display-oriented operations via escape commands
-// May add other attributes in time
-
-typedef struct
-{
- unsigned int x, y; // upper left hand corner
- unsigned int width, height; // window dimensions
-} PLDisplay;
-
-// Macro used (in some cases) to ignore value of argument
-// I don't plan on changing the value so you can hard-code it
-
-#define PL_NOTSET ( -42 )
-
-// See plcont.c for examples of the following
-
-//
-// PLfGrid is for passing (as a pointer to the first element) an arbitrarily
-// dimensioned array. The grid dimensions MUST be stored, with a maximum of 3
-// dimensions assumed for now.
-//
-
-typedef struct
-{
- PLFLT *f;
- PLINT nx, ny, nz;
-} PLfGrid;
-
-//
-// PLfGrid2 is for passing (as an array of pointers) a 2d function array. The
-// grid dimensions are passed for possible bounds checking.
-//
-
-typedef struct
-{
- PLFLT **f;
- PLINT nx, ny;
-} PLfGrid2;
-
-//
-// NOTE: a PLfGrid3 is a good idea here but there is no way to exploit it yet
-// so I'll leave it out for now.
-//
-
-//
-// PLcGrid is for passing (as a pointer to the first element) arbitrarily
-// dimensioned coordinate transformation arrays. The grid dimensions MUST be
-// stored, with a maximum of 3 dimensions assumed for now.
-//
-
-typedef struct
-{
- PLFLT *xg, *yg, *zg;
- PLINT nx, ny, nz;
-} PLcGrid;
-
-//
-// PLcGrid2 is for passing (as arrays of pointers) 2d coordinate
-// transformation arrays. The grid dimensions are passed for possible bounds
-// checking.
-//
-
-typedef struct
-{
- PLFLT **xg, **yg, **zg;
- PLINT nx, ny;
-} PLcGrid2;
-
-//
-// NOTE: a PLcGrid3 is a good idea here but there is no way to exploit it yet
-// so I'll leave it out for now.
-//
-
-// PLColor is the usual way to pass an rgb color value.
-
-typedef struct
-{
- unsigned char r; // red
- unsigned char g; // green
- unsigned char b; // blue
- char *name;
-} PLColor;
-
-// PLControlPt is how cmap1 control points are represented.
-
-typedef struct
-{
- PLFLT h; // hue
- PLFLT l; // lightness
- PLFLT s; // saturation
- PLFLT p; // position
- int alt_hue_path; // if set, interpolate through h=0
-} PLControlPt;
-
-// A PLBufferingCB is a control block for interacting with devices
-// that support double buffering.
-
-typedef struct
-{
- PLINT cmd;
- PLINT result;
-} PLBufferingCB;
-
-#define PLESC_DOUBLEBUFFERING_ENABLE 1
-#define PLESC_DOUBLEBUFFERING_DISABLE 2
-#define PLESC_DOUBLEBUFFERING_QUERY 3
-
-
-//--------------------------------------------------------------------------
-// BRAINDEAD-ness
-//
-// Some systems allow the Fortran & C namespaces to clobber each other.
-// For PLplot to work from Fortran on these systems, we must name the the
-// externally callable C functions something other than their Fortran entry
-// names. In order to make this as easy as possible for the casual user,
-// yet reversible to those who abhor my solution, I have done the
-// following:
-//
-// The C-language bindings are actually different from those
-// described in the manual. Macros are used to convert the
-// documented names to the names used in this package. The
-// user MUST include plplot.h in order to get the name
-// redefinition correct.
-//
-// Sorry to have to resort to such an ugly kludge, but it is really the
-// best way to handle the situation at present. If all available
-// compilers offer a way to correct this stupidity, then perhaps we can
-// eventually reverse it.
-//
-// If you feel like screaming at someone (I sure do), please
-// direct it at your nearest system vendor who has a braindead shared
-// C/Fortran namespace. Some vendors do offer compiler switches that
-// change the object names, but then everybody who wants to use the
-// package must throw these same switches, leading to no end of trouble.
-//
-// Note that this definition should not cause any noticable effects except
-// when debugging PLplot calls, in which case you will need to remember
-// the real function names (same as before but with a 'c_' prepended).
-//
-// Also, to avoid macro conflicts, the BRAINDEAD part must not be expanded
-// in the stub routines.
-//
-// Aside: the reason why a shared Fortran/C namespace is deserving of the
-// BRAINDEAD characterization is that it completely precludes the the kind
-// of universal API that is attempted (more or less) with PLplot, without
-// Herculean efforts (e.g. remapping all of the C bindings by macros as
-// done here). The vendors of such a scheme, in order to allow a SINGLE
-// type of argument to be passed transparently between C and Fortran,
-// namely, a pointer to a conformable data type, have slammed the door on
-// insertion of stub routines to handle the conversions needed for other
-// data types. Intelligent linkers could solve this problem, but these are
-// not anywhere close to becoming universal. So meanwhile, one must live
-// with either stub routines for the inevitable data conversions, or a
-// different API. The former is what is used here, but is made far more
-// difficult in a braindead shared Fortran/C namespace.
-//--------------------------------------------------------------------------
-
-#ifndef BRAINDEAD
-#define BRAINDEAD
-#endif
-
-#ifdef BRAINDEAD
-
-#ifndef __PLSTUBS_H__ // i.e. do not expand this in the stubs
-
-#define pl_setcontlabelformat c_pl_setcontlabelformat
-#define pl_setcontlabelparam c_pl_setcontlabelparam
-#define pladv c_pladv
-#define plarc c_plarc
-#define plaxes c_plaxes
-#define plbin c_plbin
-#define plbop c_plbop
-#define plbox c_plbox
-#define plbox3 c_plbox3
-#define plbtime c_plbtime
-#define plcalc_world c_plcalc_world
-#define plclear c_plclear
-#define plcol0 c_plcol0
-#define plcol1 c_plcol1
-#define plconfigtime c_plconfigtime
-#define plcont c_plcont
-#define plcpstrm c_plcpstrm
-#define plctime c_plctime
-#define plend c_plend
-#define plend1 c_plend1
-#define plenv c_plenv
-#define plenv0 c_plenv0
-#define pleop c_pleop
-#define plerrx c_plerrx
-#define plerry c_plerry
-#define plfamadv c_plfamadv
-#define plfill c_plfill
-#define plfill3 c_plfill3
-#define plflush c_plflush
-#define plfont c_plfont
-#define plfontld c_plfontld
-#define plgchr c_plgchr
-#define plgcol0 c_plgcol0
-#define plgcol0a c_plgcol0a
-#define plgcolbg c_plgcolbg
-#define plgcolbga c_plgcolbga
-#define plgcompression c_plgcompression
-#define plgdev c_plgdev
-#define plgdidev c_plgdidev
-#define plgdiori c_plgdiori
-#define plgdiplt c_plgdiplt
-#define plgfam c_plgfam
-#define plgfci c_plgfci
-#define plgfnam c_plgfnam
-#define plgfont c_plgfont
-#define plglevel c_plglevel
-#define plgpage c_plgpage
-#define plgra c_plgra
-#define plgradient c_plgradient
-#define plgriddata c_plgriddata
-#define plgspa c_plgspa
-#define plgstrm c_plgstrm
-#define plgver c_plgver
-#define plgvpd c_plgvpd
-#define plgvpw c_plgvpw
-#define plgxax c_plgxax
-#define plgyax c_plgyax
-#define plgzax c_plgzax
-#define plhist c_plhist
-#define plhls c_plhls
-#define plhlsrgb c_plhlsrgb
-#define plimage c_plimage
-#define plimagefr c_plimagefr
-#define plinit c_plinit
-#define pljoin c_pljoin
-#define pllab c_pllab
-#define pllightsource c_pllightsource
-#define plline c_plline
-#define plline3 c_plline3
-#define pllsty c_pllsty
-#define plmesh c_plmesh
-#define plmeshc c_plmeshc
-#define plmkstrm c_plmkstrm
-#define plmtex c_plmtex
-#define plmtex3 c_plmtex3
-#define plot3d c_plot3d
-#define plot3dc c_plot3dc
-#define plparseopts c_plparseopts
-#define plpat c_plpat
-#define plpoin c_plpoin
-#define plpoin3 c_plpoin3
-#define plpoly3 c_plpoly3
-#define plprec c_plprec
-#define plpsty c_plpsty
-#define plptex c_plptex
-#define plptex3 c_plptex3
-#define plrandd c_plrandd
-#define plreplot c_plreplot
-#define plrgb c_plrgb
-#define plrgb1 c_plrgb1
-#define plrgbhls c_plrgbhls
-#define plschr c_plschr
-#define plscmap0 c_plscmap0
-#define plscmap0a c_plscmap0a
-#define plscmap0n c_plscmap0n
-#define plscmap1 c_plscmap1
-#define plscmap1a c_plscmap1a
-#define plscmap1l c_plscmap1l
-#define plscmap1la c_plscmap1la
-#define plscmap1n c_plscmap1n
-#define plscol0 c_plscol0
-#define plscol0a c_plscol0a
-#define plscolbg c_plscolbg
-#define plscolbga c_plscolbga
-#define plscolor c_plscolor
-#define plscompression c_plscompression
-#define plsdev c_plsdev
-#define plsdidev c_plsdidev
-#define plsdimap c_plsdimap
-#define plsdiori c_plsdiori
-#define plsdiplt c_plsdiplt
-#define plsdiplz c_plsdiplz
-#define plseed c_plseed
-#define plsesc c_plsesc
-#define plsfam c_plsfam
-#define plsfci c_plsfci
-#define plsfnam c_plsfnam
-#define plsfont c_plsfont
-#define plshades c_plshades
-#define plshade c_plshade
-#define plshade1 c_plshade1
-#define plslabelfunc c_plslabelfunc
-#define plsmaj c_plsmaj
-#define plsmin c_plsmin
-#define plsori c_plsori
-#define plspage c_plspage
-#define plspal0 c_plspal0
-#define plspal1 c_plspal1
-#define plspause c_plspause
-#define plsstrm c_plsstrm
-#define plssub c_plssub
-#define plssym c_plssym
-#define plstar c_plstar
-#define plstart c_plstart
-#define plstripa c_plstripa
-#define plstripc c_plstripc
-#define plstripd c_plstripd
-#define plstyl c_plstyl
-#define plsurf3d c_plsurf3d
-#define plsvect c_plsvect
-#define plsvpa c_plsvpa
-#define plsxax c_plsxax
-#define plsyax c_plsyax
-#define plsym c_plsym
-#define plszax c_plszax
-#define pltext c_pltext
-#define pltimefmt c_pltimefmt
-#define plvasp c_plvasp
-#define plvect c_plvect
-#define plvpas c_plvpas
-#define plvpor c_plvpor
-#define plvsta c_plvsta
-#define plw3d c_plw3d
-#define plwidth c_plwidth
-#define plwind c_plwind
-#define plxormod c_plxormod
-
-#endif // __PLSTUBS_H__
-
-#endif // BRAINDEAD
-
-// Redefine some old function names for backward compatibility
-
-#ifndef __PLSTUBS_H__ // i.e. do not expand this in the stubs
-
-#define plclr pleop
-#define plpage plbop
-#define plcol plcol0
-#define plcontf plfcont
-#define Alloc2dGrid plAlloc2dGrid
-#define Free2dGrid plFree2dGrid
-
-#endif // __PLSTUBS_H__
-
-//--------------------------------------------------------------------------
-// Function Prototypes
-//--------------------------------------------------------------------------
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "plplot_octave_rej.h"
-
-// All void types
-
-// C routines callable from stub routines come first
-
-// Advance to subpage "page", or to the next one if "page" = 0.
-
-void c_pladv( PLINT page ); //%name pladv
-
-// Plot an arc
-
-void c_plarc( PLFLT x, PLFLT y, PLFLT a, PLFLT b, PLFLT angle1, PLFLT angle2,
- PLFLT rotate, PLBOOL fill ); //%name plarc
-
-// This functions similarly to plbox() except that the origin of the axes
-// is placed at the user-specified point (x0, y0).
-
-void c_plaxes( PLFLT x0, PLFLT y0, const char *xopt, PLFLT xtick, PLINT nxsub,
- const char *yopt, PLFLT ytick, PLINT nysub ); //%name plaxes
-
-// Plot a histogram using x to store data values and y to store frequencies
-
-void c_plbin( PLINT nbin, PLFLT *x, PLFLT *y, PLINT center ); //%name plbin //%input x(nbin), y(nbin)
-
-// Start new page. Should only be used with pleop().
-
-void c_plbop( void ); //%name plbop
-
-// This draws a box around the current viewport.
-
-void c_plbox( const char *xopt, PLFLT xtick, PLINT nxsub,
- const char *yopt, PLFLT ytick, PLINT nysub ); //%name plbox
-
-// This is the 3-d analogue of plbox().
-
-void c_plbox3( const char *xopt, const char *xlabel, PLFLT xtick, PLINT nsubx,
- const char *yopt, const char *ylabel, PLFLT ytick, PLINT nsuby,
- const char *zopt, const char *zlabel, PLFLT ztick, PLINT nsubz ); //%name plbox3
-
-// Calculate broken-down time from continuous time for current stream.
-void c_plbtime( PLINT *year, PLINT *month, PLINT *day, PLINT *hour, PLINT *min, PLFLT *sec, PLFLT ctime ); //%name plbtime //%output year, month, day, hour, min, sec
-
-// Start new page. Should only be used with pleop().
-
-
-// Set xor mode; 1-enter, 0-leave
-
-void c_plxormod( PLINT mode, PLINT *status ); //%name plxormod //%output status
-
-// Calculate world coordinates and subpage from relative device coordinates.
-
-void c_plcalc_world( PLFLT rx, PLFLT ry, PLFLT *wx, PLFLT *wy, PLINT *window ); //%name plcalc_world //%output wx, wy, window
-
-// Clear current subpage.
-
-void c_plclear( void ); //%name plclear
-
-// Set color, map 0. Argument is integer between 0 and 15.
-
-void c_plcol0( PLINT icol0 ); //%name plcol0
-
-inline void my_plcol( PLINT icol0 )
-{
- c_plcol0( icol0 );
-} //%name plcol
-
-// Set color, map 1. Argument is a float between 0. and 1.
-
-void c_plcol1( PLFLT col1 ); //%name plcol1
-
-// Configure transformation between continuous and broken-down time (and
-// vice versa) for current stream.
-void c_plconfigtime( PLFLT scale, PLFLT offset1, PLFLT offset2, PLINT ccontrol, PLBOOL ifbtime_offset, PLINT year, PLINT month, PLINT day, PLINT hour, PLINT min, PLFLT sec ); //%name plconfigtime
-
-// Identity transformation.
-
-void pltr0( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, PLPointer pltr_data ); //%nowrap
-
-// Does linear interpolation from singly dimensioned coord arrays.
-
-void pltr1( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, PLPointer pltr_data ); //%nowrap
-
-// Does linear interpolation from doubly dimensioned coord arrays
-// (column dominant, as per normal C 2d arrays).
-
-void pltr2( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, PLPointer pltr_data ); //%nowrap
-
-// Just like pltr2() but uses pointer arithmetic to get coordinates from
-// 2d grid tables.
-
-void pltr2p( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, PLPointer pltr_data ); //%nowrap
-
-// One more hack. As it is not possible (and would not be desirable) to pass
-// an Octave function to plcont(), I have defined three plcont():
-// plcont uses a defined here xform()
-// plcont0 uses pltr0()
-// plcont1 uses pltr1()
-// plcont2 uses pltr2()
-// plcont2p uses pltr2p()
-//
-// Also, as plplot expect vectorized bidimensional arrays, I provided a
-// f2c, which is a #define that does the necessary conversion.
-//
-
-void xform( PLFLT x, PLFLT y, PLFLT *tx, PLFLT *ty, PLPointer pltr_data )
-{
- *tx = *( (PLFLT *) pltr_data + 0 ) * x + *( (PLFLT *) pltr_data + 1 ) * y + *( (PLFLT *) pltr_data + 2 );
- *ty = *( (PLFLT *) pltr_data + 3 ) * x + *( (PLFLT *) pltr_data + 4 ) * y + *( (PLFLT *) pltr_data + 5 );
-} //%nowrap
-
-// convert from Fortran like arrays (one vector), to C like 2D arrays
-
-#define f2c( f, ff, nx, ny ) \
- PLFLT * *ff; \
- ff = (PLFLT **) alloca( nx * sizeof ( PLFLT * ) ); \
- for ( int i = 0; i < nx; i++ ) { \
- ff[i] = (PLFLT *) alloca( ny * sizeof ( PLFLT ) ); \
- for ( int j = 0; j < ny; j++ ) \
- *( ff[i] + j ) = *( f + nx * j + i );}
-
-// simpler plcont() for use with xform()
-
-void my_plcont( PLFLT *f, PLINT nx, PLINT ny, PLINT kx, PLINT lx, PLINT ky,
- PLINT ly, PLFLT *clevel, PLINT nlevel, PLFLT *tr )
-{
- f2c( f, ff, nx, ny );
- c_plcont( ff, nx, ny, kx, lx, ky, ly, clevel, nlevel, xform, tr );
-} //%name plcont //%input f(nx,ny), clevel(nlevel), tr(6)
-
-// plcont() for use with pltr0() NOT TESTED
-
-void my_plcont0( PLFLT *f, PLINT nx, PLINT ny, PLINT kx, PLINT lx, PLINT ky,
- PLINT ly, PLFLT *clevel, PLINT nlevel )
-{
- f2c( f, ff, nx, ny );
- c_plcont( ff, nx, ny, kx, lx, ky, ly, clevel, nlevel, pltr0, NULL );
-} //%name plcont0 //%input f(nx,ny), clevel(nlevel)
-
-// plcont() for use with pltr1()
-
-void my_plcont1( PLFLT *f, PLINT nx, PLINT ny, PLINT kx, PLINT lx, PLINT ky,
- PLINT ly, PLFLT *clevel, PLINT nlevel, PLFLT *xg, PLFLT *yg )
-{
- PLcGrid grid1;
- grid1.nx = nx; grid1.ny = ny;
- grid1.xg = xg; grid1.yg = yg;
- f2c( f, ff, nx, ny );
- c_plcont( ff, nx, ny, kx, lx, ky, ly, clevel, nlevel, pltr1, &grid1 );
-} //%name plcont1 //%input f(nx,ny), clevel(nlevel), xg(nx), yg(ny)
-
-// plcont() for use with pltr2()
-
-void my_plcont2( PLFLT *f, PLINT nx, PLINT ny, PLINT kx, PLINT lx, PLINT ky,
- PLINT ly, PLFLT *clevel, PLINT nlevel, PLFLT *xg, PLFLT *yg )
-{
- PLcGrid2 grid2;
- f2c( xg, xgg, nx, ny ); f2c( yg, ygg, nx, ny );
- grid2.nx = nx; grid2.ny = ny;
- grid2.xg = xgg; grid2.yg = ygg;
- f2c( f, ff, nx, ny );
- c_plcont( ff, nx, ny, kx, lx, ky, ly, clevel, nlevel, pltr2, &grid2 );
-} //%name plcont2 //%input f(nx,ny), clevel(nlevel), xg(nx,ny), yg(nx,ny)
-
-// plcont() for use with pltr2p()
-
-void my_plcont2p( PLFLT *f, PLINT nx, PLINT ny, PLINT kx, PLINT lx, PLINT ky,
- PLINT ly, PLFLT *clevel, PLINT nlevel, PLFLT *xg, PLFLT *yg )
-{
- PLcGrid2 grid2;
- f2c( xg, xgg, nx, ny ); f2c( yg, ygg, nx, ny );
- grid2.nx = nx; grid2.ny = ny;
- grid2.xg = xgg; grid2.yg = ygg;
- f2c( f, ff, nx, ny );
- c_plcont( ff, nx, ny, kx, lx, ky, ly, clevel, nlevel, pltr2, &grid2 );
-} //%name plcont2p //%input f(nx,ny), clevel(nlevel), xg(nx,ny), yg(nx,ny)
-
-// Copies state parameters from the reference stream to the current stream.
-
-void c_plcpstrm( PLINT iplsr, PLINT flags ); //%name plcpstrm
-
-// Calculate continuous time from broken-down time for current stream.
-void c_plctime( PLINT year, PLINT month, PLINT day, PLINT hour, PLINT min, PLFLT sec, PLFLT *ctime ); //%name plctime //%output ctime
-
-// Converts input values from relative device coordinates to relative plot
-// coordinates.
-
-void pldid2pc( PLFLT *xmin, PLFLT *ymin, PLFLT *xmax, PLFLT *ymax );
-
-// Converts input values from relative plot coordinates to relative
-// device coordinates.
-
-void pldip2dc( PLFLT *xmin, PLFLT *ymin, PLFLT *xmax, PLFLT *ymax );
-
-// End a plotting session for all open streams.
-
-void c_plend( void ); //%name plend
-
-// End a plotting session for the current stream only.
-
-void c_plend1( void ); //%name plend1
-
-// Simple interface for defining viewport and window.
-
-void c_plenv( PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
- PLINT just, PLINT axis ); //%name plenv
-
-
-void c_plenv0( PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
- PLINT just, PLINT axis ); //%name plenv0
-
-// End current page. Should only be used with plbop().
-
-void c_pleop( void ); //%name pleop
-
-// Plot horizontal error bars (xmin(i),y(i)) to (xmax(i),y(i))
-
-void c_plerrx( PLINT n, PLFLT *xmin, PLFLT *xmax, PLFLT *y ); //%name plerrx //%input xmin(n), xmax(n), y(n)
-
-// Plot vertical error bars (x,ymin(i)) to (x(i),ymax(i))
-
-void c_plerry( PLINT n, PLFLT *x, PLFLT *ymin, PLFLT *ymax ); //%name plerry //%input ymin(n), ymax(n), x(n)
-
-// Advance to the next family file on the next new page
-
-void c_plfamadv( void ); //%name plfamadv
-
-// Pattern fills the polygon bounded by the input points.
-
-void c_plfill( PLINT n, PLFLT *x, PLFLT *y ); //%name plfill //%input x(n), y(n)
-
-// Pattern fills the 3d polygon bounded by the input points.
-
-void c_plfill3( PLINT n, PLFLT *x, PLFLT *y, PLFLT *z ); //%name plfill3 //%input x(n), y(n), z(n)
-
-// Flushes the output stream. Use sparingly, if at all.
-
-void c_plflush( void ); //%name plflush
-
-// Sets the global font flag to 'ifont'.
-
-void c_plfont( PLINT ifont ); //%name plfont
-
-// Load specified font set.
-
-void c_plfontld( PLINT fnt ); //%name plfontld
-
-// Get character default height and current (scaled) height
-
-void c_plgchr( PLFLT *p_def, PLFLT *p_ht ); //%name plgchr //%output p_def, p_ht
-
-// Returns 8 bit RGB values for given color from color map 0
-
-void c_plgcol0( PLINT icol0, PLINT *r, PLINT *g, PLINT *b ); //%name plgcol0 //%output r, g, b
-
-// Returns 8 bit RGB + alpha values for given color from color map 0
-
-void c_plgcol0a( PLINT icol0, PLINT *r, PLINT *g, PLINT *b, PLFLT *a ); //%name plgcol0a //%output r, g, b, a
-
-// Returns the background color by 8 bit RGB value
-
-void c_plgcolbg( PLINT *r, PLINT *g, PLINT *b ); //%name plgcolbg //%output r, g, b
-
-// Returns the background color by 8 bit RGB + alpha values
-
-void c_plgcolbga( PLINT *r, PLINT *g, PLINT *b, PLFLT *a ); //%name plgcolbga //%output r, g, b, a
-
-// Returns the current compression setting
-
-void c_plgcompression( PLINT *compression ); //%name plgcompression //%output compression
-
-// Get the current device (keyword) name
-
-void c_plgdev( char *p_dev ); //%name plgdev //%output p_dev(80)
-
-// Retrieve current window into device space
-
-void c_plgdidev( PLFLT *p_mar, PLFLT *p_aspect, PLFLT *p_jx, PLFLT *p_jy ); //%name plgdidev //%output p_mar, p_aspect, p_jx, p_jy
-
-// Get plot orientation
-
-void c_plgdiori( PLFLT *p_rot ); //%name plgdiori //%output p_rot
-
-// Retrieve current window into plot space
-
-void c_plgdiplt( PLFLT *p_xmin, PLFLT *p_ymin, PLFLT *p_xmax, PLFLT *p_ymax ); //%name plgdiplt //%output p_xmin, p_ymin, p_xmax, p_ymax
-
-// Get FCI (font characterization integer)
-
-void c_plgfci( PLUNICODE *pfci ); //%name plgfci //%output pfci
-
-// Get family file parameters
-
-void c_plgfam( PLINT *p_fam, PLINT *p_num, PLINT *p_bmax ); //%name plgfam //%output p_fam, p_num, p_bmax
-
-// Get the (current) output file name. Must be preallocated to >80 bytes
-
-void c_plgfnam( char *fnam ); //%name plgfnam //%output fnam(80)
-
-// Get the current font family, style and weight
-
-void c_plgfont( PLINT *p_family, PLINT *p_style, PLINT *p_weight ); //%name plgfont //%output p_family, p_style, p_weight
-
-// Get the (current) run level.
-
-void c_plglevel( PLINT *p_level ); //%name plglevel //%output p_level
-
-// Get output device parameters.
-
-void c_plgpage( PLFLT *p_xp, PLFLT *p_yp, PLINT *p_xleng, PLINT *p_yleng,
- PLINT *p_xoff, PLINT *p_yoff ); //%name plgpage //%output p_xp, p_yp, p_xleng, p_yleng, p_xoff, p_yoff
-
-// Switches to graphics screen.
-
-void c_plgra( void ); //%name plgra
-
-// Draw gradient in polygon.
-
-void c_plgradient( PLINT n, PLFLT *x, PLFLT *y, PLFLT angle ); //%name plgradient //%input x(n), y(n)
-
-void plgriddata( PLFLT *x, PLFLT *y, PLFLT *z, int npts,
- PLFLT *xg, int nptsx, PLFLT *yg, int nptsy,
- PLFLT **zg, int type, PLFLT data ); //%nowrap
-
-void my_plgriddata( PLFLT *x, PLFLT *y, PLFLT *z, int npts,
- PLFLT *xg, int nptsx, PLFLT *yg, int nptsy,
- PLFLT *zg, int type, PLFLT data )
-{
- f2c( zg, zgg, nptsx, nptsy );
- plgriddata( x, y, z, npts, xg, nptsx, yg, nptsy, zgg, type, data );
- for ( int i = 0; i < nptsx; i++ )
- for ( int j = 0; j < nptsy; j++ )
- *( zg + nptsx * j + i ) = zgg[i][j];
-} //%name plgriddata //%input x(npts), y(npts), z(npts), xg(nptsx), yg(nptsy) //%output zg(nptsx, nptsy)
-
-// type of gridding algorithm for plgriddata()
-
-#define GRID_CSA 1 // Bivariate Cubic Spline approximation
-#define GRID_DTLI 2 // Delaunay Triangulation Linear Interpolation
-#define GRID_NNI 3 // Natural Neighbors Interpolation
-#define GRID_NNIDW 4 // Nearest Neighbors Inverse Distance Weighted
-#define GRID_NNLI 5 // Nearest Neighbors Linear Interpolation
-#define GRID_NNAIDW 6 // Nearest Neighbors Around Inverse Distance Weighted
-
-// Get subpage boundaries in absolute coordinates
-
-void c_plgspa( PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax ); //%name plgspa //%output xmin, xmax, ymin, ymax
-
-// Get current stream number.
-
-void c_plgstrm( PLINT *p_strm ); //%name plgstrm //%output p_strm
-
-// Get the current library version number
-
-void c_plgver( char *p_ver ); //%output p_ver(20) //%name plgver
-
-// Get viewport boundaries in normalized device coordinates
-
-void c_plgvpd( PLFLT *p_xmin, PLFLT *p_xmax, PLFLT *p_ymin, PLFLT *p_ymax ); //%name plgvpd //%output p_xmin, p_xmax, p_ymin, p_ymax
-
-// Get viewport boundaries in world coordinates
-
-void c_plgvpw( PLFLT *p_xmin, PLFLT *p_xmax, PLFLT *p_ymin, PLFLT *p_ymax ); //%name plgvpw //%output p_xmin, p_xmax, p_ymin, p_ymax
-
-// Get x axis labeling parameters
-
-void c_plgxax( PLINT *p_digmax, PLINT *p_digits ); //%name plgxax //%output p_digmax, p_digits
-
-// Get y axis labeling parameters
-
-void c_plgyax( PLINT *p_digmax, PLINT *p_digits ); //%name plgyax //%output p_digmax, p_digits
-
-// Get z axis labeling parameters
-
-void c_plgzax( PLINT *p_digmax, PLINT *p_digits ); //%name plgzax //%output p_digmax, p_digits
-
-// Draws a histogram of n values of a variable in array data[0..n-1]
-
-void c_plhist( PLINT n, PLFLT *data, PLFLT datmin, PLFLT datmax,
- PLINT nbin, PLINT oldwin ); //%name plhist //%input data(n)
-
-// Set current color (map 0) by hue, lightness, and saturation.
-
-void c_plhls( PLFLT h, PLFLT l, PLFLT s ); //%name plhls
-
-// Function for converting between HLS and RGB color space
-
-void c_plhlsrgb( PLFLT h, PLFLT l, PLFLT s, PLFLT *p_r, PLFLT *p_g, PLFLT *p_b ); //%name plhlsrgb //%output p_r, p_g, p_b
-
-// Initializes PLplot, using preset or default options
-
-void c_plinit( void ); //%name plinit
-
-// Draws a line segment from (x1, y1) to (x2, y2).
-
-void c_pljoin( PLFLT x1, PLFLT y1, PLFLT x2, PLFLT y2 ); //%name pljoin
-
-// Simple routine for labelling graphs.
-
-void c_pllab( const char *xlabel, const char *ylabel, const char *tlabel ); //%name pllab
-
-// Sets position of the light source
-
-void c_pllightsource( PLFLT x, PLFLT y, PLFLT z ); //%name pllightsource
-
-// Draws line segments connecting a series of points.
-
-void c_plline( PLINT n, PLFLT *x, PLFLT *y ); //%input x(n), y(n) //%name plline
-
-// Draws a line in 3 space.
-
-void c_plline3( PLINT n, PLFLT *x, PLFLT *y, PLFLT *z ); //%name plline3 //%input x(n), y(n), z(n)
-
-// Set line style.
-
-void c_pllsty( PLINT lin ); //%name pllsty
-
-// Plots a mesh representation of the function z[x][y].
-
-void c_plmesh( PLFLT *x, PLFLT *y, PLFLT **z, PLINT nx, PLINT ny, PLINT opt ); //%nowrap
-
-void my_plmesh( PLFLT *x, PLFLT *y, PLFLT *z, PLINT nx, PLINT ny, PLINT opt )
-{
- f2c( z, zz, nx, ny );
- c_plmesh( x, y, zz, nx, ny, opt );
-} //%name plmesh //%input x(nx), y(ny), z(nx,ny)
-
-// Plots a mesh representation of the function z[x][y] with contour
-
-void c_plmeshc( PLFLT *x, PLFLT *y, PLFLT **z, PLINT nx, PLINT ny, PLINT opt, PLFLT *clevel, PLINT nlevel ); //%nowrap
-
-void my_plmeshc( PLFLT *x, PLFLT *y, PLFLT *z, PLINT nx, PLINT ny, PLINT opt, PLFLT *clevel, PLINT nlevel )
-{
- f2c( z, zz, nx, ny );
- c_plmeshc( x, y, zz, nx, ny, opt, clevel, nlevel );
-} //%name plmeshc //%input x(nx), y(ny), z(nx,ny), clevel(nlevel)
-
-// Creates a new stream and makes it the default.
-
-void c_plmkstrm( PLINT *p_strm ); //%name plmkstrm //%output p_strm
-
-// Prints out "text" at specified position relative to viewport
-
-void c_plmtex( const char *side, PLFLT disp, PLFLT pos, PLFLT just,
- const char *text ); //%name plmtex
-
-// Prints out "text" at specified position relative to viewport (3D)
-
-void c_plmtex3( const char *side, PLFLT disp, PLFLT pos, PLFLT just,
- const char *text ); //%name plmtex3
-
-// Plots a 3-d representation of the function z[x][y].
-
-void c_plot3d( PLFLT *x, PLFLT *y, PLFLT **z,
- PLINT nx, PLINT ny, PLINT opt, PLINT side ); //%nowrap
-
-void my_plot3d( PLFLT *x, PLFLT *y, PLFLT *z,
- PLINT nx, PLINT ny, PLINT opt, PLINT side )
-{
- f2c( z, zz, nx, ny )
- c_plot3d( x, y, zz, nx, ny, opt, side );
-} //%name plot3d //%input x(nx), y(ny), z(nx,ny)
-
-// Plots a 3-d representation of the function z[x][y] with contour
-
-void c_plot3dc( PLFLT *x, PLFLT *y, PLFLT **z,
- PLINT nx, PLINT ny, PLINT opt,
- PLFLT *clevel, PLINT nlevel ); //%nowrap
-
-void my_plot3dc( PLFLT *x, PLFLT *y, PLFLT *z,
- PLINT nx, PLINT ny, PLINT opt,
- PLFLT *clevel, PLINT nlevel )
-{
- f2c( z, zz, nx, ny )
- c_plot3dc( x, y, zz, nx, ny, opt, clevel, nlevel );
-} //%name plot3dc //%input x(nx), y(ny), z(nx,ny), clevel(nlevel)
-
-// Plots the 3-d surface representation of the function z[x][y].
-
-void c_plsurf3d( PLFLT *x, PLFLT *y, PLFLT **z,
- PLINT nx, PLINT ny, PLINT opt, PLFLT *clevel, PLINT nlevel ); //%nowrap
-
-void my_plsurf3d( PLFLT *x, PLFLT *y, PLFLT *z,
- PLINT nx, PLINT ny, PLINT opt, PLFLT *clevel, PLINT nlevel )
-{
- f2c( z, zz, nx, ny )
- c_plsurf3d( x, y, zz, nx, ny, opt, clevel, nlevel );
-} //%name plsurf3d //%input x(nx), y(ny), z(nx,ny), clevel(nlevel)
-
-// Set fill pattern directly.
-
-void c_plpat( PLINT nlin, PLINT *inc, PLINT *del ); //%name plpat //%input inc(nlin), del(nlin)
-
-// Plots array y against x for n points using ASCII code "code".
-
-void c_plpoin( PLINT n, PLFLT *x, PLFLT *y, PLINT code ); //%input x(n), y(n) //%name plpoin
-
-// Draws a series of points in 3 space.
-
-void c_plpoin3( PLINT n, PLFLT *x, PLFLT *y, PLFLT *z, PLINT code ); //%name plpoin3 //%input x(n), y(n), z(n)
-
-// Draws a polygon in 3 space.
-
-void c_plpoly3( PLINT n, PLFLT *x, PLFLT *y, PLFLT *z, PLINT *draw, PLINT ifcc ); //%nowrap
-
-void my_plpoly3( PLINT n, PLFLT *x, PLFLT *y, PLFLT *z, PLINT *draw, PLINT clockwise )
-{
- c_plpoly3( n, x, y, z, draw, ( 1 - clockwise ) / 2 );
-} //%name plpoly3 //%input x(n), y(n), z(n), draw(4)
-
-// Set the floating point precision (in number of places) in numeric labels.
-
-void c_plprec( PLINT setp, PLINT prec ); //%name plprec
-
-// Set fill pattern, using one of the predefined patterns.
-
-void c_plpsty( PLINT patt ); //%name plpsty
-
-// Prints out "text" at world cooordinate (x,y).
-
-void c_plptex( PLFLT x, PLFLT y, PLFLT dx, PLFLT dy, PLFLT just, const char *text ); //%name plptex
-
-// Prints out "text" at world cooordinate (x,y,z).
-
-void c_plptex3( PLFLT wx, PLFLT wy, PLFLT wz, PLFLT dx, PLFLT dy, PLFLT dz, PLFLT sx, PLFLT sy, PLFLT sz, PLFLT just, const char *text ); //%name plptex3
-
-// Random number generator based on Mersenne Twister.
-// Obtain real random number in range [0,1].
-
-PLFLT c_plrandd( void ); //%name plrandd
-
-// Replays contents of plot buffer to current device/file.
-
-void c_plreplot( void ); //%name plreplot
-
-// Set line color by red, green, blue from 0. to 1.
-
-void c_plrgb( PLFLT r, PLFLT g, PLFLT b ); //%name plrgb
-
-// Set line color by 8 bit RGB values.
-
-void c_plrgb1( PLINT r, PLINT g, PLINT b ); //%name plrgb1
-
-// Function for converting between HLS and RGB color space
-
-void c_plrgbhls( PLFLT r, PLFLT g, PLFLT b, PLFLT *p_h, PLFLT *p_l, PLFLT *p_s ); //%name plrgbhls //%output p_h, p_l, p_s
-
-// Set character height.
-
-void c_plschr( PLFLT def, PLFLT scale ); //%name plschr
-
-// Set number of colors in cmap 0
-
-void c_plscmap0n( PLINT ncol0 ); //%name plscmap0n
-
-// Set number of colors in cmap 1
-
-void c_plscmap1n( PLINT ncol1 ); //%name plscmap1n
-
-// Set color map 0 colors by 8 bit RGB values
-
-void c_plscmap0( PLINT *r, PLINT *g, PLINT *b, PLINT ncol0 ); //%name plscmap0 //%input r(ncol0), g(ncol0), b(ncol0)
-
-// Set color map 1 colors by 8 bit RGB values
-
-void c_plscmap1( PLINT *r, PLINT *g, PLINT *b, PLINT ncol1 ); //%name plscmap1 //%input r(ncol1), g(ncol1), b(ncol1)
-
-// Set color map 1 colors using a piece-wise linear relationship between
-// intensity [0,1] (cmap 1 index) and position in HLS or RGB color space.
-
-void c_plscmap1l( PLINT itype, PLINT npts, PLFLT *intensity,
- PLFLT *coord1, PLFLT *coord2, PLFLT *coord3, PLINT *alt_hue_path );
-//%name plscmap1l //%input intensity(npts), coord1(npts), coord2(npts), coord3(npts), alt_hue_path(npts)
-
-// Set a given color from color map 0 by 8 bit RGB value
-
-void c_plscol0( PLINT icol0, PLINT r, PLINT g, PLINT b ); //%name plscol0
-
-// Set the background color by 8 bit RGB value
-
-void c_plscolbg( PLINT r, PLINT g, PLINT b ); //%name plscolbg
-
-// Set color map 0 colors by 8 bit RGB + alpha values
-
-void c_plscmap0a( PLINT *r, PLINT *g, PLINT *b, PLFLT *a, PLINT ncol0 ); //%name plscmap0a //%input r(ncol0), g(ncol0), b(ncol0), a(ncol0)
-
-// Set color map 1 colors by 8 bit RGB + alpha values
-
-void c_plscmap1a( PLINT *r, PLINT *g, PLINT *b, PLFLT *a, PLINT ncol1 ); //%name plscmap1a //%input r(ncol1), g(ncol1), b(ncol1), a(ncol1)
-
-// Set color map 1 colors using a piece-wise linear relationship between
-// intensity [0,1] (cmap 1 index) and position in HLS or RGB color space
-// and alpha transparency value.
-
-void c_plscmap1la( PLINT itype, PLINT npts, PLFLT *intensity,
- PLFLT *coord1, PLFLT *coord2, PLFLT *coord3, PLFLT *a, PLINT *alt_hue_path );
-//%name plscmap1la //%input intensity(npts), coord1(npts), coord2(npts), coord3(npts), a(npts), alt_hue_path(npts)
-
-// Set a given color from color map 0 by 8 bit RGB + alpha value
-
-void c_plscol0a( PLINT icol0, PLINT r, PLINT g, PLINT b, PLFLT a ); //%name plscol0a
-
-// Set the background color by 8 bit RGB + alpha value
-
-void c_plscolbga( PLINT r, PLINT g, PLINT b, PLFLT a ); //%name plscolbga
-
-// Used to globally turn color output on/off
-
-void c_plscolor( PLINT color ); //%name plscolor
-
-// Set the compression level
-
-void c_plscompression( PLINT compression ); //%name plscompression
-
-// Set the device (keyword) name
-
-void c_plsdev( const char *devname ); //%name plsdev
-
-// Set window into device space using margin, aspect ratio, and
-// justification
-
-void c_plsdidev( PLFLT mar, PLFLT aspect, PLFLT jx, PLFLT jy ); //%name plsdidev
-
-// Set up transformation from metafile coordinates.
-
-void c_plsdimap( PLINT dimxmin, PLINT dimxmax, PLINT dimymin, PLINT dimymax,
- PLFLT dimxpmm, PLFLT dimypmm ); //%name plsdimap
-
-// Set plot orientation, specifying rotation in units of pi/2.
-
-void c_plsdiori( PLFLT rot ); //%name plsdiori
-
-// Set window into plot space
-
-void c_plsdiplt( PLFLT xmin, PLFLT ymin, PLFLT xmax, PLFLT ymax ); //%name plsdiplt
-
-// Set window into plot space incrementally (zoom)
-
-void c_plsdiplz( PLFLT xmin, PLFLT ymin, PLFLT xmax, PLFLT ymax ); //%name plsdiplz
-
-// Set seed for internal random number generator
-
-void c_plseed( unsigned s ); //%name plseed
-
-// Set the escape character for text strings.
-
-void c_plsesc( char esc ); //%name plsesc
-
-// set offset and spacing of contour labels
-
-void c_pl_setcontlabelparam( PLFLT offset, PLFLT size, PLFLT spacing, PLINT active ); //%name pl_setcontlabelparam
-
-// set the format of the contour labels
-
-void c_pl_setcontlabelformat( PLINT lexp, PLINT sigdig ); //%name pl_setcontlabelformat
-
-// Set family file parameters
-
-void c_plsfam( PLINT fam, PLINT num, PLINT bmax ); //%name plsfam
-
-// Set FCI (font characterization integer)
-
-void c_plsfci( PLUNICODE fci ); //%name plsfci
-
-// Set the current font family, style and weight
-
-void c_plsfont( PLINT family, PLINT style, PLINT weight ); //%name plsfont
-
-
-// Set the output file name.
-
-void c_plsfnam( const char *fnam ); //%name plsfnam
-
-// The same as in plcont. I have hardcoded the first function pointer
-// to plfill(). The second function pointer will use the same convention
-// as in plcont().
-//
-
-// the simpler plshade()
-
-void my_plshade( PLFLT *a, PLINT nx, PLINT ny, PLFLT *defined,
- PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
- PLFLT shade_min, PLFLT shade_max,
- PLINT sh_cmap, PLFLT sh_color, PLINT sh_width,
- PLINT min_color, PLINT min_width,
- PLINT max_color, PLINT max_width,
- PLINT rectangular, PLFLT *tr )
-{
- f2c( a, aa, nx, ny );
- c_plshade( aa, nx, ny, NULL, left, right, bottom, top,
- shade_min, shade_max, sh_cmap, sh_color, sh_width,
- min_color, min_width, max_color, max_width,
- plfill, rectangular, xform, tr );
-} //%name plshade //%input a(nx, ny), tr(6)
-
-// plshade() for use with pltr1
-
-void my_plshade1( PLFLT *a, PLINT nx, PLINT ny, const char *defined,
- PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
- PLFLT shade_min, PLFLT shade_max,
- PLINT sh_cmap, PLFLT sh_color, PLINT sh_width,
- PLINT min_color, PLINT min_width,
- PLINT max_color, PLINT max_width,
- PLINT rectangular, PLFLT *xg, PLFLT *yg )
-{
- PLcGrid grid1;
- grid1.nx = nx; grid1.ny = ny;
- grid1.xg = xg; grid1.yg = yg;
- f2c( a, aa, nx, ny );
- c_plshade( aa, nx, ny, NULL, left, right, bottom, top,
- shade_min, shade_max, sh_cmap, sh_color, sh_width,
- min_color, min_width, max_color, max_width,
- plfill, rectangular, pltr1, &grid1 );
-} //%name plshade1 //%input a(nx, ny), xg(nx), yg(ny)
-
-// plshade() for use with pltr2
-
-void my_plshade2( PLFLT *a, PLINT nx, PLINT ny, const char *defined,
- PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
- PLFLT shade_min, PLFLT shade_max,
- PLINT sh_cmap, PLFLT sh_color, PLINT sh_width,
- PLINT min_color, PLINT min_width,
- PLINT max_color, PLINT max_width,
- PLINT rectangular, PLFLT *xg, PLFLT *yg )
-{
- PLcGrid2 grid2;
- f2c( xg, xgg, nx, ny ); f2c( yg, ygg, nx, ny );
- grid2.nx = nx; grid2.ny = ny;
- grid2.xg = xgg; grid2.yg = ygg;
- f2c( a, aa, nx, ny );
- c_plshade( aa, nx, ny, NULL, left, right, bottom, top,
- shade_min, shade_max, sh_cmap, sh_color, sh_width,
- min_color, min_width, max_color, max_width,
- plfill, rectangular, pltr2, &grid2 );
-} //%name plshade2 //%input a(nx, ny), xg(nx,ny), yg(nx,ny)
-
-void my_plshades( PLFLT *a, PLINT nx, PLINT ny,
- PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
- PLFLT *clevel, PLINT nlevel, PLINT fill_width,
- PLINT cont_color, PLINT cont_width,
- PLINT rectangular )
-{
- f2c( a, aa, nx, ny );
- c_plshades( aa, nx, ny, NULL, left, right, bottom, top,
- clevel, nlevel, fill_width, cont_color, cont_width,
- plfill, rectangular, NULL, NULL );
-} //%name plshades //%input a(nx, ny), clevel(nlevel)
-
-void my_plshadesx( PLFLT *a, PLINT nx, PLINT ny,
- PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
- PLFLT *clevel, PLINT nlevel, PLINT fill_width,
- PLINT cont_color, PLINT cont_width,
- PLINT rectangular, PLFLT *tr )
-{
- f2c( a, aa, nx, ny );
- c_plshades( aa, nx, ny, NULL, left, right, bottom, top,
- clevel, nlevel, fill_width, cont_color, cont_width,
- plfill, rectangular, xform, tr );
-} //%name plshadesx //%input a(nx, ny), clevel(nlevel), tr(6)
-
-void my_plshades1( PLFLT *a, PLINT nx, PLINT ny,
- PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
- PLFLT *clevel, PLINT nlevel, PLINT fill_width,
- PLINT cont_color, PLINT cont_width,
- PLINT rectangular, PLFLT *xg, PLFLT *yg )
-{
- PLcGrid grid1;
- grid1.nx = nx; grid1.ny = ny;
- grid1.xg = xg; grid1.yg = yg;
-
- f2c( a, aa, nx, ny );
- c_plshades( aa, nx, ny, NULL, left, right, bottom, top,
- clevel, nlevel, fill_width, cont_color, cont_width,
- plfill, rectangular, pltr1, &grid1 );
-} //%name plshades1 //%input a(nx, ny), clevel(nlevel), xg(nx), yg(ny)
-
-
-void my_plshades2( PLFLT *a, PLINT nx, PLINT ny,
- PLFLT left, PLFLT right, PLFLT bottom, PLFLT top,
- PLFLT *clevel, PLINT nlevel, PLINT fill_width,
- PLINT cont_color, PLINT cont_width,
- PLINT rectangular, PLFLT *xg, PLFLT *yg )
-{
- PLcGrid2 grid2;
- f2c( xg, xgg, nx, ny ); f2c( yg, ygg, nx, ny );
- grid2.nx = nx; grid2.ny = ny;
- grid2.xg = xgg; grid2.yg = ygg;
- f2c( a, aa, nx, ny );
- c_plshades( aa, nx, ny, NULL, left, right, bottom, top,
- clevel, nlevel, fill_width, cont_color, cont_width,
- plfill, rectangular, pltr2, &grid2 );
-} //%name plshades2 //%input a(nx, ny), clevel(nlevel), xg(nx,ny), yg(nx,ny)
-
-// Set up lengths of major tick marks.
-
-void c_plsmaj( PLFLT def, PLFLT scale ); //%name plsmaj
-
-// Set up lengths of minor tick marks.
-
-void c_plsmin( PLFLT def, PLFLT scale ); //%name plsmin
-
-// Set orientation. Must be done before calling plinit.
-
-void c_plsori( PLINT ori ); //%name plsori
-
-// Set output device parameters. Usually ignored by the driver.
-
-void c_plspage( PLFLT xp, PLFLT yp, PLINT xleng, PLINT yleng,
- PLINT xoff, PLINT yoff ); //%name plspage
-
-// Set the colors for color table 0 from a cmap0 file
-
-void c_plspal0( const char *filename ); //%name plspal0
-
-// Set the colors for color table 1 from a cmap1 file
-
-void c_plspal1( const char *filename, PLINT interpolate ); //%name plspal1
-
-// Set the pause (on end-of-page) status
-
-void c_plspause( PLINT pause ); //%name plspause
-
-// Set stream number.
-
-void c_plsstrm( PLINT strm ); //%name plsstrm
-
-// Set the number of subwindows in x and y
-
-void c_plssub( PLINT nx, PLINT ny ); //%name plssub
-
-// Set symbol height.
-
-void c_plssym( PLFLT def, PLFLT scale ); //%name plssym
-
-// Initialize PLplot, passing in the windows/page settings.
-
-void c_plstar( PLINT nx, PLINT ny ); //%name plstar
-
-// Initialize PLplot, passing the device name and windows/page settings.
-
-void c_plstart( const char *devname, PLINT nx, PLINT ny ); //%name plstart
-
-// Create 1d stripchart
-
-void my_plstripc( int *id, char *xspec, char *yspec,
- PLFLT xmin, PLFLT xmax, PLFLT xjump, PLFLT ymin, PLFLT ymax,
- PLFLT xlpos, PLFLT ylpos,
- PLINT y_ascl, PLINT acc,
- PLINT colbox, PLINT collab,
- PLINT *colline, PLINT *styline,
- char *legline1, char *legline2, char *legline3, char *legline4,
- char *labx, char *laby, char *labtop )
-{
- char *legline[4];
- legline[0] = legline1; legline[1] = legline2;
- legline[2] = legline3; legline[3] = legline4;
- c_plstripc( id, xspec, yspec, xmin, xmax, xjump, ymin, ymax,
- xlpos, ylpos, y_ascl, acc, colbox, collab, colline, styline, legline,
- labx, laby, labtop );
-} //%novectorize //%name plstripc //%output id //%input colline(4), styline(4)
-
-// Add a point to a stripchart.
-
-void c_plstripa( PLINT id, PLINT pen, PLFLT x, PLFLT y ); //%name plstripa
-
-// Deletes and releases memory used by a stripchart.
-
-void c_plstripd( PLINT id ); //%name plstripd
-
-// Set up a new line style
-
-void c_plstyl( PLINT nms, PLINT *mark, PLINT *space ); //%name plstyl //%input mark(nms), space(nms)
-
-// Set the vector style
-
-void c_plsvect( PLFLT *arrowx, PLFLT *arrowy, PLINT npts, PLBOOL fill ); //%name plsvect //%input arrowx(npts), arrowy(npts)
-
-// Sets the edges of the viewport to the specified absolute coordinates
-
-void c_plsvpa( PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax ); //%name plsvpa
-
-// Set x axis labeling parameters
-
-void c_plsxax( PLINT digmax, PLINT digits ); //%name plsxax
-
-// Set inferior X window
-
-void plsxwin( PLINT window_id );
-
-// Set y axis labeling parameters
-
-void c_plsyax( PLINT digmax, PLINT digits ); //%name plsyax
-
-// Plots array y against x for n points using Hershey symbol "code"
-
-void c_plsym( PLINT n, PLFLT *x, PLFLT *y, PLINT code ); //%name plsym //%input x(n), y(n)
-
-// Set z axis labeling parameters
-
-void c_plszax( PLINT digmax, PLINT digits ); //%name plszax
-
-// Switches to text screen.
-
-void c_pltext( void ); //%name pltext
-
-// Set the format for date / time labels.
-
-void c_pltimefmt( const char *fmt ); //%name pltimefmt
-
-// Sets the edges of the viewport with the given aspect ratio, leaving
-// room for labels.
-
-void c_plvasp( PLFLT aspect ); //%name plvasp
-
-// Plot an array of vector arrows - uses the same function pointer
-// convention as plcont
-
-void my_plvect( PLFLT *u, PLFLT *v, PLINT nx, PLINT ny, PLFLT scale, PLFLT *tr )
-{
- f2c( u, uu, nx, ny );
- f2c( v, vv, nx, ny );
- c_plvect( uu, vv, nx, ny, scale, xform, tr );
-} //%name plvect //%input u(nx,ny), v(nx,ny), tr(6)
-
-// plvect() for use with pltr1
-void my_plvect1( PLFLT *u, PLFLT *v, PLINT nx, PLINT ny, PLFLT scale, PLFLT *xg, PLFLT *yg )
-{
- PLcGrid grid1;
- grid1.nx = nx; grid1.ny = ny;
- grid1.xg = xg; grid1.yg = yg;
- f2c...
[truncated message content] |
|
From: <ai...@us...> - 2014-02-18 21:07:41
|
Revision: 13014
http://sourceforge.net/p/plplot/code/13014
Author: airwin
Date: 2014-02-18 21:07:37 +0000 (Tue, 18 Feb 2014)
Log Message:
-----------
Do long-neglected maintenance of parity_bit_check.sh, a script that
checks for non-ascii files in the source tree, i.e., files which
include characters with the parity bit set. Note this check does
not include files which are already well known to contain non-ascii
characters. In other words, this check only looks for unexpected
non-ascii characters.
Use the "svn export" command to create a clean directory tree that is
checked for such files.
Update the list of files (scripts/parity_bit_check.exclude) known to contain non-ascii characters.
All these changes concerned source files which have been changed from ascii to
UTF-8.
Modified Paths:
--------------
trunk/scripts/parity_bit_check.exclude
trunk/scripts/parity_bit_check.sh
Modified: trunk/scripts/parity_bit_check.exclude
===================================================================
--- trunk/scripts/parity_bit_check.exclude 2014-02-14 19:46:46 UTC (rev 13013)
+++ trunk/scripts/parity_bit_check.exclude 2014-02-18 21:07:37 UTC (rev 13014)
@@ -1,13 +1,19 @@
-\.svn
-~$
+\.shp
+\.shx
\.jpg$
\.gif$
\.cgm$
\.map$
\.fnt$
+x18
x2[46]
+x33
+xw18
xw2[46]
+xw33
+xthick18
xthick2[46]
+xthick33
lena
README.release
test_hebrew_diacritic.py
@@ -23,3 +29,11 @@
api2text.pl
docbook/AUTHORS
__pl_pltext.m
+plplot_auxiliary.adb
+plplot_auxiliary.ads
+doc/docbook/README.developers
+doc/docbook/src/CMakeLists.txt
+doc/docbook/src/advanced.xml
+doc/docbook/src/api.xml
+examples/python/test_linebreak.py
+examples/ocaml/xplot01.ml
Modified: trunk/scripts/parity_bit_check.sh
===================================================================
--- trunk/scripts/parity_bit_check.sh 2014-02-14 19:46:46 UTC (rev 13013)
+++ trunk/scripts/parity_bit_check.sh 2014-02-18 21:07:37 UTC (rev 13014)
@@ -6,7 +6,7 @@
# source tree (except those listed below) to discover which of those
# files have any character with the eighth (parity) bit set.
-# Copyright (C) 2010 Alan W. Irwin
+# Copyright (C) 2010-2014 Alan W. Irwin
#
# This file is part of PLplot.
#
@@ -50,9 +50,11 @@
# Assumption: top-level source tree is parent directory of where script
# is located.
SOURCE_TREE="$(dirname ${SCRIPT_PATH})"
-cd "${SOURCE_TREE}"
#List of all files in source tree other than .svn ones....
+rm -rf /tmp/parity_bit_check
+svn --quiet export ${SOURCE_TREE} /tmp/parity_bit_check
+cd /tmp/parity_bit_check
find -type f >| /tmp/temporary_source_tree_list
for FILE in $(grep -v -f "$SOURCE_TREE"/scripts/parity_bit_check.exclude /tmp/temporary_source_tree_list); do
@@ -62,4 +64,4 @@
printf "%s %x\n" $FILE $parity_bit_check_rc
fi
done
-rm -f /tmp/temporary_source_tree_list
\ No newline at end of file
+rm -f /tmp/temporary_source_tree_list
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
