Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12337] trunk
|
From: <and...@us...> - 2013-05-10 20:16:34
|
Revision: 12337
http://sourceforge.net/p/plplot/code/12337
Author: andrewross
Date: 2013-05-10 20:16:29 +0000 (Fri, 10 May 2013)
Log Message:
-----------
Update Ada bindings to change line width arguments from Integer to Long_Float in pllegend and plshade.
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/examples/ada/x04a.adb
trunk/examples/ada/x15a.adb
trunk/examples/ada/x16a.adb
trunk/examples/ada/x21a.adb
trunk/examples/ada/x26a.adb
trunk/examples/ada/x33a.adb
trunk/examples/ada/xthick04a.adb
trunk/examples/ada/xthick15a.adb
trunk/examples/ada/xthick16a.adb
trunk/examples/ada/xthick21a.adb
trunk/examples/ada/xthick26a.adb
trunk/examples/ada/xthick33a.adb
Modified: trunk/bindings/ada/plplot.adb
===================================================================
--- trunk/bindings/ada/plplot.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/bindings/ada/plplot.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -456,7 +456,7 @@
Title_Label : String := To_String(Default_Label_String);
Axis_Style : Axis_Style_Type := Linear_Major_Grid;
Color : Plot_Color_Type := Red;
- Line_Width : Integer := 1;
+ Line_Width : Long_Float := 1.0;
Line_Style : Line_Style_Type := 1;
Justification : Justification_Type := Not_Justified;
x_Min_Zoom : Long_Float := Long_Float'small;
@@ -1918,8 +1918,9 @@
Label_Text : Legend_String_Array_Type;
Box_Colors, Box_Patterns : Integer_Array_1D;
Box_Scales : Real_Vector;
- Box_Line_Widths : Integer_Array_1D;
- Line_Colors, Line_Styles, Line_Widths : Integer_Array_1D;
+ Box_Line_Widths : Real_Vector;
+ Line_Colors, Line_Styles : Integer_Array_1D;
+ Line_Widths : Real_Vector;
Symbol_Colors : Integer_Array_1D;
Symbol_Scales : Real_Vector;
Symbol_Numbers : Integer_Array_1D;
@@ -2772,9 +2773,11 @@
Shade_Min, Shade_Max : Long_Float;
Select_Color_Map : Natural; -- should be 0 or 1
Color : Long_Float;
- Fill_Pattern_Pen_Width : Positive;
- Shade_Min_Pen_Color, Shade_Min_Pen_Width : Natural;
- Shade_Max_Pen_Color, Shade_Max_Pen_Width : Natural;
+ Fill_Pattern_Pen_Width : Long_Float;
+ Shade_Min_Pen_Color : Natural;
+ Shade_Min_Pen_Width : Long_Float;
+ Shade_Max_Pen_Color : Natural;
+ Shade_Max_Pen_Width : Long_Float;
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
@@ -2806,9 +2809,11 @@
Shade_Min, Shade_Max : Long_Float;
Select_Color_Map : Natural; -- should be 0 or 1
Color : Long_Float;
- Fill_Pattern_Pen_Width : Positive;
- Shade_Min_Pen_Color, Shade_Min_Pen_Width : Natural;
- Shade_Max_Pen_Color, Shade_Max_Pen_Width : Natural;
+ Fill_Pattern_Pen_Width : Long_Float;
+ Shade_Min_Pen_Color : Natural;
+ Shade_Min_Pen_Width : Long_Float;
+ Shade_Max_Pen_Color : Natural;
+ Shade_Max_Pen_Width : Long_Float;
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
@@ -2838,9 +2843,9 @@
Mask_Function_Pointer : Mask_Function_Pointer_Type;
x_Min, x_Max, y_Min, y_Max : Long_Float; -- world mins and maxes
Contour_Levels : Real_Vector;
- Fill_Pattern_Pen_Width : Natural; -- 0 is allowed
+ Fill_Pattern_Pen_Width : Long_Float; -- 0.0 is allowed
Contour_Pen_Color : Natural; -- 0 for no contours
- Contour_Pen_Width : Natural; -- 0 for no contours
+ Contour_Pen_Width : Long_Float; -- 0.0 for no contours
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
Modified: trunk/bindings/ada/plplot.ads
===================================================================
--- trunk/bindings/ada/plplot.ads 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/bindings/ada/plplot.ads 2013-05-10 20:16:29 UTC (rev 12337)
@@ -139,8 +139,8 @@
type Color_Array_Type is array (1..Max_Lines_For_Multiplot) of Plot_Color_Type;
Default_Color_Array : Color_Array_Type := (Red, Blue, Green, Salmon, BlueViolet);
- type Line_Width_Array_Type is array (1..Max_Lines_For_Multiplot) of Integer;
- Default_Line_Width_Array : Line_Width_Array_Type := (1, 1, 1, 1, 1);
+ type Line_Width_Array_Type is array (1..Max_Lines_For_Multiplot) of Long_Float;
+ Default_Line_Width_Array : Line_Width_Array_Type := (1.0, 1.0, 1.0, 1.0, 1.0);
type Line_Style_Array_Type is array (1..Max_Lines_For_Multiplot) of Line_Style_Type;
Default_Line_Style_Array : Line_Style_Array_Type := (1, 1, 1, 1, 1);
@@ -614,7 +614,7 @@
Title_Label : String := To_String(Default_Label_String);
Axis_Style : Axis_Style_Type := Linear_Major_Grid;
Color : Plot_Color_Type := Red;
- Line_Width : Integer := 1;
+ Line_Width : Long_Float := 1.0;
Line_Style : Line_Style_Type := 1;
Justification : Justification_Type := Not_Justified;
x_Min_Zoom : Long_Float := Long_Float'small;
@@ -1308,8 +1308,9 @@
Label_Text : Legend_String_Array_Type;
Box_Colors, Box_Patterns : Integer_Array_1D;
Box_Scales : Real_Vector;
- Box_Line_Widths : Integer_Array_1D;
- Line_Colors, Line_Styles, Line_Widths : Integer_Array_1D;
+ Box_Line_Widths : Real_Vector;
+ Line_Colors, Line_Styles : Integer_Array_1D;
+ Line_Widths : Real_Vector;
Symbol_Colors : Integer_Array_1D;
Symbol_Scales : Real_Vector;
Symbol_Numbers : Integer_Array_1D;
@@ -1767,9 +1768,11 @@
Shade_Min, Shade_Max : Long_Float;
Select_Color_Map : Natural; -- should be 0 or 1
Color : Long_Float;
- Fill_Pattern_Pen_Width : Positive;
- Shade_Min_Pen_Color, Shade_Min_Pen_Width : Natural;
- Shade_Max_Pen_Color, Shade_Max_Pen_Width : Natural;
+ Fill_Pattern_Pen_Width : Long_Float;
+ Shade_Min_Pen_Color : Natural;
+ Shade_Min_Pen_Width : Long_Float;
+ Shade_Max_Pen_Color : Natural;
+ Shade_Max_Pen_Width : Long_Float;
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
@@ -1784,9 +1787,11 @@
Shade_Min, Shade_Max : Long_Float;
Select_Color_Map : Natural; -- should be 0 or 1
Color : Long_Float;
- Fill_Pattern_Pen_Width : Positive;
- Shade_Min_Pen_Color, Shade_Min_Pen_Width : Natural;
- Shade_Max_Pen_Color, Shade_Max_Pen_Width : Natural;
+ Fill_Pattern_Pen_Width : Long_Float;
+ Shade_Min_Pen_Color : Natural;
+ Shade_Min_Pen_Width : Long_Float;
+ Shade_Max_Pen_Color : Natural;
+ Shade_Max_Pen_Width : Long_Float;
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
@@ -1799,9 +1804,9 @@
Mask_Function_Pointer : Mask_Function_Pointer_Type;
x_Min, x_Max, y_Min, y_Max : Long_Float; -- world mins and maxes
Contour_Levels : Real_Vector;
- Fill_Pattern_Pen_Width : Natural; -- 0 is allowed
+ Fill_Pattern_Pen_Width : Long_Float; -- 0 is allowed
Contour_Pen_Color : Natural; -- 0 for no contours
- Contour_Pen_Width : Natural; -- 0 for no contours
+ Contour_Pen_Width : Long_Float; -- 0 for no contours
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
Modified: trunk/bindings/ada/plplot_thin.ads
===================================================================
--- trunk/bindings/ada/plplot_thin.ads 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/bindings/ada/plplot_thin.ads 2013-05-10 20:16:29 UTC (rev 12337)
@@ -1078,9 +1078,9 @@
text_colors : PL_Integer_Array; -- fixme these are actually colors; map to them in Ada
text : PL_Legend_String_Array;
box_colors : PL_Integer_Array; box_patterns : PL_Integer_Array;
- box_scales : PL_Float_Array; box_line_widths : PL_Integer_Array;
+ box_scales : PL_Float_Array; box_line_widths : PL_Float_Array;
line_colors : PL_Integer_Array; line_styles : PL_Integer_Array;
- line_widths : PL_Integer_Array;
+ line_widths : PL_Float_Array;
symbol_colors : PL_Integer_Array; symbol_scales : PL_Float_Array;
symbol_numbers : PL_Integer_Array;
symbols : PL_Legend_String_Array);
@@ -1529,9 +1529,9 @@
plshade(a : Long_Float_Pointer_Array; nx : PLINT; ny : PLINT; defined : Mask_Function_Pointer_Type;
left : PLFLT; right : PLFLT; bottom : PLFLT; top : PLFLT;
shade_min : PLFLT; shade_max : PLFLT;
- sh_cmap : PLINT; sh_color : PLFLT; sh_width : PLINT;
- min_color : PLINT; min_width : PLINT;
- max_color : PLINT; max_width : PLINT;
+ sh_cmap : PLINT; sh_color : PLFLT; sh_width : PLFLT;
+ min_color : PLINT; min_width : PLFLT;
+ max_color : PLINT; max_width : PLFLT;
fill : Fill_Procedure_Pointer_Type; rectangular : PLINT;
pltr : Transformation_Procedure_Pointer_Type; pltr_data : PLpointer);
pragma Import(C, plshade, "c_plshade");
@@ -1541,9 +1541,9 @@
plshade1(a : PL_Float_Array_2D; nx : PLINT; ny : PLINT; defined : Mask_Function_Pointer_Type;
left : PLFLT; right : PLFLT; bottom : PLFLT; top : PLFLT;
shade_min : PLFLT; shade_max : PLFLT;
- sh_cmap : PLINT; sh_color : PLFLT; sh_width : PLINT;
- min_color : PLINT; min_width : PLINT;
- max_color : PLINT; max_width : PLINT;
+ sh_cmap : PLINT; sh_color : PLFLT; sh_width : PLFLT;
+ min_color : PLINT; min_width : PLFLT;
+ max_color : PLINT; max_width : PLFLT;
fill : Fill_Procedure_Pointer_Type; rectangular : PLINT;
pltr : Transformation_Procedure_Pointer_Type; pltr_data : PLpointer);
pragma Import(C, plshade1, "c_plshade1");
@@ -1552,8 +1552,8 @@
procedure
plshades(z : Long_Float_Pointer_Array; nx : PLINT; ny : PLINT; defined : Mask_Function_Pointer_Type;
xmin : PLFLT; xmax : PLFLT; ymin : PLFLT; ymax : PLFLT;
- clevel : PL_Float_Array; nlevel : PLINT; fill_width : PLINT;
- cont_color : PLINT; cont_width : PLINT;
+ clevel : PL_Float_Array; nlevel : PLINT; fill_width : PLFLT;
+ cont_color : PLINT; cont_width : PLFLT;
fill : Fill_Procedure_Pointer_Type; rectangular : PLINT;
pltr : Transformation_Procedure_Pointer_Type; pltr_data : PLpointer);
pragma Import(C, plshades, "c_plshades");
Modified: trunk/bindings/ada/plplot_traditional.adb
===================================================================
--- trunk/bindings/ada/plplot_traditional.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/bindings/ada/plplot_traditional.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -458,7 +458,7 @@
Title_Label : String := To_String(Default_Label_String);
Axis_Style : Axis_Style_Type := Linear_Major_Grid;
Color : Plot_Color_Type := Red;
- Line_Width : Integer := 1;
+ Line_Width : Long_Float := 1.0;
Line_Style : Line_Style_Type := 1;
Justification : Justification_Type := Not_Justified;
x_Min_Zoom : Long_Float := Long_Float'small;
@@ -1849,8 +1849,9 @@
Label_Text : Legend_String_Array_Type;
Box_Colors, Box_Patterns : Integer_Array_1D;
Box_Scales : Real_Vector;
- Box_Line_Widths : Integer_Array_1D;
- Line_Colors, Line_Styles, Line_Widths : Integer_Array_1D;
+ Box_Line_Widths : Real_Vector;
+ Line_Colors, Line_Styles : Integer_Array_1D;
+ Line_Widths : Real_Vector;
Symbol_Colors : Integer_Array_1D;
Symbol_Scales : Real_Vector;
Symbol_Numbers : Integer_Array_1D;
@@ -2648,9 +2649,11 @@
Shade_Min, Shade_Max : Long_Float;
Select_Color_Map : Natural; -- should be 0 or 1
Color : Long_Float;
- Fill_Pattern_Pen_Width : Positive;
- Shade_Min_Pen_Color, Shade_Min_Pen_Width : Natural;
- Shade_Max_Pen_Color, Shade_Max_Pen_Width : Natural;
+ Fill_Pattern_Pen_Width : Long_Float;
+ Shade_Min_Pen_Color : Natural;
+ Shade_Min_Pen_Width : Long_Float;
+ Shade_Max_Pen_Color : Natural;
+ Shade_Max_Pen_Width : Long_Float;
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
@@ -2681,9 +2684,11 @@
Shade_Min, Shade_Max : Long_Float;
Select_Color_Map : Natural; -- should be 0 or 1
Color : Long_Float;
- Fill_Pattern_Pen_Width : Positive;
- Shade_Min_Pen_Color, Shade_Min_Pen_Width : Natural;
- Shade_Max_Pen_Color, Shade_Max_Pen_Width : Natural;
+ Fill_Pattern_Pen_Width : Long_Float;
+ Shade_Min_Pen_Color : Natural;
+ Shade_Min_Pen_Width : Long_Float;
+ Shade_Max_Pen_Color : Natural;
+ Shade_Max_Pen_Width : Long_Float;
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
@@ -2712,9 +2717,9 @@
Mask_Function_Pointer : Mask_Function_Pointer_Type;
x_Min, x_Max, y_Min, y_Max : Long_Float; -- world mins and maxes
Contour_Levels : Real_Vector;
- Fill_Pattern_Pen_Width : Natural; -- 0 is allowed
+ Fill_Pattern_Pen_Width : Long_Float; -- 0.0 is allowed
Contour_Pen_Color : Natural; -- 0 for no contours
- Contour_Pen_Width : Natural; -- 0 for no contours
+ Contour_Pen_Width : Long_Float; -- 0.0 for no contours
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
Modified: trunk/bindings/ada/plplot_traditional.ads
===================================================================
--- trunk/bindings/ada/plplot_traditional.ads 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/bindings/ada/plplot_traditional.ads 2013-05-10 20:16:29 UTC (rev 12337)
@@ -137,8 +137,8 @@
type Color_Array_Type is array (1..Max_Lines_For_Multiplot) of Plot_Color_Type;
Default_Color_Array : Color_Array_Type := (Red, Blue, Green, Salmon, BlueViolet);
- type Line_Width_Array_Type is array (1..Max_Lines_For_Multiplot) of Integer;
- Default_Line_Width_Array : Line_Width_Array_Type := (1, 1, 1, 1, 1);
+ type Line_Width_Array_Type is array (1..Max_Lines_For_Multiplot) of Long_Float;
+ Default_Line_Width_Array : Line_Width_Array_Type := (1.0, 1.0, 1.0, 1.0, 1.0);
type Line_Style_Array_Type is array (1..Max_Lines_For_Multiplot) of Line_Style_Type;
Default_Line_Style_Array : Line_Style_Array_Type := (1, 1, 1, 1, 1);
@@ -612,7 +612,7 @@
Title_Label : String := To_String(Default_Label_String);
Axis_Style : Axis_Style_Type := Linear_Major_Grid;
Color : Plot_Color_Type := Red;
- Line_Width : Integer := 1;
+ Line_Width : Long_Float := 1.0;
Line_Style : Line_Style_Type := 1;
Justification : Justification_Type := Not_Justified;
x_Min_Zoom : Long_Float := Long_Float'small;
@@ -1234,8 +1234,9 @@
Label_Text : Legend_String_Array_Type;
Box_Colors, Box_Patterns : Integer_Array_1D;
Box_Scales : Real_Vector;
- Box_Line_Widths : Integer_Array_1D;
- Line_Colors, Line_Styles, Line_Widths : Integer_Array_1D;
+ Box_Line_Widths : Real_Vector;
+ Line_Colors, Line_Styles : Integer_Array_1D;
+ Line_Widths : Real_Vector;
Symbol_Colors : Integer_Array_1D;
Symbol_Scales : Real_Vector;
Symbol_Numbers : Integer_Array_1D;
@@ -1636,9 +1637,11 @@
Shade_Min, Shade_Max : Long_Float;
Select_Color_Map : Natural; -- should be 0 or 1
Color : Long_Float;
- Fill_Pattern_Pen_Width : Positive;
- Shade_Min_Pen_Color, Shade_Min_Pen_Width : Natural;
- Shade_Max_Pen_Color, Shade_Max_Pen_Width : Natural;
+ Fill_Pattern_Pen_Width : Long_Float;
+ Shade_Min_Pen_Color : Natural;
+ Shade_Min_Pen_Width : Long_Float;
+ Shade_Max_Pen_Color : Natural;
+ Shade_Max_Pen_Width : Long_Float;
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
@@ -1652,9 +1655,11 @@
Shade_Min, Shade_Max : Long_Float;
Select_Color_Map : Natural; -- should be 0 or 1
Color : Long_Float;
- Fill_Pattern_Pen_Width : Positive;
- Shade_Min_Pen_Color, Shade_Min_Pen_Width : Natural;
- Shade_Max_Pen_Color, Shade_Max_Pen_Width : Natural;
+ Fill_Pattern_Pen_Width : Long_Float;
+ Shade_Min_Pen_Color : Natural;
+ Shade_Min_Pen_Width : Long_Float;
+ Shade_Max_Pen_Color : Natural;
+ Shade_Max_Pen_Width : Long_Float;
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
@@ -1666,9 +1671,9 @@
Mask_Function_Pointer : Mask_Function_Pointer_Type;
x_Min, x_Max, y_Min, y_Max : Long_Float; -- world mins and maxes
Contour_Levels : Real_Vector;
- Fill_Pattern_Pen_Width : Natural; -- 0 is allowed
+ Fill_Pattern_Pen_Width : Long_Float; -- 0.0 is allowed
Contour_Pen_Color : Natural; -- 0 for no contours
- Contour_Pen_Width : Natural; -- 0 for no contours
+ Contour_Pen_Width : Long_Float; -- 0.0 for no contours
Fill_Procedure_Pointer : Fill_Procedure_Pointer_Type;
Preserve_Rectangles : Boolean;
Transformation_Procedure_Pointer : Transformation_Procedure_Pointer_Type;
Modified: trunk/examples/ada/x04a.adb
===================================================================
--- trunk/examples/ada/x04a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/x04a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -94,14 +94,13 @@
declare
text, symbols : Legend_String_Array_Type(0 .. 1);
opt_array : Integer_Array_1D(0 .. 1);
- text_colors, line_colors, line_styles, line_widths : Integer_Array_1D(0..1);
+ text_colors, line_colors, line_styles: Integer_Array_1D(0..1);
symbol_numbers, symbol_colors : Integer_Array_1D(0 .. 1);
- symbol_scales : Real_Vector(0 .. 1);
+ line_widths, symbol_scales : Real_Vector(0 .. 1);
legend_width, legend_height : Long_Float;
-- Dummy arrays for unused entities. C uses null arguments but we can't.
- Box_Colors, Box_Patterns, Box_Line_Widths : Integer_Array_1D(0 .. 1)
- := (others => 0);
- Box_Scales : Real_Vector(0 .. 1):= (others => 1.0);
+ Box_Colors, Box_Patterns : Integer_Array_1D(0 .. 1):= (others => 0);
+ Box_Scales, Box_Line_Widths : Real_Vector(0 .. 1):= (others => 1.0);
begin
-- First legend entry.
opt_array(0) := Legend_Line;
@@ -109,7 +108,7 @@
text(0) := To_Unbounded_String("Amplitude");
line_colors(0) := 2;
line_styles(0) := 1;
- line_widths(0) := 1;
+ line_widths(0) := 1.0;
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
@@ -121,7 +120,7 @@
text(1) := To_Unbounded_String("Phase shift");
line_colors(1) := 3;
line_styles(1) := 1;
- line_widths(1) := 1;
+ line_widths(1) := 1.0;
symbol_colors(1) := 3;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
@@ -144,13 +143,13 @@
declare
text, symbols : Legend_String_Array_Type(0 .. 0);
opt_array : Integer_Array_1D(0 .. 0);
- text_colors, line_colors, line_styles, line_widths : Integer_Array_1D(0..0);
+ text_colors, line_colors, line_styles : Integer_Array_1D(0..0);
symbol_numbers, symbol_colors : Integer_Array_1D(0 .. 0);
- symbol_scales : Real_Vector(0 .. 0);
+ line_widths, symbol_scales : Real_Vector(0 .. 0);
legend_width, legend_height : Long_Float;
-- Dummy arrays for unused entities. C uses null arguments but we can't.
- Box_Colors, Box_Patterns, Box_Line_Widths : Integer_Array_1D(0 .. 0);
- Box_Scales : Real_Vector(0 .. 0);
+ Box_Colors, Box_Patterns : Integer_Array_1D(0 .. 0);
+ Box_Scales, Box_Line_Widths : Real_Vector(0 .. 0);
begin
-- First legend entry.
opt_array(0) := Legend_Line;
@@ -158,14 +157,14 @@
text(0) := To_Unbounded_String("Amplitude");
line_colors(0) := 2; -- fixme Use declared constants, not integers.
line_styles(0) := 1;
- line_widths(0) := 1;
+ line_widths(0) := 1.0;
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
Box_Colors(0) := 0;
Box_Patterns(0) := 0;
- Box_Line_Widths(0) := 0;
+ Box_Line_Widths(0) := 0.0;
Box_Scales(0) := 0.0;
pllegend(legend_width, legend_height,
Modified: trunk/examples/ada/x15a.adb
===================================================================
--- trunk/examples/ada/x15a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/x15a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -85,8 +85,9 @@
procedure plot1 is
shade_min, shade_max, sh_color : Long_Float;
sh_cmap : Integer := 0;
- sh_width : Integer;
- min_color, min_width, max_color, max_width : Integer;
+ sh_width : Long_Float;
+ min_color, max_color : Integer;
+ min_width, max_width : Long_Float;
begin
pladv(0);
plvpor(0.1, 0.9, 0.1, 0.9);
@@ -96,11 +97,11 @@
shade_min := zmin + (zmax-zmin) * 0.4;
shade_max := zmin + (zmax-zmin) * 0.6;
sh_color := 7.0;
- sh_width := 2;
+ sh_width := 2.0;
min_color := 9;
max_color := 2;
- min_width := 2;
- max_width := 2;
+ min_width := 2.0;
+ max_width := 2.0;
plpsty(8);
@@ -124,8 +125,9 @@
procedure plot2 is
shade_min, shade_max, sh_color : Long_Float;
sh_cmap : Integer := 0;
- sh_width : Integer;
- min_color, min_width, max_color, max_width : Integer := 0;
+ sh_width : Long_Float;
+ min_color, max_color : Integer := 0;
+ min_width, max_width : Long_Float := 0.0;
-- C run amok. The following arrays are made to accommodate the
-- original example which is written in perverse C.
@@ -150,7 +152,7 @@
del_0_To_4(3)(0) := 2000;
del_0_To_4(4)(0) := 2000;
- sh_width := 2;
+ sh_width := 2.0;
pladv(0);
plvpor(0.1, 0.9, 0.1, 0.9);
Modified: trunk/examples/ada/x16a.adb
===================================================================
--- trunk/examples/ada/x16a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/x16a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -64,9 +64,9 @@
(x_Last => nx - 1,
y_Last => ny - 1);
- fill_width : Integer := 2;
- cont_color : Integer := 0;
- cont_width : Integer := 0;
+ fill_width : Long_Float := 2.0;
+ cont_color : Integer := 0;
+ cont_width : Long_Float := 0.0;
-- Transformation function
tr : Real_Vector(0 .. 5);
@@ -254,7 +254,7 @@
plshades(z, Null, -1.0, 1.0, -1.0, 1.0,
shedge, fill_width,
- 2, 3,
+ 2, 3.0,
plfill'access, False, pltr2'access, cgrid2'Address);
plcol0(1);
Modified: trunk/examples/ada/x21a.adb
===================================================================
--- trunk/examples/ada/x21a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/x21a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -258,7 +258,7 @@
plcol0(15);
pllab("X", "Y", title(alg - 1));
plshades(zg, null, xm, xMM, ym, yMM,
- clev, 1, 0, 1, plfill'access, True, null, System.Null_Address);
+ clev, 1.0, 0, 1.0, plfill'access, True, null, System.Null_Address);
plcol0(2);
else
for i in clev'range loop
Modified: trunk/examples/ada/x26a.adb
===================================================================
--- trunk/examples/ada/x26a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/x26a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -129,15 +129,14 @@
freql, ampl, phase : Real_Vector(0 .. 100);
f0, freq : Long_Float;
opt_array : Integer_Array_1D(0 .. 1);
- text_colors, line_colors, line_styles, line_widths : Integer_Array_1D(0..1);
+ text_colors, line_colors, line_styles : Integer_Array_1D(0..1);
symbol_numbers, symbol_colors : Integer_Array_1D(0 .. 1);
- symbol_scales : Real_Vector(0 .. 1);
+ line_widths, symbol_scales : Real_Vector(0 .. 1);
symbols : Legend_String_Array_Type(0 .. 1);
legend_width, legend_height : Long_Float;
-- Dummy arrays for unused entities. C uses null arguments but we can't.
- Box_Colors, Box_Patterns, Box_Line_Widths : Integer_Array_1D(0 .. 1)
- := (others => 0);
- Box_Scales : Real_Vector(0 .. 1):= (others => 1.0);
+ Box_Colors, Box_Patterns : Integer_Array_1D(0 .. 1):= (others => 0);
+ Box_Scales, Box_Line_Widths : Real_Vector(0 .. 1):= (others => 1.0);
begin
pladv(0);
f0 := 1.0;
@@ -185,7 +184,7 @@
text_colors(0) := 2;
line_colors(0) := 2;
line_styles(0) := 1;
- line_widths(0) := 1;
+ line_widths(0) := 1.0;
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
@@ -196,7 +195,7 @@
text_colors(1) := 3;
line_colors(1) := 3;
line_styles(1) := 1;
- line_widths(1) := 1;
+ line_widths(1) := 1.0;
symbol_colors(1) := 3;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
Modified: trunk/examples/ada/x33a.adb
===================================================================
--- trunk/examples/ada/x33a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/x33a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -285,10 +285,10 @@
box_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_patterns : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
- box_line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ box_line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
line_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
line_styles : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
- line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
symbol_numbers : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
@@ -308,7 +308,7 @@
opt_base := PL_LEGEND_BACKGROUND + PL_LEGEND_BOUNDING_BOX;
opt_array(0) := PL_LEGEND_LINE + PL_LEGEND_SYMBOL;
line_styles(0) := 1;
- line_widths(0) := 1;
+ line_widths(0) := 1.0;
symbol_scales(0) := 1.0;
symbol_numbers(0) := 4;
symbols(0) := TUB("*");
@@ -349,10 +349,10 @@
box_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_patterns : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
- box_line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ box_line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
line_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
line_styles : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
- line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
symbol_numbers : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
@@ -373,7 +373,7 @@
for k in 0 .. nlegend - 1 loop
opt_array(k) := PL_LEGEND_LINE + PL_LEGEND_SYMBOL;
line_styles(k) := 1;
- line_widths(k) := 1;
+ line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
symbols(k) := TUB("*");
@@ -527,10 +527,10 @@
box_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_patterns : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
- box_line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ box_line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
line_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
line_styles : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
- line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
symbol_numbers : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
@@ -542,7 +542,7 @@
for k in 0 .. nlegend - 1 loop
opt_array(k) := PL_LEGEND_LINE + PL_LEGEND_SYMBOL;
line_styles(k) := 1;
- line_widths(k) := 1;
+ line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
symbols(k) := TUB("*");
@@ -593,10 +593,10 @@
box_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_patterns : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
- box_line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ box_line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
line_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
line_styles : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
- line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
symbol_numbers : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
@@ -631,14 +631,14 @@
box_colors(1) := 2;
box_patterns(1) := 0;
box_scales(1) := 0.8;
- box_line_widths(1) := 1;
+ box_line_widths(1) := 1.0;
opt_array(2) := PL_LEGEND_LINE;
text(2) := TUB("Line");
text_colors(2) := 3;
line_colors(2) := 3;
line_styles(2) := 1;
- line_widths(2) := 1;
+ line_widths(2) := 1.0;
opt_array(3) := PL_LEGEND_SYMBOL;
text(3) := TUB("Symbol");
@@ -653,7 +653,7 @@
text_colors(4) := 5;
line_colors(4) := 5;
line_styles(4) := 1;
- line_widths(4) := 1;
+ line_widths(4) := 1.0;
symbol_colors(4) := 5;
symbol_scales(4) := text_scale;
symbol_numbers(4) := 4;
@@ -729,7 +729,7 @@
box_colors(i) := i + 1;
box_patterns(i) := 0;
box_scales(i) := 0.8;
- box_line_widths(i) := 1;
+ box_line_widths(i) := 1.0;
end loop;
opt := opt_base;
@@ -756,7 +756,7 @@
box_colors(i) := 2;
box_patterns(i) := i;
box_scales(i) := 0.8;
- box_line_widths(i) := 1;
+ box_line_widths(i) := 1.0;
end loop;
opt := opt_base;
@@ -780,7 +780,7 @@
box_colors(i) := 2;
box_patterns(i) := 3;
box_scales(i) := 0.8;
- box_line_widths(i) := i + 1;
+ box_line_widths(i) := Long_Float(i) + 1.0;
end loop;
opt := opt_base;
@@ -803,7 +803,7 @@
text_colors(i) := i + 1;
line_colors(i) := i + 1;
line_styles(i) := 1;
- line_widths(i) := 1;
+ line_widths(i) := 1.0;
end loop;
opt := opt_base;
@@ -829,7 +829,7 @@
text_colors(i) := 2;
line_colors(i) := 2;
line_styles(i) := i + 1;
- line_widths(i) := 1;
+ line_widths(i) := 1.0;
end loop;
opt := opt_base;
@@ -852,7 +852,7 @@
text_colors(i) := 2;
line_colors(i) := 2;
line_styles(i) := 1;
- line_widths(i) := i + 1;
+ line_widths(i) := Long_Float(i) + 1.0;
end loop;
opt := opt_base;
Modified: trunk/examples/ada/xthick04a.adb
===================================================================
--- trunk/examples/ada/xthick04a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/xthick04a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -94,14 +94,13 @@
declare
text, symbols : Legend_String_Array_Type(0 .. 1);
opt_array : Integer_Array_1D(0 .. 1);
- text_colors, line_colors, line_styles, line_widths : Integer_Array_1D(0..1);
+ text_colors, line_colors, line_styles : Integer_Array_1D(0..1);
symbol_numbers, symbol_colors : Integer_Array_1D(0 .. 1);
- symbol_scales : Real_Vector(0 .. 1);
+ line_widths, symbol_scales : Real_Vector(0 .. 1);
legend_width, legend_height : Long_Float;
-- Dummy arrays for unused entities. C uses null arguments but we can't.
- Box_Colors, Box_Patterns, Box_Line_Widths : Integer_Array_1D(0 .. 1)
- := (others => 0);
- Box_Scales : Real_Vector(0 .. 1):= (others => 1.0);
+ Box_Colors, Box_Patterns : Integer_Array_1D(0 .. 1):= (others => 0);
+ Box_Scales, Box_Line_Widths : Real_Vector(0 .. 1):= (others => 1.0);
begin
-- First legend entry.
opt_array(0) := Legend_Line;
@@ -109,7 +108,7 @@
text(0) := To_Unbounded_String("Amplitude");
line_colors(0) := Yellow; -- fixme Use declared constants, not integers.
line_styles(0) := 1;
- line_widths(0) := 1;
+ line_widths(0) := 1.0;
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
@@ -121,7 +120,7 @@
text(1) := To_Unbounded_String("Phase shift");
line_colors(1) := Green;
line_styles(1) := 1;
- line_widths(1) := 1;
+ line_widths(1) := 1.0;
symbol_colors(1) := Green;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
@@ -144,13 +143,13 @@
declare
text, symbols : Legend_String_Array_Type(0 .. 0);
opt_array : Integer_Array_1D(0 .. 0);
- text_colors, line_colors, line_styles, line_widths : Integer_Array_1D(0..0);
+ text_colors, line_colors, line_styles : Integer_Array_1D(0..0);
symbol_numbers, symbol_colors : Integer_Array_1D(0 .. 0);
- symbol_scales : Real_Vector(0 .. 0);
+ line_widths, symbol_scales : Real_Vector(0 .. 0);
legend_width, legend_height : Long_Float;
-- Dummy arrays for unused entities. C uses null arguments but we can't.
- Box_Colors, Box_Patterns, Box_Line_Widths : Integer_Array_1D(0 .. 0);
- Box_Scales : Real_Vector(0 .. 0);
+ Box_Colors, Box_Patterns : Integer_Array_1D(0 .. 0);
+ Box_Scales, Box_Line_Widths : Real_Vector(0 .. 0);
begin
-- First legend entry.
opt_array(0) := Legend_Line;
@@ -158,14 +157,14 @@
text(0) := To_Unbounded_String("Amplitude");
line_colors(0) := Yellow; -- fixme Use declared constants, not integers.
line_styles(0) := 1;
- line_widths(0) := 1;
+ line_widths(0) := 1.0;
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
symbols(0) := To_Unbounded_String("*"); -- Don't care; not used.
Box_Colors(0) := 0;
Box_Patterns(0) := 0;
- Box_Line_Widths(0) := 0;
+ Box_Line_Widths(0) := 0.0;
Box_Scales(0) := 0.0;
Create_Legend(legend_width, legend_height,
Modified: trunk/examples/ada/xthick15a.adb
===================================================================
--- trunk/examples/ada/xthick15a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/xthick15a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -85,8 +85,9 @@
procedure plot1 is
shade_min, shade_max, sh_color : Long_Float;
sh_cmap : Integer := 0;
- sh_width : Integer;
- min_color, min_width, max_color, max_width : Integer;
+ sh_width : Long_Float;
+ min_color, max_color : Integer;
+ min_width, max_width : Long_Float;
begin
Advance_To_Subpage(Next_Subpage);
Set_Viewport_Normalized(0.1, 0.9, 0.1, 0.9);
@@ -96,11 +97,11 @@
shade_min := zmin + (zmax-zmin) * 0.4;
shade_max := zmin + (zmax-zmin) * 0.6;
sh_color := 7.0;
- sh_width := 2;
+ sh_width := 2.0;
min_color := 9;
max_color := 2;
- min_width := 2;
- max_width := 2;
+ min_width := 2.0;
+ max_width := 2.0;
Select_Fill_Pattern(8);
@@ -124,8 +125,9 @@
procedure plot2 is
shade_min, shade_max, sh_color : Long_Float;
sh_cmap : Integer := 0;
- sh_width : Integer;
- min_color, min_width, max_color, max_width : Integer := 0;
+ sh_width : Long_Float;
+ min_color, max_color : Integer := 0;
+ min_width, max_width : Long_Float := 0.0;
-- C run amok. The following arrays are made to accommodate the
-- original example which is written in perverse C.
@@ -150,7 +152,7 @@
del_0_To_4(3)(0) := 2000;
del_0_To_4(4)(0) := 2000;
- sh_width := 2;
+ sh_width := 2.0;
Advance_To_Subpage(Next_Subpage);
Set_Viewport_Normalized(0.1, 0.9, 0.1, 0.9);
Modified: trunk/examples/ada/xthick16a.adb
===================================================================
--- trunk/examples/ada/xthick16a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/xthick16a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -64,9 +64,9 @@
(x_Last => nx - 1,
y_Last => ny - 1);
- fill_width : Integer := 2;
- cont_color : Integer := 0;
- cont_width : Integer := 0;
+ fill_width : Long_Float := 2.0;
+ cont_color : Integer := 0;
+ cont_width : Long_Float := 0.0;
-- Transformation function
tr : Real_Vector(0 .. 5);
@@ -254,7 +254,7 @@
Shade_Regions(z, Null, -1.0, 1.0, -1.0, 1.0,
shedge, fill_width,
- 2, 3,
+ 2, 3.0,
Fill_Polygon'access, False, Plot_Transformation_2'access, cgrid2'Address);
Set_Pen_Color(Red);
Modified: trunk/examples/ada/xthick21a.adb
===================================================================
--- trunk/examples/ada/xthick21a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/xthick21a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -258,7 +258,7 @@
Set_Pen_Color(White);
Write_Labels("X", "Y", title(alg - 1));
Shade_Regions(zg, null, xm, xMM, ym, yMM,
- clev, 1, 0, 1, Fill_Polygon'access, True, null, System.Null_Address);
+ clev, 1.0, 0, 1.0, Fill_Polygon'access, True, null, System.Null_Address);
Set_Pen_Color(Yellow);
else
for i in clev'range loop
Modified: trunk/examples/ada/xthick26a.adb
===================================================================
--- trunk/examples/ada/xthick26a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/xthick26a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -129,15 +129,14 @@
freql, ampl, phase : Real_Vector(0 .. 100);
f0, freq : Long_Float;
opt_array : Integer_Array_1D(0 .. 1);
- text_colors, line_colors, line_styles, line_widths : Integer_Array_1D(0..1);
+ text_colors, line_colors, line_styles : Integer_Array_1D(0..1);
symbol_numbers, symbol_colors : Integer_Array_1D(0 .. 1);
- symbol_scales : Real_Vector(0 .. 1);
+ line_widths, symbol_scales : Real_Vector(0 .. 1);
symbols : Legend_String_Array_Type(0 .. 1);
legend_width, legend_height : Long_Float;
-- Dummy arrays for unused entities. C uses null arguments but we can't.
- Box_Colors, Box_Patterns, Box_Line_Widths : Integer_Array_1D(0 .. 1)
- := (others => 0);
- Box_Scales : Real_Vector(0 .. 1):= (others => 1.0);
+ Box_Colors, Box_Patterns : Integer_Array_1D(0 .. 1):= (others => 0);
+ Box_Scales, Box_Line_Widths : Real_Vector(0 .. 1):= (others => 1.0);
begin
Advance_To_Subpage(Next_Subpage);
f0 := 1.0;
@@ -185,7 +184,7 @@
text_colors(0) := 2;
line_colors(0) := 2;
line_styles(0) := 1;
- line_widths(0) := 1;
+ line_widths(0) := 1.0;
symbol_colors(0) := 3; -- Don't care; not used.
symbol_scales(0) := 1.0; -- Don't care; not used.
symbol_numbers(0) := 4; -- Don't care; not used.
@@ -196,7 +195,7 @@
text_colors(1) := 3;
line_colors(1) := 3;
line_styles(1) := 1;
- line_widths(1) := 1;
+ line_widths(1) := 1.0;
symbol_colors(1) := 3;
symbol_scales(1) := 1.0;
symbol_numbers(1) := 4;
Modified: trunk/examples/ada/xthick33a.adb
===================================================================
--- trunk/examples/ada/xthick33a.adb 2013-05-10 19:01:13 UTC (rev 12336)
+++ trunk/examples/ada/xthick33a.adb 2013-05-10 20:16:29 UTC (rev 12337)
@@ -287,10 +287,10 @@
box_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_patterns : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
- box_line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ box_line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
line_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
line_styles : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
- line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
symbol_numbers : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
@@ -310,7 +310,7 @@
opt_base := Legend_Background + Legend_Bounding_Box;
opt_array(0) := Legend_Line + Legend_Symbol;
line_styles(0) := 1;
- line_widths(0) := 1;
+ line_widths(0) := 1.0;
symbol_scales(0) := 1.0;
symbol_numbers(0) := 4;
symbols(0) := TUB("*");
@@ -351,10 +351,10 @@
box_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_patterns : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
- box_line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ box_line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
line_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
line_styles : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
- line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
symbol_numbers : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
@@ -375,7 +375,7 @@
for k in 0 .. nlegend - 1 loop
opt_array(k) := Legend_Line + Legend_Symbol;
line_styles(k) := 1;
- line_widths(k) := 1;
+ line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
symbols(k) := TUB("*");
@@ -529,10 +529,10 @@
box_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_patterns : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
- box_line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ box_line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
line_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
line_styles : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
- line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
symbol_numbers : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
@@ -544,7 +544,7 @@
for k in 0 .. nlegend - 1 loop
opt_array(k) := Legend_Line + Legend_Symbol;
line_styles(k) := 1;
- line_widths(k) := 1;
+ line_widths(k) := 1.0;
symbol_scales(k) := 1.0;
symbol_numbers(k) := 2;
symbols(k) := TUB("*");
@@ -595,10 +595,10 @@
box_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_patterns : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
box_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
- box_line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ box_line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
line_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
line_styles : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
- line_widths : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
+ line_widths : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
symbol_numbers : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_colors : Integer_Array_1D(0 .. nlegend - 1) := (others => 0);
symbol_scales : Real_Vector (0 .. nlegend - 1) := (others => 0.0);
@@ -633,14 +633,14 @@
box_colors(1) := 2;
box_patterns(1) := 0;
box_scales(1) := 0.8;
- box_line_widths(1) := 1;
+ box_line_widths(1) := 1.0;
opt_array(2) := Legend_Line;
text(2) := TUB("Line");
text_colors(2) := 3;
line_colors(2) := 3;
line_styles(2) := 1;
- line_widths(2) := 1;
+ line_widths(2) := 1.0;
opt_array(3) := Legend_Symbol;
text(3) := TUB("Symbol");
@@ -655,7 +655,7 @@
text_colors(4) := 5;
line_colors(4) := 5;
line_styles(4) := 1;
- line_widths(4) := 1;
+ line_widths(4) := 1.0;
symbol_colors(4) := 5;
symbol_scales(4) := text_scale;
symbol_numbers(4) := 4;
@@ -731,7 +731,7 @@
box_colors(i) := i + 1;
box_patterns(i) := 0;
box_scales(i) := 0.8;
- box_line_widths(i) := 1;
+ box_line_widths(i) := 1.0;
end loop;
opt := opt_base;
@@ -758,7 +758,7 @@
box_colors(i) := 2;
box_patterns(i) := i;
box_scales(i) := 0.8;
- box_line_widths(i) := 1;
+ box_line_widths(i) := 1.0;
end loop;
opt := opt_base;
@@ -782,7 +782,7 @@
box_colors(i) := 2;
box_patterns(i) := 3;
box_scales(i) := 0.8;
- box_line_widths(i) := i + 1;
+ box_line_widths(i) := Long_Float(i) + 1.0;
end loop;
opt := opt_base;
@@ -805,7 +805,7 @@
text_colors(i) := i + 1;
line_colors(i) := i + 1;
line_styles(i) := 1;
- line_widths(i) := 1;
+ line_widths(i) := 1.0;
end loop;
opt := opt_base;
@@ -831,7 +831,7 @@
text_colors(i) := 2;
line_colors(i) := 2;
line_styles(i) := i + 1;
- line_widths(i) := 1;
+ line_widths(i) := 1.0;
end loop;
opt := opt_base;
@@ -854,7 +854,7 @@
text_colors(i) := 2;
line_colors(i) := 2;
line_styles(i) := 1;
- line_widths(i) := i + 1;
+ line_widths(i) := Long_Float(i) + 1.0;
end loop;
opt := opt_base;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
