Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12962] trunk
|
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.
|
