Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12320] trunk
|
From: <arj...@us...> - 2013-05-02 01:20:35
|
Revision: 12320
http://sourceforge.net/p/plplot/code/12320
Author: arjenmarkus
Date: 2013-05-02 01:20:31 +0000 (Thu, 02 May 2013)
Log Message:
-----------
Propagate the API changes to pllegend and plshade(s) to the Fortran bindings.
The examples that are affected produce the same PostScript files as their
C equivalents - excepting x16 because of the colour bars.
Modified Paths:
--------------
trunk/bindings/f95/sccont.c
trunk/bindings/f95/scstubs.c
trunk/bindings/f95/sfstubs.f90
trunk/bindings/f95/sfstubsf95.f90
trunk/examples/f95/x04f.f90
trunk/examples/f95/x15f.f90
trunk/examples/f95/x16af.f90
trunk/examples/f95/x16f.f90
trunk/examples/f95/x21f.f90
trunk/examples/f95/x26f.f90
trunk/examples/f95/x33f.f90
Modified: trunk/bindings/f95/sccont.c
===================================================================
--- trunk/bindings/f95/sccont.c 2013-05-01 21:51:24 UTC (rev 12319)
+++ trunk/bindings/f95/sccont.c 2013-05-02 01:20:31 UTC (rev 12320)
@@ -47,47 +47,47 @@
void PLSHADE07( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *shade_min, PLFLT *shade_max,
- PLINT *sh_cmap, PLFLT *sh_color, PLINT *sh_width,
- PLINT *min_color, PLINT *min_width,
- PLINT *max_color, PLINT *max_width, PLINT *lx );
+ PLINT *sh_cmap, PLFLT *sh_color, PLFLT *sh_width,
+ PLINT *min_color, PLFLT *min_width,
+ PLINT *max_color, PLFLT *max_width, PLINT *lx );
void PLSHADE17( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *shade_min, PLFLT *shade_max,
- PLINT *sh_cmap, PLFLT *sh_color, PLINT *sh_width,
- PLINT *min_color, PLINT *min_width,
- PLINT *max_color, PLINT *max_width,
+ PLINT *sh_cmap, PLFLT *sh_color, PLFLT *sh_width,
+ PLINT *min_color, PLFLT *min_width,
+ PLINT *max_color, PLFLT *max_width,
PLFLT *xg1, PLFLT *yg1, PLINT *lx );
void PLSHADE27( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *shade_min, PLFLT *shade_max,
- PLINT *sh_cmap, PLFLT *sh_color, PLINT *sh_width,
- PLINT *min_color, PLINT *min_width,
- PLINT *max_color, PLINT *max_width,
+ PLINT *sh_cmap, PLFLT *sh_color, PLFLT *sh_width,
+ PLINT *min_color, PLFLT *min_width,
+ PLINT *max_color, PLFLT *max_width,
PLFLT *xg2, PLFLT *yg2, PLINT *lx );
void PLSHADE7( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *shade_min, PLFLT *shade_max,
- PLINT *sh_cmap, PLFLT *sh_color, PLINT *sh_width,
- PLINT *min_color, PLINT *min_width,
- PLINT *max_color, PLINT *max_width, PLFLT *ftr, PLINT *lx );
+ PLINT *sh_cmap, PLFLT *sh_color, PLFLT *sh_width,
+ PLINT *min_color, PLFLT *min_width,
+ PLINT *max_color, PLFLT *max_width, PLFLT *ftr, PLINT *lx );
void PLSHADES07( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
- PLFLT *clevel, PLINT *nlevel, PLINT *fill_width,
- PLINT *cont_color, PLINT *cont_width, PLINT *lx );
+ PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
+ PLINT *cont_color, PLFLT *cont_width, PLINT *lx );
void PLSHADES17( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
- PLFLT *clevel, PLINT *nlevel, PLINT *fill_width,
- PLINT *cont_color, PLINT *cont_width,
+ PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
+ PLINT *cont_color, PLFLT *cont_width,
PLFLT *xg1, PLFLT *yg1, PLINT *lx );
void PLSHADES27( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
- PLFLT *clevel, PLINT *nlevel, PLINT *fill_width,
- PLINT *cont_color, PLINT *cont_width,
+ PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
+ PLINT *cont_color, PLFLT *cont_width,
PLFLT *xg2, PLFLT *yg2, PLINT *lx );
void PLSHADES7( PLFLT *z, PLINT *nx, PLINT *ny, const char *defined,
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
- PLFLT *clevel, PLINT *nlevel, PLINT *fill_width,
- PLINT *cont_color, PLINT *cont_width, PLFLT *ftr, PLINT *lx );
+ PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
+ PLINT *cont_color, PLFLT *cont_width, PLFLT *ftr, PLINT *lx );
void PLGRIDDATA( PLFLT *x, PLFLT *y, PLFLT *z, PLINT *npts, PLFLT *xg,
PLINT *nx, PLFLT *yg, PLINT *ny, PLFLT *zg, PLINT *type,
PLFLT *data );
@@ -356,9 +356,9 @@
PLSHADE07( PLFLT *z, PLINT *nx, PLINT *ny, const char *PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *shade_min, PLFLT *shade_max,
- PLINT *sh_cmap, PLFLT *sh_color, PLINT *sh_width,
- PLINT *min_color, PLINT *min_width,
- PLINT *max_color, PLINT *max_width, PLINT *lx )
+ PLINT *sh_cmap, PLFLT *sh_color, PLFLT *sh_width,
+ PLINT *min_color, PLFLT *min_width,
+ PLINT *max_color, PLFLT *max_width, PLINT *lx )
{
PLINT rect = 1;
PLFLT ** a;
@@ -392,9 +392,9 @@
PLSHADE17( PLFLT *z, PLINT *nx, PLINT *ny, const char * PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *shade_min, PLFLT *shade_max,
- PLINT *sh_cmap, PLFLT *sh_color, PLINT *sh_width,
- PLINT *min_color, PLINT *min_width,
- PLINT *max_color, PLINT *max_width,
+ PLINT *sh_cmap, PLFLT *sh_color, PLFLT *sh_width,
+ PLINT *min_color, PLFLT *min_width,
+ PLINT *max_color, PLFLT *max_width,
PLFLT *xg1, PLFLT *yg1, PLINT *lx )
{
PLINT rect = 1;
@@ -433,9 +433,9 @@
PLSHADE27( PLFLT *z, PLINT *nx, PLINT *ny, const char * PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *shade_min, PLFLT *shade_max,
- PLINT *sh_cmap, PLFLT *sh_color, PLINT *sh_width,
- PLINT *min_color, PLINT *min_width,
- PLINT *max_color, PLINT *max_width,
+ PLINT *sh_cmap, PLFLT *sh_color, PLFLT *sh_width,
+ PLINT *min_color, PLFLT *min_width,
+ PLINT *max_color, PLFLT *max_width,
PLFLT *xg2, PLFLT *yg2, PLINT *lx )
{
PLINT rect = 0;
@@ -476,9 +476,9 @@
PLSHADE7( PLFLT *z, PLINT *nx, PLINT *ny, const char * PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
PLFLT *shade_min, PLFLT *shade_max,
- PLINT *sh_cmap, PLFLT *sh_color, PLINT *sh_width,
- PLINT *min_color, PLINT *min_width,
- PLINT *max_color, PLINT *max_width, PLFLT *ftr, PLINT *lx )
+ PLINT *sh_cmap, PLFLT *sh_color, PLFLT *sh_width,
+ PLINT *min_color, PLFLT *min_width,
+ PLINT *max_color, PLFLT *max_width, PLFLT *ftr, PLINT *lx )
{
PLINT rect = 1;
PLFLT ** a;
@@ -518,8 +518,8 @@
void
PLSHADES07( PLFLT *z, PLINT *nx, PLINT *ny, const char * PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
- PLFLT *clevel, PLINT *nlevel, PLINT *fill_width,
- PLINT *cont_color, PLINT *cont_width, PLINT *lx )
+ PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
+ PLINT *cont_color, PLFLT *cont_width, PLINT *lx )
{
PLINT rect = 1;
PLFLT ** a;
@@ -548,8 +548,8 @@
void
PLSHADES17( PLFLT *z, PLINT *nx, PLINT *ny, const char * PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
- PLFLT *clevel, PLINT *nlevel, PLINT *fill_width,
- PLINT *cont_color, PLINT *cont_width,
+ PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
+ PLINT *cont_color, PLFLT *cont_width,
PLFLT *xg1, PLFLT *yg1, PLINT *lx )
{
PLINT rect = 1;
@@ -585,8 +585,8 @@
void
PLSHADES27( PLFLT *z, PLINT *nx, PLINT *ny, const char * PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
- PLFLT *clevel, PLINT *nlevel, PLINT *fill_width,
- PLINT *cont_color, PLINT *cont_width,
+ PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
+ PLINT *cont_color, PLFLT *cont_width,
PLFLT *xg2, PLFLT *yg2, PLINT *lx )
{
PLINT rect = 0;
@@ -625,8 +625,8 @@
void
PLSHADES7( PLFLT *z, PLINT *nx, PLINT *ny, const char * PL_UNUSED( defined ),
PLFLT *xmin, PLFLT *xmax, PLFLT *ymin, PLFLT *ymax,
- PLFLT *clevel, PLINT *nlevel, PLINT *fill_width,
- PLINT *cont_color, PLINT *cont_width, PLFLT *ftr, PLINT *lx )
+ PLFLT *clevel, PLINT *nlevel, PLFLT *fill_width,
+ PLINT *cont_color, PLFLT *cont_width, PLFLT *ftr, PLINT *lx )
{
PLINT rect = 1;
PLFLT ** a;
Modified: trunk/bindings/f95/scstubs.c
===================================================================
--- trunk/bindings/f95/scstubs.c 2013-05-01 21:51:24 UTC (rev 12319)
+++ trunk/bindings/f95/scstubs.c 2013-05-02 01:20:31 UTC (rev 12320)
@@ -138,9 +138,9 @@
PLFLT *text_justification,
const PLINT *text_colors,
const PLINT *box_colors, const PLINT *box_patterns,
- const PLFLT *box_scales, const PLINT *box_line_widths,
+ const PLFLT *box_scales, const PLFLT *box_line_widths,
const PLINT *line_colors, const PLINT *line_styles,
- const PLINT *line_widths,
+ const PLFLT *line_widths,
const PLINT *symbol_colors, const PLFLT *symbol_scales,
const PLINT *symbol_numbers );
void PLLIGHTSOURCE( PLFLT *x, PLFLT *y, PLFLT *z );
@@ -816,9 +816,9 @@
PLFLT *text_justification,
const PLINT *text_colors,
const PLINT *box_colors, const PLINT *box_patterns,
- const PLFLT *box_scales, const PLINT *box_line_widths,
+ const PLFLT *box_scales, const PLFLT *box_line_widths,
const PLINT *line_colors, const PLINT *line_styles,
- const PLINT *line_widths,
+ const PLFLT *line_widths,
const PLINT *symbol_colors, const PLFLT *symbol_scales,
const PLINT *symbol_numbers )
{
Modified: trunk/bindings/f95/sfstubs.f90
===================================================================
--- trunk/bindings/f95/sfstubs.f90 2013-05-01 21:51:24 UTC (rev 12319)
+++ trunk/bindings/f95/sfstubs.f90 2013-05-02 01:20:31 UTC (rev 12320)
@@ -396,8 +396,9 @@
implicit none
character defined*(*)
- integer sh_cmap, sh_width
- integer min_color, min_width, max_color, max_width
+ integer sh_cmap
+ integer min_color, max_color
+ real(kind=plflt) sh_width, min_width, max_width
real(kind=plflt) shade_min, shade_max, sh_color
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax
@@ -423,8 +424,9 @@
implicit none
character defined*(*)
- integer sh_cmap, sh_width
- integer min_color, min_width, max_color, max_width
+ integer sh_cmap
+ integer min_color, max_color
+ real(kind=plflt) sh_width, min_width, max_width
real(kind=plflt) shade_min, shade_max, sh_color
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax, xg(:), yg(:)
@@ -451,8 +453,9 @@
implicit none
character defined*(*)
- integer sh_cmap, sh_width
- integer min_color, min_width, max_color, max_width
+ integer sh_cmap
+ integer min_color, max_color
+ real(kind=plflt) sh_width, min_width, max_width
real(kind=plflt) shade_min, shade_max, sh_color
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax, xg(:,:), yg(:,:)
@@ -478,8 +481,9 @@
implicit none
character(len=*) defined
- integer sh_cmap, sh_width
- integer min_color, min_width, max_color, max_width
+ integer sh_cmap
+ integer min_color, max_color
+ real(kind=plflt) sh_width, min_width, max_width
real(kind=plflt) shade_min, shade_max, sh_color
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax
real(kind=plflt) tr(6)
@@ -502,7 +506,8 @@
implicit none
character defined*(*)
- integer fill_width, cont_color, cont_width
+ integer cont_color
+ real(kind=plflt) fill_width, cont_width
real(kind=plflt) clevel(:)
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax
@@ -525,7 +530,8 @@
implicit none
character defined*(*)
- integer fill_width, cont_color, cont_width
+ integer cont_color
+ real(kind=plflt) fill_width, cont_width
real(kind=plflt) clevel(:)
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax, &
xg1(:), yg1(:)
@@ -549,7 +555,8 @@
implicit none
character defined*(*)
- integer fill_width, cont_color, cont_width
+ integer cont_color
+ real(kind=plflt)fill_width, cont_width
real(kind=plflt) clevel(:)
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax, &
xg2(:,:), yg2(:,:)
@@ -573,7 +580,8 @@
implicit none
character defined*(*)
- integer fill_width, cont_color, cont_width
+ integer cont_color
+ real(kind=plflt) fill_width, cont_width
real(kind=plflt) clevel(:)
real(kind=plflt) z(:,:), xmin, xmax, ymin, ymax
real(kind=plflt) tr(6)
Modified: trunk/bindings/f95/sfstubsf95.f90
===================================================================
--- trunk/bindings/f95/sfstubsf95.f90 2013-05-01 21:51:24 UTC (rev 12319)
+++ trunk/bindings/f95/sfstubsf95.f90 2013-05-02 01:20:31 UTC (rev 12320)
@@ -1099,8 +1099,10 @@
character(len=*), dimension(:) :: text, symbols
integer, dimension(:) :: opt_array, text_colors, box_colors
- integer, dimension(:) :: box_patterns, box_line_widths
- integer, dimension(:) :: line_colors, line_styles, line_widths
+ integer, dimension(:) :: box_patterns
+ real(kind=plflt), dimension(:) :: box_line_widths
+ integer, dimension(:) :: line_colors, line_styles
+ real(kind=plflt), dimension(:) :: line_widths
integer, dimension(:) :: symbol_colors, symbol_numbers
real(kind=plflt), dimension(:) :: box_scales, symbol_scales
@@ -1145,8 +1147,10 @@
character(len=*), dimension(:) :: text, symbols
integer, dimension(:) :: opt_array, text_colors, box_colors
- integer, dimension(:) :: box_patterns, box_line_widths
- integer, dimension(:) :: line_colors, line_styles, line_widths
+ integer, dimension(:) :: box_patterns
+ real(kind=plflt), dimension(:) :: box_line_widths
+ integer, dimension(:) :: line_colors, line_styles
+ real(kind=plflt), dimension(:) :: line_widths
integer, dimension(:) :: symbol_colors, symbol_numbers
real(kind=plflt), dimension(:) :: box_scales, symbol_scales
Modified: trunk/examples/f95/x04f.f90
===================================================================
--- trunk/examples/f95/x04f.f90 2013-05-01 21:51:24 UTC (rev 12319)
+++ trunk/examples/f95/x04f.f90 2013-05-02 01:20:31 UTC (rev 12320)
@@ -43,11 +43,10 @@
real(kind=plflt) :: legend_width, legend_height
integer :: opt_array(2), text_colors(2), line_colors(2), &
- line_styles(2), line_widths(2), symbol_colors(2), &
- symbol_numbers(2)
- real(kind=plflt) :: symbol_scales(2), box_scales(0)
+ line_styles(2), symbol_colors(2), symbol_numbers(2)
+ real(kind=plflt) :: line_widths(2), symbol_scales(2), box_scales(0)
integer :: box_colors(0), box_patterns(0)
- integer :: box_line_widths(0)
+ real(kind=plflt) :: box_line_widths(0)
character(len=20) :: text(2)
character(len=1) :: symbols(2)
Modified: trunk/examples/f95/x15f.f90
===================================================================
--- trunk/examples/f95/x15f.f90 2013-05-01 21:51:24 UTC (rev 12319)
+++ trunk/examples/f95/x15f.f90 2013-05-02 01:20:31 UTC (rev 12320)
@@ -160,8 +160,9 @@
character(len=1) undefined
real(kind=plflt) shade_min, shade_max, sh_color
- integer sh_cmap, sh_width
- integer min_color, min_width, max_color, max_width
+ integer sh_cmap
+ integer min_color, max_color
+ real(kind=plflt) sh_width, min_width, max_width
sh_cmap = 0
min_color = 0
@@ -216,22 +217,23 @@
character(len=1) undefined
real(kind=plflt) shade_min, shade_max, sh_color
- integer sh_cmap, sh_width
- integer min_color, min_width, max_color, max_width
+ integer sh_cmap
+ integer min_color, max_color
+ real(kind=plflt) sh_width, min_width, max_width
integer i, j
integer nlin(10), inc(2,10), del(2,10)
data nlin /1, 1, 1, 1, 1, 2, 2, 2, 2, 2/
data ( (inc(i,j), i=1,2), j=1,10) / &
450, 0, -450, 0, 0, 0, 900, 0, &
- 300, 0, 450,-450, 0, 900, 0, 450, &
+ 300, 0, 450,-450, 0, 900, 0, 450, &
450, -450, 0, 900/
data ( (del(i,j), i=1,2), j=1,10) / &
2000, 2000, 2000, 2000, 2000, 2000, &
2000, 2000, 2000, 2000, 2000, 2000, &
2000, 2000, 2000, 2000, 4000, 4000, &
4000, 2000/
-
+
sh_cmap = 0
min_color = 0
min_width = 0
@@ -267,8 +269,8 @@
!--------------------------------------------------------------------------
! plot3
!
-! Illustrates shaded regions in 3d, using a different fill pattern for
-! each region.
+! Illustrates shaded regions in 3d, using a different fill pattern for
+! each region.
!--------------------------------------------------------------------------
subroutine plot3
@@ -289,8 +291,8 @@
call plw3d(1._plflt, 1._plflt, 1._plflt, -1.0_plflt, 1.0_plflt, &
-1.0_plflt, 1.0_plflt, 0.0_plflt,1.5_plflt, 30._plflt, -40._plflt)
-! Plot using identity transform
-
+! Plot using identity transform
+
call plcol0(1)
call plbox3("bntu", "X", 0.0_plflt, 0, "bntu", "Y", 0.0_plflt, 0, &
"bcdfntu", "Z", 0.5_plflt, 0)
Modified: trunk/examples/f95/x16af.f90
===================================================================
--- trunk/examples/f95/x16af.f90 2013-05-01 21:51:24 UTC (rev 12319)
+++ trunk/examples/f95/x16af.f90 2013-05-02 01:20:31 UTC (rev 12320)
@@ -57,8 +57,9 @@
real(kind=plflt) z(xdim, ydim), w(xdim, ydim), clevel(NCONTR)
real(kind=plflt) xmin, xmax, ymin, ymax, zmin, zmax, x, y
real(kind=plflt) shade_min, shade_max, sh_color
- integer i, j, sh_cmap, sh_width
- integer min_color, min_width, max_color, max_width
+ integer i, j, sh_cmap
+ integer min_color, max_color
+ real(kind=plflt) sh_width, min_width, max_width
xmin = -1._plflt
ymin = -1._plflt
@@ -145,8 +146,9 @@
integer nxsub, nysub
integer ncolbox, ncollab
integer i, j, kx, lx, ky, ly
- integer sh_cmap, sh_width
- integer min_color, min_width, max_color, max_width
+ integer sh_cmap
+ integer min_color, max_color
+ real(kind=plflt) sh_width, min_width, max_width
character(len=8) xopt, yopt
! Set up for plshade call
Modified: trunk/examples/f95/x16f.f90
===================================================================
--- trunk/examples/f95/x16f.f90 2013-05-01 21:51:24 UTC (rev 12319)
+++ trunk/examples/f95/x16f.f90 2013-05-02 01:20:31 UTC (rev 12320)
@@ -33,7 +33,8 @@
z(xdim,ydim), w(xdim,ydim), xg1(xdim), yg1(ydim), &
xg2(xdim,ydim), yg2(xdim,ydim), zmin, zmax, &
px(PERIMETERPTS), py(PERIMETERPTS)
- integer fill_width, cont_color, cont_width
+ integer cont_color
+ real(kind=plflt) fill_width, cont_width
integer i, j
! dummy to fill argument list with something not currently used.
character(len=1) defined
Modified: trunk/examples/f95/x21f.f90
===================================================================
--- trunk/examples/f95/x21f.f90 2013-05-01 21:51:24 UTC (rev 12319)
+++ trunk/examples/f95/x21f.f90 2013-05-02 01:20:31 UTC (rev 12320)
@@ -40,7 +40,7 @@
parameter (rosen = 0)
real(kind=plflt) xmin, xmax, ymin, ymax
-
+
real(kind=plflt) x(pts), y(pts), z(pts), clev(nl)
real(kind=plflt) xg(xp), yg(yp), zg(xp,yp)
real(kind=plflt) zmin, zmax, lzmin, lzmax
@@ -102,7 +102,7 @@
z(i) = log((1._plflt-x(i))**2 + 100._plflt*(y(i)-x(i)**2)**2)
endif
enddo
-
+
zmin = z(1)
zmax = z(1)
do i=2,pts
@@ -116,7 +116,7 @@
do i=1,yp
yg(i) = ymin + (ymax-ymin)*(i-1._plflt)/(yp-1._plflt)
enddo
-
+
call plcol0(1)
call plenv(xmin, xmax, ymin, ymax, 2, 0)
call plcol0(15)
@@ -158,15 +158,15 @@
if ((alg.eq.GRID_CSA).or.(alg.eq.GRID_DTLI).or. &
(alg.eq.GRID_NNLI).or.(alg.eq.GRID_NNI)) then
-
+
do i=1,xp
do j=1,yp
if (myisnan(zg(i,j))) then
! average (IDW) over the 8 neighbors
-
+
zg(i,j) = 0._plflt
dist = 0._plflt
-
+
ii=i-1
do while ((ii.le.i+1).and.(ii.le.xp))
jj = j-1
@@ -194,7 +194,7 @@
enddo
enddo
endif
-
+
call a2mnmx(zg, xp, yp, lzmin, lzmax, xp)
lzmin = min(lzmin, zmin)
@@ -205,9 +205,9 @@
call plcol0(1)
call pladv(alg)
-
+
if (k.eq.1) then
-
+
do i=1,nl
clev(i) = lzmin + (lzmax-lzmin)/(nl-1._plflt)*(i-1._plflt)
enddo
@@ -215,23 +215,23 @@
call plcol0(15)
call pllab("X", "Y", title(alg))
call plshades(zg, defined, xmin, xmax, ymin, &
- ymax, clev, 1, 0, 1)
+ ymax, clev, 1._plflt, 0, 1._plflt)
call plcol0(2)
else
-
+
do i = 1,nl
clev(i) = lzmin + (lzmax-lzmin)/(nl-1._plflt)*(i-1._plflt)
enddo
call plvpor(0._plflt, 1._plflt, 0._plflt, 0.9_plflt)
call plwind(-1.1_plflt, 0.75_plflt, -0.65_plflt, 1.20_plflt)
-!
+!
! For the comparison to be fair, all plots should have the
! same z values, but to get the max/min of the data generated
! by all algorithms would imply two passes. Keep it simple.
!
! plw3d(1., 1., 1., xmin, xmax, ymin, ymax, zmin, zmax, 30, -60);
!
-
+
call plw3d(1._plflt, 1._plflt, 1._plflt, xmin, xmax, ymin, ymax, &
lzmin, lzmax, 30._plflt, -40._plflt)
call plbox3("bntu", "X", 0._plflt, 0, &
@@ -246,26 +246,26 @@
enddo
call plend
-
+
end
subroutine cmap1_init
use plplot
implicit none
real(kind=plflt) i(2), h(2), l(2), s(2)
-
+
i(1) = 0._plflt
i(2) = 1._plflt
-
+
h(1) = 240._plflt
h(2) = 0._plflt
-
+
l(1) = 0.6_plflt
l(2) = 0.6_plflt
-
+
s(1) = 0.8_plflt
s(2) = 0.8_plflt
-
+
call plscmap1n(256)
call plscmap1l(.false., i, h, l, s)
end subroutine cmap1_init
@@ -281,7 +281,7 @@
integer i, j, nx, ny, xdim
real(kind=plflt) f(xdim, ny), fmin, fmax
-
+
fmax = f(1, 1)
fmin = fmax
do j = 1, ny
Modified: trunk/examples/f95/x26f.f90
===================================================================
--- trunk/examples/f95/x26f.f90 2013-05-01 21:51:24 UTC (rev 12319)
+++ trunk/examples/f95/x26f.f90 2013-05-02 01:20:31 UTC (rev 12320)
@@ -155,13 +155,13 @@
integer text_colors(nlegend)
integer line_colors(nlegend)
integer line_styles(nlegend)
- integer line_widths(nlegend)
+ real(kind=plflt) line_widths(nlegend)
integer symbol_numbers(nlegend)
integer symbol_colors(nlegend)
real(kind=plflt) symbol_scales(nlegend)
character(len=20) symbols(nlegend)
- integer box_colors(0), box_patterns(0), box_line_widths(0)
- real(kind=plflt) box_scales(0)
+ integer box_colors(0), box_patterns(0)
+ real(kind=plflt) box_scales(0), box_line_widths(0)
real(kind=plflt) legend_width, legend_height
call pladv(0)
Modified: trunk/examples/f95/x33f.f90
===================================================================
--- trunk/examples/f95/x33f.f90 2013-05-01 21:51:24 UTC (rev 12319)
+++ trunk/examples/f95/x33f.f90 2013-05-02 01:20:31 UTC (rev 12320)
@@ -51,10 +51,10 @@
integer :: box_colors(MAX_NLEGEND)
integer :: box_patterns(MAX_NLEGEND)
real(kind=plflt) :: box_scales(MAX_NLEGEND)
- integer :: box_line_widths(MAX_NLEGEND)
+ real(kind=plflt) :: box_line_widths(MAX_NLEGEND)
integer :: line_colors(MAX_NLEGEND)
integer :: line_styles(MAX_NLEGEND)
- integer :: line_widths(MAX_NLEGEND)
+ real(kind=plflt) :: line_widths(MAX_NLEGEND)
integer :: symbol_numbers(MAX_NLEGEND), symbol_colors(MAX_NLEGEND)
real(kind=plflt) :: symbol_scales(MAX_NLEGEND)
character(len=200) :: text(MAX_NLEGEND)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
