Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[11653] trunk
|
From: <ai...@us...> - 2011-03-19 21:14:17
|
Revision: 11653
http://plplot.svn.sourceforge.net/plplot/?rev=11653&view=rev
Author: airwin
Date: 2011-03-19 21:14:10 +0000 (Sat, 19 Mar 2011)
Log Message:
-----------
Remove long-deprecated plcol from Fortran 77 and Fortran 95 API. Use
plcol0 instead.
Modified Paths:
--------------
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
trunk/examples/f77/x16af.fm4
trunk/examples/f77/x20f.fm4
trunk/examples/f95/x16af.f90
trunk/examples/f95/x20f.f90
Modified: trunk/bindings/f77/plstubs.h
===================================================================
--- trunk/bindings/f77/plstubs.h 2011-03-19 19:41:45 UTC (rev 11652)
+++ trunk/bindings/f77/plstubs.h 2011-03-19 21:14:10 UTC (rev 11653)
@@ -183,7 +183,6 @@
#define PLCALC_WORLDa FNAME( PLCALC_WORLD_, plcalc_world_ )
#define PLCLEAR FNAME( PLCLEAR, plclear )
#define PLCLR FNAME( PLCLR, plclr )
-#define PLCOL FNAME( PLCOL, plcol )
#define PLCOL0 FNAME( PLCOL0, plcol0 )
#define PLCOL1 FNAME( PLCOL1, plcol1 )
#define PLCOLORBAR FNAME( PLCOLORBAR7, plcolorbar7 )
Modified: trunk/bindings/f77/scstubs.c
===================================================================
--- trunk/bindings/f77/scstubs.c 2011-03-19 19:41:45 UTC (rev 11652)
+++ trunk/bindings/f77/scstubs.c 2011-03-19 21:14:10 UTC (rev 11653)
@@ -167,15 +167,7 @@
c_plcol1( *col );
}
-// The old way, same as plcol0
-
void
-PLCOL( PLINT *icol )
-{
- c_plcol0( *icol );
-}
-
-void
PLCOLORBAR( PLINT *position, PLINT *opt, PLFLT *x, PLFLT *y, PLFLT *length, PLFLT *width,
PLINT *cont_color, PLINT *cont_width, PLFLT *ticks, PLINT *sub_ticks,
char *axis_opts, char *label, PLINT *n_colors, PLFLT *colors, PLFLT *values )
Modified: trunk/bindings/f95/plstubs.h
===================================================================
--- trunk/bindings/f95/plstubs.h 2011-03-19 19:41:45 UTC (rev 11652)
+++ trunk/bindings/f95/plstubs.h 2011-03-19 21:14:10 UTC (rev 11653)
@@ -183,7 +183,6 @@
#define PLCALC_WORLDa FNAME( PLCALC_WORLD_, plcalc_world_ )
#define PLCLEAR FNAME( PLCLEAR, plclear )
#define PLCLR FNAME( PLCLR, plclr )
-#define PLCOL FNAME( PLCOL, plcol )
#define PLCOL0 FNAME( PLCOL0, plcol0 )
#define PLCOL1 FNAME( PLCOL1, plcol1 )
#define PLCONFIGTIME FNAME( PLCONFIGTIME, plconfigtime )
Modified: trunk/bindings/f95/scstubs.c
===================================================================
--- trunk/bindings/f95/scstubs.c 2011-03-19 19:41:45 UTC (rev 11652)
+++ trunk/bindings/f95/scstubs.c 2011-03-19 21:14:10 UTC (rev 11653)
@@ -168,15 +168,7 @@
c_plcol1( *col );
}
-// The old way, same as plcol0
-
void
-PLCOL( PLINT *icol )
-{
- c_plcol0( *icol );
-}
-
-void
PLCONFIGTIME( PLFLT *scale, PLFLT *offset1, PLFLT *offset2, PLINT *ccontrol, PLBOOL *ifbtime_offset, PLINT *year, PLINT *month, PLINT *day, PLINT *hour, PLINT *min, PLFLT *sec )
{
c_plconfigtime( *scale, *offset1, *offset2, *ccontrol, *ifbtime_offset, *year, *month, *day, *hour, *min, *sec );
Modified: trunk/bindings/f95/sfstubsf95.f90
===================================================================
--- trunk/bindings/f95/sfstubsf95.f90 2011-03-19 19:41:45 UTC (rev 11652)
+++ trunk/bindings/f95/sfstubsf95.f90 2011-03-19 21:14:10 UTC (rev 11653)
@@ -177,12 +177,6 @@
end interface
interface
- subroutine plcol( icol )
- integer :: icol
- end subroutine plcol
- end interface
-
- interface
subroutine plcol1( col )
use plplot_flt
real(kind=plflt) :: col
Modified: trunk/examples/f77/x16af.fm4
===================================================================
--- trunk/examples/f77/x16af.fm4 2011-03-19 19:41:45 UTC (rev 11652)
+++ trunk/examples/f77/x16af.fm4 2011-03-19 21:14:10 UTC (rev 11653)
@@ -110,9 +110,9 @@
& min_color, min_width, max_color, max_width, xdim)
enddo
- call plcol(1)
+ call plcol0(1)
call plbox('bcnst', 0.0d0, 0, 'bcnstv', 0.0d0, 0)
- call plcol(2)
+ call plcol0(2)
call pllab('distance', 'altitude', 'Bogon flux')
end
@@ -234,7 +234,7 @@
ncollab = 2
call pladv(0)
- call plcol(ncolbox)
+ call plcol0(ncolbox)
c Scale window to user coordinates.
c Make a bit larger so the boundary does not get clipped.
@@ -282,10 +282,10 @@
xtm(i) = x0 + rmax * cos(theta)
ytm(i) = y0 + rmax * sin(theta)
enddo
- call plcol(ncolbox)
+ call plcol0(ncolbox)
call plline(NBDRY, xtm, ytm)
- call plcol(ncollab)
+ call plcol0(ncollab)
call pllab(' ', ' ',
&'Shielded potential of charges in a conducting sphere')
Modified: trunk/examples/f77/x20f.fm4
===================================================================
--- trunk/examples/f77/x20f.fm4 2011-03-19 19:41:45 UTC (rev 11652)
+++ trunk/examples/f77/x20f.fm4 2011-03-19 21:14:10 UTC (rev 11653)
@@ -272,7 +272,7 @@
call a2mnmx(img_f,width,height,img_min,img_max,WDIM)
- call plcol(2)
+ call plcol0(2)
call plenv(0.d0, width_r, 0.d0, height_r, 1, -1)
call pllab("", "", "Reduced dynamic range image example")
call plimagefr0(img_f, width, height, 0.d0, width_r, 0.d0,
Modified: trunk/examples/f95/x16af.f90
===================================================================
--- trunk/examples/f95/x16af.f90 2011-03-19 19:41:45 UTC (rev 11652)
+++ trunk/examples/f95/x16af.f90 2011-03-19 21:14:10 UTC (rev 11653)
@@ -111,9 +111,9 @@
min_color, min_width, max_color, max_width )
enddo
- call plcol(1)
+ call plcol0(1)
call plbox('bcnst', 0.0_plflt, 0, 'bcnstv', 0.0_plflt, 0)
- call plcol(2)
+ call plcol0(2)
call pllab('distance', 'altitude', 'Bogon flux')
end
@@ -235,7 +235,7 @@
ncollab = 2
call pladv(0)
- call plcol(ncolbox)
+ call plcol0(ncolbox)
! Scale window to user coordinates.
! Make a bit larger so the boundary does not get clipped.
@@ -284,10 +284,10 @@
xtm(i) = x0 + rmax * cos(theta)
ytm(i) = y0 + rmax * sin(theta)
enddo
- call plcol(ncolbox)
+ call plcol0(ncolbox)
call plline(xtm, ytm)
- call plcol(ncollab)
+ call plcol0(ncollab)
call pllab(' ', ' ', &
'Shielded potential of charges in a conducting sphere')
Modified: trunk/examples/f95/x20f.f90
===================================================================
--- trunk/examples/f95/x20f.f90 2011-03-19 19:41:45 UTC (rev 11652)
+++ trunk/examples/f95/x20f.f90 2011-03-19 21:14:10 UTC (rev 11653)
@@ -261,7 +261,7 @@
call a2mnmx(img_f,width,height,img_min,img_max,width)
- call plcol(2)
+ call plcol0(2)
call plenv(0._plflt, width_r, 0._plflt, height_r, 1, -1)
call pllab("", "", "Reduced dynamic range image example")
call plimagefr(img_f, 0._plflt, width_r, 0._plflt, &
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
