Thread: [Plplot-cvs] SF.net SVN: plplot:[11354] trunk (Page 19)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 11354
          http://plplot.svn.sourceforge.net/plplot/?rev=11354&view=rev
Author:   airwin
Date:     2010-11-28 20:53:56 +0000 (Sun, 28 Nov 2010)

Log Message:
-----------
Introduce new plstring3 API for plotting a glyph for a whole range of
3D coordinates.  This API is designed to largely supersede plpoin3
since many(!) more glyphs are available with plstring3.  Convert C
example 18 to replace plpoin3 with plstring3.  This plstring3 API
addition and example 18 change needs to be propagated to all our
languages.

Modified Paths:
--------------
    trunk/examples/c/x18c.c
    trunk/include/plplot.h
    trunk/src/plsym.c

Modified: trunk/examples/c/x18c.c
===================================================================

--- trunk/examples/c/x18c.c	2010-11-28 18:40:34 UTC (rev 11353)
+++ trunk/examples/c/x18c.c	2010-11-28 20:53:56 UTC (rev 11354)
@@ -1,3 +1,4 @@
+// -*- coding: utf-8; -*-
 // $Id$
 //
 //      3-d line and point plot demo.  Adapted from x08c.c.
@@ -72,9 +73,14 @@
         plcol0( 2 );
 
         if ( opt[k] )
+        {
             plline3( NPTS, x, y, z );
+        }
         else
-            plpoin3( NPTS, x, y, z, 1 );
+        {
+            // U+22C5 DOT OPERATOR.
+            plstring3( NPTS, x, y, z, "⋅" );
+        }
 
         plcol0( 3 );
         sprintf( title, "#frPLplot Example 18 - Alt=%.0f, Az=%.0f",

Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h	2010-11-28 18:40:34 UTC (rev 11353)
+++ trunk/include/plplot.h	2010-11-28 20:53:56 UTC (rev 11354)
@@ -765,6 +765,7 @@
 #define    plstart                  c_plstart
 #define    plstransform             c_plstransform
 #define    plstring                 c_plstring
+#define    plstring3                c_plstring3
 #define    plstripa                 c_plstripa
 #define    plstripc                 c_plstripc
 #define    plstripd                 c_plstripd
@@ -1748,6 +1749,15 @@
 PLDLLIMPEXP void
 c_plstring( PLINT n, PLFLT *x, PLFLT *y, const char *string );
 
+// Prints out the same string repeatedly at the n points in world
+// coordinates given by the x, y, and z arrays.  Supersedes plpoin3
+// for the case where text refers to a unicode glyph either directly
+// as UTF-8 or indirectly via the standard text escape sequences
+// allowed for PLplot input strings.
+
+PLDLLIMPEXP void
+c_plstring3( PLINT n, PLFLT *x, PLFLT *y, PLFLT *z, const char *string );
+
 // Add a point to a stripchart.
 
 PLDLLIMPEXP void

Modified: trunk/src/plsym.c
===================================================================
--- trunk/src/plsym.c	2010-11-28 18:40:34 UTC (rev 11353)
+++ trunk/src/plsym.c	2010-11-28 20:53:56 UTC (rev 11354)
@@ -204,16 +204,17 @@
 
 //--------------------------------------------------------------------------
 //! Plot a glyph at the specified 3D points.  Setup the call to this
-//! function similar to what is done for plline3.  code=-1 means try
-//! to just draw a point.  Right now it's just a move and a draw at
-//! the same place.  Not ideal, since a sufficiently intelligent
-//! output device may optimize it away, or there may be faster ways of
-//! doing it.  This is OK for now, though, and offers a 4X speedup
-//! over drawing a Hershey font "point" (which is actually diamond
-//! shaped and therefore takes 4 strokes to draw).  If 0 < code < 32,
-//! then a useful (but small subset) of Hershey symbols is plotted.
-//! If 32 <= code <= 127 the corresponding printable ASCII character
-//! is plotted.
+//! function similar to what is done for plline3.  This function is
+//! largely superseded by plstring3 which gives access to many(!) more
+//! glyphs.  code=-1 means try to just draw a point.  Right now it's
+//! just a move and a draw at the same place.  Not ideal, since a
+//! sufficiently intelligent output device may optimize it away, or
+//! there may be faster ways of doing it.  This is OK for now, though,
+//! and offers a 4X speedup over drawing a Hershey font "point" (which
+//! is actually diamond shaped and therefore takes 4 strokes to draw).
+//! If 0 < code < 32, then a useful (but small subset) of Hershey
+//! symbols is plotted.  If 32 <= code <= 127 the corresponding
+//! printable ASCII character is plotted.
 //! @param n : number of points in x, y, and z arrays.
 //! @param x : pointer to an array with X coordinates of points.
 //! @param y : pointer to an array with Y coordinates of points.
@@ -277,10 +278,55 @@
             }
         }
     }
-    return;
 }
 
 //--------------------------------------------------------------------------
+//! Plot glyphs (normally just one of them) at the specified 3D
+//! coordinates.  Setup the call to this function similar to what is
+//! done for plline3.  This function largely supersedes plpoin3
+//! because many(!) more glyphs are accessible with plstring3.  The
+//! glyph is specified with a PLplot user string.  As with plmtex and
+//! plptex, the user string can contain FCI escapes to determine the
+//! font, UTF-8 code to determine the glyph or else PLplot escapes for
+//! Hershey or unicode text to determine the glyph.
+//! @param n : number of points in x, y, and z arrays.
+//! @param x : array of X coordinates of points.
+//! @param y : array of Y coordinates of points.
+//! @param z : array of Z coordinates of points.
+//! @param string : PLplot user string corresponding to the glyph to
+//! be plotted at each of the n points.
+//--------------------------------------------------------------------------
+
+void
+c_plstring3( PLINT n, PLFLT *x, PLFLT *y, PLFLT *z, const char * string )
+{
+    PLINT i;
+    PLFLT u, v;
+    PLFLT xmin, xmax, ymin, ymax, zmin, zmax, zscale;
+
+    if ( plsc->level < 3 )
+    {
+        plabort( "plstring3: Please set up window first" );
+        return;
+    }
+
+    plP_gdom( &xmin, &xmax, &ymin, &ymax );
+    plP_grange( &zscale, &zmin, &zmax );
+
+    for ( i = 0; i < n; i++ )
+    {
+        if ( x[i] >= xmin && x[i] <= xmax &&
+             y[i] >= ymin && y[i] <= ymax &&
+             z[i] >= zmin && z[i] <= zmax )
+        {
+            u = plP_w3wcx( x[i], y[i], z[i] );
+            v = plP_w3wcy( x[i], y[i], z[i] );
+            c_plptex( u, v, 1., 0., 0.5, string );
+        }
+    }
+}
+
+//--------------------------------------------------------------------------
 // static void plhrsh(PLINT ch, PLINT x, PLINT y)
 //    PLINT ch - hershey code to plot
 //    PLINT x - device-world x coordinate of hershey character


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Plplot-cvs] SF.net SVN: plplot:[11354] trunk (Page 19)

Cross-platform, scientific graphics plotting library

plplot-cvs