From: <hez...@us...> - 2011-03-20 23:09:40
|
Revision: 11665 http://plplot.svn.sourceforge.net/plplot/?rev=11665&view=rev Author: hezekiahcarty Date: 2011-03-20 23:09:33 +0000 (Sun, 20 Mar 2011) Log Message: ----------- Propagate the plarc rotation change to all other language bindings/examples This provides clean build results and unchanged "make test_diff_psc" on my system. Modified Paths: -------------- trunk/bindings/ada/plplot.adb trunk/bindings/ada/plplot.ads trunk/bindings/ada/plplot_thin.ads trunk/bindings/ada/plplot_traditional.adb trunk/bindings/ada/plplot_traditional.ads trunk/bindings/c++/plstream.cc trunk/bindings/c++/plstream.h trunk/bindings/d/plplot.d trunk/bindings/f77/scstubs.c trunk/bindings/f95/scstubs.c trunk/bindings/java/PLStream.java trunk/bindings/octave/plplot_octave.h.in trunk/bindings/swig-support/plplotcapi.i trunk/bindings/swig-support/swig_documentation.i trunk/bindings/tcl/plapi.tpl trunk/examples/ada/x03a.adb trunk/examples/c++/x03.cc trunk/examples/d/x03d.d trunk/examples/f77/x03f.fm4 trunk/examples/f95/x03f.f90 trunk/examples/octave/x03c.m trunk/examples/python/xw03.py trunk/examples/tcl/x03.tcl Modified: trunk/bindings/ada/plplot.adb =================================================================== --- trunk/bindings/ada/plplot.adb 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/ada/plplot.adb 2011-03-20 23:09:33 UTC (rev 11665) @@ -1086,7 +1086,7 @@ -- Plot an arc. -- plarc procedure Draw_Arc - (x, y, a, b, angle1, angle2 : Long_Float; + (x, y, a, b, angle1, angle2, rotate : Long_Float; fill : Boolean) is fill_arc : PLBOOL; @@ -1097,7 +1097,7 @@ else fill_arc := PLfalse; end if; - plarc(x, y, a, b, angle1, angle2, fill_arc); + plarc(x, y, a, b, angle1, angle2, rotate, fill_arc); end Draw_Arc; Modified: trunk/bindings/ada/plplot.ads =================================================================== --- trunk/bindings/ada/plplot.ads 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/ada/plplot.ads 2011-03-20 23:09:33 UTC (rev 11665) @@ -738,7 +738,7 @@ -- Plot an arc. -- plarc procedure Draw_Arc - (x, y, a, b, angle1, angle2 : Long_Float; + (x, y, a, b, angle1, angle2, rotate : Long_Float; fill : Boolean); Modified: trunk/bindings/ada/plplot_thin.ads =================================================================== --- trunk/bindings/ada/plplot_thin.ads 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/ada/plplot_thin.ads 2011-03-20 23:09:33 UTC (rev 11665) @@ -512,7 +512,7 @@ -- Plot an arc. procedure - plarc(x : PLFLT; y : PLFLT; a : PLFLT; b : PLFLT; angle1 : PLFLT; angle2 : PLFLT; fill : PLBOOL); + plarc(x : PLFLT; y : PLFLT; a : PLFLT; b : PLFLT; angle1 : PLFLT; angle2 : PLFLT; rotate : PLFLT; fill : PLBOOL); pragma Import(C, plarc, "c_plarc"); Modified: trunk/bindings/ada/plplot_traditional.adb =================================================================== --- trunk/bindings/ada/plplot_traditional.adb 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/ada/plplot_traditional.adb 2011-03-20 23:09:33 UTC (rev 11665) @@ -1083,7 +1083,7 @@ -- Plot an arc. procedure plarc - (x, y, a, b, angle1, angle2 : Long_Float; + (x, y, a, b, angle1, angle2, rotate : Long_Float; fill : Boolean) is fill_arc : PLBOOL; @@ -1094,7 +1094,7 @@ else fill_arc := PLfalse; end if; - PLplot_Thin.plarc(x, y, a, b, angle1, angle2, fill_arc); + PLplot_Thin.plarc(x, y, a, b, angle1, angle2, rotate, fill_arc); end plarc; @@ -3312,4 +3312,4 @@ -- the 16 default colors of color map 0. Make_Snapshot_Of_Color_Map_0(Default_Red_Components, Default_Green_Components, Default_Blue_Components); -end PLplot_Traditional; \ No newline at end of file +end PLplot_Traditional; Modified: trunk/bindings/ada/plplot_traditional.ads =================================================================== --- trunk/bindings/ada/plplot_traditional.ads 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/ada/plplot_traditional.ads 2011-03-20 23:09:33 UTC (rev 11665) @@ -732,7 +732,7 @@ -- Plot an arc. procedure plarc - (x, y, a, b, angle1, angle2 : Long_Float; + (x, y, a, b, angle1, angle2, rotate : Long_Float; fill : Boolean); Modified: trunk/bindings/c++/plstream.cc =================================================================== --- trunk/bindings/c++/plstream.cc 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/c++/plstream.cc 2011-03-20 23:09:33 UTC (rev 11665) @@ -321,11 +321,11 @@ void plstream::arc( PLFLT x, PLFLT y, PLFLT a, PLFLT b, PLFLT angle1, PLFLT angle2, - PLBOOL fill ) + PLFLT rotate, PLBOOL fill ) { set_stream(); - plarc( x, y, a, b, angle1, angle2, fill ); + plarc( x, y, a, b, angle1, angle2, rotate, fill ); } #ifdef PL_DEPRECATED Modified: trunk/bindings/c++/plstream.h =================================================================== --- trunk/bindings/c++/plstream.h 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/c++/plstream.h 2011-03-20 23:09:33 UTC (rev 11665) @@ -122,7 +122,7 @@ // Plot an arc void arc( PLFLT x, PLFLT y, PLFLT a, PLFLT b, PLFLT angle1, PLFLT angle2, - PLBOOL fill ); + PLFLT rotate, PLBOOL fill ); // Simple arrow plotter #ifdef PL_DEPRECATED Modified: trunk/bindings/d/plplot.d =================================================================== --- trunk/bindings/d/plplot.d 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/d/plplot.d 2011-03-20 23:09:33 UTC (rev 11665) @@ -1494,7 +1494,7 @@ /* Plot an arc */ void c_plarc( PLFLT x, PLFLT y, PLFLT a, PLFLT b, PLFLT angle1, PLFLT angle2, - PLBOOL fill ); + PLFLT rotate, PLBOOL fill ); /* Clear current subpage. */ void c_plclear(); Modified: trunk/bindings/f77/scstubs.c =================================================================== --- trunk/bindings/f77/scstubs.c 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/f77/scstubs.c 2011-03-20 23:09:33 UTC (rev 11665) @@ -90,9 +90,9 @@ } void -PLARC( PLFLT *x, PLFLT *y, PLFLT *a, PLFLT *b, PLFLT *angle1, PLFLT *angle2, PLBOOL *fill ) +PLARC( PLFLT *x, PLFLT *y, PLFLT *a, PLFLT *b, PLFLT *angle1, PLFLT *angle2, PLFLT *rotate, PLBOOL *fill ) { - c_plarc( *x, *y, *a, *b, *angle1, *angle2, *fill ); + c_plarc( *x, *y, *a, *b, *angle1, *angle2, *rotate, *fill ); } void Modified: trunk/bindings/f95/scstubs.c =================================================================== --- trunk/bindings/f95/scstubs.c 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/f95/scstubs.c 2011-03-20 23:09:33 UTC (rev 11665) @@ -91,9 +91,9 @@ } void -PLARC( PLFLT *x, PLFLT *y, PLFLT *a, PLFLT *b, PLFLT *angle1, PLFLT *angle2, PLBOOL *fill ) +PLARC( PLFLT *x, PLFLT *y, PLFLT *a, PLFLT *b, PLFLT *angle1, PLFLT *angle2, PLFLT *rotate, PLBOOL *fill ) { - c_plarc( *x, *y, *a, *b, *angle1, *angle2, *fill ); + c_plarc( *x, *y, *a, *b, *angle1, *angle2, *rotate, *fill ); } void Modified: trunk/bindings/java/PLStream.java =================================================================== --- trunk/bindings/java/PLStream.java 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/java/PLStream.java 2011-03-20 23:09:33 UTC (rev 11665) @@ -131,10 +131,10 @@ plplotjavac.pladv( page ); } - public void arc( double x, double y, double a, double b, double angle1, double angle2, boolean fill ) + public void arc( double x, double y, double a, double b, double angle1, double angle2, double rotate, boolean fill ) { if ( set_stream() == -1 ) return; - plplotjavac.plarc( x, y, a, b, angle1, angle2, fill ); + plplotjavac.plarc( x, y, a, b, angle1, angle2, rotate, fill ); } public void axes( double x0, double y0, String xopt, double xtick, int nxsub, Modified: trunk/bindings/octave/plplot_octave.h.in =================================================================== --- trunk/bindings/octave/plplot_octave.h.in 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/octave/plplot_octave.h.in 2011-03-20 23:09:33 UTC (rev 11665) @@ -630,7 +630,7 @@ // Plot an arc void c_plarc( PLFLT x, PLFLT y, PLFLT a, PLFLT b, PLFLT angle1, PLFLT angle2, - PLBOOL fill ); //%name plarc + PLFLT rotate, PLBOOL fill ); //%name plarc // This functions similarly to plbox() except that the origin of the axes // is placed at the user-specified point (x0, y0). Modified: trunk/bindings/swig-support/plplotcapi.i =================================================================== --- trunk/bindings/swig-support/plplotcapi.i 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/swig-support/plplotcapi.i 2011-03-20 23:09:33 UTC (rev 11665) @@ -264,7 +264,7 @@ void plarc( PLFLT x, PLFLT y, PLFLT a, PLFLT b, PLFLT angle1, PLFLT angle2, - PLBOOL fill ); + PLFLT rotate, PLBOOL fill ); void plaxes( PLFLT x0, PLFLT y0, const char *xopt, PLFLT xtick, PLINT nxsub, Modified: trunk/bindings/swig-support/swig_documentation.i =================================================================== --- trunk/bindings/swig-support/swig_documentation.i 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/swig-support/swig_documentation.i 2011-03-20 23:09:33 UTC (rev 11665) @@ -101,7 +101,7 @@ Draw a possible filled arc centered at x, y with semimajor axis a and semiminor axis b, starting at angle1 and ending at angle2. - Redacted form: General: plarc(x, y, a, b, angle1, angle2, fill) + Redacted form: General: plarc(x, y, a, b, angle1, angle2, rotate, fill) This function is used in example 3. @@ -110,7 +110,7 @@ SYNOPSIS: -plarc(x, y, a, b, angle1, angle2, fill) +plarc(x, y, a, b, angle1, angle2, rotate, fill) ARGUMENTS: @@ -126,6 +126,8 @@ angle2 (PLFLT, input) : Ending angle of the arc. + rotate (PLFLT, input) : Rotation of arc + fill (PLBOOL, input) : Draw a filled arc. ") plarc; Modified: trunk/bindings/tcl/plapi.tpl =================================================================== --- trunk/bindings/tcl/plapi.tpl 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/bindings/tcl/plapi.tpl 2011-03-20 23:09:33 UTC (rev 11665) @@ -45,6 +45,7 @@ b PLFLT angle1 PLFLT angle2 PLFLT +rotate PLFLT fill PLINT # This functions similarly to plbox() except that the origin of the axes Modified: trunk/examples/ada/x03a.adb =================================================================== --- trunk/examples/ada/x03a.adb 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/examples/ada/x03a.adb 2011-03-20 23:09:33 UTC (rev 11665) @@ -65,7 +65,7 @@ -- Draw circles for polar grid. for i in 1 .. 10 loop - plarc(0.0, 0.0, 0.1 * Long_Float(i), 0.1 * Long_Float(i), 0.0, 360.0, False); + plarc(0.0, 0.0, 0.1 * Long_Float(i), 0.1 * Long_Float(i), 0.0, 360.0, 0.0, False); end loop; plcol0(2); Modified: trunk/examples/c++/x03.cc =================================================================== --- trunk/examples/c++/x03.cc 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/examples/c++/x03.cc 2011-03-20 23:09:33 UTC (rev 11665) @@ -81,7 +81,7 @@ // Draw circles for polar grid for ( i = 1; i <= 10; i++ ) { - pls->arc( 0.0, 0.0, 0.1 * i, 0.1 * i, 0.0, 360.0, 0 ); + pls->arc( 0.0, 0.0, 0.1 * i, 0.1 * i, 0.0, 360.0, 0.0, 0 ); } pls->col0( 2 ); Modified: trunk/examples/d/x03d.d =================================================================== --- trunk/examples/d/x03d.d 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/examples/d/x03d.d 2011-03-20 23:09:33 UTC (rev 11665) @@ -39,7 +39,7 @@ /* Draw circles for polar grid */ for ( size_t i = 1; i < 11; i++ ) - plarc( 0.0, 0.0, 0.1 * i, 0.1 * i, 0.0, 360.0, 0 ); + plarc( 0.0, 0.0, 0.1 * i, 0.1 * i, 0.0, 360.0, 0.0, 0 ); plcol0( 2 ); for ( size_t i = 0; i <= 11; i++ ) Modified: trunk/examples/f77/x03f.fm4 =================================================================== --- trunk/examples/f77/x03f.fm4 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/examples/f77/x03f.fm4 2011-03-20 23:09:33 UTC (rev 11665) @@ -49,7 +49,8 @@ c Draw circles for polar grid do i = 1,10 - call plarc(0.0d0, 0.0d0, 0.1d0*i, 0.1d0*i, 0.0d0, 360.0d0, 0) + call plarc(0.0d0, 0.0d0, 0.1d0*i, 0.1d0*i, + & 0.0d0, 360.0d0, 0.0d0, 0) enddo call plcol0(2) Modified: trunk/examples/f95/x03f.f90 =================================================================== --- trunk/examples/f95/x03f.f90 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/examples/f95/x03f.f90 2011-03-20 23:09:33 UTC (rev 11665) @@ -49,7 +49,7 @@ ! Draw circles for polar grid do i = 1,10 call plarc(0.0_plflt, 0.0_plflt, 0.1_plflt*i, 0.1_plflt*i, & - 0.0_plflt, 360.0_plflt, 0) + 0.0_plflt, 360.0_plflt, 0.0_plflt, 0) enddo call plcol0(2) do i = 0,11 Modified: trunk/examples/octave/x03c.m =================================================================== --- trunk/examples/octave/x03c.m 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/examples/octave/x03c.m 2011-03-20 23:09:33 UTC (rev 11665) @@ -40,7 +40,7 @@ plenv(-1.3, 1.3, -1.3, 1.3, 1, -2); ## Draw circles for polar grid for i=1:10 - plarc(0.0, 0.0, 0.1 * i, 0.1 * i, 0.0, 360.0, 0); + plarc(0.0, 0.0, 0.1 * i, 0.1 * i, 0.0, 360.0, 0.0, 0); endfor Modified: trunk/examples/python/xw03.py =================================================================== --- trunk/examples/python/xw03.py 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/examples/python/xw03.py 2011-03-20 23:09:33 UTC (rev 11665) @@ -39,7 +39,7 @@ # Draw circles for polar grid for i in range(10): - plarc(0.0, 0.0, 0.1*(i+1), 0.1*(i+1), 0.0, 360.0, 0) + plarc(0.0, 0.0, 0.1*(i+1), 0.1*(i+1), 0.0, 360.0, 0.0, 0) plcol0(2) for i in range(12): Modified: trunk/examples/tcl/x03.tcl =================================================================== --- trunk/examples/tcl/x03.tcl 2011-03-20 23:08:53 UTC (rev 11664) +++ trunk/examples/tcl/x03.tcl 2011-03-20 23:09:33 UTC (rev 11665) @@ -21,7 +21,7 @@ matrix yj f $nj1 for {set i 1} {$i <= $ni} {incr i} { - $w cmd plarc 0.0 0.0 [expr {0.1 * $i}]] [expr {0.1 * $i}] 0.0 360.0 0 + $w cmd plarc 0.0 0.0 [expr {0.1 * $i}]] [expr {0.1 * $i}] 0.0 360.0 0.0 0 } # Draw radial spokes for polar grid and write labels for angle This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |