[Plplot-cvs] SF.net SVN: plplot:[11506] trunk

[<ai...@us...>]

Revision: 11506
          http://plplot.svn.sourceforge.net/plplot/?rev=11506&view=rev
Author:   airwin
Date:     2011-01-27 00:05:56 +0000 (Thu, 27 Jan 2011)

Log Message:
-----------
Expand plplot_parameters.h to take care of the needs of f77 examples
19-21.

Modified Paths:
--------------
    trunk/bindings/f77/plplot_parameters.h
    trunk/examples/f77/x19f.fm4
    trunk/examples/f77/x20f.fm4
    trunk/examples/f77/x21f.fm4

Modified: trunk/bindings/f77/plplot_parameters.h
===================================================================
--- trunk/bindings/f77/plplot_parameters.h	2011-01-26 23:10:23 UTC (rev 11505)
+++ trunk/bindings/f77/plplot_parameters.h	2011-01-27 00:05:56 UTC (rev 11506)
@@ -20,12 +20,23 @@
 C      License along with PLplot; if not, write to the Free Software
 C      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+c common parameters
       integer PL_PARSE_FULL
       parameter(PL_PARSE_FULL = 1)
       real*8 PI, TWOPI
       parameter (PI = 3.1415926535897932384d0)
       parameter (TWOPI = 2.d0*PI)
 
+c flags used for plgriddata()
+      integer GRID_CSA, GRID_DTLI, GRID_NNI, GRID_NNIDW, GRID_NNLI, 
+     &     GRID_NNAIDW
+      parameter (GRID_CSA = 1)
+      parameter (GRID_DTLI = 2)
+      parameter (GRID_NNI = 3)
+      parameter (GRID_NNIDW = 4)
+      parameter (GRID_NNLI = 5)
+      parameter (GRID_NNAIDW = 6)
+
 c flags used for position argument of both pllegend and plcolorbar
       integer PL_POSITION_LEFT
       integer PL_POSITION_RIGHT

Modified: trunk/examples/f77/x19f.fm4
===================================================================
--- trunk/examples/f77/x19f.fm4	2011-01-26 23:10:23 UTC (rev 11505)
+++ trunk/examples/f77/x19f.fm4	2011-01-27 00:05:56 UTC (rev 11506)
@@ -42,8 +42,7 @@
       implicit none
 
       real*8    x, y, xt, yt, radius
-      real*8    PI
-      parameter ( PI = 3.1415926535897932384d0 )
+      include 'plplot_parameters.h'
 
       radius = 90.0d0 - y
       xt = radius * cos(x * PI / 180.0d0)
@@ -65,8 +64,7 @@
       integer n
       real*8    x(n)
       real*8    y(n)
-      real*8    PI
-      parameter ( PI = 3.1415926535897932384d0 )
+      include 'plplot_parameters.h'
 
       integer i
       real*8    xp, yp, radius
@@ -155,8 +153,7 @@
       external mapform19
       external geolocation_labeler
 
-      integer PL_PARSE_FULL
-      parameter(PL_PARSE_FULL = 1)
+      include 'plplot_parameters.h'
 c      Process command-line arguments
       call plparseopts(PL_PARSE_FULL)
 

Modified: trunk/examples/f77/x20f.fm4
===================================================================
--- trunk/examples/f77/x20f.fm4	2011-01-26 23:10:23 UTC (rev 11505)
+++ trunk/examples/f77/x20f.fm4	2011-01-27 00:05:56 UTC (rev 11506)
@@ -74,8 +74,7 @@
       real*8  XDIMR, YDIMR
       parameter(XDIM = 260, YDIM = 220)
       parameter(XDIMR = XDIM, YDIMR = YDIM)
-      real*8  PI
-      parameter(PI = 3.1415926535897932384d0)
+      include 'plplot_parameters.h'
 
       real*8  x(XDIM), y(YDIM), z(XDIM,YDIM), r(XDIM,YDIM)
       real*8  xi, yi, xe, ye
@@ -109,10 +108,6 @@
       logical nointeractive
       character*80 f_name
 
-      integer PL_PARSE_FULL
-      parameter( PL_PARSE_FULL = 1 )
-
-
 c
 c     Bugs in plimage():
 c      -at high magnifications, the left and right edge are ragged, try

Modified: trunk/examples/f77/x21f.fm4
===================================================================
--- trunk/examples/f77/x21f.fm4	2011-01-26 23:10:23 UTC (rev 11505)
+++ trunk/examples/f77/x21f.fm4	2011-01-27 00:05:56 UTC (rev 11506)
@@ -19,31 +19,13 @@
 c      You should have received a copy of the GNU Library General Public
 c      License along with PLplot; if not, write to the Free Software
 c      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
+c     This is a separate routine so must be included before "implicit none"
       include 'plf77demos.inc'
 
       implicit none
 
-      real*8 PI
-      parameter (PI = 3.1415926535897932384d0)
+      include 'plplot_parameters.h'
 
-      integer PL_PARSE_FULL
-      parameter(PL_PARSE_FULL = 1)
-      
-      integer GRID_CSA, GRID_DTLI, GRID_NNI, GRID_NNIDW, GRID_NNLI, 
-     &     GRID_NNAIDW
-      parameter (GRID_CSA = 1)
-      parameter (GRID_DTLI = 2)
-      parameter (GRID_NNI = 3)
-      parameter (GRID_NNIDW = 4)
-      parameter (GRID_NNLI = 5)
-      parameter (GRID_NNAIDW = 6)
-
-      integer DRAW_LINEXY, MAG_COLOR, BASE_CONT
-      parameter(DRAW_LINEXY = 3)
-      parameter(MAG_COLOR = 4)
-      parameter(BASE_CONT = 8)
-       
       external plrandd
       real*8 plrandd
 


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