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

[<hez...@us...>]

Revision: 11718
          http://plplot.svn.sourceforge.net/plplot/?rev=11718&view=rev
Author:   hezekiahcarty
Date:     2011-04-22 04:48:42 +0000 (Fri, 22 Apr 2011)

Log Message:
-----------
Swap plcolorbar position and opt parameter order to match pllegend

Modified Paths:
--------------
    trunk/examples/c/x33c.c
    trunk/src/pllegend.c

Modified: trunk/examples/c/x33c.c
===================================================================
--- trunk/examples/c/x33c.c	2011-04-21 00:47:06 UTC (rev 11717)
+++ trunk/examples/c/x33c.c	2011-04-22 04:48:42 UTC (rev 11718)
@@ -230,7 +230,7 @@
         plsmaj( 0.0, 0.5 );
         plsmin( 0.0, 0.5 );
 
-        plcolorbar( position, opt,
+        plcolorbar( opt, position,
                     x, y, length, width,
                     low_cap_color, high_cap_color,
                     cont_color, cont_width,

Modified: trunk/src/pllegend.c
===================================================================
--- trunk/src/pllegend.c	2011-04-21 00:47:06 UTC (rev 11717)
+++ trunk/src/pllegend.c	2011-04-22 04:48:42 UTC (rev 11718)
@@ -998,10 +998,6 @@
 //--------------------------------------------------------------------------
 //! Plot color bar for image, shade or gradient plots.
 //!
-//! @param position This variable defines the placement of the colorbar on the
-//! subpage.  The position can be one of PL_POSITION_TOP,
-//! PL_POSITION_BOTTOM, PL_POSITION_LEFT or PL_POSITION_RIGHT.  The colorbar
-//! will be drawn perpendicular to the given side of the subpage.
 //! @param opt This variable contains bits which control the overall colorbar.
 //! The type of colorbar can be specified with PL_COLORBAR_SHADE,
 //! PL_COLORBAR_IMAGE or PL_COLORBAR_GRADIENT.  The position of the (optional)
@@ -1015,6 +1011,10 @@
 //! any tick marks and tick labels will be placed at the breaks between shaded
 //! segments.  TODO: This should be expanded to support custom placement of
 //! tick marks and tick labels at custom value locations for any colorbar type.
+//! @param position This variable defines the placement of the colorbar on the
+//! subpage.  The position can be one of PL_POSITION_TOP,
+//! PL_POSITION_BOTTOM, PL_POSITION_LEFT or PL_POSITION_RIGHT.  The colorbar
+//! will be drawn perpendicular to the given side of the subpage.
 //! @param x Colorbar displacement distance along/away from the horizonal axis
 //! in normalized subpage coordinates.
 //! @param y Colorbar displacement distance along/away from the vertical axis
@@ -1053,7 +1053,7 @@
 //!
 
 void
-c_plcolorbar( PLINT position, PLINT opt,
+c_plcolorbar( PLINT opt, PLINT position,
               PLFLT x, PLFLT y, PLFLT length, PLFLT width,
               PLFLT low_cap_color, PLFLT high_cap_color,
               PLINT cont_color, PLINT cont_width,


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