[Plplot-cvs] SF.net SVN: plplot:[11915] trunk/bindings

[<and...@us...>]

Revision: 11915
          http://plplot.svn.sourceforge.net/plplot/?rev=11915&view=rev
Author:   andrewross
Date:     2011-09-07 11:45:29 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Add plsmema to f77 and f95 bindings. Add plsmem and plsmema to the C++ bindings. Propagation of these two API functions seems inconsistent, and the only example to test them is a python script. Needs a standard example which uses them.

Closes plplot bug 3324339.

Modified Paths:
--------------
    trunk/bindings/c++/plstream.cc
    trunk/bindings/c++/plstream.h
    trunk/bindings/f77/plstubs.h
    trunk/bindings/f77/scstubs.c
    trunk/bindings/f95/plstubs.h
    trunk/bindings/f95/scstubs.c
    trunk/bindings/f95/sfstubsf95.f90

Modified: trunk/bindings/c++/plstream.cc
===================================================================
--- trunk/bindings/c++/plstream.cc	2011-09-07 09:52:13 UTC (rev 11914)
+++ trunk/bindings/c++/plstream.cc	2011-09-07 11:45:29 UTC (rev 11915)
@@ -1949,6 +1949,24 @@
     plsmaj( def, scale );
 }
 
+// Set the RGB memory area to be plotted (with the 'mem' or 'memcairo' drivers)
+
+void plstream::smem( PLINT maxx, PLINT maxy, void *plotmem)
+{
+    set_stream();
+
+    plsmem( maxx, maxy, plotmem );
+}
+
+// Set the RGBA memory area to be plotted (with the 'memcairo' drivers)
+
+void plstream::smema( PLINT maxx, PLINT maxy, void *plotmem)
+{
+    set_stream();
+
+    plsmema( maxx, maxy, plotmem );
+}
+
 // Set up lengths of minor tick marks.
 
 void plstream::smin( PLFLT def, PLFLT scale )

Modified: trunk/bindings/c++/plstream.h
===================================================================
--- trunk/bindings/c++/plstream.h	2011-09-07 09:52:13 UTC (rev 11914)
+++ trunk/bindings/c++/plstream.h	2011-09-07 11:45:29 UTC (rev 11915)
@@ -785,6 +785,14 @@
 
     void smaj( PLFLT def, PLFLT scale );
 
+// Set the RGB memory area to be plotted (with the 'mem' or 'memcairo' drivers)
+
+    void smem( PLINT maxx, PLINT maxy, void *plotmem );
+
+// Set the RGBA memory area to be plotted (with the 'memcairo' driver)
+
+    void smema( PLINT maxx, PLINT maxy, void *plotmem );
+
 // Set up lengths of minor tick marks.
 
     void smin( PLFLT def, PLFLT scale );

Modified: trunk/bindings/f77/plstubs.h
===================================================================
--- trunk/bindings/f77/plstubs.h	2011-09-07 09:52:13 UTC (rev 11914)
+++ trunk/bindings/f77/plstubs.h	2011-09-07 11:45:29 UTC (rev 11915)
@@ -313,6 +313,7 @@
 #define    PLSLABELFUNC_NONEa        FNAME( PLSLABELFUNC_NONE_, plslabelfunc_none_ )
 #define    PLSMAJ                    FNAME( PLSMAJ, plsmaj )
 #define    PLSMEM                    FNAME( PLSMEM, plsmem )
+#define    PLSMEMA                   FNAME( PLSMEMA, plsmema )
 #define    PLSMIN                    FNAME( PLSMIN, plsmin )
 #define    PLSORI                    FNAME( PLSORI, plsori )
 #define    PLSPAGE                   FNAME( PLSPAGE, plspage )

Modified: trunk/bindings/f77/scstubs.c
===================================================================
--- trunk/bindings/f77/scstubs.c	2011-09-07 09:52:13 UTC (rev 11914)
+++ trunk/bindings/f77/scstubs.c	2011-09-07 11:45:29 UTC (rev 11915)
@@ -990,6 +990,12 @@
 }
 
 void
+PLSMEMA( PLINT *maxx, PLINT *maxy, void *plotmem )
+{
+    c_plsmema( *maxx, *maxy, plotmem );
+}
+
+void
 PLSMIN( PLFLT *def, PLFLT *scale )
 {
     c_plsmin( *def, *scale );

Modified: trunk/bindings/f95/plstubs.h
===================================================================
--- trunk/bindings/f95/plstubs.h	2011-09-07 09:52:13 UTC (rev 11914)
+++ trunk/bindings/f95/plstubs.h	2011-09-07 11:45:29 UTC (rev 11915)
@@ -325,6 +325,7 @@
 #define    PLSLABELFUNC_NONEa        FNAME( PLSLABELFUNC_NONE_, plslabelfunc_none_ )
 #define    PLSMAJ                    FNAME( PLSMAJ, plsmaj )
 #define    PLSMEM                    FNAME( PLSMEM, plsmem )
+#define    PLSMEMA                   FNAME( PLSMEMA, plsmema )
 #define    PLSMIN                    FNAME( PLSMIN, plsmin )
 #define    PLSORI                    FNAME( PLSORI, plsori )
 #define    PLSPAGE                   FNAME( PLSPAGE, plspage )

Modified: trunk/bindings/f95/scstubs.c
===================================================================
--- trunk/bindings/f95/scstubs.c	2011-09-07 09:52:13 UTC (rev 11914)
+++ trunk/bindings/f95/scstubs.c	2011-09-07 11:45:29 UTC (rev 11915)
@@ -1064,6 +1064,12 @@
 }
 
 void
+PLSMEMA( PLINT *maxx, PLINT *maxy, void *plotmem )
+{
+    c_plsmema( *maxx, *maxy, plotmem );
+}
+
+void
 PLSMIN( PLFLT *def, PLFLT *scale )
 {
     c_plsmin( *def, *scale );

Modified: trunk/bindings/f95/sfstubsf95.f90
===================================================================
--- trunk/bindings/f95/sfstubsf95.f90	2011-09-07 09:52:13 UTC (rev 11914)
+++ trunk/bindings/f95/sfstubsf95.f90	2011-09-07 11:45:29 UTC (rev 11915)
@@ -752,6 +752,7 @@
       end interface
 
       ! plsmem: void * argument tricky - TODO
+      ! plsmema: void * argument tricky - TODO
 
       interface
          subroutine plsmin( def, scale )

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