From: <ai...@us...> - 2009-02-03 02:15:46
|
Revision: 9439 http://plplot.svn.sourceforge.net/plplot/?rev=9439&view=rev Author: airwin Date: 2009-02-03 02:12:56 +0000 (Tue, 03 Feb 2009) Log Message: ----------- Propagate x14 changes to f77 and f95. Modified Paths: -------------- trunk/examples/f77/x14f.fm4 trunk/examples/f95/x14f.f90 Modified: trunk/examples/f77/x14f.fm4 =================================================================== --- trunk/examples/f77/x14f.fm4 2009-02-03 01:20:33 UTC (rev 9438) +++ trunk/examples/f77/x14f.fm4 2009-02-03 02:12:56 UTC (rev 9439) @@ -28,8 +28,6 @@ implicit none integer digmax - integer xleng0 , yleng0 , xoff0 , yoff0 - integer xleng1 , xoff1 , yoff1 character*80 driver character*15 geometry_master @@ -46,16 +44,10 @@ integer lnblnk integer PL_PARSE_FULL parameter(PL_PARSE_FULL = 1) + real*8 xp0, yp0 + integer xleng0, yleng0, xoff0, yoff0 + logical valid_geometry - xleng0 = 400 - yleng0 = 300 - xoff0 = 200 - yoff0 = 200 - xleng1 = 400 - xleng1 = 300 - xoff1 = 500 - yoff1 = 500 - geometry_master = '500x410+100+200' geometry_slave = '500x410+650+200' @@ -74,9 +66,17 @@ C to stdout generated by second plinit below. call flush(6) +C If valid geometry specified on command line, use it for both streams. + call plgpage(xp0, yp0, xleng0, yleng0, xoff0, yoff0) + valid_geometry = (xleng0 .gt. 0 .and. yleng0 .gt. 0) + C Set up first stream - call plsetopt( 'geometry', geometry_master) + if(valid_geometry) then + call plspage(xp0, yp0, xleng0, yleng0, xoff0, yoff0) + else + call plsetopt( 'geometry', geometry_master) + endif call plsdev(driver) call plssub(2, 2) @@ -86,9 +86,14 @@ call plsstrm(1) + if(valid_geometry) then + call plspage(xp0, yp0, xleng0, yleng0, xoff0, yoff0) + else + call plsetopt( 'geometry', geometry_slave) + endif + C Turn off pause to make this a slave (must follow master) - call plsetopt( 'geometry', geometry_slave) call plspause(0) call plsdev(driver) call plsfam(fam,num,bmax) Modified: trunk/examples/f95/x14f.f90 =================================================================== --- trunk/examples/f95/x14f.f90 2009-02-03 01:20:33 UTC (rev 9438) +++ trunk/examples/f95/x14f.f90 2009-02-03 02:12:56 UTC (rev 9439) @@ -29,8 +29,6 @@ implicit none integer i, digmax - integer xleng0 , yleng0 , xoff0 , yoff0 - integer xleng1 , yleng1 , xoff1 , yoff1 character*80 driver character*15 geometry_master @@ -43,16 +41,10 @@ real(kind=plflt) xscale, yscale, xoff, yoff common /plotdat/ x, y, xs, ys, xscale, yscale, xoff, yoff character*80 version + real(kind=plflt) xp0, yp0 + integer xleng0, yleng0, xoff0, yoff0 + logical valid_geometry - xleng0 = 400 - yleng0 = 300 - xoff0 = 200 - yoff0 = 200 - xleng1 = 400 - xleng1 = 300 - xoff1 = 500 - yoff1 = 500 - geometry_master = '500x410+100+200' geometry_slave = '500x410+650+200' @@ -71,9 +63,17 @@ ! to stdout generated by second plinit below. call flush(6) +! If valid geometry specified on command line, use it for both streams. + call plgpage(xp0, yp0, xleng0, yleng0, xoff0, yoff0) + valid_geometry = (xleng0 .gt. 0 .and. yleng0 .gt. 0) + ! Set up first stream - call plsetopt( 'geometry', geometry_master) + if(valid_geometry) then + call plspage(xp0, yp0, xleng0, yleng0, xoff0, yoff0) + else + call plsetopt( 'geometry', geometry_master) + endif call plsdev(driver) call plssub(2, 2) @@ -83,9 +83,14 @@ call plsstrm(1) + if(valid_geometry) then + call plspage(xp0, yp0, xleng0, yleng0, xoff0, yoff0) + else + call plsetopt( 'geometry', geometry_slave) + endif + ! Turn off pause to make this a slave (must follow master) - call plsetopt( 'geometry', geometry_slave) call plspause(.false.) call plsdev(driver) call plsfam(fam,num,bmax) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |