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-01-28 06:46:06
|
Revision: 12963 http://sourceforge.net/p/plplot/code/12963 Author: airwin Date: 2014-01-28 06:46:00 +0000 (Tue, 28 Jan 2014) Log Message: ----------- Rename all alpha channel arguments in our public API from a to alpha. Tested on Linux using the plplotd target. Modified Paths: -------------- trunk/include/plplot.h trunk/src/plctrl.c Modified: trunk/include/plplot.h =================================================================== --- trunk/include/plplot.h 2014-01-27 08:07:41 UTC (rev 12962) +++ trunk/include/plplot.h 2014-01-28 06:46:00 UTC (rev 12963) @@ -1017,7 +1017,7 @@ // Returns 8 bit RGB values for given color from color map 0 and alpha value PLDLLIMPEXP void -c_plgcol0a( PLINT icol0, PLINT *r, PLINT *g, PLINT *b, PLFLT *a ); +c_plgcol0a( PLINT icol0, PLINT *r, PLINT *g, PLINT *b, PLFLT *alpha ); // Returns the background color by 8 bit RGB value @@ -1027,7 +1027,7 @@ // Returns the background color by 8 bit RGB value and alpha value PLDLLIMPEXP void -c_plgcolbga( PLINT *r, PLINT *g, PLINT *b, PLFLT *a ); +c_plgcolbga( PLINT *r, PLINT *g, PLINT *b, PLFLT *alpha ); // Returns the current compression setting @@ -1487,7 +1487,7 @@ // Set color map 0 colors by 8 bit RGB values and alpha values PLDLLIMPEXP void -c_plscmap0a( const PLINT *r, const PLINT *g, const PLINT *b, const PLFLT *a, PLINT ncol0 ); +c_plscmap0a( const PLINT *r, const PLINT *g, const PLINT *b, const PLFLT *alpha, PLINT ncol0 ); // Set number of colors in cmap 0 @@ -1502,7 +1502,7 @@ // Set color map 1 colors by 8 bit RGB and alpha values PLDLLIMPEXP void -c_plscmap1a( const PLINT *r, const PLINT *g, const PLINT *b, const PLFLT *a, PLINT ncol1 ); +c_plscmap1a( const PLINT *r, const PLINT *g, const PLINT *b, const PLFLT *alpha, PLINT 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. @@ -1517,7 +1517,7 @@ PLDLLIMPEXP void c_plscmap1la( PLBOOL itype, PLINT npts, const PLFLT *intensity, - const PLFLT *coord1, const PLFLT *coord2, const PLFLT *coord3, const PLFLT *a, const PLBOOL *alt_hue_path ); + const PLFLT *coord1, const PLFLT *coord2, const PLFLT *coord3, const PLFLT *alpha, const PLBOOL *alt_hue_path ); // Set number of colors in cmap 1 @@ -1542,7 +1542,7 @@ // Set a given color from color map 0 by 8 bit RGB value PLDLLIMPEXP void -c_plscol0a( PLINT icol0, PLINT r, PLINT g, PLINT b, PLFLT a ); +c_plscol0a( PLINT icol0, PLINT r, PLINT g, PLINT b, PLFLT alpha ); // Set the background color by 8 bit RGB value @@ -1552,7 +1552,7 @@ // Set the background color by 8 bit RGB value and alpha value PLDLLIMPEXP void -c_plscolbga( PLINT r, PLINT g, PLINT b, PLFLT a ); +c_plscolbga( PLINT r, PLINT g, PLINT b, PLFLT alpha ); // Used to globally turn color output on/off Modified: trunk/src/plctrl.c =================================================================== --- trunk/src/plctrl.c 2014-01-27 08:07:41 UTC (rev 12962) +++ trunk/src/plctrl.c 2014-01-28 06:46:00 UTC (rev 12963) @@ -227,15 +227,15 @@ //! @param r Red value of the background color (0 - 255). //! @param g Green value of the background color (0 - 255). //! @param b Blue value of the background color (0 - 255). -//! @param a Alpha (transparency) value of the background color +//! @param alpha Alpha (transparency) value of the background color //! (0.0 - 1.0). //-------------------------------------------------------------------------- void -c_plscolbga( PLINT r, PLINT g, PLINT b, PLFLT a ) +c_plscolbga( PLINT r, PLINT g, PLINT b, PLFLT alpha ) { - plscol0a( 0, r, g, b, a ); + plscol0a( 0, r, g, b, alpha ); } //-------------------------------------------------------------------------- @@ -261,12 +261,12 @@ //! @param r Current red value of the background color. //! @param g Current green value of the background color. //! @param b Current blue value of the background color. -//! @param a Current alpha value of the background color. +//! @param alpha Current alpha value of the background color. void -c_plgcolbga( PLINT *r, PLINT *g, PLINT *b, PLFLT *a ) +c_plgcolbga( PLINT *r, PLINT *g, PLINT *b, PLFLT *alpha ) { - plgcol0a( 0, r, g, b, a ); + plgcol0a( 0, r, g, b, alpha ); } //-------------------------------------------------------------------------- @@ -314,10 +314,10 @@ //! @param r Red value of the color (0 - 255). //! @param g Green value of the color (0 - 255). //! @param b Blue value of the color (0 - 255). -//! @param a Alpha value of the color (0.0 - 1.0). +//! @param alpha Alpha value of the color (0.0 - 1.0). void -c_plscol0a( PLINT icol0, PLINT r, PLINT g, PLINT b, PLFLT a ) +c_plscol0a( PLINT icol0, PLINT r, PLINT g, PLINT b, PLFLT alpha ) { if ( plsc->cmap0 == NULL ) plscmap0n( 0 ); @@ -328,11 +328,11 @@ plabort( buffer ); return; } - if ( ( r < 0 || r > 255 ) || ( g < 0 || g > 255 ) || ( b < 0 || b > 255 ) || ( a < 0 || a > 1.0 ) ) + if ( ( r < 0 || r > 255 ) || ( g < 0 || g > 255 ) || ( b < 0 || b > 255 ) || ( alpha < 0. || alpha > 1.0 ) ) { char buffer[BUFFER_SIZE]; snprintf( buffer, BUFFER_SIZE, "plscol0a: Invalid RGB color: %d, %d, %d, %f", - (int) r, (int) g, (int) b, (double) a ); + (int) r, (int) g, (int) b, (double) alpha ); plabort( buffer ); return; } @@ -340,7 +340,7 @@ plsc->cmap0[icol0].r = (unsigned char) r; plsc->cmap0[icol0].g = (unsigned char) g; plsc->cmap0[icol0].b = (unsigned char) b; - plsc->cmap0[icol0].a = a; + plsc->cmap0[icol0].a = alpha; if ( plsc->level > 0 ) plP_state( PLSTATE_CMAP0 ); @@ -392,18 +392,18 @@ //! @param r Current red value of the color. //! @param g Current green value of the color. //! @param b Current blue value of the color. -//! @param a Current alpha value of the color. +//! @param alpha Current alpha value of the color. void -c_plgcol0a( PLINT icol0, PLINT *r, PLINT *g, PLINT *b, PLFLT *a ) +c_plgcol0a( PLINT icol0, PLINT *r, PLINT *g, PLINT *b, PLFLT *alpha ) { if ( plsc->cmap0 == NULL ) plscmap0n( 0 ); - *r = -1; - *g = -1; - *b = -1; - *a = -1.0; + *r = -1; + *g = -1; + *b = -1; + *alpha = -1.0; if ( icol0 < 0 || icol0 > plsc->ncol0 ) { @@ -413,10 +413,10 @@ return; } - *r = plsc->cmap0[icol0].r; - *g = plsc->cmap0[icol0].g; - *b = plsc->cmap0[icol0].b; - *a = plsc->cmap0[icol0].a; + *r = plsc->cmap0[icol0].r; + *g = plsc->cmap0[icol0].g; + *b = plsc->cmap0[icol0].b; + *alpha = plsc->cmap0[icol0].a; return; } @@ -471,11 +471,11 @@ //! @param r Array of red values. //! @param g Array of green values. //! @param b Array of blue values. -//! @param a Array of alpha values. +//! @param alpha Array of alpha values. //! @param ncol0 Total number of RGBA values. void -c_plscmap0a( const PLINT *r, const PLINT *g, const PLINT *b, const PLFLT *a, PLINT ncol0 ) +c_plscmap0a( const PLINT *r, const PLINT *g, const PLINT *b, const PLFLT *alpha, PLINT ncol0 ) { int i; @@ -486,11 +486,11 @@ if ( ( r[i] < 0 || r[i] > 255 ) || ( g[i] < 0 || g[i] > 255 ) || ( b[i] < 0 || b[i] > 255 ) || - ( a[i] < 0.0 || a[i] > 1.0 ) ) + ( alpha[i] < 0.0 || alpha[i] > 1.0 ) ) { char buffer[BUFFER_SIZE]; snprintf( buffer, BUFFER_SIZE, "plscmap0a: Invalid RGB color: %d, %d, %d, %f", - (int) r[i], (int) g[i], (int) b[i], (double) a[i] ); + (int) r[i], (int) g[i], (int) b[i], (double) alpha[i] ); plabort( buffer ); return; } @@ -498,7 +498,7 @@ plsc->cmap0[i].r = (unsigned char) r[i]; plsc->cmap0[i].g = (unsigned char) g[i]; plsc->cmap0[i].b = (unsigned char) b[i]; - plsc->cmap0[i].a = a[i]; + plsc->cmap0[i].a = alpha[i]; } if ( plsc->level > 0 ) @@ -554,11 +554,11 @@ //! @param r Array of red values. //! @param g Array of green values. //! @param b Array of blue values. -//! @param a Array of alpha values. +//! @param alpha Array of alpha values. //! @param ncol1 Total number of RGBA values. void -c_plscmap1a( const PLINT *r, const PLINT *g, const PLINT *b, const PLFLT *a, PLINT ncol1 ) +c_plscmap1a( const PLINT *r, const PLINT *g, const PLINT *b, const PLFLT *alpha, PLINT ncol1 ) { int i; @@ -569,18 +569,18 @@ if ( ( r[i] < 0 || r[i] > 255 ) || ( g[i] < 0 || g[i] > 255 ) || ( b[i] < 0 || b[i] > 255 ) || - ( a[i] < 0.0 || a[i] > 1.0 ) ) + ( alpha[i] < 0.0 || alpha[i] > 1.0 ) ) { char buffer[BUFFER_SIZE]; snprintf( buffer, BUFFER_SIZE, "plscmap1a: Invalid RGB color: %d, %d, %d, %f", - (int) r[i], (int) g[i], (int) b[i], (double) a[i] ); + (int) r[i], (int) g[i], (int) b[i], (double) alpha[i] ); plabort( buffer ); return; } plsc->cmap1[i].r = (unsigned char) r[i]; plsc->cmap1[i].g = (unsigned char) g[i]; plsc->cmap1[i].b = (unsigned char) b[i]; - plsc->cmap1[i].a = a[i]; + plsc->cmap1[i].a = alpha[i]; } if ( plsc->level > 0 ) @@ -721,13 +721,13 @@ //! @param coord1[] first coordinate for each control point //! @param coord2[] second coordinate for each control point //! @param coord3[] third coordinate for each control point -//! @param a[] alpha value for each control point +//! @param alpha[] alpha value for each control point //! @param alt_hue_path[] if true, use alternative hue interpolation path //! for the associated interval. void c_plscmap1la( PLINT itype, PLINT npts, const PLFLT *pos, - const PLFLT *coord1, const PLFLT *coord2, const PLFLT *coord3, const PLFLT *a, const PLINT *alt_hue_path ) + const PLFLT *coord1, const PLFLT *coord2, const PLFLT *coord3, const PLFLT *alpha, const PLINT *alt_hue_path ) { int n; PLFLT h, l, s, r, g, b; @@ -779,7 +779,7 @@ plsc->cmap1cp[n].l = l; plsc->cmap1cp[n].s = s; plsc->cmap1cp[n].p = pos[n]; - plsc->cmap1cp[n].a = a[n]; + plsc->cmap1cp[n].a = alpha[n]; if ( alt_hue_path == NULL ) plsc->cmap1cp[n].alt_hue_path = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-27 08:07:45
|
Revision: 12962 http://sourceforge.net/p/plplot/code/12962 Author: airwin Date: 2014-01-27 08:07:41 +0000 (Mon, 27 Jan 2014) Log Message: ----------- Document plot3dcl and plsurf3dl. Change the ixstart and ixn arguments of these functions to indexxmin, and indexxmax in the code and documentation to be consistent with the naming of the indexymin and indexymax arguments. Tested by Alan W. Irwin <ai...@us...> on Linux using the validate target and the check_api_xml_consistency target (which is now available when the cmake option, ADD_SPECIAL_CONSISTENCY_CHECKING, is set to ON). This last test showed there is no more missing documentation of our public API in api.xml. However, that target also shows there are still a lot of argument inconsistencies between plplot.h and api.xml to sort out. Modified Paths: -------------- trunk/doc/docbook/src/api.xml trunk/doc/docbook/src/plplotdoc.xml.in trunk/include/plplot.h trunk/src/plot3d.c Modified: trunk/doc/docbook/src/api.xml =================================================================== --- trunk/doc/docbook/src/api.xml 2014-01-27 01:39:07 UTC (rev 12961) +++ trunk/doc/docbook/src/api.xml 2014-01-27 08:07:41 UTC (rev 12962) @@ -9423,7 +9423,6 @@ </sect1> - <sect1 id="plot3dc" renderas="sect3"> <title> <function>plot3dc</function>: Magnitude colored plot surface with contour. @@ -9624,6 +9623,286 @@ </sect1> + <sect1 id="plot3dcl" renderas="sect3"> + <title> + <function>plot3dcl</function>: Magnitude colored plot surface + with contour for z[x][y] with y index limits + </title> + + <para> + <funcsynopsis> + <funcprototype> + <funcdef> + <function>plot3dcl</function> + </funcdef> + <paramdef><parameter>x</parameter></paramdef> + <paramdef><parameter>y</parameter></paramdef> + <paramdef><parameter>z</parameter></paramdef> + <paramdef><parameter>nx</parameter></paramdef> + <paramdef><parameter>ny</parameter></paramdef> + <paramdef><parameter>opt</parameter></paramdef> + <paramdef><parameter>clevel</parameter></paramdef> + <paramdef><parameter>nlevel</parameter></paramdef> + <paramdef><parameter>indexxmin</parameter></paramdef> + <paramdef><parameter>indexxmax</parameter></paramdef> + <paramdef><parameter>indexymin</parameter></paramdef> + <paramdef><parameter>indexymax</parameter></paramdef> + </funcprototype> + </funcsynopsis> + </para> + + <para> + 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 + <literal><parameter>x</parameter></literal>, + <literal><parameter>y</parameter></literal> coordinate grid + where <literal><parameter>z</parameter></literal> is defined can + be non-rectangular. The implementation is incomplete so the last + 4 parameters of plot3dcl; + <literal><parameter>indexxmin</parameter></literal>, + <literal><parameter>indexxmax</parameter></literal>, + <literal><parameter>indexymin</parameter></literal>, and + <literal><parameter>indexymax</parameter></literal>; are + currently ignored and the functionality is otherwise identical + to that of &plot3dc;. + </para> + + <variablelist> + <varlistentry> + <term> + <parameter>x</parameter> + (<literal>PLFLT *</literal>, input) + </term> + <listitem> + <para> + Pointer to set of x coordinate values at which the function is + evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>y</parameter> + (<literal>PLFLT *</literal>, input) + </term> + <listitem> + <para> + Pointer to set of y coordinate values at which the function is + evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>z</parameter> + (<literal>PLFLT **</literal>, input) + </term> + <listitem> + <para> + Pointer to a vectored two-dimensional array with set of + function values. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>nx</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Number of <literal><parameter>x</parameter></literal> values at + which the function is evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>ny</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Number of <literal><parameter>y</parameter></literal> values at + which the function is evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>opt</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + 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 + <itemizedlist> + <listitem> + <para> + <literal><parameter>opt</parameter>=DRAW_LINEX</literal>: Lines + are drawn showing + <literal><parameter>z</parameter></literal> as a function + of <literal><parameter>x</parameter></literal> for each + value of <literal><parameter>y</parameter>[j]</literal>. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=DRAW_LINEY</literal>: Lines + are drawn showing + <literal><parameter>z</parameter></literal> as a function + of <literal><parameter>y</parameter></literal> for each + value of <literal><parameter>x</parameter>[i]</literal>. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=DRAW_LINEXY</literal>: Network + of lines is drawn connecting points at which function is + defined. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=MAG_COLOR</literal>: Each line + in the mesh is colored according to the z value being plotted. The + color is used from the current color map 1. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=BASE_CONT</literal>: A contour + plot is drawn at the base XY plane using parameters + <parameter>nlevel</parameter> and <parameter>clevel</parameter>. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=DRAW_SIDES</literal>: draws a curtain + between the base XY plane and the borders of the plotted function. + </para> + </listitem> + </itemizedlist> + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>clevel</parameter> + (<literal>PLFLT *</literal>, input) + </term> + <listitem> + <para> + Pointer to the array that defines the contour level spacing. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>nlevel</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Number of elements in the <literal>clevel</literal> array. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>indexxmin</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + The index value (which must be ≥ 0) that corresponds to + the first <literal><parameter>x</parameter></literal> index where + <literal><parameter>z</parameter></literal> is defined. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>indexxmax</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + The index value (which must be ≤ + <literal><parameter>nx</parameter></literal>) which corresponds (by + convention) to one more than the last + <literal><parameter>x</parameter></literal> index value where + <literal><parameter>z</parameter></literal> is defined. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>indexymin</parameter> + (<literal>PLINT *</literal>, input) + </term> + <listitem> + <para> + Array of <literal><parameter>y</parameter></literal> index + values which all must be ≥ 0. These values are the first + <literal><parameter>y</parameter></literal> index where + <literal><parameter>z</parameter></literal> is defined for a + particular <literal><parameter>x</parameter></literal> index in the + range from <literal><parameter>indexxmin</parameter></literal> to + <literal><parameter>indexxmax - 1</parameter></literal>. The dimension of + <literal><parameter>indexymin</parameter></literal> is + <literal><parameter>indexxmax</parameter></literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>indexymax</parameter> + (<literal>PLINT *</literal>, input) + </term> + <listitem> + <para> + Array of <literal><parameter>y</parameter></literal> index + values which all must be ≤ + <literal><parameter>ny</parameter></literal>. These values + correspond (by convention) to one more than the last + <literal><parameter>y</parameter></literal> index where + <literal><parameter>z</parameter></literal> is defined for a + particular <literal><parameter>x</parameter></literal> index in the + range from <literal><parameter>indexxmin</parameter></literal> to + <literal><parameter>indexxmax - 1</parameter></literal>. The dimension of + <literal><parameter>indexymax</parameter></literal> is + <literal><parameter>indexxmax</parameter></literal>. + </para> + </listitem> + </varlistentry> + </variablelist> + + <para> + Redacted form: + <itemizedlist> + <listitem> + <para> + General: <function>plot3dcl(x, y, z, opt, clevel, indexxmin, + indexymin, indexymax)</function> + </para> + </listitem> + <listitem> + <para> + Perl/PDL: Not available? + </para> + </listitem> + </itemizedlist> + </para> + + <para> + This function is not used in any example. + </para> + + </sect1> + <sect1 id="plparseopts" renderas="sect3"> <title> <function>plparseopts</function>: Parse command-line arguments @@ -16231,6 +16510,264 @@ </sect1> + <sect1 id="plsurf3dl" renderas="sect3"> + <title> + <function>plsurf3dl</function>: Plot shaded 3-d surface plot for + z[x][y] with y index limits + </title> + + <para> + <funcsynopsis> + <funcprototype> + <funcdef> + <function>plsurf3dl</function> + </funcdef> + <paramdef><parameter>x</parameter></paramdef> + <paramdef><parameter>y</parameter></paramdef> + <paramdef><parameter>z</parameter></paramdef> + <paramdef><parameter>nx</parameter></paramdef> + <paramdef><parameter>ny</parameter></paramdef> + <paramdef><parameter>opt</parameter></paramdef> + <paramdef><parameter>clevel</parameter></paramdef> + <paramdef><parameter>nlevel</parameter></paramdef> + <paramdef><parameter>indexxmin</parameter></paramdef> + <paramdef><parameter>indexxmax</parameter></paramdef> + <paramdef><parameter>indexymin</parameter></paramdef> + <paramdef><parameter>indexymax</parameter></paramdef> + </funcprototype> + </funcsynopsis> + </para> + + <para> + + This variant of &plsurf3d; (see that function's documentation for + more details) should be suitable for the case where the area of + the <literal><parameter>x</parameter></literal>, + <literal><parameter>y</parameter></literal> coordinate grid where + <literal><parameter>z</parameter></literal> is defined can be + non-rectangular. The limits of that grid are provided by + the parameters <literal><parameter>indexxmin</parameter></literal>, + <literal><parameter>indexxmax</parameter></literal>, + <literal><parameter>indexymin</parameter></literal>, + and <literal><parameter>indexymax</parameter></literal>. + + </para> + + <variablelist> + <varlistentry> + <term> + <parameter>x</parameter> + (<literal>PLFLT *</literal>, input) + </term> + <listitem> + <para> + Pointer to set of x coordinate values at which the function is + evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>y</parameter> + (<literal>PLFLT *</literal>, input) + </term> + <listitem> + <para> + Pointer to set of y coordinate values at which the function is + evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>z</parameter> + (<literal>PLFLT **</literal>, input) + </term> + <listitem> + <para> + Pointer to a vectored two-dimensional array with set of + function values. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>nx</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Number of <literal><parameter>x</parameter></literal> values at + which function is evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>ny</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Number of <literal><parameter>y</parameter></literal> values at + which function is evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>opt</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Determines the way in which the surface is represented. To specify + more than one option just add the options, e.g. FACETED + SURF_CONT + <itemizedlist> + <listitem> + <para> + <literal><parameter>opt</parameter>=FACETED</literal>: Network + of lines is drawn connecting points at which function is + defined. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=BASE_CONT</literal>: A contour + plot is drawn at the base XY plane using parameters + <parameter>nlevel</parameter> and <parameter>clevel</parameter>. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=SURF_CONT</literal>: A contour + plot is drawn at the surface plane using parameters + <parameter>nlevel</parameter> and <parameter>clevel</parameter>. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=DRAW_SIDES</literal>: draws a curtain + between the base XY plane and the borders of the plotted function. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=MAG_COLOR</literal>: + the surface is colored according to the value of Z; if + <literal>MAG_COLOR</literal> is not used, then the default + the surface is colored according to the intensity of the + reflected light in the surface from a light source whose + position is set using &pllightsource;. + </para> + </listitem> + </itemizedlist> + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>clevel</parameter> + (<literal>PLFLT *</literal>, input) + </term> + <listitem> + <para> + Pointer to the array that defines the contour level spacing. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>nlevel</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Number of elements in the <literal>clevel</literal> array. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>indexxmin</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + The index value (which must be ≥ 0) that corresponds to + the first <literal><parameter>x</parameter></literal> index where + <literal><parameter>z</parameter></literal> is defined. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>indexxmax</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + The index value (which must be ≤ + <literal><parameter>nx</parameter></literal>) which corresponds (by + convention) to one more than the last + <literal><parameter>x</parameter></literal> index value where + <literal><parameter>z</parameter></literal> is defined. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>indexymin</parameter> + (<literal>PLINT *</literal>, input) + </term> + <listitem> + <para> + Array of <literal><parameter>y</parameter></literal> index + values which all must be ≥ 0. These values are the first + <literal><parameter>y</parameter></literal> index where + <literal><parameter>z</parameter></literal> is defined for a + particular <literal><parameter>x</parameter></literal> index in the + range from <literal><parameter>indexxmin</parameter></literal> to + <literal><parameter>indexxmax - 1</parameter></literal>. The dimension of + <literal><parameter>indexymin</parameter></literal> is + <literal><parameter>indexxmax</parameter></literal>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>indexymax</parameter> + (<literal>PLINT *</literal>, input) + </term> + <listitem> + <para> + Array of <literal><parameter>y</parameter></literal> index + values which all must be ≤ + <literal><parameter>ny</parameter></literal>. These values + correspond (by convention) to one more than the last + <literal><parameter>y</parameter></literal> index where + <literal><parameter>z</parameter></literal> is defined for a + particular <literal><parameter>x</parameter></literal> index in the + range from <literal><parameter>indexxmin</parameter></literal> to + <literal><parameter>indexxmax - 1</parameter></literal>. The dimension of + <literal><parameter>indexymax</parameter></literal> is + <literal><parameter>indexxmax</parameter></literal>. + </para> + </listitem> + </varlistentry> + </variablelist> + + <para> + Redacted form: <function>plsurf3dl(x, y, z, opt, clevel, + indexxmin, indexymin, indexymax)</function> + </para> + + <para> + This function is not used in any examples. + </para> + + </sect1> + <sect1 id="plfsurf3d" renderas="sect3"> <title> <function>plfsurf3d</function>: Plot shaded 3-d surface plot @@ -16240,7 +16777,7 @@ <funcsynopsis> <funcprototype> <funcdef> - <function>plsurf3d</function> + <function>plfsurf3d</function> </funcdef> <paramdef><parameter>x</parameter></paramdef> <paramdef><parameter>y</parameter></paramdef> Modified: trunk/doc/docbook/src/plplotdoc.xml.in =================================================================== --- trunk/doc/docbook/src/plplotdoc.xml.in 2014-01-27 01:39:07 UTC (rev 12961) +++ trunk/doc/docbook/src/plplotdoc.xml.in 2014-01-27 08:07:41 UTC (rev 12962) @@ -165,6 +165,7 @@ <!ENTITY plOptUsage '<link linkend="plOptUsage"><function>plOptUsage</function></link>'> <!ENTITY plot3d '<link linkend="plot3d"><function>plot3d</function></link>'> <!ENTITY plot3dc '<link linkend="plot3dc"><function>plot3dc</function></link>'> +<!ENTITY plot3dcl '<link linkend="plot3dcl"><function>plot3dcl</function></link>'> <!ENTITY plot3dfortran95 '<link linkend="plot3dfortran95"><function>plot3dfortran95</function></link>'> <!ENTITY plparseopts '<link linkend="plparseopts"><function>plparseopts</function></link>'> <!ENTITY plparseoptsfortran95 '<link linkend="plparseoptsfortran95"><function>plparseoptsfortran95</function></link>'> @@ -231,6 +232,7 @@ <!ENTITY plstransform '<link linkend="plstransform"><function>plstransform</function></link>'> <!ENTITY plstyl '<link linkend="plstyl"><function>plstyl</function></link>'> <!ENTITY plsurf3d '<link linkend="plsurf3d"><function>plsurf3d</function></link>'> +<!ENTITY plsurf3dl '<link linkend="plsurf3dl"><function>plsurf3dl</function></link>'> <!ENTITY plsvect '<link linkend="plsvect"><function>plsvect</function></link>'> <!ENTITY plsvpa '<link linkend="plsvpa"><function>plsvpa</function></link>'> <!ENTITY plsxax '<link linkend="plsxax"><function>plsxax</function></link>'> Modified: trunk/include/plplot.h =================================================================== --- trunk/include/plplot.h 2014-01-27 01:39:07 UTC (rev 12961) +++ trunk/include/plplot.h 2014-01-27 08:07:41 UTC (rev 12962) @@ -1374,7 +1374,7 @@ c_plot3dcl( const PLFLT *x, const PLFLT *y, const PLFLT * const *z, PLINT nx, PLINT ny, PLINT opt, const PLFLT *clevel, PLINT nlevel, - PLINT ixstart, PLINT ixn, const PLINT *indexymin, const PLINT *indexymax ); + PLINT indexxmin, PLINT indexxmax, const PLINT *indexymin, const PLINT *indexymax ); // Like plot3dcl, but uses an evaluator function to access z data from zp @@ -1382,7 +1382,7 @@ plfplot3dcl( const PLFLT *x, const PLFLT *y, PLF2OPS zops, PLPointer zp, PLINT nx, PLINT ny, PLINT opt, const PLFLT *clevel, PLINT nlevel, - PLINT ixstart, PLINT ixn, const PLINT *indexymin, const PLINT *indexymax ); + PLINT indexxmin, PLINT indexxmax, const PLINT *indexymin, const PLINT *indexymax ); // // definitions for the opt argument in plot3dc() and plsurf3d() @@ -1883,14 +1883,14 @@ PLDLLIMPEXP void c_plsurf3dl( const PLFLT *x, const PLFLT *y, const PLFLT * const *z, PLINT nx, PLINT ny, PLINT opt, const PLFLT *clevel, PLINT nlevel, - PLINT ixstart, PLINT ixn, const PLINT *indexymin, const PLINT *indexymax ); + PLINT indexxmin, PLINT indexxmax, const PLINT *indexymin, const PLINT *indexymax ); // Like plsurf3dl, but uses an evaluator function to access z data from zp PLDLLIMPEXP void plfsurf3dl( const PLFLT *x, const PLFLT *y, PLF2OPS zops, PLPointer zp, PLINT nx, PLINT ny, PLINT opt, const PLFLT *clevel, PLINT nlevel, - PLINT ixstart, PLINT ixn, const PLINT *indexymin, const PLINT * indexymax ); + PLINT indexxmin, PLINT indexxmax, const PLINT *indexymin, const PLINT *indexymax ); // Set arrow style for vector plots. PLDLLIMPEXP void Modified: trunk/src/plot3d.c =================================================================== --- trunk/src/plot3d.c 2014-01-27 01:39:07 UTC (rev 12961) +++ trunk/src/plot3d.c 2014-01-27 08:07:41 UTC (rev 12962) @@ -353,7 +353,7 @@ //-------------------------------------------------------------------------- // void plsurf3dl(x, y, z, nx, ny, opt, clevel, nlevel, -// ixstart, ixn, indexymin, indexymax) +// indexxmin, indexxmax, indexymin, indexymax) // // Plots the 3-d surface representation of the function z[x][y]. // The x values are stored as x[0..nx-1], the y values as y[0..ny-1], @@ -374,7 +374,7 @@ // // indexymin and indexymax are arrays which specify the y index range // (following the convention that the upper range limit is one more than -// actual index limit) for an x index range of ixstart, ixn. +// actual index limit) for an x index range of indexxmin, indexxmax. // This code is a complete departure from the approach taken in the old version // of this routine. Formerly to code attempted to use the logic for the hidden // line algorithm to draw the hidden surface. This was really hard. This code @@ -388,16 +388,16 @@ void c_plsurf3dl( const PLFLT *x, const PLFLT *y, const PLFLT * const *z, PLINT nx, PLINT ny, PLINT opt, const PLFLT *clevel, PLINT nlevel, - PLINT ixstart, PLINT ixn, const PLINT *indexymin, const PLINT *indexymax ) + PLINT indexxmin, PLINT indexxmax, const PLINT *indexymin, const PLINT *indexymax ) { plfsurf3dl( x, y, plf2ops_c(), (PLPointer) z, nx, ny, - opt, clevel, nlevel, ixstart, ixn, indexymin, indexymax ); + opt, clevel, nlevel, indexxmin, indexxmax, indexymin, indexymax ); } void plfsurf3dl( const PLFLT *x, const PLFLT *y, PLF2OPS zops, PLPointer zp, PLINT nx, PLINT ny, PLINT opt, const PLFLT *clevel, PLINT nlevel, - PLINT ixstart, PLINT ixn, const PLINT *indexymin, const PLINT *indexymax ) + PLINT indexxmin, PLINT indexxmax, const PLINT *indexymin, const PLINT *indexymax ) { PLFLT cxx, cxy, cyx, cyy, cyz; PLINT i, j, k; @@ -596,7 +596,7 @@ plAlloc2dGrid( &cgrid2.yg, nx, ny ); plAlloc2dGrid( &zstore, nx, ny ); - for ( i = ixstart; i < ixn; i++ ) + for ( i = indexxmin; i < indexxmax; i++ ) { for ( j = 0; j < indexymin[i]; j++ ) { @@ -618,7 +618,7 @@ } } // Fill cont structure with contours. - cont_store( (const PLFLT * const *) zstore, nx, ny, ixstart + 1, ixn, 1, ny, + cont_store( (const PLFLT * const *) zstore, nx, ny, indexxmin + 1, indexxmax, 1, ny, clevel, nlevel, pltr2, (void *) &cgrid2, &cont ); // Free the 2D input arrays to cont_store since not needed any more. @@ -683,7 +683,7 @@ ix = ixFast * ( iFast + i ) + ixSlow * ( iSlow + j ) + ixOrigin; iy = iyFast * ( iFast + i ) + iySlow * ( iSlow + j ) + iyOrigin; - if ( ixstart <= ix && ix < ixn && + if ( indexxmin <= ix && ix < indexxmax && indexymin[ix] <= iy && iy < indexymax[ix] ) { xm += px[2 * i + j] = x[ix]; @@ -778,7 +778,7 @@ { plcol0( 0 ); plfplot3dcl( x, y, zops, zp, nx, ny, MESH | DRAW_LINEXY, NULL, 0, - ixstart, ixn, indexymin, indexymax ); + indexxmin, indexxmax, indexymin, indexymax ); } if ( opt & DRAW_SIDES ) // the sides look ugly !!! @@ -793,7 +793,7 @@ { ix = ixFast * ( iFast + i ) + ixSlow * iSlow + ixOrigin; iy = iyFast * ( iFast + i ) + iySlow * iSlow + iyOrigin; - if ( ixstart <= ix && ix < ixn && + if ( indexxmin <= ix && ix < indexxmax && indexymin[ix] <= iy && iy < indexymax[ix] ) { px[2 * i] = x[ix]; @@ -822,7 +822,7 @@ { ix = ixFast * iFast + ixSlow * ( iSlow + i ) + ixOrigin; iy = iyFast * iFast + iySlow * ( iSlow + i ) + iyOrigin; - if ( ixstart <= ix && ix < ixn && + if ( indexxmin <= ix && ix < indexxmax && indexymin[ix] <= iy && iy < indexymax[ix] ) { px[2 * i] = x[ix]; @@ -894,7 +894,7 @@ //-------------------------------------------------------------------------- // void plot3dcl(x, y, z, nx, ny, opt, clevel, nlevel, -// ixstart, ixn, indexymin, indexymax) +// indexxmin, indexxmax, indexymin, indexymax) // // Plots a 3-d representation of the function z[x][y]. The x values // are stored as x[0..nx-1], the y values as y[0..ny-1], and the z @@ -912,17 +912,17 @@ // or any bitwise combination, e.g. "MAG_COLOR | DRAW_LINEX" // indexymin and indexymax are arrays which specify the y index limits // (following the convention that the upper range limit is one more than -// actual index limit) for an x index range of ixstart, ixn. +// actual index limit) for an x index range of indexxmin, indexxmax. //-------------------------------------------------------------------------- void c_plot3dcl( const PLFLT *x, const PLFLT *y, const PLFLT * const *z, PLINT nx, PLINT ny, PLINT opt, const PLFLT *clevel, PLINT nlevel, - PLINT ixstart, PLINT ixn, const PLINT *indexymin, const PLINT *indexymax ) + PLINT indexxmin, PLINT indexxmax, const PLINT *indexymin, const PLINT *indexymax ) { plfplot3dcl( x, y, plf2ops_c(), (PLPointer) z, nx, ny, - opt, clevel, nlevel, ixstart, ixn, indexymin, indexymax ); + opt, clevel, nlevel, indexxmin, indexxmax, indexymin, indexymax ); } //-------------------------------------------------------------------------- @@ -957,8 +957,8 @@ //! or any bitwise OR'd combination, e.g. "MAG_COLOR | DRAW_LINEX" //! @param clevel z values at which to draw contours //! @param nlevel Number of values in clevels -//! @param PL_UNUSED( ixstart ) Not used. -//! @param PL_UNUSED( ixn ) Not used. +//! @param PL_UNUSED( indexxmin ) Not used. +//! @param PL_UNUSED( indexxmax ) Not used. //! @param PL_UNUSED( indexymin ) Not used. //! @param PL_UNUSED( indexymax ) Not used. //! @@ -968,7 +968,7 @@ plfplot3dcl( const PLFLT *x, const PLFLT *y, PLF2OPS zops, PLPointer zp, PLINT nx, PLINT ny, PLINT opt, const PLFLT *clevel, PLINT nlevel, - PLINT PL_UNUSED( ixstart ), PLINT PL_UNUSED( ixn ), const PLINT * PL_UNUSED( indexymin ), const PLINT * PL_UNUSED( indexymax ) ) + PLINT PL_UNUSED( indexxmin ), PLINT PL_UNUSED( indexxmax ), const PLINT * PL_UNUSED( indexymin ), const PLINT * PL_UNUSED( indexymax ) ) { PLFLT cxx, cxy, cyx, cyy, cyz; PLINT init, ix, iy, color; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-27 01:39:10
|
Revision: 12961 http://sourceforge.net/p/plplot/code/12961 Author: airwin Date: 2014-01-27 01:39:07 +0000 (Mon, 27 Jan 2014) Log Message: ----------- Implement ADD_SPECIAL_CONSISTENCY_CHECKING build system option that adds some custom check targets that ordinarily are not added to a normal build because of the extra dependencies. One of these targets is the already existing check_plplot_h.inc target (to check consistency of the octave binding). Also implement the check_api_xml_consistency target which is an additional target of this kind. That target uses H?\199?\142ili?\195?\160ng Wang's check application (written in Go and available from https://github.com/hailiang/go-plplot/tree/master/c/check) to check the consistency of api.xml with plplot.h. Modified Paths: -------------- trunk/cmake/modules/ocaml.cmake trunk/cmake/modules/plplot.cmake trunk/doc/docbook/src/CMakeLists.txt Modified: trunk/cmake/modules/ocaml.cmake =================================================================== --- trunk/cmake/modules/ocaml.cmake 2014-01-27 01:30:31 UTC (rev 12960) +++ trunk/cmake/modules/ocaml.cmake 2014-01-27 01:39:07 UTC (rev 12961) @@ -145,9 +145,13 @@ endif(ENABLE_ocaml) if(ENABLE_ocaml) - # Leave this OFF by default since this target requires extra - # dependencies such as libpcre-ocaml-dev package on Debian. - option(GENERATE_PLPLOT_H_INC "Generate generated_plplot_h.inc" OFF) + if(ADD_SPECIAL_CONSISTENCY_CHECKING) + option(GENERATE_PLPLOT_H_INC "Generate generated_plplot_h.inc" ON) + else(ADD_SPECIAL_CONSISTENCY_CHECKING) + # Leave this OFF by default since this target requires extra + # dependencies such as libpcre-ocaml-dev package on Debian. + option(GENERATE_PLPLOT_H_INC "Generate generated_plplot_h.inc" OFF) + endif(ADD_SPECIAL_CONSISTENCY_CHECKING) if(GENERATE_PLPLOT_H_INC) find_program(OCAML ocaml) Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2014-01-27 01:30:31 UTC (rev 12960) +++ trunk/cmake/modules/plplot.cmake 2014-01-27 01:39:07 UTC (rev 12961) @@ -19,6 +19,8 @@ # Module for determining all configuration variables for PLplot. +option(ADD_SPECIAL_CONSISTENCY_CHECKING "Add extra source-tree consistency checking targets that require special tools" OFF) + # 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-01-27 01:30:31 UTC (rev 12960) +++ trunk/doc/docbook/src/CMakeLists.txt 2014-01-27 01:39:07 UTC (rev 12961) @@ -19,6 +19,35 @@ # You should have received a copy of the GNU Library General Public License # along with PLplot; if not, write to the Free Software +if(ADD_SPECIAL_CONSISTENCY_CHECKING) + # For this special case, must have access to a build of Hǎiliàng Wang's + # "check" application. To build that tool (written in the Go language) + # follow these simple directions (which worked fine on 2014-01-26): + # Install go-lang package from your distro (I used the Debian testing + # version, go-lang version 1.2). + # cd /home/software/golang_apps #(or wherever you like) + # export GOPATH=$(pwd) + # go get -u github.com/hailiang/go-plplot/c/check + # go build github.com/hailiang/go-plplot/c/check + ## The above creates the "check" executable in $GOPATH/bin + ## That is too generic a name so symlink a more individual name + # cd $GOPATH/bin; ln -s check api.xml_consistency_checker; + ## Now put $GOPATH/bin on your PATH and CMake should do the rest. + find_program(API_XML_CONSISTENCY_CHECKER api.xml_consistency_checker) + if(API_XML_CONSISTENCY_CHECKER) + add_custom_target(check_api_xml_consistency + # Currently the checker needs plplot.h to be in the same directory + # as the configured header files. + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CMAKE_SOURCE_DIR}/include/plplot.h + ${CMAKE_BINARY_DIR}/include/plplot.h + COMMAND ${API_XML_CONSISTENCY_CHECKER} -header=${CMAKE_BINARY_DIR}/include/plplot.h -apixml=${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml + ) + 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) +endif(ADD_SPECIAL_CONSISTENCY_CHECKING) + set(BINDIR ${CMAKE_CURRENT_SOURCE_DIR}/../bin) set(PLPLOTDOC plplotdoc) if(NOT DEFINED HTML_EXT) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-27 01:30:33
|
Revision: 12960 http://sourceforge.net/p/plplot/code/12960 Author: airwin Date: 2014-01-27 01:30:31 +0000 (Mon, 27 Jan 2014) Log Message: ----------- Improve warnings when drawing mode setting/getting not supported by a device. Modified Paths: -------------- trunk/src/plctrl.c Modified: trunk/src/plctrl.c =================================================================== --- trunk/src/plctrl.c 2014-01-26 02:50:33 UTC (rev 12959) +++ trunk/src/plctrl.c 2014-01-27 01:30:31 UTC (rev 12960) @@ -2041,7 +2041,7 @@ { if ( !plsc->dev_modeset ) { - plwarn( "plsdrawmode: Mode setting is not supported" ); + plwarn( "plsdrawmode: Mode setting is not supported by this device" ); } else if ( plsc->level > 0 ) { @@ -2060,13 +2060,13 @@ //! @returns Current drawing mode //! PLINT -c_plgdrawmode() +c_plgdrawmode( void ) { PLINT mode; if ( !plsc->dev_modeset ) { - plwarn( "plgdrawmode: Mode getting is not supported" ); + plwarn( "plgdrawmode: Mode getting is not supported by this device" ); mode = PL_DRAWMODE_UNKNOWN; } else if ( plsc->level > 0 ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-26 02:50:38
|
Revision: 12959 http://sourceforge.net/p/plplot/code/12959 Author: airwin Date: 2014-01-26 02:50:33 +0000 (Sun, 26 Jan 2014) Log Message: ----------- Add information concerning (good) rendering of UTF-8 symbols in api.xml by the "man" command. Modified Paths: -------------- trunk/doc/docbook/README.developers Modified: trunk/doc/docbook/README.developers =================================================================== --- trunk/doc/docbook/README.developers 2014-01-25 19:47:30 UTC (rev 12958) +++ trunk/doc/docbook/README.developers 2014-01-26 02:50:33 UTC (rev 12959) @@ -133,6 +133,14 @@ (for MANPAGE in *.3plplot; do nroff -man $MANPAGE ; done) |less +Two of our man pages (plot3dcl.3plplot and plsurf3dl.3plplot) +currently contain utf8 symbols (for the math symbols ≤ and ≥). Those +symbols do not render correctly using nroff -man (or any other +recommended nroff options such as -Tutf8). However, they display +without issues if viewed with man (by copying the files to a temporary +directory man/man3 and viewing them with, e.g., "man -M./man +plot3dcl"). + 2. info pages. info --file plplotdoc.info @@ -162,8 +170,13 @@ Man pages. These results are not affected since the man pages ignore the advanced -chapter, and the api.xml file currently contains only the ascii -subset of UTF-8. +chapter, but (see discussion above) the api.xml file currently +contains two functions whose documentation uses UTF-8 math symbols, +and for those man pages the man command renders those symbols without +issues. I assume what is going on here is the UTF-8 math symbols +are just being cleanly passed through to the man viewer ("less" in +this case) so with some exceptions (see comments on less below) good +rendering of arbitrary UTF-8 symbols will occur. Info files. @@ -191,7 +204,7 @@ about that choice below). The order of the glyphs in the Hindi Peace word is not correct (last two glyphs switched) which is a common complex text layout (CTL) issue when using unsophisticated software to -render Hindi. However, the the Peace word is laid out in the correct +render Hindi. However, the Peace word is laid out in the correct (right-to-left) order for Arabic and Hebrew so there is some CTL sophistication in the xelatex layout engine, and probably hope that further layout issues such as the one for Hindi will be fixed. @@ -212,7 +225,7 @@ is you must use a specific rather than generic font for the sans, serif, and mono cases. Specific fonts are never a good way to go for documents containing different languages (such as the table of "Peace" -words I recently introduced into advanced.xml) since since the user is +words I recently introduced into advanced.xml) since the user is forced to compromise between font quality and comprehensiveness. For example, I have tried using the unifont font (which gives complete coverage of glyphs for the basic multilingual plane), and the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-25 19:47:33
|
Revision: 12958 http://sourceforge.net/p/plplot/code/12958 Author: airwin Date: 2014-01-25 19:47:30 +0000 (Sat, 25 Jan 2014) Log Message: ----------- Document plgdrawmode and plsdrawmode. Modified Paths: -------------- trunk/doc/docbook/src/api.xml trunk/doc/docbook/src/plplotdoc.xml.in Modified: trunk/doc/docbook/src/api.xml =================================================================== --- trunk/doc/docbook/src/api.xml 2014-01-24 08:34:51 UTC (rev 12957) +++ trunk/doc/docbook/src/api.xml 2014-01-25 19:47:30 UTC (rev 12958) @@ -5266,6 +5266,45 @@ </sect1> + <sect1 id="plgdrawmode" renderas="sect3"> + <title> + <function>plgdrawmode</function>: Get drawing mode (depends on +device support!) + </title> + + <para> + <funcsynopsis> + <funcprototype> + <funcdef> + <function>plgdrawmode</function> + </funcdef> + <paramdef></paramdef> + </funcprototype> + </funcsynopsis> + </para> + + <para> + 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 + <literal>PL_DRAWMODE_DEFAULT</literal>, + <literal>PL_DRAWMODE_REPLACE</literal>, + <literal>PL_DRAWMODE_XOR</literal>, or + <literal>PL_DRAWMODE_UNKNOWN</literal>. This function returns + <literal>PL_DRAWMODE_UNKNOWN</literal> for the rest of the + device drivers. See also &plsdrawmode;. + </para> + + <para> + Redacted form: <function>plgdrawmode()</function> + </para> + + <para> + This function is used in example 34. + </para> + + </sect1> + <sect1 id="plgfam" renderas="sect3"> <title> <function>plgfam</function>: Get family file parameters @@ -5337,7 +5376,6 @@ </sect1> - <sect1 id="plgfci" renderas="sect3"> <title> <function>plgfci</function>: Get FCI (font characterization integer) @@ -12757,6 +12795,55 @@ </sect1> + <sect1 id="plsdrawmode" renderas="sect3"> + <title> + <function>plsdrawmode</function>: Set drawing mode (depends on +device support!) + </title> + + <para> + <funcsynopsis> + <funcprototype> + <funcdef> + <function>plsdrawmode</function> + </funcdef> + <paramdef>mode</paramdef> + </funcprototype> + </funcsynopsis> + </para> + + <para> + Set drawing mode. Note only one device driver (cairo) currently + supports this at the moment. See also &plgdrawmode;. + </para> + + <variablelist> + <varlistentry> + <term> + <parameter>mode</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Control variable which species the drawing mode (one of + <literal>PL_DRAWMODE_DEFAULT</literal>, + <literal>PL_DRAWMODE_REPLACE</literal>, or + <literal>PL_DRAWMODE_XOR</literal>) to use. + </para> + </listitem> + </varlistentry> + </variablelist> + + <para> + Redacted form: <function>plsdrawmode(mode)</function> + </para> + + <para> + This function is used in example 34. + </para> + + </sect1> + <sect1 id="plseed" renderas="sect3"> <title> <function>plseed</function>: Set seed for internal random Modified: trunk/doc/docbook/src/plplotdoc.xml.in =================================================================== --- trunk/doc/docbook/src/plplotdoc.xml.in 2014-01-24 08:34:51 UTC (rev 12957) +++ trunk/doc/docbook/src/plplotdoc.xml.in 2014-01-25 19:47:30 UTC (rev 12958) @@ -125,6 +125,7 @@ <!ENTITY plgdiori '<link linkend="plgdiori"><function>plgdiori</function></link>'> <!ENTITY plgdiplt '<link linkend="plgdiplt"><function>plgdiplt</function></link>'> <!ENTITY plGetCursor '<link linkend="plGetCursor"><function>plGetCursor</function></link>'> +<!ENTITY plgdrawmode '<link linkend="plgdrawmode"><function>plgdrawmode</function></link>'> <!ENTITY plgfam '<link linkend="plgfam"><function>plgfam</function></link>'> <!ENTITY plgfci '<link linkend="plgfci"><function>plgfci</function></link>'> <!ENTITY plgfnam '<link linkend="plgfnam"><function>plgfnam</function></link>'> @@ -197,6 +198,7 @@ <!ENTITY plsdiori '<link linkend="plsdiori"><function>plsdiori</function></link>'> <!ENTITY plsdiplt '<link linkend="plsdiplt"><function>plsdiplt</function></link>'> <!ENTITY plsdiplz '<link linkend="plsdiplz"><function>plsdiplz</function></link>'> +<!ENTITY plsdrawmode '<link linkend="plsdrawmode"><function>plsdrawmode</function></link>'> <!ENTITY plseed '<link linkend="plseed"><function>plseed</function></link>'> <!ENTITY plsesc '<link linkend="plsesc"><function>plsesc</function></link>'> <!ENTITY plsescfortran95 '<link linkend="plsescfortran95"><function>plsescfortran95</function></link>'> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-24 08:34:56
|
Revision: 12957 http://sourceforge.net/p/plplot/code/12957 Author: airwin Date: 2014-01-24 08:34:51 +0000 (Fri, 24 Jan 2014) Log Message: ----------- Implement documentation for plgcmap1_range and plscmap1_range. Thanks to H?\199?\142ili?\195?\160ng Wang for writing the plplot.h/api.xml consistency checker that discovered these functions in our public API did not have any documentation in api.xml. ToDo: There are still 4 more functions that are missing documentation according to that checker report and also inconsistencies between plplot.h and api.xml in the number and names of the function arguments. Modified Paths: -------------- trunk/doc/docbook/src/api.xml trunk/doc/docbook/src/plplotdoc.xml.in Modified: trunk/doc/docbook/src/api.xml =================================================================== --- trunk/doc/docbook/src/api.xml 2014-01-24 05:11:55 UTC (rev 12956) +++ trunk/doc/docbook/src/api.xml 2014-01-24 08:34:51 UTC (rev 12957) @@ -4559,6 +4559,64 @@ </sect1> + <sect1 id="plgcmap1_range" renderas="sect3"> + <title> + <function>plgcmap1_range</function>: Get the cmap1 argument + range for continuous color plots + </title> + + <para> + <funcsynopsis> + <funcprototype> + <funcdef> + <function>plgcmap1_range</function> + </funcdef> + <paramdef><parameter>min_color</parameter></paramdef> + <paramdef><parameter>max_color</parameter></paramdef> + </funcprototype> + </funcsynopsis> + </para> + + <para> + Get the cmap1 argument range for continuous color plots. + (Use &plscmap1_range; to set the cmap1 argument range.) + </para> + + <variablelist> + <varlistentry> + <term> + <parameter>min_color</parameter> + (<literal>PLFLT *</literal>, output) + </term> + <listitem> + <para> + Pointer to the current minimum cmap1 floating point argument. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>max_color</parameter> + (<literal>PLFLT *</literal>, output) + </term> + <listitem> + <para> + Pointer to the current maximum cmap1 floating point argument. + </para> + </listitem> + </varlistentry> + </variablelist> + + <para> + Redacted form: <function>plgcmap1_range(min_color, max_color)</function> + </para> + + <para> + This function is currently not used in any example. + </para> + + </sect1> + <sect1 id="plgcol0" renderas="sect3"> <title> <function>plgcol0</function>: Returns 8-bit RGB values for given color @@ -11157,6 +11215,69 @@ </sect1> + <sect1 id="plscmap1_range" renderas="sect3"> + <title> + <function>plscmap1_range</function>: Set the cmap1 argument + range for continuous color plots + </title> + + <para> + <funcsynopsis> + <funcprototype> + <funcdef> + <function>plscmap1_range</function> + </funcdef> + <paramdef><parameter>min_color</parameter></paramdef> + <paramdef><parameter>max_color</parameter></paramdef> + </funcprototype> + </funcsynopsis> + </para> + + <para> + Set the cmap1 argument range for continuous color + plots. If <parameter>min_color</parameter> is greater than + <parameter>max_color</parameter> or + <parameter>max_color</parameter> is greater than 1.0 or + <parameter>min_color</parameter> is less than 0.0 then no change + is made. (Use &plgcmap1_range; to get the cmap1 + argument range.) + </para> + + <variablelist> + <varlistentry> + <term> + <parameter>min_color</parameter> + (<literal>PLFLT</literal>, input) + </term> + <listitem> + <para> + The minimum cmap1 floating point argument. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>max_color</parameter> + (<literal>PLFLT</literal>, input) + </term> + <listitem> + <para> + The maximum cmap1 floating point argument. + </para> + </listitem> + </varlistentry> + </variablelist> + + <para> + Redacted form: <function>plscmap1_range(min_color, max_color)</function> + </para> + + <para> + This function is currently used in example 33. + </para> + + </sect1> + <sect1 id="plscmap1" renderas="sect3"> <title> <function>plscmap1</function>: Set color map1 colors using 8-bit RGB Modified: trunk/doc/docbook/src/plplotdoc.xml.in =================================================================== --- trunk/doc/docbook/src/plplotdoc.xml.in 2014-01-24 05:11:55 UTC (rev 12956) +++ trunk/doc/docbook/src/plplotdoc.xml.in 2014-01-24 08:34:51 UTC (rev 12957) @@ -116,6 +116,7 @@ <!ENTITY plfontld '<link linkend="plfontld"><function>plfontld</function></link>'> <!ENTITY plFree2dGrid '<link linkend="plFree2dGrid"><function>plFree2dGrid</function></link>'> <!ENTITY plgch '<link linkend="plgch"><function>plgch</function></link>'> +<!ENTITY plgcmap1_range '<link linkend="plgcmap1_range"><function>plgcmap1_range</function></link>'> <!ENTITY plgcol0 '<link linkend="plgcol0"><function>plgcol0</function></link>'> <!ENTITY plgcolbg '<link linkend="plgcolbg"><function>plgcolbg</function></link>'> <!ENTITY plgcompression '<link linkend="plgcompression"><function>plgcompression</function></link>'> @@ -182,6 +183,7 @@ <!ENTITY plschr '<link linkend="plschr"><function>plschr</function></link>'> <!ENTITY plscmap0 '<link linkend="plscmap0"><function>plscmap0</function></link>'> <!ENTITY plscmap0n '<link linkend="plscmap0n"><function>plscmap0n</function></link>'> +<!ENTITY plscmap1_range '<link linkend="plscmap1_range"><function>plgsmap1_range</function></link>'> <!ENTITY plscmap1 '<link linkend="plscmap1"><function>plscmap1</function></link>'> <!ENTITY plscmap1l '<link linkend="plscmap1l"><function>plscmap1l</function></link>'> <!ENTITY plscmap1n '<link linkend="plscmap1n"><function>plscmap1n</function></link>'> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-24 05:11:58
|
Revision: 12956 http://sourceforge.net/p/plplot/code/12956 Author: airwin Date: 2014-01-24 05:11:55 +0000 (Fri, 24 Jan 2014) Log Message: ----------- Implement long-overdue documentation for plbtime, plconfigtime, and plctime. Thanks to H?\199?\142ili?\195?\160ng Wang for writing the plplot.h/api.xml consistency checker that discovered these (and 6 other functions in our public API) were missing documentation. Modified Paths: -------------- trunk/doc/docbook/src/api.xml trunk/doc/docbook/src/plplotdoc.xml.in Modified: trunk/doc/docbook/src/api.xml =================================================================== --- trunk/doc/docbook/src/api.xml 2014-01-23 14:07:07 UTC (rev 12955) +++ trunk/doc/docbook/src/api.xml 2014-01-24 05:11:55 UTC (rev 12956) @@ -1565,6 +1565,154 @@ </sect1> + <sect1 id="plbtime" renderas="sect3"> + <title> + <function>plbtime</function>: Calculate broken-down time from + continuous time for the current stream + </title> + + <para> + <funcsynopsis> + <funcprototype> + <funcdef> + <function>plbtime</function> + </funcdef> + <paramdef><parameter>year</parameter></paramdef> + <paramdef><parameter>month</parameter></paramdef> + <paramdef><parameter>day</parameter></paramdef> + <paramdef><parameter>hour</parameter></paramdef> + <paramdef><parameter>min</parameter></paramdef> + <paramdef><parameter>sec</parameter></paramdef> + <paramdef><parameter>ctime</parameter></paramdef> + </funcprototype> + </funcsynopsis> + </para> + <para> + Calculate broken-down time; + <literal><parameter>year</parameter></literal>, + <literal><parameter>month</parameter></literal>, + <literal><parameter>day</parameter></literal>, + <literal><parameter>hour</parameter></literal>, + <literal><parameter>min</parameter></literal>, + <literal><parameter>sec</parameter></literal>; from + continuous time, <literal><parameter>ctime</parameter></literal> + for the current stream. This function is the inverse + of &plctime;. + </para> + <para> + 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;. + </para> + + <variablelist> + <varlistentry> + <term> + <parameter>year</parameter> + (<literal>PLINT *</literal>, output) + </term> + <listitem> + <para> + Output year. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>month</parameter> + (<literal>PLINT *</literal>, output) + </term> + <listitem> + <para> + Output month in range from 0 (January) to 11 (December). + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>day</parameter> + (<literal>PLINT *</literal>, output) + </term> + <listitem> + <para> + Output day in range from 1 to 31. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>hour</parameter> + (<literal>PLINT *</literal>, output) + </term> + <listitem> + <para> + Output hour in range from 0 to 23. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>min</parameter> + (<literal>PLINT *</literal>, output) + </term> + <listitem> + <para> + Output minute in range from 0 to 59 + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>sec</parameter> + (<literal>PLFLT *</literal>, output) + </term> + <listitem> + <para> + Output second in floating range from 0. to 60. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>ctime</parameter> + (<literal>PLFLT</literal>, input) + </term> + <listitem> + <para> + Continous time from which the broken-down time is calculated. + </para> + </listitem> + </varlistentry> + </variablelist> + + <para> + Redacted form: + <itemizedlist> + <listitem> + <para> + General: <function>plbtime(year, month, day, hour, min, sec, ctime)</function> + </para> + </listitem> + <listitem> + <para> + Perl/PDL: Not available? + </para> + </listitem> + </itemizedlist> + </para> + + <para> + This function is used in example 29. + </para> + + </sect1> + <sect1 id="plcalc_world" renderas="sect3"> <title> <function>plcalc_world</function>: Calculate world coordinates and @@ -2317,6 +2465,233 @@ </sect1> + <sect1 id="plconfigtime" renderas="sect3"> + <title> + <function>plconfigtime</function>: Configure the transformation + between continuous and broken-down time for the current stream + </title> + + <para> + <funcsynopsis> + <funcprototype> + <funcdef> + <function>plconfigtime</function> + </funcdef> + <paramdef><parameter>scale</parameter></paramdef> + <paramdef><parameter>offset1</parameter></paramdef> + <paramdef><parameter>offset2</parameter></paramdef> + <paramdef><parameter>ccontrol</parameter></paramdef> + <paramdef><parameter>ifbtime_offset</parameter></paramdef> + <paramdef><parameter>year</parameter></paramdef> + <paramdef><parameter>month</parameter></paramdef> + <paramdef><parameter>day</parameter></paramdef> + <paramdef><parameter>hour</parameter></paramdef> + <paramdef><parameter>min</parameter></paramdef> + <paramdef><parameter>sec</parameter></paramdef> + </funcprototype> + </funcsynopsis> + </para> + + <para> + Configure the transformation + between continuous and broken-down time + for the current stream. This transformation is + used by both &plbtime; and &plctime;. + </para> + + <variablelist> + <varlistentry> + <term> + <parameter>scale</parameter> + (<literal>PLFLT</literal>, input) + </term> + <listitem> + <para> + The number of days per continuous time unit. As a special + case, if <parameter>scale</parameter> 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. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>offset1</parameter> + (<literal>PLFLT</literal>, input) + </term> + <listitem> + <para> + If <parameter>ifbtime_offset</parameter> is true, the + parameters <parameter>offset1</parameter> and + <parameter>offset2</parameter> 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 <parameter>offset1</parameter> as an integer + that can be exactly represented by a + floating-point variable and specifying + <parameter>offset2</parameter> as a number in the range + from 0. to 1) the chance to minimize the numerical errors of + the continuous time representation. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>offset2</parameter> + (<literal>PLFLT</literal>, input) + </term> + <listitem> + <para> + See documentation of <parameter>offset1</parameter>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>ccontrol</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + <parameter>ccontrol</parameter> 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). + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>ifbzero_control</parameter> + (<literal>PLBOOL</literal>, input) + </term> + <listitem> + <para> + <parameter>ifbzero_control</parameter> controls how the + epoch of the continuous time scale is specified by the + user. If <parameter>ifbzero_control</parameter> is false, + then <parameter>offset1</parameter> and + <parameter>offset2</parameter> are used to specify the + epoch, and the following broken-down time parameters are + completely ignored. If + <parameter>ifbzero_control</parameter> is true, then + <parameter>offset1</parameter> and + <parameter>offset2</parameter> are completely ignored, and + the following broken-down time parameters are used to + specify the epoch. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>year</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Year of epoch. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>month</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Month of epoch in range from 0 (January) to 11 (December). + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>day</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Day of epoch in range from 1 to 31. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>hour</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Hour of epoch in range from 0 to 23 + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>min</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Minute of epoch in range from 0 to 59. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>sec</parameter> + (<literal>PLFLT</literal>, input) + </term> + <listitem> + <para> + Second of epoch in floating range from 0. to 60. + </para> + </listitem> + </varlistentry> + </variablelist> + + <para> + Redacted form: + <itemizedlist> + <listitem> + <para> + General: <function>plconfigtime(scale, offset1, offset2, ccontrol, ifbtime_offset, year, month, day, hour, min, sec)</function> + </para> + </listitem> + <listitem> + <para> + Perl/PDL: Not available? + </para> + </listitem> + </itemizedlist> + </para> + + <para> + This function is used in example 29. + </para> + + </sect1> + <sect1 id="plcont" renderas="sect3"> <title> <function>plcont</function>: Contour plot @@ -2578,6 +2953,156 @@ </sect1> + <sect1 id="plctime" renderas="sect3"> + <title> + <function>plctime</function>: Calculate continuous time from + broken-down time for the current stream + </title> + + <para> + <funcsynopsis> + <funcprototype> + <funcdef> + <function>plctime</function> + </funcdef> + <paramdef><parameter>year</parameter></paramdef> + <paramdef><parameter>month</parameter></paramdef> + <paramdef><parameter>day</parameter></paramdef> + <paramdef><parameter>hour</parameter></paramdef> + <paramdef><parameter>min</parameter></paramdef> + <paramdef><parameter>sec</parameter></paramdef> + <paramdef><parameter>ctime</parameter></paramdef> + </funcprototype> + </funcsynopsis> + </para> + <para> + Calculate continuous time, <literal><parameter>ctime</parameter></literal>, + from broken-down time for the current stream. The broken-down +time is specified by the following parameters: + <literal><parameter>year</parameter></literal>, + <literal><parameter>month</parameter></literal>, + <literal><parameter>day</parameter></literal>, + <literal><parameter>hour</parameter></literal>, + <literal><parameter>min</parameter></literal>, and + <literal><parameter>sec</parameter></literal>. + This function is the inverse of &plbtime;. + </para> + <para> + 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. + </para> + + <variablelist> + <varlistentry> + <term> + <parameter>year</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Input year. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>month</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Input month in range from 0 (January) to 11 (December). + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>day</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Input day in range from 1 to 31. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>hour</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Input hour in range from 0 to 23 + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>min</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Input minute in range from 0 to 59. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>sec</parameter> + (<literal>PLFLT</literal>, input) + </term> + <listitem> + <para> + Input second in floating range from 0. to 60. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>ctime</parameter> + (<literal>PLFLT *</literal>, output) + </term> + <listitem> + <para> + Continous time calculated from the broken-down time + specified by the previous parameters. + </para> + </listitem> + </varlistentry> + </variablelist> + + <para> + Redacted form: + <itemizedlist> + <listitem> + <para> + General: <function>plctime(year, month, day, hour, min, sec, ctime)</function> + </para> + </listitem> + <listitem> + <para> + Perl/PDL: Not available? + </para> + </listitem> + </itemizedlist> + </para> + + <para> + This function is used in example 29. + </para> + + </sect1> + <sect1 id="plend" renderas="sect3"> <title> <function>plend</function>: End plotting session Modified: trunk/doc/docbook/src/plplotdoc.xml.in =================================================================== --- trunk/doc/docbook/src/plplotdoc.xml.in 2014-01-23 14:07:07 UTC (rev 12955) +++ trunk/doc/docbook/src/plplotdoc.xml.in 2014-01-24 05:11:55 UTC (rev 12956) @@ -84,7 +84,7 @@ <!ENTITY plbop '<link linkend="plbop"><function>plbop</function></link>'> <!ENTITY plbox '<link linkend="plbox"><function>plbox</function></link>'> <!ENTITY plbox3 '<link linkend="plbox3"><function> plbox3</function></link>'> -<!ENTITY plbtime '<link linkend="plbox3"><function> plbox3</function></link>'> +<!ENTITY plbtime '<link linkend="plbtime"><function> plbtime</function></link>'> <!ENTITY plcalc_world '<link linkend="plcalc_world"><function> plcalc_world</function></link>'> <!ENTITY plclear '<link linkend="plclear"><function>plclear</function></link>'> <!ENTITY plClearOpts '<link linkend="plClearOpts"><function>plClearOpts</function></link>'> @@ -95,11 +95,11 @@ <!ENTITY plcon1 '<link linkend="plcon1"><function>plcon1</function></link>'> <!ENTITY plcon2 '<link linkend="plcon2"><function>plcon2</function></link>'> <!ENTITY plconf '<link linkend="plconf"><function>plconf</function></link>'> -<!ENTITY plconfigtime '<link linkend="plconfigtime"><function>plconf</function></link>'> +<!ENTITY plconfigtime '<link linkend="plconfigtime"><function>plconfigtime</function></link>'> <!ENTITY plcont '<link linkend="plcont"><function>plcont</function></link>'> <!ENTITY plcontfortran95 '<link linkend="plcontfortran95"><function>plcontfortran95</function></link>'> <!ENTITY plcpstrm '<link linkend="plcpstrm"><function>plcpstrm</function></link>'> -<!ENTITY plctime '<link linkend="plctime"><function>plend</function></link>'> +<!ENTITY plctime '<link linkend="plctime"><function>plctime</function></link>'> <!ENTITY plend '<link linkend="plend"><function>plend</function></link>'> <!ENTITY plend1 '<link linkend="plend1"><function>plend1</function></link>'> <!ENTITY plenv0 '<link linkend="plenv0"><function>plenv0</function></link>'> @@ -234,7 +234,7 @@ <!ENTITY plsym '<link linkend="plsym"><function>plsym</function></link>'> <!ENTITY plszax '<link linkend="plszax"><function>plszax</function></link>'> <!ENTITY pltext '<link linkend="pltext"><function>pltext</function></link>'> -<!ENTITY pltimefmt '<link linkend="pltimefmt"><function>pltr0</function></link>'> +<!ENTITY pltimefmt '<link linkend="pltimefmt"><function>pltimefmt</function></link>'> <!ENTITY pltr0 '<link linkend="pltr0"><function>pltr0</function></link>'> <!ENTITY pltr1 '<link linkend="pltr1"><function>pltr1</function></link>'> <!ENTITY pltr2 '<link linkend="pltr2"><function>pltr2</function></link>'> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2014-01-23 14:07:11
|
Revision: 12955 http://sourceforge.net/p/plplot/code/12955 Author: arjenmarkus Date: 2014-01-23 14:07:07 +0000 (Thu, 23 Jan 2014) Log Message: ----------- (plplotbugs #142) First step to making the pausing more consistent. With this change the demos run via the runAllDemos.tcl program wait after each page, with a message at the bottom of what is expected. The behaviour in the Pltk package is controlled via the -eopcmd/-bopcmd options to the plframe widget. Modified Paths: -------------- trunk/examples/tk/runAllDemos.tcl Modified: trunk/examples/tk/runAllDemos.tcl =================================================================== --- trunk/examples/tk/runAllDemos.tcl 2014-01-22 23:43:10 UTC (rev 12954) +++ trunk/examples/tk/runAllDemos.tcl 2014-01-23 14:07:07 UTC (rev 12955) @@ -37,7 +37,7 @@ "*tclsh*" { # use 'wish" method plstdwin . - plframe .p + plframe .p -eopcmd waitForReturn set plwin .p button .bnextpage -text "Page" -command [list $plwin nextpage] } @@ -48,6 +48,16 @@ } } +bind $plwin <Key-Return> stopWaiting + +proc stopWaiting {} { + set ::waitForReturn 1 +} +proc waitForReturn {} { + .l configure -text "Press <enter> for the next page or complete the program" + vwait ::waitForReturn +} + grid .p -columnspan 5 -sticky news grid rowconfigure . 0 -weight 1 for {set i 0} {$i < 5} {incr i} { @@ -81,7 +91,7 @@ proc run {demo} { global plwin - $plwin configure -eopcmd [list .bnextpage configure -state normal] + $plwin configure -eopcmd waitForReturn .l configure -text "Starting $demo" setButtonState disabled update idletasks @@ -89,6 +99,7 @@ if {[catch {$demo $plwin} err]} { puts stderr $err } + $plwin configure -eopcmd [list .bnextpage configure -state normal] $plwin cmd pleop .l configure -text "$demo complete" setButtonState normal This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-22 23:43:13
|
Revision: 12954 http://sourceforge.net/p/plplot/code/12954 Author: airwin Date: 2014-01-22 23:43:10 +0000 (Wed, 22 Jan 2014) Log Message: ----------- Finish off the official deprecation of plrgb, plrgb1, plhls, and plwid in a consistent way. Modified Paths: -------------- trunk/include/plplot.h Modified: trunk/include/plplot.h =================================================================== --- trunk/include/plplot.h 2014-01-22 23:18:38 UTC (rev 12953) +++ trunk/include/plplot.h 2014-01-22 23:43:10 UTC (rev 12954) @@ -646,7 +646,9 @@ #define plgyax c_plgyax #define plgzax c_plgzax #define plhist c_plhist +#ifdef PL_DEPRECATED #define plhls c_plhls +#endif #define plhlsrgb c_plhlsrgb #define plimage c_plimage #define plimagefr c_plimagefr @@ -680,8 +682,10 @@ #define plptex3 c_plptex3 #define plrandd c_plrandd #define plreplot c_plreplot +#ifdef PL_DEPRECATED #define plrgb c_plrgb #define plrgb1 c_plrgb1 +#endif #define plrgbhls c_plrgbhls #define plschr c_plschr #define plscmap0 c_plscmap0 @@ -755,7 +759,9 @@ #define plvpor c_plvpor #define plvsta c_plvsta #define plw3d c_plw3d +#ifdef PL_DEPRECATED #define plwid c_plwid +#endif #define plwidth c_plwidth #define plwind c_plwind #define plxormod c_plxormod @@ -1978,10 +1984,12 @@ PLFLT xmax0, PLFLT ymin0, PLFLT ymax0, PLFLT zmin0, PLFLT zmax0, PLFLT alt, PLFLT az ); +#ifdef PL_DEPRECATED // Set pen width with deprecated integer width PLDLLIMPEXP void c_plwid( PLINT width ); +#endif // Set pen width. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-22 23:18:40
|
Revision: 12953 http://sourceforge.net/p/plplot/code/12953 Author: airwin Date: 2014-01-22 23:18:38 +0000 (Wed, 22 Jan 2014) Log Message: ----------- Document when plwid was officially deprecated. Modified Paths: -------------- trunk/src/pldeprecated.c Modified: trunk/src/pldeprecated.c =================================================================== --- trunk/src/pldeprecated.c 2014-01-22 23:09:31 UTC (rev 12952) +++ trunk/src/pldeprecated.c 2014-01-22 23:18:38 UTC (rev 12953) @@ -43,6 +43,9 @@ // plrgb1 // plhls +// The following function was formally deprecated in 5.9.10. +// plwid + //-------------------------------------------------------------------------- // plrgb() // This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-22 23:09:35
|
Revision: 12952 http://sourceforge.net/p/plplot/code/12952 Author: airwin Date: 2014-01-22 23:09:31 +0000 (Wed, 22 Jan 2014) Log Message: ----------- Make api.xml more consistent with the plplot.h header. These issues were all discovered by a consistency checker written by H?\199?\142ili?\195?\160ng Wang. Tested by Alan W. Irwin <ai...@us...> using the "make validate" command. ToDo: The checker found ~10 functions in the public API of PLplot that are undocumented in api.xml. At least one of those (plwid) is deprecated so some conditional programming using the PL_DEPRECATED macro should be used to eliminate that function (and any other officially deprecated function) from consideration by the consistency checker. Also, some of those ~10 functions will actually need to be documented in api.xml to provide a clean checker report. Modified Paths: -------------- trunk/doc/docbook/src/api.xml Modified: trunk/doc/docbook/src/api.xml =================================================================== --- trunk/doc/docbook/src/api.xml 2014-01-22 22:55:21 UTC (rev 12951) +++ trunk/doc/docbook/src/api.xml 2014-01-22 23:09:31 UTC (rev 12952) @@ -293,7 +293,7 @@ <funcdef> <function>pladv</function> </funcdef> - <paramdef><parameter>sub</parameter></paramdef> + <paramdef><parameter>page</parameter></paramdef> </funcprototype> </funcsynopsis> </para> @@ -304,12 +304,12 @@ advance if there are no remaining subpages on the current page. If subpages aren't being used, <literal>&pladv;(0)</literal> will always advance the page. If - <literal><parameter>sub</parameter>>0</literal>, PLplot switches + <literal><parameter>page</parameter>>0</literal>, 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 - <literal><parameter>sub</parameter>=0</literal>) by &plenv;, but if + <literal><parameter>page</parameter>=0</literal>) by &plenv;, but if &plenv; is not used, &pladv; must be called after initializing PLplot but before defining the viewport. </para> @@ -317,21 +317,22 @@ <variablelist> <varlistentry> <term> - <parameter>sub</parameter> + <parameter>page</parameter> (<literal>PLINT</literal>, input) </term> <listitem> <para> 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. + to zero to advance to the next subpage (or to the next page + if subpages are not being used). </para> </listitem> </varlistentry> </variablelist> <para> - Redacted form: <function>pladv(sub)</function> + Redacted form: <function>pladv(page)</function> </para> <para> @@ -1760,19 +1761,19 @@ <funcdef> <function>plcol0</function> </funcdef> - <paramdef><parameter>color</parameter></paramdef> + <paramdef><parameter>icol0</parameter></paramdef> </funcprototype> </funcsynopsis> </para> <para> - Sets the color for color map0 (see <xref linkend="color-map-0"/>). + Sets the color index for color map0 (see <xref linkend="color-map-0"/>). </para> <variablelist> <varlistentry> <term> - <parameter>color</parameter> + <parameter>icol0</parameter> (<literal>PLINT</literal>, input) </term> <listitem> @@ -1806,7 +1807,7 @@ </variablelist> <para> - Redacted form: <function>plcol0(color)</function> + Redacted form: <function>plcol0(icol0)</function> </para> <para> @@ -2327,7 +2328,7 @@ <funcdef> <function>plcont</function> </funcdef> - <paramdef><parameter>z</parameter></paramdef> + <paramdef><parameter>f</parameter></paramdef> <paramdef><parameter>nx</parameter></paramdef> <paramdef><parameter>ny</parameter></paramdef> <paramdef><parameter>kx</parameter></paramdef> @@ -2344,7 +2345,7 @@ <para> Draws a contour plot of the data in - <literal><parameter>z</parameter>[<parameter>nx</parameter>][<parameter>ny</parameter>]</literal>, + <literal><parameter>f</parameter>[<parameter>nx</parameter>][<parameter>ny</parameter>]</literal>, using the <literal><parameter>nlevel</parameter></literal> contour levels specified by <literal><parameter>clevel</parameter></literal>. Only the region of the array from @@ -2364,7 +2365,7 @@ <variablelist> <varlistentry> <term> - <parameter>z</parameter> + <parameter>f</parameter> (<literal>PLFLT **</literal>, input) </term> <listitem> @@ -2382,7 +2383,7 @@ <listitem> <para> Physical dimensions of array - <literal><parameter>z</parameter></literal>. + <literal><parameter>f</parameter></literal>. </para> </listitem> </varlistentry> @@ -2439,7 +2440,7 @@ <listitem> <para> Pointer to function that defines transformation between indices - in array <literal><parameter>z</parameter></literal> and the + in array <literal><parameter>f</parameter></literal> and the world coordinates (C only). Transformation functions are provided in the PLplot library: &pltr0; for identity mapping, and &pltr1; and &pltr2; for @@ -2479,23 +2480,23 @@ <itemizedlist> <listitem> <para> - F95: <function>plcont(z, kx, lx, ky, ly, clevel, tr?)</function> or - <function>plcont(z, kx, lx, ky, ly, clevel, xgrid, ygrid)</function> + F95: <function>plcont(f, kx, lx, ky, ly, clevel, tr?)</function> or + <function>plcont(f, kx, lx, ky, ly, clevel, xgrid, ygrid)</function> </para> </listitem> <listitem> <para> - Java: <function>pls.cont(z, kx, lx, ky, ly, clevel, xgrid, ygrid)</function> + Java: <function>pls.cont(f, kx, lx, ky, ly, clevel, xgrid, ygrid)</function> </para> </listitem> <listitem> <para> - Perl/PDL: <function>plcont(z, kx, lx, ky, ly, clevel, pltr, pltr_data)</function> + Perl/PDL: <function>plcont(f, kx, lx, ky, ly, clevel, pltr, pltr_data)</function> </para> </listitem> <listitem> <para> - Python: <function>plcont2(z, kx, lx, ky, ly, clevel)</function> + Python: <function>plcont2(f, kx, lx, ky, ly, clevel)</function> </para> </listitem> </itemizedlist> @@ -3862,7 +3863,7 @@ <funcdef> <function>plfont</function> </funcdef> - <paramdef><parameter>font</parameter></paramdef> + <paramdef><parameter>ifont</parameter></paramdef> </funcprototype> </funcsynopsis> </para> @@ -3876,7 +3877,7 @@ <variablelist> <varlistentry> <term> - <parameter>font</parameter> + <parameter>ifont</parameter> (<literal>PLINT</literal>, input) </term> <listitem> @@ -3910,7 +3911,7 @@ </variablelist> <para> - Redacted form: <function>plfont(font)</function> + Redacted form: <function>plfont(ifont)</function> </para> <para> @@ -3930,7 +3931,7 @@ <funcdef> <function>plfontld</function> </funcdef> - <paramdef><parameter>set</parameter></paramdef> + <paramdef><parameter>fnt</parameter></paramdef> </funcprototype> </funcsynopsis> </para> @@ -3943,7 +3944,7 @@ <variablelist> <varlistentry> <term> - <parameter>set</parameter> + <parameter>fnt</parameter> (<literal>PLINT</literal>, input) </term> <listitem> @@ -3967,7 +3968,7 @@ </variablelist> <para> - Redacted form: <function>plfontld(set)</function> + Redacted form: <function>plfontld(fnt)</function> </para> <para> @@ -4693,9 +4694,9 @@ <funcdef> <function>plgfam</function> </funcdef> - <paramdef><parameter>fam</parameter></paramdef> - <paramdef><parameter>num</parameter></paramdef> - <paramdef><parameter>bmax</parameter></paramdef> + <paramdef><parameter>p_fam</parameter></paramdef> + <paramdef><parameter>p_num</parameter></paramdef> + <paramdef><parameter>p_bmax</parameter></paramdef> </funcprototype> </funcsynopsis> </para> @@ -4708,7 +4709,7 @@ <variablelist> <varlistentry> <term> - <parameter>fam</parameter> + <parameter>p_fam</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -4720,7 +4721,7 @@ </varlistentry> <varlistentry> <term> - <parameter>num</parameter> + <parameter>p_num</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -4731,7 +4732,7 @@ </varlistentry> <varlistentry> <term> - <parameter>bmax</parameter> + <parameter>p_bmax</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -4744,7 +4745,7 @@ </variablelist> <para> - Redacted form: <function>plgfam(fam, num, bmax)</function> + Redacted form: <function>plgfam(p_fam, p_num, p_bmax)</function> </para> <para> @@ -4765,7 +4766,7 @@ <funcdef> <function>plgfci</function> </funcdef> - <paramdef><parameter>fci</parameter></paramdef> + <paramdef><parameter>p_fci</parameter></paramdef> </funcprototype> </funcsynopsis> </para> @@ -4778,7 +4779,7 @@ <variablelist> <varlistentry> <term> - <parameter>fci</parameter> + <parameter>p_fci</parameter> (<literal>PLUNICODE *</literal>, output) </term> <listitem> @@ -4791,7 +4792,7 @@ </variablelist> <para> - Redacted form: <function>plgfci(fci)</function> + Redacted form: <function>plgfci(p_fci)</function> </para> <para> @@ -5004,12 +5005,12 @@ <funcdef> <function>plgpage</function> </funcdef> - <paramdef><parameter>xp</parameter></paramdef> - <paramdef><parameter>yp</parameter></paramdef> - <paramdef><parameter>xleng</parameter></paramdef> - <paramdef><parameter>yleng</parameter></paramdef> - <paramdef><parameter>xoff</parameter></paramdef> - <paramdef><parameter>yoff</parameter></paramdef> + <paramdef><parameter>p_xp</parameter></paramdef> + <paramdef><parameter>p_yp</parameter></paramdef> + <paramdef><parameter>p_xleng</parameter></paramdef> + <paramdef><parameter>p_yleng</parameter></paramdef> + <paramdef><parameter>p_xoff</parameter></paramdef> + <paramdef><parameter>p_yoff</parameter></paramdef> </funcprototype> </funcsynopsis> </para> @@ -5024,7 +5025,7 @@ <variablelist> <varlistentry> <term> - <parameter>xp</parameter> + <parameter>p_xp</parameter> (<literal>PLFLT *</literal>, output) </term> <listitem> @@ -5035,7 +5036,7 @@ </varlistentry> <varlistentry> <term> - <parameter>yp</parameter> + <parameter>p_yp</parameter> (<literal>PLFLT *</literal>, output) </term> <listitem> @@ -5046,7 +5047,7 @@ </varlistentry> <varlistentry> <term> - <parameter>xleng</parameter> + <parameter>p_xleng</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -5057,7 +5058,7 @@ </varlistentry> <varlistentry> <term> - <parameter>yleng</parameter> + <parameter>p_yleng</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -5068,7 +5069,7 @@ </varlistentry> <varlistentry> <term> - <parameter>xoff</parameter> + <parameter>p_xoff</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -5079,7 +5080,7 @@ </varlistentry> <varlistentry> <term> - <parameter>yoff</parameter> + <parameter>p_yoff</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -5091,7 +5092,7 @@ </variablelist> <para> - Redacted form: <function>plgpage(xp, yp, xleng, yleng, xoff, yoff)</function> + Redacted form: <function>plgpage(p_xp, p_yp, p_xleng, p_yleng, p_xoff, p_yoff)</function> </para> <para> @@ -5603,7 +5604,7 @@ <funcdef> <function>plgstrm</function> </funcdef> - <paramdef><parameter>strm</parameter></paramdef> + <paramdef><parameter>p_strm</parameter></paramdef> </funcprototype> </funcsynopsis> </para> @@ -5615,7 +5616,7 @@ <variablelist> <varlistentry> <term> - <parameter>strm</parameter> + <parameter>p_strm</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -5626,9 +5627,8 @@ </varlistentry> </variablelist> - <para> - Redacted form: <function>plgstrm(strm)</function> + Redacted form: <function>plgstrm(p_strm)</function> </para> <para> @@ -5878,17 +5878,17 @@ <funcdef> <function>plgxax</function> </funcdef> - <paramdef><parameter>digmax</parameter></paramdef> - <paramdef><parameter>digits</parameter></paramdef> + <paramdef><parameter>p_digmax</parameter></paramdef> + <paramdef><parameter>p_digits</parameter></paramdef> </funcprototype> </funcsynopsis> </para> <para> Returns current values of the - <literal><parameter>digmax</parameter></literal> and - <literal><parameter>digits</parameter></literal> flags for the x - axis. <literal><parameter>digits</parameter></literal> is updated + <literal><parameter>p_digmax</parameter></literal> and + <literal><parameter>p_digits</parameter></literal> flags for the x + axis. <literal><parameter>p_digits</parameter></literal> is updated after the plot is drawn, so this routine should only be called <emphasis>after</emphasis> the call to &plbox; (or &plbox3;) is complete. See <xref linkend="annotation"/> for more information. @@ -5897,7 +5897,7 @@ <variablelist> <varlistentry> <term> - <parameter>digmax</parameter> + <parameter>p_digmax</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -5905,13 +5905,13 @@ 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 - <literal><parameter>digmax</parameter></literal>. + <literal><parameter>p_digmax</parameter></literal>. </para> </listitem> </varlistentry> <varlistentry> <term> - <parameter>digits</parameter> + <parameter>p_digits</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -5924,7 +5924,7 @@ </variablelist> <para> - Redacted form: <function>plgxax(digmax, digits)</function> + Redacted form: <function>plgxax(p_digmax, p_digits)</function> </para> <para> @@ -5944,8 +5944,8 @@ <funcdef> <function>plgyax</function> </funcdef> - <paramdef><parameter>digmax</parameter></paramdef> - <paramdef><parameter>digits</parameter></paramdef> + <paramdef><parameter>p_digmax</parameter></paramdef> + <paramdef><parameter>p_digits</parameter></paramdef> </funcprototype> </funcsynopsis> </para> @@ -5958,7 +5958,7 @@ <variablelist> <varlistentry> <term> - <parameter>digmax</parameter> + <parameter>p_digmax</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -5966,13 +5966,13 @@ 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 - <literal><parameter>digmax</parameter></literal>. + <literal><parameter>p_digmax</parameter></literal>. </para> </listitem> </varlistentry> <varlistentry> <term> - <parameter>digits</parameter> + <parameter>p_digits</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -5985,7 +5985,7 @@ </variablelist> <para> - Redacted form: <function>plgyax(digmax, digits)</function> + Redacted form: <function>plgyax(p_digmax, p_digits)</function> </para> <para> @@ -6005,8 +6005,8 @@ <funcdef> <function>plgzax</function> </funcdef> - <paramdef><parameter>digmax</parameter></paramdef> - <paramdef><parameter>digits</parameter></paramdef> + <paramdef><parameter>p_digmax</parameter></paramdef> + <paramdef><parameter>p_digits</parameter></paramdef> </funcprototype> </funcsynopsis> </para> @@ -6019,7 +6019,7 @@ <variablelist> <varlistentry> <term> - <parameter>digmax</parameter> + <parameter>p_digmax</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -6027,13 +6027,13 @@ 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 - <literal><parameter>digmax</parameter></literal>. + <literal><parameter>p_digmax</parameter></literal>. </para> </listitem> </varlistentry> <varlistentry> <term> - <parameter>digits</parameter> + <parameter>p_digits</parameter> (<literal>PLINT *</literal>, output) </term> <listitem> @@ -6046,7 +6046,7 @@ </variablelist> <para> - Redacted form: <function>plgzax(digmax, digits)</function> + Redacted form: <function>plgzax(p_digmax, p_digits)</function> </para> <para> @@ -7589,7 +7589,7 @@ <funcdef> <function>pllsty</function> </funcdef> - <paramdef><parameter>n</parameter></paramdef> + <paramdef><parameter>lin</parameter></paramdef> </funcprototype> </funcsynopsis> </para> @@ -7602,7 +7602,7 @@ <variablelist> <varlistentry> <term> - <parameter>n</parameter> + <parameter>lin</parameter> (<literal>PLINT</literal>, input) </term> <listitem> @@ -7617,7 +7617,7 @@ </variablelist> <para> - Redacted form: <function>pllsty(n)</function> + Redacted form: <function>pllsty(lin)</function> </para> <para> @@ -8097,13 +8097,12 @@ </para> <para> - Identical to <function>plmesh</function> but with extra functionalities: + A more powerful form of <function>&plmesh;</function>: 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. </para> - <variablelist> <varlistentry> <term> @@ -8828,15 +8827,160 @@ </para> <para> - Identical to <function>plot3d</function> but with extra functionalities: + Aside from dropping the <parameter>side</parameter> + functionality this is a more powerful form of <function>&plot3d;</function>: 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 <function>plmeshc</function>. The only difference between + The arguments are identical to those of <function>&plmeshc;</function>. 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. </para> + <variablelist> + <varlistentry> + <term> + <parameter>x</parameter> + (<literal>PLFLT *</literal>, input) + </term> + <listitem> + <para> + Pointer to set of x coordinate values at which the function is + evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>y</parameter> + (<literal>PLFLT *</literal>, input) + </term> + <listitem> + <para> + Pointer to set of y coordinate values at which the function is + evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>z</parameter> + (<literal>PLFLT **</literal>, input) + </term> + <listitem> + <para> + Pointer to a vectored two-dimensional array with set of + function values. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>nx</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Number of <literal><parameter>x</parameter></literal> values at + which function is evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>ny</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Number of <literal><parameter>y</parameter></literal> values at + which function is evaluated. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>opt</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + 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 + <itemizedlist> + <listitem> + <para> + <literal><parameter>opt</parameter>=DRAW_LINEX</literal>: Lines + are drawn showing + <literal><parameter>z</parameter></literal> as a function + of <literal><parameter>x</parameter></literal> for each + value of <literal><parameter>y</parameter>[j]</literal>. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=DRAW_LINEY</literal>: Lines + are drawn showing + <literal><parameter>z</parameter></literal> as a function + of <literal><parameter>y</parameter></literal> for each + value of <literal><parameter>x</parameter>[i]</literal>. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=DRAW_LINEXY</literal>: Network + of lines is drawn connecting points at which function is + defined. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=MAG_COLOR</literal>: Each line + in the mesh is colored according to the z value being plotted. The + color is used from the current color map 1. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=BASE_CONT</literal>: A contour + plot is drawn at the base XY plane using parameters + <parameter>nlevel</parameter> and <parameter>clevel</parameter>. + </para> + </listitem> + <listitem> + <para> + <literal><parameter>opt</parameter>=DRAW_SIDES</literal>: draws a curtain + between the base XY plane and the borders of the plotted function. + </para> + </listitem> + </itemizedlist> + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>clevel</parameter> + (<literal>PLFLT *</literal>, input) + </term> + <listitem> + <para> + Pointer to the array that defines the contour level spacing. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <parameter>nlevel</parameter> + (<literal>PLINT</literal>, input) + </term> + <listitem> + <para> + Number of elements in the <literal>clevel</literal> array. + </para> + </listitem> + </varlistentry> + </variablelist> + <para> Redacted form: <itemizedlist> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-22 22:55:25
|
Revision: 12951 http://sourceforge.net/p/plplot/code/12951 Author: airwin Date: 2014-01-22 22:55:21 +0000 (Wed, 22 Jan 2014) Log Message: ----------- Change name of argument label ==> labels in the plcolorbar function prototype to make it consistent with the name used and documented in the plcolorbar function definition. Change the name of the plgfci argument from pfci ==> p_fci to make it consistent with the names of pointer arguments for other PLplot routines. Modified Paths: -------------- trunk/include/plplot.h trunk/src/plcore.c Modified: trunk/include/plplot.h =================================================================== --- trunk/include/plplot.h 2014-01-22 20:22:02 UTC (rev 12950) +++ trunk/include/plplot.h 2014-01-22 22:55:21 UTC (rev 12951) @@ -1056,7 +1056,7 @@ // Get FCI (font characterization integer) PLDLLIMPEXP void -c_plgfci( PLUNICODE *pfci ); +c_plgfci( PLUNICODE *p_fci ); // Get family file parameters @@ -1259,7 +1259,7 @@ PLINT bg_color, PLINT bb_color, PLINT bb_style, PLFLT low_cap_color, PLFLT high_cap_color, PLINT cont_color, PLFLT cont_width, - PLINT n_labels, const PLINT *label_opts, const char * const *label, + PLINT n_labels, const PLINT *label_opts, const char * const *labels, PLINT n_axes, const char * const * axis_opts, const PLFLT *ticks, const PLINT *sub_ticks, const PLINT *n_values, const PLFLT * const *values ); Modified: trunk/src/plcore.c =================================================================== --- trunk/src/plcore.c 2014-01-22 20:22:02 UTC (rev 12950) +++ trunk/src/plcore.c 2014-01-22 22:55:21 UTC (rev 12951) @@ -3786,10 +3786,10 @@ // drivers. // void -c_plgfci( PLUNICODE *pfci ) +c_plgfci( PLUNICODE *p_fci ) { // Always mark FCI as such. - *pfci = plsc->fci | PL_FCI_MARK; + *p_fci = plsc->fci | PL_FCI_MARK; } // Store hex digit value shifted to the left by hexdigit hexadecimal digits // into pre-existing FCI. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-22 20:22:06
|
Revision: 12950 http://sourceforge.net/p/plplot/code/12950 Author: airwin Date: 2014-01-22 20:22:02 +0000 (Wed, 22 Jan 2014) Log Message: ----------- Change plbox3 argument names to be consistent with plbox argument names; nsubx ==> nxsub nsuby ==> nysub nsubz ==> nzsub Modified Paths: -------------- trunk/include/plplot.h trunk/src/plbox.c Modified: trunk/include/plplot.h =================================================================== --- trunk/include/plplot.h 2014-01-22 19:15:08 UTC (rev 12949) +++ trunk/include/plplot.h 2014-01-22 20:22:02 UTC (rev 12950) @@ -856,9 +856,9 @@ // This is the 3-d analogue of plbox(). PLDLLIMPEXP 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 ); +c_plbox3( const char *xopt, const char *xlabel, PLFLT xtick, PLINT nxsub, + const char *yopt, const char *ylabel, PLFLT ytick, PLINT nysub, + const char *zopt, const char *zlabel, PLFLT ztick, PLINT nzsub ); // Calculate world coordinates and subpage from relative device coordinates. Modified: trunk/src/plbox.c =================================================================== --- trunk/src/plbox.c 2014-01-22 19:15:08 UTC (rev 12949) +++ trunk/src/plbox.c 2014-01-22 20:22:02 UTC (rev 12950) @@ -593,9 +593,9 @@ //-------------------------------------------------------------------------- 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 ) +c_plbox3( const char *xopt, const char *xlabel, PLFLT xtick, PLINT nxsub, + const char *yopt, const char *ylabel, PLFLT ytick, PLINT nysub, + const char *zopt, const char *zlabel, PLFLT ztick, PLINT nzsub ) { PLFLT dx, dy, tx, ty, ux, uy; PLFLT xmin, xmax, ymin, ymax, zmin, zmax, zscale; @@ -646,26 +646,26 @@ ux = plP_w3wcx( xmax, ymin, zmin ); uy = plP_w3wcy( xmax, ymin, zmin ); plxybx( xopt, xlabel, PL_X_AXIS, tx, ty, ux, uy, - xmin, xmax, xtick, nsubx, 0, &xdigits ); + xmin, xmax, xtick, nxsub, 0, &xdigits ); dx = ux - tx; dy = uy - ty; plzbx( zopt, zlabel, 1, dx, dy, ux, uy, - plP_w3wcy( xmax, ymin, zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmax, ymin, zmax ), zmin, zmax, ztick, nzsub, &zdigits ); tx = plP_w3wcx( xmin, ymax, zmin ); ty = plP_w3wcy( xmin, ymax, zmin ); ux = plP_w3wcx( xmin, ymin, zmin ); uy = plP_w3wcy( xmin, ymin, zmin ); plxybx( yopt, ylabel, PL_Y_AXIS, tx, ty, ux, uy, - ymax, ymin, ytick, nsuby, ln, &ydigits ); + ymax, ymin, ytick, nysub, ln, &ydigits ); dx = ux - tx; dy = uy - ty; // restore zdigits to initial value for second call zdigits = zdigmax; plzbx( zopt, zlabel, 0, dx, dy, tx, ty, - plP_w3wcy( xmin, ymax, zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmin, ymax, zmax ), zmin, zmax, ztick, nzsub, &zdigits ); } else if ( cxx <= 0.0 && cxy <= 0.0 ) { @@ -675,26 +675,26 @@ ux = plP_w3wcx( xmin, ymin, zmin ); uy = plP_w3wcy( xmin, ymin, zmin ); plxybx( yopt, ylabel, PL_Y_AXIS, tx, ty, ux, uy, - ymax, ymin, ytick, nsuby, 0, &ydigits ); + ymax, ymin, ytick, nysub, 0, &ydigits ); dx = ux - tx; dy = uy - ty; plzbx( zopt, zlabel, 1, dx, dy, ux, uy, - plP_w3wcy( xmin, ymin, zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmin, ymin, zmax ), zmin, zmax, ztick, nzsub, &zdigits ); tx = plP_w3wcx( xmax, ymax, zmin ); ty = plP_w3wcy( xmax, ymax, zmin ); ux = plP_w3wcx( xmin, ymax, zmin ); uy = plP_w3wcy( xmin, ymax, zmin ); plxybx( xopt, xlabel, PL_X_AXIS, tx, ty, ux, uy, - xmax, xmin, xtick, nsubx, ln, &xdigits ); + xmax, xmin, xtick, nxsub, ln, &xdigits ); dx = ux - tx; dy = uy - ty; // restore zdigits to initial value for second call zdigits = zdigmax; plzbx( zopt, zlabel, 0, dx, dy, tx, ty, - plP_w3wcy( xmax, ymax, zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmax, ymax, zmax ), zmin, zmax, ztick, nzsub, &zdigits ); } else if ( cxx <= 0.0 && cxy >= 0.0 ) { @@ -704,26 +704,26 @@ ux = plP_w3wcx( xmin, ymax, zmin ); uy = plP_w3wcy( xmin, ymax, zmin ); plxybx( xopt, xlabel, PL_X_AXIS, tx, ty, ux, uy, - xmax, xmin, xtick, nsubx, 0, &xdigits ); + xmax, xmin, xtick, nxsub, 0, &xdigits ); dx = ux - tx; dy = uy - ty; plzbx( zopt, zlabel, 1, dx, dy, ux, uy, - plP_w3wcy( xmin, ymax, zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmin, ymax, zmax ), zmin, zmax, ztick, nzsub, &zdigits ); tx = plP_w3wcx( xmax, ymin, zmin ); ty = plP_w3wcy( xmax, ymin, zmin ); ux = plP_w3wcx( xmax, ymax, zmin ); uy = plP_w3wcy( xmax, ymax, zmin ); plxybx( yopt, ylabel, PL_Y_AXIS, tx, ty, ux, uy, - ymin, ymax, ytick, nsuby, ln, &ydigits ); + ymin, ymax, ytick, nysub, ln, &ydigits ); dx = ux - tx; dy = uy - ty; // restore zdigits to initial value for second call zdigits = zdigmax; plzbx( zopt, zlabel, 0, dx, dy, tx, ty, - plP_w3wcy( xmax, ymin, zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmax, ymin, zmax ), zmin, zmax, ztick, nzsub, &zdigits ); } else if ( cxx >= 0.0 && cxy >= 0.0 ) { @@ -733,26 +733,26 @@ ux = plP_w3wcx( xmax, ymax, zmin ); uy = plP_w3wcy( xmax, ymax, zmin ); plxybx( yopt, ylabel, PL_X_AXIS, tx, ty, ux, uy, - ymin, ymax, ytick, nsuby, 0, &ydigits ); + ymin, ymax, ytick, nysub, 0, &ydigits ); dx = ux - tx; dy = uy - ty; plzbx( zopt, zlabel, 1, dx, dy, ux, uy, - plP_w3wcy( xmax, ymax, zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmax, ymax, zmax ), zmin, zmax, ztick, nzsub, &zdigits ); tx = plP_w3wcx( xmin, ymin, zmin ); ty = plP_w3wcy( xmin, ymin, zmin ); ux = plP_w3wcx( xmax, ymin, zmin ); uy = plP_w3wcy( xmax, ymin, zmin ); plxybx( xopt, xlabel, PL_X_AXIS, tx, ty, ux, uy, - xmin, xmax, xtick, nsubx, ln, &xdigits ); + xmin, xmax, xtick, nxsub, ln, &xdigits ); dx = ux - tx; dy = uy - ty; // restore zdigits to initial value for second call zdigits = zdigmax; plzbx( zopt, zlabel, 0, dx, dy, tx, ty, - plP_w3wcy( xmin, ymin, zmax ), zmin, zmax, ztick, nsubz, &zdigits ); + plP_w3wcy( xmin, ymin, zmax ), zmin, zmax, ztick, nzsub, &zdigits ); } plsxax( xdigmax, xdigits ); plsyax( ydigmax, ydigits ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-22 19:15:13
|
Revision: 12949 http://sourceforge.net/p/plplot/code/12949 Author: airwin Date: 2014-01-22 19:15:08 +0000 (Wed, 22 Jan 2014) Log Message: ----------- Correct misspelling of function name, plggriddata ==> plgriddata. (Thanks to H?\199?\142ili?\195?\160ng Wang for finding this). Modified Paths: -------------- trunk/doc/docbook/src/api.xml Modified: trunk/doc/docbook/src/api.xml =================================================================== --- trunk/doc/docbook/src/api.xml 2014-01-22 09:06:22 UTC (rev 12948) +++ trunk/doc/docbook/src/api.xml 2014-01-22 19:15:08 UTC (rev 12949) @@ -5245,7 +5245,7 @@ <funcsynopsis> <funcprototype> <funcdef> - <function>plggriddata</function> + <function>plgriddata</function> </funcdef> <paramdef><parameter>x</parameter></paramdef> <paramdef><parameter>y</parameter></paramdef> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-22 09:06:25
|
Revision: 12948 http://sourceforge.net/p/plplot/code/12948 Author: airwin Date: 2014-01-22 09:06:22 +0000 (Wed, 22 Jan 2014) Log Message: ----------- Sort out some PATH issues for the "MinGW Makefiles" or "MSYS Makefiles" case. Modified Paths: -------------- trunk/scripts/comprehensive_test.sh Modified: trunk/scripts/comprehensive_test.sh =================================================================== --- trunk/scripts/comprehensive_test.sh 2014-01-22 09:03:05 UTC (rev 12947) +++ trunk/scripts/comprehensive_test.sh 2014-01-22 09:06:22 UTC (rev 12948) @@ -40,8 +40,9 @@ MINGW_OR_MSYS="false" fi - if [ "$CMAKE_BUILD_TYPE_OPTION" = "-DBUILD_SHARED_LIBS=ON" -a "$MINGW_OR_MSYS" = "true" ] ; then - PATH=$PATH_SAVE:$BUILD_TREE/dll + if [ "$CMAKE_BUILD_TYPE_OPTION" != "-DBUILD_SHARED_LIBS=OFF" -a "$MINGW_OR_MSYS" = "true" ] ; then + echo "Prepend $BUILD_TREE/dll to the original PATH" + PATH=$BUILD_TREE/dll:$PATH fi mkdir -p "$OUTPUT_TREE" rm -rf "$BUILD_TREE" @@ -58,12 +59,6 @@ # line below. set -- $cmake_added_options echo "cmake in the build tree" - PATH_AFTER_CMAKE=$PATH - if [ "$generator_string" = "MinGW Makefiles" ] ; then - # For this case must use PATH specified by the user - # that excludes MSYS. - PATH=$path_excluding_msys - fi cmake "-DCMAKE_INSTALL_PREFIX=$INSTALL_TREE" $BUILD_TEST_OPTION \ $* $CMAKE_BUILD_TYPE_OPTION -G "$generator_string" \ "$SOURCE_TREE" >& "$output" @@ -73,7 +68,6 @@ exit 1 fi - PATH=$PATH_AFTER_CMAKE if [ "$do_ctest" = "yes" ] ; then output="$OUTPUT_TREE"/make.out rm -f "$output" @@ -148,13 +142,15 @@ if [ "$do_test_install_tree" = "yes" -o \ "$do_test_traditional_install_tree" = "yes" ] ; then + echo "Prepend $INSTALL_TREE/bin to the original PATH" PATH="$INSTALL_TREE/bin":$PATH_SAVE - if [ "$MINGW_OR_MSYS" = "true" ] ; then + if [ "$CMAKE_BUILD_TYPE_OPTION" = "-DBUILD_SHARED_LIBS=ON" -a "$MINGW_OR_MSYS" = "true" ] ; then # Use this logic to be as version-independent as possible. current_dir=$(pwd) # Wild cards must not be inside quotes. cd "$INSTALL_TREE"/lib/plplot[0-9].[0-9]*.[0-9]*/drivers* + echo "Prepend $(pwd) to the current PATH" PATH="$(pwd):$PATH" cd $current_dir fi @@ -166,14 +162,7 @@ output="$OUTPUT_TREE"/installed_cmake.out rm -f "$output" echo "cmake in the installed examples build tree" - PATH_AFTER_CMAKE=$PATH - if [ "$generator_string" = "MinGW Makefiles" ] ; then - # For this case must use PATH specified by the user - # that excludes MSYS. - PATH=$path_excluding_msys - fi cmake -G "$generator_string" "$INSTALL_TREE"/share/plplot[0-9].[0-9]*.[0-9]*/examples >& "$output" - PATH=$PATH_AFTER_CMAKE if [ "$do_test_noninteractive" = "yes" ] ; then output="$OUTPUT_TREE"/installed_make_noninteractive.out rm -f "$output" @@ -223,6 +212,7 @@ fi fi + echo "Restore PATH to the original PATH" PATH=$PATH_SAVE if [ "$do_test_interactive" = "yes" ] ; then if [ "$do_test_build_tree" = "yes" ] ; then @@ -248,6 +238,7 @@ exit 1 fi fi + echo "Prepend $INSTALL_TREE/bin to the original PATH" PATH="$INSTALL_TREE/bin":$PATH_SAVE if [ "$do_test_install_tree" = "yes" ] ; then cd "$INSTALL_BUILD_TREE" @@ -296,6 +287,8 @@ fi fi fi + echo "Restore PATH to the the original PATH" + PATH=$PATH_SAVE } usage () { @@ -316,10 +309,6 @@ The next four control how the builds and tests are done. [--generator_string (defaults to 'Unix Makefiles')] - [--path_excluding_msys (MUST be specified whenever the generator string is - 'MinGW Makefiles' where it is necessary to limit - the PATH for the cmake invocation to exclude MSYS. - Otherwise this option is completely ignored)] [--ctest_command (defaults to 'ctest -j8')] [--build_command (defaults to 'make -j8')] @@ -369,7 +358,6 @@ do_clean_as_you_go=yes generator_string="Unix Makefiles" -path_excluding_msys= ctest_command="ctest -j8" build_command="make -j8" @@ -410,10 +398,6 @@ generator_string=$2 shift ;; - --path_excluding_msys) - path_excluding_msys=$2 - shift - ;; --ctest_command) ctest_command=$2 shift @@ -546,12 +530,6 @@ exit 1 fi -if [ "$generator_string" = "MinGW Makefiles" -a -z "$path_excluding_msys" ] ; then - echo "ERROR: empty value of path_excluding_msys when generator is" - echo "'MinGW Makefiles'" - usage 1 1>&2 -fi - echo "Summary of options used for these tests prefix=$prefix @@ -559,9 +537,6 @@ do_clean_as_you_go=$do_clean_as_you_go generator_string=$generator_string" -if [ "$generator_string"="MinGW Makefiles" ] ; then - echo "path_excluding_msys=$path_excluding_msys" -fi echo " ctest_command=$ctest_command build_command=$build_command This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-22 09:03:09
|
Revision: 12947 http://sourceforge.net/p/plplot/code/12947 Author: airwin Date: 2014-01-22 09:03:05 +0000 (Wed, 22 Jan 2014) Log Message: ----------- For the MinGW case, install the *.o files that are created by the plplotada library build. This installation is not required on Linux, and even for the MinGW case gnatmake does not require these *.o files to be installed in order to build the installed Ada examples, but when those built examples are run, they immediately fail with a return code of 3 unless these *.o files are installed. Therefore, I am pretty sure this is a workaround for a MinGW gnatmake issue. Modified Paths: -------------- trunk/bindings/ada/CMakeLists.txt Modified: trunk/bindings/ada/CMakeLists.txt =================================================================== --- trunk/bindings/ada/CMakeLists.txt 2014-01-21 09:10:25 UTC (rev 12946) +++ trunk/bindings/ada/CMakeLists.txt 2014-01-22 09:03:05 UTC (rev 12947) @@ -47,6 +47,22 @@ ${ALI_PREFIX}/plplot_auxiliary.ali ) + # I am pretty sure this is a workaround for a MinGW gnatmake bug + # since the installation of these files is not needed for Linux. + # However, without this workaround the standard examples build on + # MinGW/MSYS platforms without problems (so gnatmake is happy if the + # *.o files are not installed which is another indication we are + # dealing with a bug here), but at run-time the ada examples + # immediately return with a return code of 3. + if(MINGW) + list(APPEND ALI_LIST + ${ALI_PREFIX}/plplot.o + ${ALI_PREFIX}/plplot_thin.o + ${ALI_PREFIX}/plplot_traditional.o + ${ALI_PREFIX}/plplot_auxiliary.o + ) + endif(MINGW) + set(plplotada${LIB_TAG}_LIB_SRCS) foreach(SOURCE_FILE ${SOURCE_LIST}) list(APPEND plplotada${LIB_TAG}_LIB_SRCS @@ -107,7 +123,7 @@ ) # Permissions of *.ali files in accordance with - # http://www.ada-france.org/debian/debian-ada-policy.html + # http://people.debian.org/~lbrenta/debian-ada-policy.html install(FILES ${ALI_LIST} DESTINATION ${ADA_LIB_DIR} PERMISSIONS OWNER_READ GROUP_READ WORLD_READ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-21 09:10:27
|
Revision: 12946 http://sourceforge.net/p/plplot/code/12946 Author: airwin Date: 2014-01-21 09:10:25 +0000 (Tue, 21 Jan 2014) Log Message: ----------- Make this script much more robust against errors. Make the information messages from this more informative. Modified Paths: -------------- trunk/scripts/comprehensive_test.sh Modified: trunk/scripts/comprehensive_test.sh =================================================================== --- trunk/scripts/comprehensive_test.sh 2014-01-21 09:08:28 UTC (rev 12945) +++ trunk/scripts/comprehensive_test.sh 2014-01-21 09:10:25 UTC (rev 12946) @@ -77,7 +77,7 @@ if [ "$do_ctest" = "yes" ] ; then output="$OUTPUT_TREE"/make.out rm -f "$output" - echo "$build_command in the build tree" + echo "$build_command VERBOSE=1 in the build tree" $build_command VERBOSE=1 >& "$output" make_rc=$? if [ "$make_rc" -eq 0 ] ; then @@ -85,11 +85,22 @@ rm -f "$output" echo "$ctest_command in the build tree" $ctest_command --extra-verbose >& "$output" - if [ "$do_clean_as_you_go" = "yes" ] ; then - output="$OUTPUT_TREE"/clean_ctest_plot_files.out - rm -f "$output" - echo "$build_command clean_ctest_plot_files in the build tree (since we are done with ctest)" - $build_command clean_ctest_plot_files >& "$output" + ctest_rc=$? + if [ "$ctest_rc" -eq 0 ] ; then + if [ "$do_clean_as_you_go" = "yes" ] ; then + output="$OUTPUT_TREE"/clean_ctest_plot_files.out + rm -f "$output" + echo "$build_command clean_ctest_plot_files in the build tree (since we are done with ctest)" + $build_command clean_ctest_plot_files >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: $build_command clean_ctest_plot_files failed in the build tree" + exit 1 + fi + fi + else + echo "ERROR: $ctest_command failed in the build tree" + exit 1 fi else echo "ERROR: $build_command failed in the build tree" @@ -100,7 +111,7 @@ if [ "$do_test_build_tree" = "yes" -a "$do_test_noninteractive" = "yes" ] ; then output="$OUTPUT_TREE"/make_noninteractive.out rm -f "$output" - echo "$build_command test_noninteractive in the build tree" + echo "$build_command VERBOSE=1 test_noninteractive in the build tree" $build_command VERBOSE=1 test_noninteractive >& "$output" make_test_noninteractive_rc=$? if [ "$make_test_noninteractive_rc" -ne 0 ] ; then @@ -114,7 +125,7 @@ rm -rf "$INSTALL_TREE" output="$OUTPUT_TREE"/make_install.out rm -f "$output" - echo "$build_command install in the build tree" + echo "$build_command VERBOSE=1 install in the build tree" $build_command VERBOSE=1 install >& "$output" make_install_rc=$? if [ "$make_install_rc" -ne 0 ] ; then @@ -128,6 +139,11 @@ rm -f "$output" echo "$build_command clean in the build tree (since we are done with it at least for the non-interactive test case)" $build_command clean >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: $build_command clean failed in the build tree" + exit 1 + fi fi if [ "$do_test_install_tree" = "yes" -o \ @@ -161,13 +177,23 @@ if [ "$do_test_noninteractive" = "yes" ] ; then output="$OUTPUT_TREE"/installed_make_noninteractive.out rm -f "$output" - echo "$build_command test_noninteractive in the installed examples build tree" + echo "$build_command VERBOSE=1 test_noninteractive in the installed examples build tree" $build_command VERBOSE=1 test_noninteractive >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: $build_command test_noninteractive failed in the installed examples build tree" + exit 1 + fi if [ "$do_clean_as_you_go" = "yes" ] ; then output="$OUTPUT_TREE"/installed_clean.out rm -f "$output" echo "$build_command clean in the installed examples build tree (since we are done with it at least for the non-interactive test case)" $build_command clean >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: $build_command clean failed in the installed examples build tree" + exit 1 + fi fi fi fi @@ -178,11 +204,21 @@ rm -f "$output" echo "Traditional $build_command test_noninteractive in the installed examples tree" $build_command test_noninteractive >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: Traditional $build_command test_noninteractive failed in the installed examples tree" + exit 1 + fi if [ "$do_clean_as_you_go" = "yes" ] ; then output="$OUTPUT_TREE"/traditional_clean.out rm -f "$output" echo "Traditional $build_command clean in the installed examples tree (since we are done with it at least for the non-interactive test case)" $build_command clean >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: Traditional $build_command clean failed in the installed examples tree" + exit 1 + fi fi fi fi @@ -193,27 +229,47 @@ cd "$BUILD_TREE" output="$OUTPUT_TREE"/make_interactive.out rm -f "$output" - echo "$build_command test_interactive in the build tree" + echo "$build_command VERBOSE=1 test_interactive in the build tree" $build_command VERBOSE=1 test_interactive >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: $build_command test_interactive failed in the build tree" + exit 1 + fi fi if [ "$do_clean_as_you_go" = "yes" ] ; then output="$OUTPUT_TREE"/clean.out rm -f "$output" echo "$build_command clean in the build tree (since we are done with it)" $build_command clean >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: $build_command clean failed in the build tree" + exit 1 + fi fi PATH="$INSTALL_TREE/bin":$PATH_SAVE if [ "$do_test_install_tree" = "yes" ] ; then cd "$INSTALL_BUILD_TREE" output="$OUTPUT_TREE"/installed_make_interactive.out rm -f "$output" - echo "$build_command test_interactive in the installed examples build tree" + echo "$build_command VERBOSE=1 test_interactive in the installed examples build tree" $build_command VERBOSE=1 test_interactive >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: $build_command test_interactive failed in the installed examples build tree" + exit 1 + fi if [ "$do_clean_as_you_go" = "yes" ] ; then output="$OUTPUT_TREE"/installed_clean.out rm -f "$output" echo "$build_command clean in the installed examples build tree (since we are done with it)" $build_command clean >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: $build_command clean failed in the installed examples build tree" + exit 1 + fi fi fi if [ "$do_test_traditional_install_tree" = "yes" ] ; then @@ -222,11 +278,21 @@ rm -f "$output" echo "Traditional $build_command test_interactive in the installed examples tree" $build_command test_interactive >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: Traditional $build_command test_interactive failed in the installed exaples tree" + exit 1 + fi if [ "$do_clean_as_you_go" = "yes" ] ; then output="$OUTPUT_TREE"/traditional_clean.out rm -f "$output" echo "Traditional $build_command clean in the installed examples tree (since we are done with it)" $build_command clean >& "$output" + make_rc=$? + if [ "$make_rc" -ne 0 ] ; then + echo "ERROR: Traditional $build_command clean failed in the installed examples tree" + exit 1 + fi fi fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-21 09:08:36
|
Revision: 12945 http://sourceforge.net/p/plplot/code/12945 Author: airwin Date: 2014-01-21 09:08:28 +0000 (Tue, 21 Jan 2014) Log Message: ----------- Implement NUMBER_PARALLEL_JOBS option with a default of 4 rather than hard coding 4. Modified Paths: -------------- trunk/cmake/epa_build/CMakeLists.txt Modified: trunk/cmake/epa_build/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/CMakeLists.txt 2014-01-16 05:44:27 UTC (rev 12944) +++ trunk/cmake/epa_build/CMakeLists.txt 2014-01-21 09:08:28 UTC (rev 12945) @@ -316,12 +316,15 @@ # The parallel versions are for software packages that # do not have race conditions for parallel builds or tests. -set(EPA_PARALLEL_BUILD_COMMAND "${EPA_BUILD_COMMAND}" -j4) -set(EPA_PARALLEL_CTEST_COMMAND "${EPA_CTEST_COMMAND}" -j4) + +set(NUMBER_PARALLEL_JOBS 4 CACHE STRING "Number of parallel jobs") + +set(EPA_PARALLEL_BUILD_COMMAND "${EPA_BUILD_COMMAND}" -j${NUMBER_PARALLEL_JOBS}) +set(EPA_PARALLEL_CTEST_COMMAND "${EPA_CTEST_COMMAND}" -j${NUMBER_PARALLEL_JOBS}) # For autotools based builds. option(AUTOTOOLS_PARALLEL_BUILD "Build autotools projects using parallel make unless a specific project is expressely configured otherwise" ON) if(AUTOTOOLS_PARALLEL_BUILD) - set(EPA_PARALLEL_MAKE_COMMAND "${EPA_MAKE_COMMAND}" -j4) + set(EPA_PARALLEL_MAKE_COMMAND "${EPA_MAKE_COMMAND}" -j${NUMBER_PARALLEL_JOBS}) else(AUTOTOOLS_PARALLEL_BUILD) set(EPA_PARALLEL_MAKE_COMMAND "${EPA_MAKE_COMMAND}") endif(AUTOTOOLS_PARALLEL_BUILD) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-16 05:44:30
|
Revision: 12944 http://sourceforge.net/p/plplot/code/12944 Author: airwin Date: 2014-01-16 05:44:27 +0000 (Thu, 16 Jan 2014) Log Message: ----------- Remove (now-)redundant -geometry options from wish test targets. Modified Paths: -------------- trunk/examples/CMakeLists.txt Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2014-01-15 23:13:47 UTC (rev 12943) +++ trunk/examples/CMakeLists.txt 2014-01-16 05:44:27 UTC (rev 12944) @@ -1037,7 +1037,7 @@ # tests that use "package require Pltk" only work if # BUILD_SHARED_LIBS is true. add_custom_target(test_wish_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_standard_examples -geometry 800x600 + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_standard_examples WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) add_dependencies(test_wish_standard_examples @@ -1130,7 +1130,7 @@ # tests that use "package require Plplotter" only work if # BUILD_SHARED_LIBS is true. add_custom_target(test_wish_runAllDemos - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_runAllDemos -geometry 800x600 + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tk/wish_runAllDemos WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tk ) add_dependencies(test_wish_runAllDemos This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-15 23:13:49
|
Revision: 12943 http://sourceforge.net/p/plplot/code/12943 Author: airwin Date: 2014-01-15 23:13:47 +0000 (Wed, 15 Jan 2014) Log Message: ----------- Improve comments on examples that must be skipped because they don't work properly with this TEA-based wish method. Modified Paths: -------------- trunk/examples/tk/wish_standard_examples.in Modified: trunk/examples/tk/wish_standard_examples.in =================================================================== --- trunk/examples/tk/wish_standard_examples.in 2014-01-15 21:04:39 UTC (rev 12942) +++ trunk/examples/tk/wish_standard_examples.in 2014-01-15 23:13:47 UTC (rev 12943) @@ -5,6 +5,10 @@ # We use of the wish -colormap new option since it cannot hurt, # but this does not solve color issues # for both examples 2 ("Couldn't parse color 76") and 24 ("illegal number of colors in cmap0: red") so we comment out those examples for now. +# N.B. recently that example 2 and example 24 error message has been +# replaced by a segfault. So presumably the issue all along has been +# a memory management issue that (as typical with such issues) +# manifests in a variety of ways depending on subtle details. # Example 20 enables plspause so comment out for now. # The following exec command reexecutes the script under wish. This # is possible because all comment lines are ignored by wish including This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2014-01-15 21:04:40
|
Revision: 12942 http://sourceforge.net/p/plplot/code/12942 Author: arjenmarkus Date: 2014-01-15 21:04:39 +0000 (Wed, 15 Jan 2014) Log Message: ----------- Translation of the plitclgen script into Tcl code. Note that it is not yet used by the build scripts. That will be a next step. Added Paths: ----------- trunk/bindings/tcl/plitclgen.tcl Added: trunk/bindings/tcl/plitclgen.tcl =================================================================== --- trunk/bindings/tcl/plitclgen.tcl (rev 0) +++ trunk/bindings/tcl/plitclgen.tcl 2014-01-15 21:04:39 UTC (rev 12942) @@ -0,0 +1,80 @@ +#!/usr/local/bin/perl +# $Id: plitclgen 2352 2001-01-02 03:17:35Z mlebrun $ +# +# Arjen Markus +# - translation of the original Perl script +# +# This script is used to automatically generate the [incr Tcl] methods +# needed in the PLWin [incr Tcl] class. These methods mirror most of +# the Tcl API commands which are generated by the companion script, +# pltclgen. +# +# However, PLWin is a widget wrapper, and as such, not all of the Tcl +# API has any business being in the widget. So we remove various +# shadow methods for portions of the API which are not relevant to +# widgets, such as the stream manipulation functions, etc. +# +# Also, note that this script is not quite as automatic as pltclgen. +# The output must be inserted by hand into PLWin.tcl. Hopefully this +# will not seem like an unreasonable limitation, since the Tcl API +# only changes occasionally by this point. +############################################################################### + +# +# Exclude several functions from the class +# +set ignore { + "plend" + "plend1" + "plfamadv" + "plgfam" + "plsfam" + "plsfnam" + "plsstrm" +} + +# +# Use eval or {*} - depending on the Tcl version +# +set use_expand [package vsatisfies [package present Tcl] 8.5] + +# main code -- +# +set verbose [expr {[lsearch $argv "-v"] >= 0}] + +# Find the source tree directory that must be specified on the command line. +set sourcedir [lindex $argv 0] ;# Get the current source directory - for "out of source tree builds" +set specfile [file join $sourcedir "plapi.tpl"] ;# PLplot API template specification file. +set genfile "gen.itcl" ;# Generated functions go here. + +set SPECFILE [open $specfile] +set GENFILE [open $genfile "w"] + +# Scan the PLplot API template specification file looking for function +# "prototypes". These are introduced with the token "pltclcmd". When +# we find one, go process it. Anything other than a comment or a +# valid function "prototype" is considered an error, and is printed to +# stdout. + +while { [gets $SPECFILE line] >= 0 } { + regsub {#.*$} $line {} line + if { $line == "" } continue + + if { [regexp {^pltclcmd (\w+) (.*)} $line ==> cmd] } { + if { [lsearch $ignore $cmd] < 0 } { + puts "Generating itcl method for $cmd.\n"; + + puts $GENFILE " method $cmd {args} {"; + if { $use_expand } { + puts $GENFILE " \$plwin cmd $cmd {*}\$args"; + } else { + puts $GENFILE " eval \$plwin cmd $cmd \$args"; + } + puts $GENFILE " }\n"; + } + } else { + + # Just print the unrecognized output to stdout. + puts "? $line" + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2014-01-15 20:16:39
|
Revision: 12941 http://sourceforge.net/p/plplot/code/12941 Author: arjenmarkus Date: 2014-01-15 20:16:36 +0000 (Wed, 15 Jan 2014) Log Message: ----------- Use the CMake variable plplottcltk_SOVERSION as the suffix for the Tcl/Tk library, so that the pkgIndex.tcl file is adjusted automatically. Modified Paths: -------------- trunk/bindings/tk/pkgIndex.tcl.in Modified: trunk/bindings/tk/pkgIndex.tcl.in =================================================================== --- trunk/bindings/tk/pkgIndex.tcl.in 2014-01-15 02:32:38 UTC (rev 12940) +++ trunk/bindings/tk/pkgIndex.tcl.in 2014-01-15 20:16:36 UTC (rev 12941) @@ -34,7 +34,7 @@ if {$tcl_platform(platform) == "unix"} { if {[string match "*CYGWIN*" $::tcl_platform(os)]} { - set stem cygplplottcltk@LIB_TAG@-10 + set stem cygplplottcltk@LIB_TAG@-@plplottcltk_SOVERSION@ } else { set stem tk } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-15 02:32:42
|
Revision: 12940 http://sourceforge.net/p/plplot/code/12940 Author: airwin Date: 2014-01-15 02:32:38 +0000 (Wed, 15 Jan 2014) Log Message: ----------- Apply patch to swig-2.0.11 to allow it to support octave-3.8.0. Tested by Alan W. Irwin <ai...@us...> on Linux by building and installing the patched swig-2.0.11 using epa_build with the -DBUILD_THE_BUILD_TOOLS=ON option. That installed result was then tested (with an ordinary epa_build of plplot_lite). Good results were obtained for a build and install of PLplot, and the test_diff_psc target in the build tree generated good results for Java, Python, Octave, and Lua (our 4 swig-generated bindings). Modified Paths: -------------- trunk/cmake/epa_build/swig/CMakeLists.txt Modified: trunk/cmake/epa_build/swig/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/swig/CMakeLists.txt 2014-01-15 02:07:27 UTC (rev 12939) +++ trunk/cmake/epa_build/swig/CMakeLists.txt 2014-01-15 02:32:38 UTC (rev 12940) @@ -68,8 +68,18 @@ DEPENDS ${dependencies_targets} URL ${URL} URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH} + PATCH_COMMAND "" CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "LDFLAGS=-Wl,-rpath -Wl,${EPA_CMAKE_INSTALL_PREFIX}/lib" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX} BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} BUILD_IN_SOURCE OFF INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install ) + +add_custom_command( + OUTPUT + ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch + COMMAND ${CMAKE_COMMAND} -E echo + "Provide swig support for octave-3.8.0" + COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/octave-3.8.0.patch + APPEND + ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-01-15 02:07:32
|
Revision: 12939 http://sourceforge.net/p/plplot/code/12939 Author: airwin Date: 2014-01-15 02:07:27 +0000 (Wed, 15 Jan 2014) Log Message: ----------- Commit patch to update swig octave support to version 3.8.0. This patch was implemented by the swig developer, Karl Wette, for the pending release of swig-3.0.0. It was obtained using wget https://github.com/swig/swig/commit/5b167cc12daf9ea275c17fedaefc975450613ab2.patch and modified by commenting out the first file which is an update to the swig-3.0.0 changelog. After that change, this swig-3.0.0 patch does apply cleanly to swig 2.0.11, but has not been tested beyond that yet for that version of swig. Added Paths: ----------- trunk/cmake/epa_build/swig/octave-3.8.0.patch Added: trunk/cmake/epa_build/swig/octave-3.8.0.patch =================================================================== --- trunk/cmake/epa_build/swig/octave-3.8.0.patch (rev 0) +++ trunk/cmake/epa_build/swig/octave-3.8.0.patch 2014-01-15 02:07:27 UTC (rev 12939) @@ -0,0 +1,284 @@ +From 5b167cc12daf9ea275c17fedaefc975450613ab2 Mon Sep 17 00:00:00 2001 +From: Karl Wette <kar...@li...> +Date: Mon, 13 Jan 2014 18:24:17 +1300 +Subject: [PATCH] octave: update support to Octave version 3.8.0 + +--- + CHANGES.current | 26 ++++++++++++ + Doc/Manual/Octave.html | 7 +--- + Lib/octave/octrun.swg | 104 ++++++++++++++++++++++++++++++++++++++-------- + Lib/octave/octruntime.swg | 14 +++---- + 4 files changed, 122 insertions(+), 29 deletions(-) + +#diff --git a/CHANGES.current b/CHANGES.current +#index a4fc5db..c711536 100644 +#--- a/CHANGES.current +#+++ b/CHANGES.current +@@ -5,6 +5,32 @@ See the RELEASENOTES file for a summary of changes in each release. + Version 3.0.0 (in progress) + ============================ + ++2014-01-13: kwwette ++ [Octave] update support to Octave version 3.8.0 ++ ++ - Octave 3.8.0 no longer defines OCTAVE_API_VERSION_NUMBER, but 3.8.1 ++ will define OCTAVE_{MAJOR,MINOR,PATCH}_VERSION instead: see ++ http://hg.savannah.gnu.org/hgweb/octave/rev/b6b6e0dc700e ++ So we now use a new macro SWIG_OCTAVE_PREREQ(major,minor,patch) to ++ enable features requiring Octave version major.minor.patch or later. ++ ++ For Octave versions prior to 3.8.1, we reconstruct values for ++ OCTAVE_{MAJOR,MINOR,PATCH}_VERSION based on OCTAVE_API_VERSION_NUMBER, ++ extracted from Octave's ChangeLogs. An additional hack is needed to ++ distinguish between Octave <= 3.2.x and 3.8.0, neither of which define ++ OCTAVE_API_VERSION_NUMBER. ++ ++ - Octave 3.8.0 deprecates symbol_table::varref(), so remove its use ++ for this and future versions of Octave. ++ ++ - Octave 3.8.0 removes octave_value::is_real_nd_array(), used in ++ octave_swig_type::dims(). Its use is not required here, so remove it. ++ ++ - Retested against Octave versions 3.0.5, 3.2.4, 3.4.3, 3.6.4, and 3.8.0. ++ ++ - Updated Octave documentation with tested Octave versions, and added a ++ warning against using versions <= 3.x.x, which are no longer tested. ++ + 2014-01-11: wsfulton + Fix and document the naturalvar feature override behaviour - the naturalvar + feature attached to a variable name has precedence over the naturalvar +diff --git a/Doc/Manual/Octave.html b/Doc/Manual/Octave.html +index 84c0a0f..3e12ce6 100644 +--- a/Doc/Manual/Octave.html ++++ b/Doc/Manual/Octave.html +@@ -59,11 +59,8 @@ + + + <p> +-The SWIG implemention was first based on Octave 2.9.12, so this is the minimum version required. Testing has only been done on Linux. +-</p> +- +-<p> +-As of SWIG 2.0.7, the Octave module has been tested with Octave versions 3.0.5, 3.2.4, 3.4.3, and 3.6.1. ++As of SWIG 3.0.0, the Octave module has been tested with Octave versions 3.0.5, 3.2.4, 3.4.3, 3.6.4, and 3.8.0. ++Use of Octave versions older than 3.x.x is not recommended, as these versions are no longer tested with SWIG. + </p> + + <H2><a name="Octave_nn3"></a>30.2 Running SWIG</H2> +diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg +index 41d1c7a..2174a0f 100644 +--- a/Lib/octave/octrun.swg ++++ b/Lib/octave/octrun.swg +@@ -1,20 +1,88 @@ + + #include <octave/version.h> +-#ifndef OCTAVE_API_VERSION_NUMBER +- +- // Hack to distinguish between Octave 3.2 and earlier versions before OCTAVE_API_VERSION_NUMBER existed +- #define ComplexLU __ignore +- #include <octave/CmplxLU.h> +- #undef ComplexLU +- #ifdef octave_Complex_LU_h +- # define OCTAVE_API_VERSION_NUMBER 36 +- #else +- # define OCTAVE_API_VERSION_NUMBER 37 +- #endif + +-#endif ++// Macro for enabling features which require Octave version >= major.minor.patch ++#define SWIG_OCTAVE_PREREQ(major, minor, patch) \ ++ ( (OCTAVE_MAJOR_VERSION<<16) + (OCTAVE_MINOR_VERSION<<8) + OCTAVE_PATCH_VERSION >= ((major)<<16) + ((minor)<<8) + (patch) ) ++ ++// Reconstruct Octave major, minor, and patch versions for releases prior to 3.8.1 ++#if !defined(OCTAVE_MAJOR_VERSION) ++ ++# if !defined(OCTAVE_API_VERSION_NUMBER) ++ ++// Hack to distinguish between Octave 3.8.0, which removed OCTAVE_API_VERSION_NUMBER but did not yet ++// introduce OCTAVE_MAJOR_VERSION, and Octave <= 3.2, which did not define OCTAVE_API_VERSION_NUMBER ++# include <octave/ov.h> ++# if defined(octave_ov_h) ++# define OCTAVE_MAJOR_VERSION 3 ++# define OCTAVE_MINOR_VERSION 8 ++# define OCTAVE_PATCH_VERSION 0 ++# else ++ ++// Hack to distinguish between Octave 3.2 and earlier versions, before OCTAVE_API_VERSION_NUMBER existed ++# define ComplexLU __ignore ++# include <octave/CmplxLU.h> ++# undef ComplexLU ++# if defined(octave_Complex_LU_h) ++ ++// We know only that this version is prior to Octave 3.2, i.e. OCTAVE_API_VERSION_NUMBER < 37 ++# define OCTAVE_MAJOR_VERSION 3 ++# define OCTAVE_MINOR_VERSION 1 ++# define OCTAVE_PATCH_VERSION 99 ++ ++# else ++ ++// OCTAVE_API_VERSION_NUMBER == 37 ++# define OCTAVE_MAJOR_VERSION 3 ++# define OCTAVE_MINOR_VERSION 2 ++# define OCTAVE_PATCH_VERSION 0 ++ ++# endif // defined(octave_Complex_LU_h) ++ ++# endif // defined(octave_ov_h) + +-#if OCTAVE_API_VERSION_NUMBER < 37 ++// Correlation between Octave API and version numbers extracted from Octave's ++// ChangeLogs; version is the *earliest* released Octave with that API number ++# elif OCTAVE_API_VERSION_NUMBER >= 48 ++# define OCTAVE_MAJOR_VERSION 3 ++# define OCTAVE_MINOR_VERSION 6 ++# define OCTAVE_PATCH_VERSION 0 ++ ++# elif OCTAVE_API_VERSION_NUMBER >= 45 ++# define OCTAVE_MAJOR_VERSION 3 ++# define OCTAVE_MINOR_VERSION 4 ++# define OCTAVE_PATCH_VERSION 1 ++ ++# elif OCTAVE_API_VERSION_NUMBER >= 42 ++# define OCTAVE_MAJOR_VERSION 3 ++# define OCTAVE_MINOR_VERSION 3 ++# define OCTAVE_PATCH_VERSION 54 ++ ++# elif OCTAVE_API_VERSION_NUMBER >= 41 ++# define OCTAVE_MAJOR_VERSION 3 ++# define OCTAVE_MINOR_VERSION 3 ++# define OCTAVE_PATCH_VERSION 53 ++ ++# elif OCTAVE_API_VERSION_NUMBER >= 40 ++# define OCTAVE_MAJOR_VERSION 3 ++# define OCTAVE_MINOR_VERSION 3 ++# define OCTAVE_PATCH_VERSION 52 ++ ++# elif OCTAVE_API_VERSION_NUMBER >= 39 ++# define OCTAVE_MAJOR_VERSION 3 ++# define OCTAVE_MINOR_VERSION 3 ++# define OCTAVE_PATCH_VERSION 51 ++ ++# else // OCTAVE_API_VERSION_NUMBER == 38 ++# define OCTAVE_MAJOR_VERSION 3 ++# define OCTAVE_MINOR_VERSION 3 ++# define OCTAVE_PATCH_VERSION 50 ++ ++# endif // !defined(OCTAVE_API_VERSION_NUMBER) ++ ++#endif // !defined(OCTAVE_MAJOR_VERSION) ++ ++#if !SWIG_OCTAVE_PREREQ(3,2,0) + #define SWIG_DEFUN(cname, wname, doc) DEFUNX_DLD(#cname, wname, FS ## cname, args, nargout, doc) + #else + #define SWIG_DEFUN(cname, wname, doc) DEFUNX_DLD(#cname, wname, G ## cname, args, nargout, doc) +@@ -427,7 +495,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); + if (error_state) return dim_vector(1,1); + } + return d; +- } else if (out.is_matrix_type() || out.is_real_nd_array() || out.is_numeric_type() ) { ++ } else if (out.is_matrix_type() || out.is_numeric_type() ) { + if (out.rows()==1 || out.columns()==1) { + Array<int> a = out.int_vector_value(); + if (error_state) return dim_vector(1,1); +@@ -746,7 +814,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); + return outarg(0).string_value(); + } + +-#if OCTAVE_API_VERSION_NUMBER >= 40 ++#if SWIG_OCTAVE_PREREQ(3,3,52) + virtual octave_map map_value() const { + return octave_map(); + } +@@ -982,7 +1050,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); + virtual std::string string_value(bool force = false) const + { return ptr->string_value(force); } + +-#if OCTAVE_API_VERSION_NUMBER >= 40 ++#if SWIG_OCTAVE_PREREQ(3,3,52) + virtual octave_map map_value() const + { return ptr->map_value(); } + #else +@@ -1293,10 +1361,12 @@ SWIGRUNTIME void SWIG_Octave_SetGlobalValue(std::string name, const octave_value + } + + SWIGRUNTIME void SWIG_Octave_LinkGlobalValue(std::string name) { +-#if OCTAVE_API_VERSION_NUMBER < 37 ++#if !SWIG_OCTAVE_PREREQ(3,2,0) + link_to_global_variable(curr_sym_tab->lookup(name, true)); + #else ++#if !SWIG_OCTAVE_PREREQ(3,8,0) + symbol_table::varref(name); ++#endif + symbol_table::mark_global(name); + #endif + } +diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg +index 43313c3..fbf2007 100644 +--- a/Lib/octave/octruntime.swg ++++ b/Lib/octave/octruntime.swg +@@ -25,7 +25,7 @@ static bool SWIG_init_user(octave_swig_type* module_ns); + SWIGINTERN bool SWIG_Octave_LoadModule(std::string name) { + bool retn; + { +-#if OCTAVE_API_VERSION_NUMBER < 38 ++#if !SWIG_OCTAVE_PREREQ(3,3,50) + unwind_protect::begin_frame("SWIG_Octave_LoadModule"); + unwind_protect_int(error_state); + unwind_protect_int(warning_state); +@@ -44,7 +44,7 @@ SWIGINTERN bool SWIG_Octave_LoadModule(std::string name) { + discard_warning_messages = true; + feval(name, octave_value_list(), 0); + retn = (error_state == 0); +-#if OCTAVE_API_VERSION_NUMBER < 38 ++#if !SWIG_OCTAVE_PREREQ(3,3,50) + unwind_protect::run_frame("SWIG_Octave_LoadModule"); + #endif + } +@@ -57,7 +57,7 @@ SWIGINTERN bool SWIG_Octave_LoadModule(std::string name) { + SWIGINTERN bool SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::string name) { + bool retn; + { +-#if OCTAVE_API_VERSION_NUMBER < 38 ++#if !SWIG_OCTAVE_PREREQ(3,3,50) + unwind_protect::begin_frame("SWIG_Octave_InstallFunction"); + unwind_protect_int(error_state); + unwind_protect_int(warning_state); +@@ -80,7 +80,7 @@ SWIGINTERN bool SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::st + error_state = 0; + feval("autoload", args, 0); + retn = (error_state == 0); +-#if OCTAVE_API_VERSION_NUMBER < 38 ++#if !SWIG_OCTAVE_PREREQ(3,3,50) + unwind_protect::run_frame("SWIG_Octave_InstallFunction"); + #endif + } +@@ -196,7 +196,7 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) { + // definitely affects version 3.2.*, not sure about 3.3.*, seems to be fixed in + // version 3.4.* and above. can be turned off with macro definition. + #ifndef SWIG_OCTAVE_NO_SEGFAULT_HACK +-#if 36 < OCTAVE_API_VERSION_NUMBER && OCTAVE_API_VERSION_NUMBER < 45 ++#if SWIG_OCTAVE_PREREQ(3,2,0) && !SWIG_OCTAVE_PREREQ(3,4,1) + octave_exit = ::_Exit; + #endif + #endif +@@ -212,7 +212,7 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) { + + // workaround bug in octave where installing global variable of custom type and then + // exiting without explicitly clearing the variable causes octave to segfault. +-#if OCTAVE_API_VERSION_NUMBER > 36 ++#if SWIG_OCTAVE_PREREQ(3,2,0) + octave_value_list eval_args; + eval_args.append("base"); + eval_args.append("function __swig_atexit__; " +@@ -297,7 +297,7 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) { + } + } + +-#if OCTAVE_API_VERSION_NUMBER < 37 ++#if !SWIG_OCTAVE_PREREQ(3,2,0) + mlock(me->name()); + #else + mlock(); +-- +1.8.5.1 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |