Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot: [8164] trunk/bindings
|
From: <and...@us...> - 2008-01-23 10:58:59
|
Revision: 8164
http://plplot.svn.sourceforge.net/plplot/?rev=8164&view=rev
Author: andrewross
Date: 2008-01-23 02:59:02 -0800 (Wed, 23 Jan 2008)
Log Message:
-----------
Add f77/f95 bindings for the new date / time and alpha transparency
functions.
Modified Paths:
--------------
trunk/bindings/f77/plstubs.h
trunk/bindings/f77/scstubs.c
trunk/bindings/f77/sfstubs.fm4
trunk/bindings/f95/plstubs.h
trunk/bindings/f95/scstubs.c
trunk/bindings/f95/sfstubs.f90
trunk/bindings/f95/sfstubsf95.f90
Modified: trunk/bindings/f77/plstubs.h
===================================================================
--- trunk/bindings/f77/plstubs.h 2008-01-23 09:59:02 UTC (rev 8163)
+++ trunk/bindings/f77/plstubs.h 2008-01-23 10:59:02 UTC (rev 8164)
@@ -245,12 +245,17 @@
#define PLRGBHLS FNAME(PLRGBHLS,plrgbhls)
#define PLSCHR FNAME(PLSCHR,plschr)
#define PLSCMAP0 FNAME(PLSCMAP0,plscmap0)
+#define PLSCMAP0A FNAME(PLSCMAP0A,plscmap0a)
#define PLSCMAP0N FNAME(PLSCMAP0N,plscmap0n)
#define PLSCMAP1 FNAME(PLSCMAP1,plscmap1)
+#define PLSCMAP1A FNAME(PLSCMAP1A,plscmap1a)
#define PLSCMAP1L FNAME(PLSCMAP1L,plscmap1l)
+#define PLSCMAP1LA FNAME(PLSCMAP1LA,plscmap1la)
#define PLSCMAP1N FNAME(PLSCMAP1N,plscmap1n)
#define PLSCOL0 FNAME(PLSCOL0,plscol0)
+#define PLSCOL0A FNAME(PLSCOL0A,plscol0a)
#define PLSCOLBG FNAME(PLSCOLBG,plscolbg)
+#define PLSCOLBGA FNAME(PLSCOLBGA,plscolbga)
#define PLSCOLOR FNAME(PLSCOLOR,plscolor)
#define PLSCOMPRESSION FNAME(PLSCOMPRESSION,plscompression)
#define PLSDEV7 FNAME(PLSDEV7,plsdev7)
@@ -295,6 +300,7 @@
#define PLSYM FNAME(PLSYM,plsym)
#define PLSZAX FNAME(PLSZAX,plszax)
#define PLTEXT FNAME(PLTEXT,pltext)
+#define PLTIMEFMT7 FNAME(PLTIMEFMT7,pltimefmt7)
#define PLVASP FNAME(PLVASP,plvasp)
#define PLVEC07 FNAME(PLVEC07,plvec07)
#define PLVEC17 FNAME(PLVEC17,plvec17)
Modified: trunk/bindings/f77/scstubs.c
===================================================================
--- trunk/bindings/f77/scstubs.c 2008-01-23 09:59:02 UTC (rev 8163)
+++ trunk/bindings/f77/scstubs.c 2008-01-23 10:59:02 UTC (rev 8164)
@@ -228,12 +228,24 @@
}
void
+PLGCOL0A(PLINT *icol0, PLINT *r, PLINT *g, PLINT *b, PLFLT *a)
+{
+ c_plgcol0a(*icol0, r, g, b, a);
+}
+
+void
PLGCOLBG(PLINT *r, PLINT *g, PLINT *b)
{
c_plgcolbg(r, g, b);
}
void
+PLGCOLBGA(PLINT *r, PLINT *g, PLINT *b, PLFLT *a)
+{
+ c_plgcolbga(r, g, b, a);
+}
+
+void
PLGCOMPRESSION(PLINT *compression)
{
c_plgcompression(compression);
@@ -559,6 +571,12 @@
}
void
+PLSCMAP0A(PLINT *r, PLINT *g, PLINT *b, PLFLT *a, PLINT *ncol0)
+{
+ c_plscmap0a(r, g, b, a, *ncol0);
+}
+
+void
PLSCMAP0N(PLINT *n)
{
c_plscmap0n(*n);
@@ -571,6 +589,12 @@
}
void
+PLSCMAP1A(PLINT *r, PLINT *g, PLINT *b, PLFLT *a, PLINT *ncol1)
+{
+ c_plscmap1a(r, g, b, a, *ncol1);
+}
+
+void
PLSCMAP1L(PLBOOL *itype, PLINT *npts, PLFLT *intensity,
PLFLT *coord1, PLFLT *coord2, PLFLT *coord3, PLBOOL *rev)
{
@@ -578,6 +602,13 @@
}
void
+PLSCMAP1LA(PLBOOL *itype, PLINT *npts, PLFLT *intensity,
+ PLFLT *coord1, PLFLT *coord2, PLFLT *coord3, PLFLT *a, PLBOOL *rev)
+{
+ c_plscmap1la(*itype, *npts, intensity, coord1, coord2, coord3, a, rev);
+}
+
+void
PLSCMAP1N(PLINT *n)
{
c_plscmap1n(*n);
@@ -590,12 +621,24 @@
}
void
+PLSCOL0A(PLINT *icol0, PLINT *r, PLINT *g, PLINT *b, PLFLT *a)
+{
+ c_plscol0a(*icol0, *r, *g, *b, *a);
+}
+
+void
PLSCOLBG(PLINT *r, PLINT *g, PLINT *b)
{
c_plscolbg(*r, *g, *b);
}
void
+PLSCOLBGA(PLINT *r, PLINT *g, PLINT *b, PLFLT *a)
+{
+ c_plscolbga(*r, *g, *b, *a);
+}
+
+void
PLSCOLOR(PLINT *color)
{
c_plscolor(*color);
@@ -829,6 +872,12 @@
}
void
+PLTIMEFMT7(const char *fmt)
+{
+ c_pltimefmt(fmt);
+}
+
+void
PLVASP(PLFLT *aspect)
{
c_plvasp(*aspect);
Modified: trunk/bindings/f77/sfstubs.fm4
===================================================================
--- trunk/bindings/f77/sfstubs.fm4 2008-01-23 09:59:02 UTC (rev 8163)
+++ trunk/bindings/f77/sfstubs.fm4 2008-01-23 10:59:02 UTC (rev 8164)
@@ -660,3 +660,16 @@
!***********************************************************************
+ subroutine pltimefmt(fmt)
+
+ implicit none
+ character*(*) fmt
+
+ include 'sfstubs.h'
+
+ call plstrf2c(fmt, string1, maxlen)
+ call pltimefmt7(s1)
+
+ end
+
+!***********************************************************************
Modified: trunk/bindings/f95/plstubs.h
===================================================================
--- trunk/bindings/f95/plstubs.h 2008-01-23 09:59:02 UTC (rev 8163)
+++ trunk/bindings/f95/plstubs.h 2008-01-23 10:59:02 UTC (rev 8164)
@@ -179,7 +179,9 @@
#define PLFONTLD FNAME(PLFONTLD,plfontld)
#define PLGCHR FNAME(PLGCHR,plgchr)
#define PLGCOL0 FNAME(PLGCOL0,plgcol0)
+#define PLGCOL0A FNAME(PLGCOL0A,plgcol0a)
#define PLGCOLBG FNAME(PLGCOLBG,plgcolbg)
+#define PLGCOLBGA FNAME(PLGCOLBGA,plgcolbga)
#define PLGCOMPRESSION FNAME(PLGCOMPRESSION,plgcompression)
#define PLGDEV7 FNAME(PLGDEV7,plgdev7)
#define PLGDIDEV FNAME(PLGDIDEV,plgdidev)
@@ -240,13 +242,19 @@
#define PLRGBHLS FNAME(PLRGBHLS,plrgbhls)
#define PLSCHR FNAME(PLSCHR,plschr)
#define PLSCMAP0 FNAME(PLSCMAP0F77,plscmap0f77)
+#define PLSCMAP0A FNAME(PLSCMAP0AF77,plscmap0af77)
#define PLSCMAP0N FNAME(PLSCMAP0N,plscmap0n)
#define PLSCMAP1 FNAME(PLSCMAP1F77,plscmap1f77)
+#define PLSCMAP1A FNAME(PLSCMAP1AF77,plscmap1af77)
#define PLSCMAP1L FNAME(PLSCMAP1LF77,plscmap1lf77)
+#define PLSCMAP1L2 FNAME(PLSCMAP1L2F77,plscmap1l2f77)
#define PLSCMAP1LA FNAME(PLSCMAP1LAF77,plscmap1laf77)
+#define PLSCMAP1LA2 FNAME(PLSCMAP1LA2F77,plscmap1la2f77)
#define PLSCMAP1N FNAME(PLSCMAP1N,plscmap1n)
#define PLSCOL0 FNAME(PLSCOL0,plscol0)
+#define PLSCOL0A FNAME(PLSCOL0A,plscol0a)
#define PLSCOLBG FNAME(PLSCOLBG,plscolbg)
+#define PLSCOLBGA FNAME(PLSCOLBGA,plscolbga)
#define PLSCOLOR FNAME(PLSCOLOR,plscolor)
#define PLSCOMPRESSION FNAME(PLSCOMPRESSION,plscompression)
#define PLSDEV7 FNAME(PLSDEV7,plsdev7)
@@ -291,6 +299,7 @@
#define PLSYM FNAME(PLSYMF77,plsymf77)
#define PLSZAX FNAME(PLSZAX,plszax)
#define PLTEXT FNAME(PLTEXT,pltext)
+#define PLTIMEFMT7 FNAME(PLTIMEFMT7,pltimefmt7)
#define PLVASP FNAME(PLVASP,plvasp)
#define PLVEC07 FNAME(PLVEC07,plvec07)
#define PLVEC17 FNAME(PLVEC17,plvec17)
Modified: trunk/bindings/f95/scstubs.c
===================================================================
--- trunk/bindings/f95/scstubs.c 2008-01-23 09:59:02 UTC (rev 8163)
+++ trunk/bindings/f95/scstubs.c 2008-01-23 10:59:02 UTC (rev 8164)
@@ -228,12 +228,24 @@
}
void
+PLGCOL0A(PLINT *icol0, PLINT *r, PLINT *g, PLINT *b, PLFLT *a)
+{
+ c_plgcol0a(*icol0, r, g, b, a);
+}
+
+void
PLGCOLBG(PLINT *r, PLINT *g, PLINT *b)
{
c_plgcolbg(r, g, b);
}
void
+PLGCOLBGA(PLINT *r, PLINT *g, PLINT *b, PLFLT *a)
+{
+ c_plgcolbga(r, g, b, a);
+}
+
+void
PLGCOMPRESSION(PLINT *compression)
{
c_plgcompression(compression);
@@ -561,6 +573,12 @@
}
void
+PLSCMAP0A(PLINT *r, PLINT *g, PLINT *b, PLFLT *a, PLINT *ncol0)
+{
+ c_plscmap0a(r, g, b, a, *ncol0);
+}
+
+void
PLSCMAP0N(PLINT *n)
{
c_plscmap0n(*n);
@@ -573,6 +591,12 @@
}
void
+PLSCMAP1A(PLINT *r, PLINT *g, PLINT *b, PLFLT *a, PLINT *ncol1)
+{
+ c_plscmap1a(r, g, b, a, *ncol1);
+}
+
+void
PLSCMAP1L(PLBOOL *itype, PLINT *npts, PLFLT *intensity,
PLFLT *coord1, PLFLT *coord2, PLFLT *coord3, PLBOOL *rev)
{
@@ -580,13 +604,27 @@
}
void
-PLSCMAP1LA(PLBOOL *itype, PLINT *npts, PLFLT *intensity,
+PLSCMAP1L2(PLBOOL *itype, PLINT *npts, PLFLT *intensity,
PLFLT *coord1, PLFLT *coord2, PLFLT *coord3)
{
c_plscmap1l(*itype, *npts, intensity, coord1, coord2, coord3, NULL);
}
void
+PLSCMAP1LA(PLBOOL *itype, PLINT *npts, PLFLT *intensity,
+ PLFLT *coord1, PLFLT *coord2, PLFLT *coord3, PLFLT *a, PLBOOL *rev)
+{
+ c_plscmap1la(*itype, *npts, intensity, coord1, coord2, coord3, a, rev);
+}
+
+void
+PLSCMAP1LA2(PLBOOL *itype, PLINT *npts, PLFLT *intensity,
+ PLFLT *coord1, PLFLT *coord2, PLFLT *coord3, PLFLT *a)
+{
+ c_plscmap1la(*itype, *npts, intensity, coord1, coord2, coord3, a, NULL);
+}
+
+void
PLSCMAP1N(PLINT *n)
{
c_plscmap1n(*n);
@@ -599,12 +637,24 @@
}
void
+PLSCOL0A(PLINT *icol0, PLINT *r, PLINT *g, PLINT *b, PLFLT *a)
+{
+ c_plscol0a(*icol0, *r, *g, *b, *a);
+}
+
+void
PLSCOLBG(PLINT *r, PLINT *g, PLINT *b)
{
c_plscolbg(*r, *g, *b);
}
void
+PLSCOLBGA(PLINT *r, PLINT *g, PLINT *b, PLFLT *a)
+{
+ c_plscolbga(*r, *g, *b, *a);
+}
+
+void
PLSCOLOR(PLINT *color)
{
c_plscolor(*color);
@@ -838,6 +888,12 @@
}
void
+PLTIMEFMT7(const char *fmt)
+{
+ c_pltimefmt(fmt);
+}
+
+void
PLVASP(PLFLT *aspect)
{
c_plvasp(*aspect);
Modified: trunk/bindings/f95/sfstubs.f90
===================================================================
--- trunk/bindings/f95/sfstubs.f90 2008-01-23 09:59:02 UTC (rev 8163)
+++ trunk/bindings/f95/sfstubs.f90 2008-01-23 10:59:02 UTC (rev 8164)
@@ -717,3 +717,19 @@
end subroutine
+!***********************************************************************
+
+ subroutine pltimefmt(fmt)
+
+ implicit none
+ character*(*) fmt
+
+ include 'sfstubs.h'
+
+ call plstrf2c(fmt, string1, maxlen)
+ s1 = transfer( string1, s1 )
+ call pltimefmt7(s1)
+
+ end subroutine
+
+!***********************************************************************
Modified: trunk/bindings/f95/sfstubsf95.f90
===================================================================
--- trunk/bindings/f95/sfstubsf95.f90 2008-01-23 09:59:02 UTC (rev 8163)
+++ trunk/bindings/f95/sfstubsf95.f90 2008-01-23 10:59:02 UTC (rev 8164)
@@ -280,12 +280,28 @@
end interface
interface
+ subroutine plgcol0a( icol, r, g, b, a )
+ use plplot_flt
+ integer :: icol, r, g, b
+ real(kind=plflt) :: a
+ end subroutine plgcol0a
+ end interface
+
+ interface
subroutine plgcolbg( r, g, b )
integer :: r, g, b
end subroutine plgcolbg
end interface
interface
+ subroutine plgcolbga( r, g, b, a )
+ use plplot_flt
+ integer :: r, g, b
+ real(kind=plflt) :: a
+ end subroutine plgcolbga
+ end interface
+
+ interface
subroutine plgcompression( compression )
integer :: compression
end subroutine plgcompression
@@ -528,6 +544,10 @@
module procedure plscmap0
end interface
+ interface plscmap0a
+ module procedure plscmap0a
+ end interface
+
interface
subroutine plscmap0n( n )
integer :: n
@@ -538,9 +558,18 @@
module procedure plscmap1
end interface
+ interface plscmap1a
+ module procedure plscmap1a
+ end interface
+
interface plscmap1l
module procedure plscmap1l
+ module procedure plscmap1l2
+ end interface
+
+ interface plscmap1la
module procedure plscmap1la
+ module procedure plscmap1la2
end interface
interface
@@ -556,12 +585,28 @@
end interface
interface
+ subroutine plscol0a( icol, r, g, b, a )
+ use plplot_flt
+ integer :: icol, r, g, b
+ real(kind=plflt) :: a
+ end subroutine plscol0a
+ end interface
+
+ interface
subroutine plscolbg( r, g, b )
integer :: r, g, b
end subroutine plscolbg
end interface
interface
+ subroutine plscolbga( r, g, b, a )
+ use plplot_flt
+ integer :: r, g, b
+ real(kind=plflt) :: a
+ end subroutine plscolbga
+ end interface
+
+ interface
subroutine plscolor( color )
integer :: color
end subroutine plscolor
@@ -1003,12 +1048,26 @@
call plscmap0f77( r, g, b, size(r) )
end subroutine plscmap0
+ subroutine plscmap0a( r, g, b, a )
+ integer, dimension(:) :: r, g, b
+ real(kind=plflt) :: a
+
+ call plscmap0af77( r, g, b, a, size(r) )
+ end subroutine plscmap0a
+
subroutine plscmap1( r, g, b )
integer, dimension(:) :: r, g, b
call plscmap1f77( r, g, b, size(r) )
end subroutine plscmap1
+ subroutine plscmap1a( r, g, b, a )
+ integer, dimension(:) :: r, g, b
+ real(kind=plflt) :: a
+
+ call plscmap1af77( r, g, b, a, size(r) )
+ end subroutine plscmap1a
+
subroutine plscmap1l( rgbtype, intensity, coord1, coord2, coord3, rev)
logical :: rgbtype
real(kind=plflt), dimension(:) :: intensity, coord1, coord2, coord3
@@ -1025,16 +1084,42 @@
call plscmap1lf77( type, size(intensity), intensity, coord1, coord2, coord3, irev )
end subroutine plscmap1l
- subroutine plscmap1la( rgbtype, intensity, coord1, coord2, coord3)
+ subroutine plscmap1l2( rgbtype, intensity, coord1, coord2, coord3)
logical :: rgbtype
real(kind=plflt), dimension(:) :: intensity, coord1, coord2, coord3
integer :: type
type = convert_to_int( rgbtype )
- call plscmap1laf77( type, size(intensity), intensity, coord1, coord2, coord3)
+ call plscmap1l2f77( type, size(intensity), intensity, coord1, coord2, coord3)
+ end subroutine plscmap1l2
+
+ subroutine plscmap1la( rgbtype, intensity, coord1, coord2, coord3, a, rev)
+ logical :: rgbtype
+ real(kind=plflt), dimension(:) :: intensity, coord1, coord2, coord3, a
+ logical, dimension(:) :: rev
+
+ integer, dimension(size(rev)) :: irev
+ integer :: i
+ integer :: type
+
+ type = convert_to_int( rgbtype )
+ do i = 1,size(rev)
+ irev(i) = convert_to_int( rev(i) )
+ enddo
+ call plscmap1laf77( type, size(intensity), intensity, coord1, coord2, coord3, a, irev )
end subroutine plscmap1la
+ subroutine plscmap1la2( rgbtype, intensity, coord1, coord2, coord3, a)
+ logical :: rgbtype
+ real(kind=plflt), dimension(:) :: intensity, coord1, coord2, coord3, a
+
+ integer :: type
+
+ type = convert_to_int( rgbtype )
+ call plscmap1la2f77( type, size(intensity), intensity, coord1, coord2, coord3, a)
+ end subroutine plscmap1la2
+
subroutine plstripc(id, xspec, yspec, xmin, xmax, xjump, &
ymin, ymax, xlpos, ylpos, y_ascl, acc, &
colbox, collab, colline, styline, legline, &
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|