Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[11717] trunk
|
From: <ai...@us...> - 2011-04-21 00:47:16
|
Revision: 11717
http://plplot.svn.sourceforge.net/plplot/?rev=11717&view=rev
Author: airwin
Date: 2011-04-21 00:47:06 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
Yet another pllegend API change within this release cycle. I have
decided to swap the opt and position parameters in the argument list
because it is much more logical to have the position argument next to
the x and y offset arguments. I have propagated this change to all
our language bindings and examples, and the result gives a clean
test_diff_psc target diff report.
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/f77/sfstubs.fm4
trunk/bindings/f95/scstubs.c
trunk/bindings/f95/sfstubsf95.f90
trunk/bindings/java/PLStream.java
trunk/bindings/ocaml/plplot.ml
trunk/bindings/ocaml/plplot.mli
trunk/bindings/ocaml/plplot_core.idl
trunk/bindings/ocaml/plplot_impl.c
trunk/bindings/swig-support/plplotcapi.i
trunk/bindings/tcl/tclAPI.c
trunk/examples/ada/x04a.adb
trunk/examples/ada/x26a.adb
trunk/examples/ada/x33a.adb
trunk/examples/ada/xthick04a.adb
trunk/examples/ada/xthick26a.adb
trunk/examples/ada/xthick33a.adb
trunk/examples/c/x04c.c
trunk/examples/c/x26c.c
trunk/examples/c/x33c.c
trunk/examples/c++/x04.cc
trunk/examples/c++/x26.cc
trunk/examples/c++/x33.cc
trunk/examples/d/x04d.d
trunk/examples/d/x26d.d
trunk/examples/d/x33d.d
trunk/examples/f77/x04f.fm4
trunk/examples/f77/x26f.fm4
trunk/examples/f77/x33f.fm4
trunk/examples/f95/x04f.f90
trunk/examples/f95/x26f.f90
trunk/examples/f95/x33f.f90
trunk/examples/java/x04.java
trunk/examples/java/x26.java
trunk/examples/java/x33.java
trunk/examples/lua/x04.lua
trunk/examples/lua/x26.lua
trunk/examples/lua/x33.lua
trunk/examples/ocaml/x04.ml
trunk/examples/ocaml/x26.ml
trunk/examples/ocaml/x33.ml
trunk/examples/octave/x04c.m
trunk/examples/octave/x26c.m
trunk/examples/octave/x33c.m
trunk/examples/python/xw04.py
trunk/examples/python/xw26.py
trunk/examples/python/xw33.py
trunk/examples/tcl/x04.tcl
trunk/examples/tcl/x26.tcl
trunk/examples/tcl/x33.tcl
trunk/include/plplot.h
trunk/src/pllegend.c
Modified: trunk/bindings/ada/plplot.adb
===================================================================
--- trunk/bindings/ada/plplot.adb 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/ada/plplot.adb 2011-04-21 00:47:06 UTC (rev 11717)
@@ -1857,7 +1857,7 @@
-- pllegend
procedure Create_Legend
(Legend_Width, Legend_Height : out Long_Float;
- Position, Options : Integer;
+ Options, Position : Integer;
X_Offset, Y_Offset : Long_Float;
Plot_Area_Width : Long_Float;
Background_Color, Bounding_Box_Color : Plot_Color_Type;
@@ -1938,7 +1938,7 @@
PL_Symbols(I) := C_Symbols_String_Array(I)'Address;
end loop;
- pllegend(Legend_Width, Legend_Height, Position, Options,
+ pllegend(Legend_Width, Legend_Height, Options, Position,
X_Offset, Y_Offset, Plot_Area_Width, Background_Color, Bounding_Box_Color,
Bounding_Box_Style, Number_Rows, Number_Columns, Number_Entries,
Entry_Options, Text_Offset, Text_Scale, Text_Spacing, Text_Justification,
Modified: trunk/bindings/ada/plplot.ads
===================================================================
--- trunk/bindings/ada/plplot.ads 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/ada/plplot.ads 2011-04-21 00:47:06 UTC (rev 11717)
@@ -1282,7 +1282,7 @@
-- pllegend
procedure Create_Legend
(Legend_Width, Legend_Height : out Long_Float;
- Position, Options : Integer;
+ Options, Position : Integer;
X_Offset, Y_Offset : Long_Float;
Plot_Area_Width : Long_Float;
Background_Color, Bounding_Box_Color : Plot_Color_Type;
Modified: trunk/bindings/ada/plplot_thin.ads
===================================================================
--- trunk/bindings/ada/plplot_thin.ads 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/ada/plplot_thin.ads 2011-04-21 00:47:06 UTC (rev 11717)
@@ -1069,7 +1069,7 @@
procedure
pllegend
(p_legend_width : out PLFLT; p_legend_height : out PLFLT;
- plposition : PLINT; opt : PLINT; x : PLFLT; y : PLFLT; plot_width : PLFLT;
+ opt : PLINT; plposition : PLINT; x : PLFLT; y : PLFLT; plot_width : PLFLT;
bg_color : PLINT; bb_color : PLINT; bb_style : PLINT;
nrow : PLINT; ncolumn : PLINT;
nlegend : PLINT; opt_array : PL_Integer_Array;
Modified: trunk/bindings/ada/plplot_traditional.adb
===================================================================
--- trunk/bindings/ada/plplot_traditional.adb 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/ada/plplot_traditional.adb 2011-04-21 00:47:06 UTC (rev 11717)
@@ -1788,7 +1788,7 @@
-- Routine for drawing discrete line, symbol, or cmap0 legends
procedure pllegend
(Legend_Width, Legend_Height : out Long_Float;
- Position, Options : Integer;
+ Options, Position : Integer;
X_Offset, Y_Offset : Long_Float;
Plot_Area_Width : Long_Float;
Background_Color, Bounding_Box_Color : Plot_Color_Type;
@@ -1869,7 +1869,7 @@
PL_Symbols(I) := C_Symbols_String_Array(I)'Address;
end loop;
- PLplot_Thin.pllegend(Legend_Width, Legend_Height, Position, Options,
+ PLplot_Thin.pllegend(Legend_Width, Legend_Height, Options, Position,
X_Offset, Y_Offset, Plot_Area_Width, Background_Color, Bounding_Box_Color,
Bounding_Box_Style, Number_Rows, Number_Columns, Number_Entries,
Entry_Options, Text_Offset, Text_Scale, Text_Spacing, Text_Justification,
Modified: trunk/bindings/ada/plplot_traditional.ads
===================================================================
--- trunk/bindings/ada/plplot_traditional.ads 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/ada/plplot_traditional.ads 2011-04-21 00:47:06 UTC (rev 11717)
@@ -1208,7 +1208,7 @@
-- Routine for drawing discrete line, symbol, or cmap0 legends
procedure pllegend
(Legend_Width, Legend_Height : out Long_Float;
- Position, Options : Integer;
+ Options, Position : Integer;
X_Offset, Y_Offset : Long_Float;
Plot_Area_Width : Long_Float;
Background_Color, Bounding_Box_Color : Plot_Color_Type;
Modified: trunk/bindings/c++/plstream.cc
===================================================================
--- trunk/bindings/c++/plstream.cc 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/c++/plstream.cc 2011-04-21 00:47:06 UTC (rev 11717)
@@ -1000,7 +1000,7 @@
// Routine for drawing line, symbol, or cmap0 legends
void plstream::legend( PLFLT *p_legend_width, PLFLT *p_legend_height,
- PLINT position, PLINT opt, PLFLT x, PLFLT y, PLFLT plot_width,
+ PLINT opt, PLINT position, PLFLT x, PLFLT y, PLFLT plot_width,
PLINT bg_color, PLINT bb_color, PLINT bb_style,
PLINT nrow, PLINT ncolumn,
PLINT nlegend, const PLINT *opt_array,
@@ -1016,7 +1016,7 @@
{
set_stream();
- pllegend( p_legend_width, p_legend_height, position, opt, x, y, plot_width,
+ pllegend( p_legend_width, p_legend_height, opt, position, x, y, plot_width,
bg_color, bb_color, bb_style, nrow, ncolumn, nlegend, opt_array,
text_offset, text_scale, text_spacing, text_justification,
text_colors, text, box_colors, box_patterns, box_scales,
Modified: trunk/bindings/c++/plstream.h
===================================================================
--- trunk/bindings/c++/plstream.h 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/c++/plstream.h 2011-04-21 00:47:06 UTC (rev 11717)
@@ -428,7 +428,7 @@
// Routine for drawing line, symbol, or cmap0 legends
void legend( PLFLT *p_legend_width, PLFLT *p_legend_height,
- PLINT position, PLINT opt, PLFLT x, PLFLT y, PLFLT plot_width,
+ PLINT opt, PLINT position, PLFLT x, PLFLT y, PLFLT plot_width,
PLINT bg_color, PLINT bb_color, PLINT bb_style,
PLINT nrow, PLINT ncolumn,
PLINT nlegend, const PLINT *opt_array,
Modified: trunk/bindings/d/plplot.d
===================================================================
--- trunk/bindings/d/plplot.d 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/d/plplot.d 2011-04-21 00:47:06 UTC (rev 11717)
@@ -312,7 +312,7 @@
// Routine for drawing discrete line, symbol, or cmap0 legends
void pllegend( PLFLT *p_legend_width, PLFLT *p_legend_height,
- PLINT position, PLINT opt, PLFLT x, PLFLT y, PLFLT plot_width,
+ PLINT opt, PLINT position, PLFLT x, PLFLT y, PLFLT plot_width,
PLINT bg_color, PLINT bb_color, PLINT bb_style,
PLINT nrow, PLINT ncolumn,
PLINT[] opt_array,
@@ -349,7 +349,7 @@
assert( nlegend == symbol_numbers.length, "pllegend(): Arrays must be of same length!" );
assert( nlegend == symbols.length, "pllegend(): Arrays must be of same length!" );
c_pllegend( p_legend_width, p_legend_height,
- position, opt, x, y, plot_width,
+ opt, position, x, y, plot_width,
bg_color, bb_color, bb_style,
nrow, ncolumn,
nlegend, opt_array.ptr,
@@ -1787,7 +1787,7 @@
// Routine for drawing discrete line, symbol, or cmap0 legends
void c_pllegend( PLFLT *p_legend_width, PLFLT *p_legend_height,
- PLINT position, PLINT opt, PLFLT x, PLFLT y, PLFLT plot_width,
+ PLINT opt, PLINT position, PLFLT x, PLFLT y, PLFLT plot_width,
PLINT bg_color, PLINT bb_color, PLINT bb_style,
PLINT nrow, PLINT ncolumn,
PLINT nlegend, PLINT *opt_array,
Modified: trunk/bindings/f77/scstubs.c
===================================================================
--- trunk/bindings/f77/scstubs.c 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/f77/scstubs.c 2011-04-21 00:47:06 UTC (rev 11717)
@@ -553,7 +553,7 @@
void PLLEGEND(
PLFLT *p_legend_width, PLFLT *p_legend_height,
- PLINT *position, PLINT *opt, PLFLT *x, PLFLT *y, PLFLT *plot_width,
+ PLINT *opt, PLINT *position, PLFLT *x, PLFLT *y, PLFLT *plot_width,
PLINT *bg_color, PLINT *bb_color, PLINT *bb_style,
PLINT *nrow, PLINT *ncolumn,
PLINT *nlegend, const PLINT *opt_array,
@@ -568,7 +568,7 @@
const PLINT *symbol_numbers )
{
c_pllegend( p_legend_width, p_legend_height,
- *position, *opt, *x, *y, *plot_width,
+ *opt, *position, *x, *y, *plot_width,
*bg_color, *bb_color, *bb_style,
*nrow, *ncolumn,
*nlegend, opt_array,
Modified: trunk/bindings/f77/sfstubs.fm4
===================================================================
--- trunk/bindings/f77/sfstubs.fm4 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/f77/sfstubs.fm4 2011-04-21 00:47:06 UTC (rev 11717)
@@ -289,7 +289,7 @@
c***********************************************************************
subroutine pllegend( legend_width, legend_height,
- & position, opt, x, y,
+ & opt, position, x, y,
& plot_width, bg_color, bb_color, bb_style,
& nrow, ncolumn, nlegend, opt_array,
& text_offset, text_scale, text_spacing,
@@ -329,7 +329,7 @@
call pllegend07_cnv_text( 1, nlegend, text )
call pllegend07_cnv_text( 2, nlegend, symbols )
- call pllegend07( legend_width, legend_height, position, opt, x, y,
+ call pllegend07( legend_width, legend_height, opt, position, x, y,
& plot_width, bg_color, bb_color, bb_style,
& nrow, ncolumn, nlegend, opt_array,
& text_offset, text_scale, text_spacing,
Modified: trunk/bindings/f95/scstubs.c
===================================================================
--- trunk/bindings/f95/scstubs.c 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/f95/scstubs.c 2011-04-21 00:47:06 UTC (rev 11717)
@@ -592,7 +592,7 @@
void PLLEGEND(
PLFLT *p_legend_width, PLFLT *p_legend_height,
- PLINT *position, PLINT *opt, PLFLT *x, PLFLT *y, PLFLT *plot_width,
+ PLINT *opt, PLINT *position, PLFLT *x, PLFLT *y, PLFLT *plot_width,
PLINT *bg_color, PLINT *bb_color, PLINT *bb_style,
PLINT *nrow, PLINT *ncolumn,
PLINT *nlegend, const PLINT *opt_array,
@@ -607,7 +607,7 @@
const PLINT *symbol_numbers )
{
c_pllegend( p_legend_width, p_legend_height,
- *position, *opt, *x, *y, *plot_width,
+ *opt, *position, *x, *y, *plot_width,
*bg_color, *bb_color, *bb_style,
*nrow, *ncolumn,
*nlegend, opt_array,
Modified: trunk/bindings/f95/sfstubsf95.f90
===================================================================
--- trunk/bindings/f95/sfstubsf95.f90 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/f95/sfstubsf95.f90 2011-04-21 00:47:06 UTC (rev 11717)
@@ -1059,7 +1059,7 @@
end subroutine plimage
subroutine pllegend_1( legend_width, legend_height, &
- & position, opt, x, y, &
+ & opt, position, x, y, &
& plot_width, bg_color, bb_color, bb_style, &
& nrow, ncolumn, nlegend, opt_array, &
& text_offset, text_scale, text_spacing, &
@@ -1091,7 +1091,7 @@
call pllegend07_cnv_text( 1, nlegend, text )
call pllegend07_cnv_text( 2, nlegend, symbols )
- call pllegend07( legend_width, legend_height, position, opt, x, y, &
+ call pllegend07( legend_width, legend_height, opt, position, x, y, &
plot_width, bg_color, bb_color, bb_style, &
nrow, ncolumn, nlegend, opt_array, &
text_offset, text_scale, text_spacing, &
@@ -1105,7 +1105,7 @@
end subroutine pllegend_1
subroutine pllegend_2( legend_width, legend_height, &
- & position, opt, x, y, &
+ & opt, position, x, y, &
& plot_width, bg_color, bb_color, bb_style, &
& nrow, ncolumn, opt_array, &
& text_offset, text_scale, text_spacing, &
@@ -1137,7 +1137,7 @@
nlegend = min( size(opt_array), size(text) )
call pllegend_1( legend_width, legend_height, &
- position, opt, x, y, &
+ opt, position, x, y, &
plot_width, bg_color, bb_color, bb_style, &
nrow, ncolumn, nlegend, opt_array, &
text_offset, text_scale, text_spacing, &
Modified: trunk/bindings/java/PLStream.java
===================================================================
--- trunk/bindings/java/PLStream.java 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/java/PLStream.java 2011-04-21 00:47:06 UTC (rev 11717)
@@ -529,7 +529,7 @@
}
public void legend( double[] p_legend_width, double[] p_legend_height,
- int position, int opt, double x, double y, double plot_width,
+ int opt, int position, double x, double y, double plot_width,
int bg_color, int bb_color, int bb_style,
int nrow, int ncolumn, int[] opt_array,
double text_offset, double text_scale,
@@ -544,7 +544,7 @@
{
if ( set_stream() == -1 ) return;
plplotjavac.pllegend( p_legend_width, p_legend_height,
- position, opt, x, y, plot_width, bg_color, bb_color,
+ opt, position, x, y, plot_width, bg_color, bb_color,
bb_style, nrow, ncolumn, opt_array,
text_offset, text_scale, text_spacing,
text_justification, text_colors, text,
Modified: trunk/bindings/ocaml/plplot.ml
===================================================================
--- trunk/bindings/ocaml/plplot.ml 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/ocaml/plplot.ml 2011-04-21 00:47:06 UTC (rev 11717)
@@ -795,7 +795,7 @@
custom (
fun () ->
ignore (
- pllegend pos_opt opt legend_x legend_y plot_width bg bb bb_style
+ pllegend opt pos_opt legend_x legend_y plot_width bg bb bb_style
rows columns
entry_opts
text_offset text_scale text_spacing text_justification text_colors text
Modified: trunk/bindings/ocaml/plplot.mli
===================================================================
--- trunk/bindings/ocaml/plplot.mli 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/ocaml/plplot.mli 2011-04-21 00:47:06 UTC (rev 11717)
@@ -754,7 +754,7 @@
float -> float -> float -> int -> int -> float -> int -> string -> string ->
float array -> float array -> unit
= "camlidl_plplot_core_c_plcolorbar_bytecode" "camlidl_plplot_core_c_plcolorbar"
-external pllegend : plplot_position_opt -> plplot_legend_opt ->
+external pllegend : plplot_legend_opt -> plplot_position_opt ->
float -> float -> float -> int -> int -> int -> int -> int ->
plplot_legend_opt array -> float -> float ->
float -> float -> int array -> string array -> int array -> int array ->
Modified: trunk/bindings/ocaml/plplot_core.idl
===================================================================
--- trunk/bindings/ocaml/plplot_core.idl 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/ocaml/plplot_core.idl 2011-04-21 00:47:06 UTC (rev 11717)
@@ -314,5 +314,5 @@
RAW_ML(external plgriddata : float array -> float array -> float array -> float array -> float array -> plplot_grid_method_type -> float -> float array array = "ml_plgriddata_bytecode" "ml_plgriddata")
RAW_ML(external plparseopts : string array -> plplot_parse_method_type list -> unit = "ml_plparseopts")
-RAW_ML(external pllegend : plplot_position_opt -> plplot_legend_opt -> float -> float -> float -> int -> int -> int -> int -> int -> plplot_legend_opt array -> float -> float -> float -> float -> int array -> string array -> int array -> int array -> float array -> int array -> int array -> int array -> int array -> int array -> float array -> int array -> string array -> float * float = "ml_pllegend_byte" "ml_pllegend")
+RAW_ML(external pllegend : plplot_legend_opt -> plplot_position_opt -> float -> float -> float -> int -> int -> int -> int -> int -> plplot_legend_opt array -> float -> float -> float -> float -> int array -> string array -> int array -> int array -> float array -> int array -> int array -> int array -> int array -> int array -> float array -> int array -> string array -> float * float = "ml_pllegend_byte" "ml_pllegend")
Modified: trunk/bindings/ocaml/plplot_impl.c
===================================================================
--- trunk/bindings/ocaml/plplot_impl.c 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/ocaml/plplot_impl.c 2011-04-21 00:47:06 UTC (rev 11717)
@@ -771,7 +771,7 @@
return translated_option;
}
-value ml_pllegend( value position, value opt, value x, value y, value plot_width,
+value ml_pllegend( value opt, value position, value x, value y, value plot_width,
value bg_color,
value bb_color, value bb_style,
value nrow, value ncolumn,
@@ -832,7 +832,7 @@
// The returned width and height of the legend
PLFLT width, height;
- pllegend( &width, &height, c_position, c_opt, Double_val( x ), Double_val( y ),
+ pllegend( &width, &height, c_opt, c_position, Double_val( x ), Double_val( y ),
Double_val( plot_width ), Int_val( bg_color ),
Int_val( bb_color ), Int_val( bb_style ),
Int_val( nrow ), Int_val( ncolumn ),
Modified: trunk/bindings/swig-support/plplotcapi.i
===================================================================
--- trunk/bindings/swig-support/plplotcapi.i 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/swig-support/plplotcapi.i 2011-04-21 00:47:06 UTC (rev 11717)
@@ -460,7 +460,7 @@
void
pllegend( PLFLT *OUTPUT, PLFLT *OUTPUT,
- PLINT position, PLINT opt, PLFLT x, PLFLT y, PLFLT plot_width,
+ PLINT opt, PLINT position, PLFLT x, PLFLT y, PLFLT plot_width,
PLINT bg_color, PLINT bb_color, PLINT bb_style,
PLINT nrow, PLINT ncolumn,
PLINT n, const PLINT *Array,
Modified: trunk/bindings/tcl/tclAPI.c
===================================================================
--- trunk/bindings/tcl/tclAPI.c 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/bindings/tcl/tclAPI.c 2011-04-21 00:47:06 UTC (rev 11717)
@@ -4123,7 +4123,7 @@
{
PLFLT legend_width, legend_height;
PLFLT x, y, plot_width;
- PLINT position, opt;
+ PLINT opt, position;
PLINT bg_color, bb_color, bb_style;
PLINT nrow, ncolumn;
PLINT nlegend;
@@ -4154,8 +4154,8 @@
return TCL_ERROR;
}
- sscanf( argv[1], "%d", &position );
- sscanf( argv[2], "%d", &opt );
+ sscanf( argv[1], "%d", &opt );
+ sscanf( argv[2], "%d", &position );
sscanf( argv[3], "%lg", &value ); x = (PLFLT) value;
sscanf( argv[4], "%lg", &value ); y = (PLFLT) value;
sscanf( argv[5], "%lg", &value ); plot_width = (PLFLT) value;
@@ -4187,7 +4187,7 @@
nlegend = MIN( number_opts, number_texts );
c_pllegend( &legend_width, &legend_height,
- position, opt, x, y, plot_width,
+ opt, position, x, y, plot_width,
bg_color, bb_color, bb_style,
nrow, ncolumn,
nlegend, opt_array,
Modified: trunk/examples/ada/x04a.adb
===================================================================
--- trunk/examples/ada/x04a.adb 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/ada/x04a.adb 2011-04-21 00:47:06 UTC (rev 11717)
@@ -128,7 +128,7 @@
symbols(1) := To_Unbounded_String("*");
pllegend(legend_width, legend_height,
- 0, Legend_Background + Legend_Bounding_Box,
+ Legend_Background + Legend_Bounding_Box, 0,
0.0, 0.0, 0.1, 15,
1, 1, 0, 0,
opt_array,
@@ -169,7 +169,7 @@
Box_Scales(0) := 0.0;
pllegend(legend_width, legend_height,
- 0, Legend_Background + Legend_Bounding_Box,
+ Legend_Background + Legend_Bounding_Box, 0,
0.0, 0.0, 0.1, 15, -- fixme Replace colors and styles with names.
1, 1, 0, 0,
opt_array,
Modified: trunk/examples/ada/x26a.adb
===================================================================
--- trunk/examples/ada/x26a.adb 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/ada/x26a.adb 2011-04-21 00:47:06 UTC (rev 11717)
@@ -204,7 +204,7 @@
plscol0a(15, 32, 32, 32, 0.70);
pllegend(legend_width, legend_height,
- 0, Legend_Background + Legend_Bounding_Box,
+ Legend_Background + Legend_Bounding_Box, 0,
0.0, 0.0, 0.1, 15,
1, 1, 0, 0,
opt_array,
Modified: trunk/examples/ada/x33a.adb
===================================================================
--- trunk/examples/ada/x33a.adb 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/ada/x33a.adb 2011-04-21 00:47:06 UTC (rev 11717)
@@ -108,7 +108,7 @@
-- colors : Real_Vector(0 .. n - 1);
-- i : Integer;
-- color_step, color_offset : Long_Float;
- -- position, opt : Integer;
+ -- opt, position : Integer;
-- axis_opts_1, axis_opts_2 : Unbounded_String;
-- begin
-- pladv(0);
@@ -137,7 +137,7 @@
-- end if;
-- end if;
--
- -- plcolorbar(position, opt, 0.1, 0.1, 0.5, 0.1, -- fixme
+ -- plcolorbar(opt, position, 0.1, 0.1, 0.5, 0.1, -- fixme
-- cont_color, cont_width,
-- ticks, sub_ticks,
-- axis_opts_1, "Test label - Left, High Cap",
@@ -146,7 +146,7 @@
-- position := PL_POSITION_RIGHT;
-- opt := bar_type + PL_COLORBAR_LABEL_RIGHT + PL_COLORBAR_CAP_LOW;
--
- -- plcolorbar(position, opt, 0.1, 0.4, 0.5, 0.1, -- fixme etc.
+ -- plcolorbar(opt, position, 0.1, 0.4, 0.5, 0.1, -- fixme etc.
-- cont_color, cont_width,
-- ticks, sub_ticks,
-- axis_opts_1, "Test label - Right, Low Cap",
@@ -155,7 +155,7 @@
-- position := PL_POSITION_TOP;
-- opt := bar_type + PL_COLORBAR_LABEL_TOP + PL_COLORBAR_CAP_HIGH;
--
- -- plcolorbar(position, opt, 0.1, 0.1, 0.5, 0.1,
+ -- plcolorbar(opt, position, 0.1, 0.1, 0.5, 0.1,
-- cont_color, cont_width,
-- ticks, sub_ticks,
-- axis_opts_2, "Test label - Top, High Cap",
@@ -164,7 +164,7 @@
-- position := PL_POSITION_BOTTOM;
-- opt := bar_type + PL_COLORBAR_LABEL_BOTTOM + PL_COLORBAR_CAP_LOW;
--
- -- plcolorbar(position, opt, 0.4, 0.1, 0.5, 0.1,
+ -- plcolorbar(opt, position, 0.4, 0.1, 0.5, 0.1,
-- cont_color, cont_width,
-- ticks, sub_ticks,
-- axis_opts_2, "Test label - Bottom, Low Cap",
@@ -186,7 +186,7 @@
-- colors : Long_Float(0 .. n - 1);
-- i : Integer;
-- color_step, color_offset : Long_Float;
- -- position, opt : Integer;
+ -- opt, position : Integer;
-- axis_opts_1, axis_opts_2 : Unbounded_String;
-- begin
-- pladv(0);
@@ -222,7 +222,7 @@
-- end if;
-- end if;
--
- -- plcolorbar(position, opt, 0.1, 0.1, 0.5, 0.1,
+ -- plcolorbar(opt, position, 0.1, 0.1, 0.5, 0.1,
-- cont_color, cont_width,
-- ticks, sub_ticks,
-- axis_opts_1, "Test label - Left, Low Cap",
@@ -231,7 +231,7 @@
-- position := PL_POSITION_RIGHT;
-- opt := bar_type + PL_COLORBAR_LABEL_RIGHT + PL_COLORBAR_CAP_HIGH;
--
- -- plcolorbar(position, opt, 0.1, 0.4, 0.5, 0.1,
+ -- plcolorbar(opt, position, 0.1, 0.4, 0.5, 0.1,
-- cont_color, cont_width,
-- ticks, sub_ticks,
-- axis_opts_1, "Test label - Right, High Cap",
@@ -240,7 +240,7 @@
-- position := PL_POSITION_TOP;
-- opt := bar_type + PL_COLORBAR_LABEL_TOP + PL_COLORBAR_CAP_LOW;
--
- -- plcolorbar(position, opt, 0.1, 0.1, 0.5, 0.1,
+ -- plcolorbar(opt, position, 0.1, 0.1, 0.5, 0.1,
-- cont_color, cont_width,
-- ticks, sub_ticks,
-- axis_opts_2, "Test label - Top, Low Cap",
@@ -249,7 +249,7 @@
-- position := PL_POSITION_BOTTOM;
-- opt := bar_type + PL_COLORBAR_LABEL_BOTTOM + PL_COLORBAR_CAP_HIGH;
--
- -- plcolorbar(position, opt, 0.4, 0.1, 0.5, 0.1,
+ -- plcolorbar(opt, position, 0.4, 0.1, 0.5, 0.1,
-- cont_color, cont_width,
-- ticks, sub_ticks,
-- axis_opts_2, "Test label - Bottom, High Cap",
@@ -330,7 +330,7 @@
line_colors(0) := 1 + (k mod 8);
symbol_colors(0) := 1 + (k mod 8);
- pllegend(legend_width, legend_height, position, opt, 0.05, 0.05,
+ pllegend(legend_width, legend_height, opt, position, 0.05, 0.05,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -398,7 +398,7 @@
y := 0.1;
nrow := 1;
ncolumn := nlegend;
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -413,7 +413,7 @@
y := 0.1;
nrow := 1;
ncolumn := nlegend;
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -428,7 +428,7 @@
y := 0.0;
nrow := nlegend;
ncolumn := 1;
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -443,7 +443,7 @@
y := 0.0;
nrow := nlegend;
ncolumn := 1;
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -458,7 +458,7 @@
y := 0.0;
nrow := 6;
ncolumn := 2;
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -473,7 +473,7 @@
y := 0.0;
nrow := 6;
ncolumn := 2;
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -488,7 +488,7 @@
y := 0.0;
nrow := 3;
ncolumn := 3;
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -564,7 +564,7 @@
nrow := Integer'min(3, nlegend);
ncolumn := 0;
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.025, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 1.5,
1.0, text_colors, text,
@@ -662,7 +662,7 @@
opt := opt_base;
plscol0a(15, 32, 32, 32, 0.70);
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -686,7 +686,7 @@
x := x + legend_width;
plscol0a(15, 32, 32, 32, 0.70);
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -711,7 +711,7 @@
x := x + legend_width;
plscol0a(15, 32, 32, 32, 0.70);
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -739,7 +739,7 @@
max_height := 0.0;
plscol0a(15, 32, 32, 32, 0.70);
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -763,7 +763,7 @@
x := x + legend_width;
plscol0a(15, 32, 32, 32, 0.70);
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -787,7 +787,7 @@
x := x + legend_width;
plscol0a(15, 32, 32, 32, 0.70);
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -813,7 +813,7 @@
max_height := 0.0;
plscol0a(15, 32, 32, 32, 0.70);
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -836,7 +836,7 @@
x := x + legend_width;
plscol0a(15, 32, 32, 32, 0.70);
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -859,7 +859,7 @@
x := x + legend_width;
plscol0a(15, 32, 32, 32, 0.70);
- pllegend(legend_width, legend_height, position, opt, x, y,
+ pllegend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
Modified: trunk/examples/ada/xthick04a.adb
===================================================================
--- trunk/examples/ada/xthick04a.adb 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/ada/xthick04a.adb 2011-04-21 00:47:06 UTC (rev 11717)
@@ -128,7 +128,7 @@
symbols(1) := To_Unbounded_String("*");
Create_Legend(legend_width, legend_height,
- 0, Legend_Background + Legend_Bounding_Box,
+ Legend_Background + Legend_Bounding_Box, 0,
0.0, 0.0, 0.1, White,
Red, 1, 0, 0,
opt_array,
@@ -169,7 +169,7 @@
Box_Scales(0) := 0.0;
Create_Legend(legend_width, legend_height,
- 0, Legend_Background + Legend_Bounding_Box,
+ Legend_Background + Legend_Bounding_Box, 0,
0.0, 0.0, 0.1, White,
Red, 1, 0, 0,
opt_array,
Modified: trunk/examples/ada/xthick26a.adb
===================================================================
--- trunk/examples/ada/xthick26a.adb 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/ada/xthick26a.adb 2011-04-21 00:47:06 UTC (rev 11717)
@@ -204,7 +204,7 @@
Set_One_Color_Map_0_And_Alpha(15, 32, 32, 32, 0.70);
Create_Legend(legend_width, legend_height,
- 0, Legend_Background + Legend_Bounding_Box,
+ Legend_Background + Legend_Bounding_Box, 0,
0.0, 0.0, 0.1, 15,
1, 1, 0, 0,
opt_array,
Modified: trunk/examples/ada/xthick33a.adb
===================================================================
--- trunk/examples/ada/xthick33a.adb 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/ada/xthick33a.adb 2011-04-21 00:47:06 UTC (rev 11717)
@@ -332,7 +332,7 @@
line_colors(0) := 1 + (k mod 8);
symbol_colors(0) := 1 + (k mod 8);
- Create_Legend(legend_width, legend_height, position, opt, 0.05, 0.05,
+ Create_Legend(legend_width, legend_height, opt, position, 0.05, 0.05,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -400,7 +400,7 @@
y := 0.1;
nrow := 1;
ncolumn := nlegend;
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -415,7 +415,7 @@
y := 0.1;
nrow := 1;
ncolumn := nlegend;
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -430,7 +430,7 @@
y := 0.0;
nrow := nlegend;
ncolumn := 1;
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -445,7 +445,7 @@
y := 0.0;
nrow := nlegend;
ncolumn := 1;
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -460,7 +460,7 @@
y := 0.0;
nrow := 6;
ncolumn := 2;
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -475,7 +475,7 @@
y := 0.0;
nrow := 6;
ncolumn := 2;
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -490,7 +490,7 @@
y := 0.0;
nrow := 3;
ncolumn := 3;
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 2.0,
1.0, text_colors, text,
@@ -566,7 +566,7 @@
nrow := Integer'min(3, nlegend);
ncolumn := 0;
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.025, 15, 1, 1, nrow, ncolumn,
opt_array, 1.0, 1.0, 1.5,
1.0, text_colors, text,
@@ -664,7 +664,7 @@
opt := opt_base;
Set_One_Color_Map_0_And_Alpha(White, 32, 32, 32, 0.70);
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -688,7 +688,7 @@
x := x + legend_width;
Set_One_Color_Map_0_And_Alpha(White, 32, 32, 32, 0.70);
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -713,7 +713,7 @@
x := x + legend_width;
Set_One_Color_Map_0_And_Alpha(White, 32, 32, 32, 0.70);
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -741,7 +741,7 @@
max_height := 0.0;
Set_One_Color_Map_0_And_Alpha(White, 32, 32, 32, 0.70);
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -765,7 +765,7 @@
x := x + legend_width;
Set_One_Color_Map_0_And_Alpha(White, 32, 32, 32, 0.70);
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -789,7 +789,7 @@
x := x + legend_width;
Set_One_Color_Map_0_And_Alpha(White, 32, 32, 32, 0.70);
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -815,7 +815,7 @@
max_height := 0.0;
Set_One_Color_Map_0_And_Alpha(White, 32, 32, 32, 0.70);
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -838,7 +838,7 @@
x := x + legend_width;
Set_One_Color_Map_0_And_Alpha(White, 32, 32, 32, 0.70);
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
@@ -861,7 +861,7 @@
x := x + legend_width;
Set_One_Color_Map_0_And_Alpha(White, 32, 32, 32, 0.70);
- Create_Legend(legend_width, legend_height, position, opt, x, y,
+ Create_Legend(legend_width, legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
opt_array, 1.0, text_scale, 2.0,
0.0, text_colors, text,
Modified: trunk/examples/c/x04c.c
===================================================================
--- trunk/examples/c/x04c.c 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/c/x04c.c 2011-04-21 00:47:06 UTC (rev 11717)
@@ -143,7 +143,7 @@
plscol0a( 15, 32, 32, 32, 0.70 );
pllegend( &legend_width, &legend_height,
- 0, PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX,
+ PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX, 0,
0.0, 0.0, 0.1, 15,
1, 1, 0, 0,
nlegend, opt_array,
Modified: trunk/examples/c/x26c.c
===================================================================
--- trunk/examples/c/x26c.c 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/c/x26c.c 2011-04-21 00:47:06 UTC (rev 11717)
@@ -243,7 +243,7 @@
plscol0a( 15, 32, 32, 32, 0.70 );
pllegend( &legend_width, &legend_height,
- 0, PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX,
+ PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX, 0,
0.0, 0.0, 0.10, 15,
1, 1, 0, 0,
nlegend, opt_array,
Modified: trunk/examples/c/x33c.c
===================================================================
--- trunk/examples/c/x33c.c 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/c/x33c.c 2011-04-21 00:47:06 UTC (rev 11717)
@@ -346,7 +346,7 @@
line_colors[0] = 1 + ( k % 8 );
symbol_colors[0] = 1 + ( k % 8 );
- pllegend( &legend_width, &legend_height, position, opt, 0.05, 0.05,
+ pllegend( &legend_width, &legend_height, opt, position, 0.05, 0.05,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -394,7 +394,7 @@
y = 0.1;
nrow = 1;
ncolumn = nlegend;
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -408,7 +408,7 @@
y = 0.1;
nrow = 1;
ncolumn = nlegend;
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -422,7 +422,7 @@
y = 0.;
nrow = nlegend;
ncolumn = 1;
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -436,7 +436,7 @@
y = 0.;
nrow = nlegend;
ncolumn = 1;
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -450,7 +450,7 @@
y = 0.;
nrow = 6;
ncolumn = 2;
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -464,7 +464,7 @@
y = 0.;
nrow = 6;
ncolumn = 2;
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -478,7 +478,7 @@
y = 0.;
nrow = 3;
ncolumn = 3;
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -530,7 +530,7 @@
nrow = MIN( 3, nlegend );
ncolumn = 0;
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.025, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 1.5,
1., text_colors, (const char **) text,
@@ -614,7 +614,7 @@
opt = opt_base;
plscol0a( 15, 32, 32, 32, 0.70 );
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -639,7 +639,7 @@
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -664,7 +664,7 @@
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -692,7 +692,7 @@
max_height = 0.;
plscol0a( 15, 32, 32, 32, 0.70 );
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -717,7 +717,7 @@
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -742,7 +742,7 @@
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -769,7 +769,7 @@
max_height = 0.;
plscol0a( 15, 32, 32, 32, 0.70 );
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -793,7 +793,7 @@
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -817,7 +817,7 @@
x += legend_width;
plscol0a( 15, 32, 32, 32, 0.70 );
- pllegend( &legend_width, &legend_height, position, opt, x, y,
+ pllegend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
Modified: trunk/examples/c++/x04.cc
===================================================================
--- trunk/examples/c++/x04.cc 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/c++/x04.cc 2011-04-21 00:47:06 UTC (rev 11717)
@@ -172,7 +172,7 @@
pls->scol0a( 15, 32, 32, 32, 0.70 );
pls->legend( &legend_width, &legend_height,
- 0, PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX,
+ PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX, 0,
0.0, 0.0, 0.1, 15,
1, 1, 0, 0,
nlegend, opt_array,
Modified: trunk/examples/c++/x26.cc
===================================================================
--- trunk/examples/c++/x26.cc 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/c++/x26.cc 2011-04-21 00:47:06 UTC (rev 11717)
@@ -253,7 +253,7 @@
pls->scol0a( 15, 32, 32, 32, 0.70 );
pls->legend( &legend_width, &legend_height,
- 0, PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX,
+ PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX, 0,
0.0, 0.0, 0.10, 15,
1, 1, 0, 0,
nlegend, opt_array,
Modified: trunk/examples/c++/x33.cc
===================================================================
--- trunk/examples/c++/x33.cc 2011-04-20 23:26:48 UTC (rev 11716)
+++ trunk/examples/c++/x33.cc 2011-04-21 00:47:06 UTC (rev 11717)
@@ -100,7 +100,7 @@
colors[i] = 0.0 + color_step * (PLFLT) ( i );
}
- PLINT position, opt;
+ PLINT opt, position;
position = PL_POSITION_LEFT;
opt = bar_type | PL_COLORBAR_LABEL_LEFT |
PL_COLORBAR_CAP_HIGH;
@@ -125,7 +125,7 @@
}
}
- pls->colorbar( position, opt, 0.1, 0.1, 0.5, 0.1,
+ pls->colorbar( opt, position, 0.1, 0.1, 0.5, 0.1,
cont_color, cont_width, ticks, sub_ticks,
axis_opts_1, "Test label - Left, High Cap",
n, colors, values );
@@ -134,7 +134,7 @@
opt = bar_type | PL_COLORBAR_LABEL_RIGHT |
PL_COLORBAR_CAP_LOW;
- pls->colorbar( position, opt, 0.1, 0.4, 0.5, 0.1,
+ pls->colorbar( opt, position, 0.1, 0.4, 0.5, 0.1,
cont_color, cont_width, ticks, sub_ticks,
axis_opts_1, "Test label - Right, Low Cap",
n, colors, values );
@@ -143,7 +143,7 @@
opt = bar_type | PL_COLORBAR_LABEL_TOP |
PL_COLORBAR_CAP_HIGH;
- pls->colorbar( position, opt, 0.1, 0.1, 0.5, 0.1,
+ pls->colorbar( opt, position, 0.1, 0.1, 0.5, 0.1,
cont_color, cont_width, ticks, sub_ticks,
axis_opts_2, "Test label - Top, High Cap",
n, colors, values );
@@ -152,7 +152,7 @@
opt = bar_type | PL_COLORBAR_LABEL_BOTTOM |
PL_COLORBAR_CAP_LOW;
- pls->colorbar( position, opt, 0.4, 0.1, 0.5, 0.1,
+ pls->colorbar( opt, position, 0.4, 0.1, 0.5, 0.1,
cont_color, cont_width, ticks, sub_ticks,
axis_opts_2, "Test label - Bottom, Low Cap",
n, colors, values );
@@ -178,7 +178,7 @@
colors[i] = 0.0 + color_step * (PLFLT) ( i );
}
- PLINT position, opt;
+ PLINT opt, position;
position = PL_POSITION_LEFT;
opt = bar_type | PL_COLORBAR_LABEL_LEFT |
PL_COLORBAR_CAP_LOW;
@@ -203,7 +203,7 @@
}
}
- pls->colorbar( position, opt, 0.1, 0.1, 0.5, 0.1,
+ pls->colorbar( opt, position, 0.1, 0.1, 0.5, 0.1,
cont_color, cont_width, ticks, sub_ticks,
axis_opts_1, "Test label - Left, Low Cap",
n, colors, values );
@@ -212,7 +212,7 @@
opt = bar_type | PL_COLORBAR_LABEL_RIGHT |
PL_COLORBAR_CAP_HIGH;
- pls->colorbar( position, opt, 0.1, 0.4, 0.5, 0.1,
+ pls->colorbar( opt, position, 0.1, 0.4, 0.5, 0.1,
cont_color, cont_width, ticks, sub_ticks,
axis_opts_1, "Test label - Right, High Cap",
n, colors, values );
@@ -221,7 +221,7 @@
opt = bar_type | PL_COLORBAR_LABEL_TOP |
PL_COLORBAR_CAP_LOW;
- pls->colorbar( position, opt, 0.1, 0.1, 0.5, 0.1,
+ pls->colorbar( opt, position, 0.1, 0.1, 0.5, 0.1,
cont_color, cont_width, ticks, sub_ticks,
axis_opts_2, "Test label - Top, Low Cap",
n, colors, values );
@@ -230,7 +230,7 @@
opt = bar_type | PL_COLORBAR_LABEL_BOTTOM |
PL_COLORBAR_CAP_HIGH;
- pls->colorbar( position, opt, 0.4, 0.1, 0.5, 0.1,
+ pls->colorbar( opt, position, 0.4, 0.1, 0.5, 0.1,
cont_color, cont_width, ticks, sub_ticks,
axis_opts_2, "Test label - Bottom, High Cap",
n, colors, values );
@@ -316,7 +316,7 @@
line_colors[0] = 1 + ( k % 8 );
symbol_colors[0] = 1 + ( k % 8 );
- pls->legend( &legend_width, &legend_height, position, opt, 0.05, 0.05,
+ pls->legend( &legend_width, &legend_height, opt, position, 0.05, 0.05,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -364,7 +364,7 @@
y = 0.1;
nrow = 1;
ncolumn = nlegend;
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -378,7 +378,7 @@
y = 0.1;
nrow = 1;
ncolumn = nlegend;
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -392,7 +392,7 @@
y = 0.;
nrow = nlegend;
ncolumn = 1;
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -406,7 +406,7 @@
y = 0.;
nrow = nlegend;
ncolumn = 1;
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -420,7 +420,7 @@
y = 0.;
nrow = 6;
ncolumn = 2;
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -434,7 +434,7 @@
y = 0.;
nrow = 6;
ncolumn = 2;
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -448,7 +448,7 @@
y = 0.;
nrow = 3;
ncolumn = 3;
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.05, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 2.0,
1., text_colors, (const char **) text,
@@ -500,7 +500,7 @@
nrow = MIN( 3, nlegend );
ncolumn = 0;
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.025, 15, 1, 1, nrow, ncolumn,
nlegend, opt_array, 1.0, 1.0, 1.5,
1., text_colors, (const char **) text,
@@ -584,7 +584,7 @@
opt = opt_base;
pls->scol0a( 15, 32, 32, 32, 0.70 );
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -609,7 +609,7 @@
x += legend_width;
pls->scol0a( 15, 32, 32, 32, 0.70 );
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -634,7 +634,7 @@
x += legend_width;
pls->scol0a( 15, 32, 32, 32, 0.70 );
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -662,7 +662,7 @@
max_height = 0.;
pls->scol0a( 15, 32, 32, 32, 0.70 );
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -687,7 +687,7 @@
x += legend_width;
pls->scol0a( 15, 32, 32, 32, 0.70 );
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0., text_colors, (const char **) text,
@@ -712,7 +712,7 @@
x += legend_width;
pls->scol0a( 15, 32, 32, 32, 0.70 );
- pls->legend( &legend_width, &legend_height, position, opt, x, y,
+ pls->legend( &legend_width, &legend_height, opt, position, x, y,
0.1, 15, 1, 1, 0, 0,
nlegend, opt_array, 1.0, text_scale, 2.0,
0....
[truncated message content] |
