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

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

Revision: 11230
          http://plplot.svn.sourceforge.net/plplot/?rev=11230&view=rev
Author:   airwin
Date:     2010-09-28 17:49:52 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
PL_LEGEND_NONE #defined to indicate the plotted area of a particular
legend entry should have nothing plotted.

text_justification argument changed from PLINT to the correct PLFLT.

Thanks to Hez for spotting these two issues.

Modified Paths:
--------------
    trunk/include/plplot.h
    trunk/src/pllegend.c

Modified: trunk/include/plplot.h
===================================================================
--- trunk/include/plplot.h	2010-09-28 05:58:58 UTC (rev 11229)
+++ trunk/include/plplot.h	2010-09-28 17:49:52 UTC (rev 11230)
@@ -1209,6 +1209,7 @@
 /* Routine for drawing line, symbol, cmap0, or cmap1 legends */
 
 // Flags for pllegend.
+#define PL_LEGEND_NONE          0
 #define PL_LEGEND_LINE          1
 #define PL_LEGEND_SYMBOL        2
 #define PL_LEGEND_CMAP0         4
@@ -1220,7 +1221,7 @@
 c_pllegend( PLINT opt, PLFLT x, PLFLT y, PLFLT plot_width, PLINT bg_color,
             PLINT nlegend, PLINT *opt_array,
             PLFLT text_offset, PLFLT text_scale, PLFLT text_spacing,
-            PLINT text_justification, PLINT *text_colors, char **text,
+            PLFLT text_justification, PLINT *text_colors, char **text,
             PLINT *line_colors, PLINT *line_styles, PLINT *line_widths,
             PLINT *symbol_numbers, PLINT *symbol_colors,
             PLFLT *symbol_scales, PLINT *symbols,

Modified: trunk/src/pllegend.c
===================================================================
--- trunk/src/pllegend.c	2010-09-28 05:58:58 UTC (rev 11229)
+++ trunk/src/pllegend.c	2010-09-28 17:49:52 UTC (rev 11230)
@@ -115,11 +115,11 @@
 //! @param nlegend : number of legend entries
 //! @param opt_array : array of nlegend values of options to control
 //! each individual plotted area corresponding to a legend entry.  If
-//! the PL_LEGEND_CMAP0, PL_LEGEND_CMAP1, PL_LEGEND_LINE, and/or
-//! PL_LEGEND_SYMBOL bits are set, the plotted area corresponding to a
-//! legend entry is specified with a colored box (with the color of
-//! that box determined by either a cmap0 index or a cmap1 value); a
-//! line; and/or a line of symbols
+//! the PL_LEGEND_NONE, PL_LEGEND_CMAP0, PL_LEGEND_CMAP1,
+//! PL_LEGEND_LINE, and/or PL_LEGEND_SYMBOL bits are set, the plotted
+//! area corresponding to a legend entry is specified with nothing; a
+//! colored box (with the color of that box determined by either a
+//! cmap0 index or a cmap1 value); a line; and/or a line of symbols
 //! @param text_offset : offset of the text area from the plot area in
 //! units of character width
 //! @param text_scale : character height scale for text annotations
@@ -169,7 +169,7 @@
 c_pllegend( PLINT opt, PLFLT x, PLFLT y, PLFLT plot_width, PLINT bg_color,
             PLINT nlegend, PLINT *opt_array,
             PLFLT text_offset, PLFLT text_scale, PLFLT text_spacing,
-            PLINT text_justification, PLINT *text_colors, char **text,
+            PLFLT text_justification, PLINT *text_colors, char **text,
             PLINT *line_colors, PLINT *line_styles, PLINT *line_widths,
             PLINT *symbol_numbers, PLINT *symbol_colors,
             PLFLT *symbol_scales, PLINT *symbols,


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