From: <ai...@us...> - 2010-11-03 06:32:30
|
Revision: 11303 http://plplot.svn.sourceforge.net/plplot/?rev=11303&view=rev Author: airwin Date: 2010-11-03 06:32:24 +0000 (Wed, 03 Nov 2010) Log Message: ----------- Temporarily disable pllegend in both bindings and examples for Python and OCaml to make it easier to do pllegend C API changes. Modified Paths: -------------- trunk/bindings/ocaml/plplot_impl.c trunk/bindings/swig-support/plplotcapi.i trunk/examples/ocaml/x04.ml trunk/examples/ocaml/x26.ml trunk/examples/python/xw04.py trunk/examples/python/xw26.py Modified: trunk/bindings/ocaml/plplot_impl.c =================================================================== --- trunk/bindings/ocaml/plplot_impl.c 2010-11-02 18:37:50 UTC (rev 11302) +++ trunk/bindings/ocaml/plplot_impl.c 2010-11-03 06:32:24 UTC (rev 11303) @@ -802,7 +802,7 @@ lor_ml_list( Field( opt_array, i ), translate_legend_option ); } - pllegend( c_opt, Double_val( x ), Double_val( y ), + /* pllegend( c_opt, Double_val( x ), Double_val( y ), Double_val( plot_width ), Int_val( bg_color ), n_legend, c_opt_array, Double_val( text_offset ), Double_val( text_scale ), @@ -811,7 +811,7 @@ c_box_colors, c_box_patterns, (double *) box_scales, c_line_colors, c_line_styles, c_line_widths, c_symbol_colors, (double *) symbol_scales, c_symbol_numbers, - c_symbols ); + c_symbols ); */ CAMLreturn( Val_unit ); } Modified: trunk/bindings/swig-support/plplotcapi.i =================================================================== --- trunk/bindings/swig-support/plplotcapi.i 2010-11-02 18:37:50 UTC (rev 11302) +++ trunk/bindings/swig-support/plplotcapi.i 2010-11-03 06:32:24 UTC (rev 11303) @@ -518,7 +518,8 @@ void pllab( const char *xlabel, const char *ylabel, const char *tlabel ); -#ifdef SWIG_PYTHON +//#ifdef SWIG_PYTHON +#if 0 %feature( "autodoc", "Create a discrete annotated legend using boxes, lines, and/or lines of symbols." ) pllegend; void pllegend( PLINT opt, PLFLT x, PLFLT y, PLFLT plot_width, PLINT bg_color, Modified: trunk/examples/ocaml/x04.ml =================================================================== --- trunk/examples/ocaml/x04.ml 2010-11-02 18:37:50 UTC (rev 11302) +++ trunk/examples/ocaml/x04.ml 2010-11-03 06:32:24 UTC (rev 11303) @@ -87,12 +87,12 @@ to do with boxes *) plscol0a 15 32 32 32 0.90; - pllegend [PL_LEGEND_BACKGROUND] 0.57 0.85 0.06 15 opt_array + (*pllegend [PL_LEGEND_BACKGROUND] 0.57 0.85 0.06 15 opt_array 1.0 1.0 2.0 1.0 text_colors text [||] [||] [||] line_colors line_styles line_widths - symbol_colors symbol_scales symbol_numbers symbols; + symbol_colors symbol_scales symbol_numbers symbols; *) () ) else if plot_type = 1 then ( @@ -111,12 +111,12 @@ to do with boxes and symbols *) plscol0a 15 32 32 32 0.90; - pllegend [PL_LEGEND_BACKGROUND] 0.57 0.85 0.06 15 opt_array + (*pllegend [PL_LEGEND_BACKGROUND] 0.57 0.85 0.06 15 opt_array 1.0 1.0 2.0 1.0 text_colors text [||] [||] [||] line_colors line_styles line_widths - [||] [||] [||] [||]; + [||] [||] [||] [||];*) () ) Modified: trunk/examples/ocaml/x26.ml =================================================================== --- trunk/examples/ocaml/x26.ml 2010-11-02 18:37:50 UTC (rev 11302) +++ trunk/examples/ocaml/x26.ml 2010-11-03 06:32:24 UTC (rev 11303) @@ -182,12 +182,12 @@ to do with boxes *) plscol0a 15 32 32 32 0.90; - pllegend [PL_LEGEND_BACKGROUND] 0.57 0.85 0.06 15 opt_array + (*pllegend [PL_LEGEND_BACKGROUND] 0.57 0.85 0.06 15 opt_array 1.0 1.0 2.0 1.0 text_colors legend_text [||] [||] [||] line_colors line_styles line_widths - symbol_colors symbol_scales symbol_numbers symbols; + symbol_colors symbol_scales symbol_numbers symbols;*) () (*--------------------------------------------------------------------------*\ Modified: trunk/examples/python/xw04.py =================================================================== --- trunk/examples/python/xw04.py 2010-11-02 18:37:50 UTC (rev 11302) +++ trunk/examples/python/xw04.py 2010-11-03 06:32:24 UTC (rev 11303) @@ -121,12 +121,12 @@ symbols[1] = 3 plscol0a( 15, 32, 32, 32, 0.90 ) - pllegend( PL_LEGEND_BACKGROUND, 0.57, 0.85, 0.06, 15, - opt_array, - 1.0, 1.0, 2.0, - 1., text_colors, text, - box_colors, box_patterns, box_scales, - line_colors, line_styles, line_widths, - symbol_colors, symbol_scales, symbol_numbers, symbols ) +# pllegend( PL_LEGEND_BACKGROUND, 0.57, 0.85, 0.06, 15, +# opt_array, +# 1.0, 1.0, 2.0, +# 1., text_colors, text, +# box_colors, box_patterns, box_scales, +# line_colors, line_styles, line_widths, +# symbol_colors, symbol_scales, symbol_numbers, symbols ) main() Modified: trunk/examples/python/xw26.py =================================================================== --- trunk/examples/python/xw26.py 2010-11-02 18:37:50 UTC (rev 11302) +++ trunk/examples/python/xw26.py 2010-11-03 06:32:24 UTC (rev 11303) @@ -191,13 +191,13 @@ symbols[1] = 3 plscol0a( 15, 32, 32, 32, 0.90 ) - pllegend( PL_LEGEND_BACKGROUND, 0.57, 0.85, 0.06, 15, - opt_array, - 1.0, 1.0, 2.0, - 1., text_colors, text, - box_colors, box_patterns, box_scales, - line_colors, line_styles, line_widths, - symbol_colors, symbol_scales, symbol_numbers, symbols ) +# pllegend( PL_LEGEND_BACKGROUND, 0.57, 0.85, 0.06, 15, +# opt_array, +# 1.0, 1.0, 2.0, +# 1., text_colors, text, +# box_colors, box_patterns, box_scales, +# line_colors, line_styles, line_widths, +# symbol_colors, symbol_scales, symbol_numbers, symbols ) main() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |