Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[9300] trunk
|
From: <jb...@us...> - 2009-01-14 05:59:04
|
Revision: 9300
http://plplot.svn.sourceforge.net/plplot/?rev=9300&view=rev
Author: jbauck
Date: 2009-01-14 05:59:01 +0000 (Wed, 14 Jan 2009)
Log Message:
-----------
Add overloaded versions of plscmap1, Set_Color_Map_1_RGB, plscmap1a, Set_Color_Map_1_RGB_And_Alpha to allow simplified hue reversal. Added checks for array length consistency in same.
Modified Paths:
--------------
trunk/bindings/ada/plplot.adb.cmake
trunk/bindings/ada/plplot.ads.cmake
trunk/bindings/ada/plplot_traditional.adb.cmake
trunk/bindings/ada/plplot_traditional.ads.cmake
trunk/examples/ada/x08a.adb.cmake
trunk/examples/ada/x11a.adb.cmake
trunk/examples/ada/x12a.adb.cmake
trunk/examples/ada/x15a.adb.cmake
trunk/examples/ada/x20a.adb.cmake
trunk/examples/ada/x21a.adb.cmake
trunk/examples/ada/x30a.adb.cmake
trunk/examples/ada/xthick08a.adb.cmake
trunk/examples/ada/xthick11a.adb.cmake
trunk/examples/ada/xthick12a.adb.cmake
trunk/examples/ada/xthick15a.adb.cmake
trunk/examples/ada/xthick20a.adb.cmake
trunk/examples/ada/xthick21a.adb.cmake
trunk/examples/ada/xthick30a.adb.cmake
Modified: trunk/bindings/ada/plplot.adb.cmake
===================================================================
--- trunk/bindings/ada/plplot.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/bindings/ada/plplot.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -2202,7 +2202,7 @@
-- intensity [0,1] (cmap 1 index) and position in HLS or RGB color space.
-- plscmap1l
procedure Set_Color_Map_1_Piecewise
- (Color_Model : Color_Model_Type; -- HLS or RGB
+ (Color_Model : Color_Model_Type; -- HLS or RGB
Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
-- Note: Hue is 0.0 .. 360.0.
@@ -2214,6 +2214,13 @@
PL_Reverse_Hue : PL_Bool_Array (Reverse_Hue'range);
begin
+ -- Check for consistent array lengths.
+ if Control_Points'length /= H_Or_R'length or Control_Points'length /= L_or_G'length or
+ Control_Points'length /= S_Or_B'length or Control_Points'length /= Reverse_Hue'length
+ then
+ Put_Line("*** WARNING: Inconsistent array lengths when setting color map 1 ***");
+ end if;
+
if Color_Model = RGB then
PL_Color_Model := PLtrue;
else
@@ -2230,6 +2237,35 @@
plscmap1l(PL_Color_Model, Control_Points'Length, Control_Points, H_Or_R, L_Or_G, S_Or_B, PL_Reverse_Hue);
end Set_Color_Map_1_Piecewise;
+
+
+ -- Overloaded version of Set_Color_Map_1_Piecewise which allows simplified (non-)reversal of
+ -- the traversed hue range. This is an Ada-like way of doing what is described
+ -- in the PLplot documentation when a C user passes a null pointer as the
+ -- final argument instead of an array of booleans to indicate hue reversal.
+ -- plscmap1l
+ procedure Set_Color_Map_1_Piecewise
+ (Color_Model : Color_Model_Type; -- HLS or RGB
+ Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ -- Note: Hue is 0.0 .. 360.0.
+ L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Reverse_Hue : Reverse_Hue_Type) is
+
+ Reverse_Hue_Array : Boolean_Array_1D(Control_Points'range);
+ begin
+ if Reverse_Hue = Reverse_Hue_All then
+ for i in Reverse_Hue_Array'range loop
+ Reverse_Hue_Array(i) := True;
+ end loop;
+ elsif Reverse_Hue = Reverse_Hue_None then
+ for i in Reverse_Hue_Array'range loop
+ Reverse_Hue_Array(i) := False;
+ end loop;
+ end if;
+ Set_Color_Map_1_Piecewise(Color_Model, Control_Points, H_Or_R, L_Or_G, S_Or_B, Reverse_Hue_Array);
+ end Set_Color_Map_1_Piecewise;
-- Set color map 1 colors using a piece-wise linear relationship between
@@ -2237,7 +2273,7 @@
-- Will also linear interpolate alpha values.
-- plscmap1la
procedure Set_Color_Map_1_Piecewise_And_Alpha
- (Color_Model : Color_Model_Type; -- HLS or RGB
+ (Color_Model : Color_Model_Type; -- HLS or RGB
Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
@@ -2249,8 +2285,13 @@
PL_Reverse_Hue : PL_Bool_Array (Reverse_Hue'range);
begin
- -- fix this Should check that arrays H_Or_R, S_Or_B, S_Or_B and
- -- Reverse_Hue should be the same length.
+ -- Check for consistent array lengths.
+ if Control_Points'length /= H_Or_R'length or Control_Points'length /= L_or_G'length or
+ Control_Points'length /= S_Or_B'length or Control_Points'length /= Reverse_Hue'length
+ then
+ Put_Line("*** WARNING: Inconsistent array lengths when setting color map 1 ***");
+ end if;
+
if Color_Model = RGB then
PL_Color_Model := PLtrue;
else
@@ -2267,9 +2308,37 @@
plscmap1la(PL_Color_Model, Control_Points'Length, Control_Points, H_Or_R, L_Or_G, S_Or_B, Alpha, PL_Reverse_Hue);
end Set_Color_Map_1_Piecewise_And_Alpha;
+
+
+ -- Overloaded version of Set_Color_Map_1_Piecewise_And_Alpha which allows simplified (non-)reversal of
+ -- the traversed hue range. This is an Ada-like way of doing what is described
+ -- in the PLplot documentation when a C user passes a null pointer as the
+ -- final argument instead of an array of booleans to indicate hue reversal.
+ -- plscmap1la
+ procedure Set_Color_Map_1_Piecewise_And_Alpha
+ (Color_Model : Color_Model_Type; -- HLS or RGB
+ Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Alpha : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Reverse_Hue : Reverse_Hue_Type) is
+
+ Reverse_Hue_Array : Boolean_Array_1D(Control_Points'range);
+ begin
+ if Reverse_Hue = Reverse_Hue_All then
+ for i in Reverse_Hue_Array'range loop
+ Reverse_Hue_Array(i) := True;
+ end loop;
+ elsif Reverse_Hue = Reverse_Hue_None then
+ for i in Reverse_Hue_Array'range loop
+ Reverse_Hue_Array(i) := False;
+ end loop;
+ end if;
+ Set_Color_Map_1_Piecewise_And_Alpha(Color_Model, Control_Points, H_Or_R, L_Or_G, S_Or_B, Alpha, Reverse_Hue_Array);
+ end Set_Color_Map_1_Piecewise_And_Alpha;
-
-- Set number of colors in cmap 1
-- plscmap1n
procedure Set_Number_Of_Colors_In_Color_Map_1(Number_Of_Colors : Integer) is
Modified: trunk/bindings/ada/plplot.ads.cmake
===================================================================
--- trunk/bindings/ada/plplot.ads.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/bindings/ada/plplot.ads.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -576,6 +576,7 @@
type Color_Themes_For_Map_1_Type is (Gray, Blue_Green_Red, Red_Green_Blue,
Red_Cyan_Blue, Blue_Black_Red, Red_Blue_Green, Red_Yellow);
+ type Reverse_Hue_Type is (Reverse_Hue_None, Reverse_Hue_All);
-- Quick application of pre-fabricated color schemes to color map 1.
@@ -1351,6 +1352,20 @@
L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
Reverse_Hue : Boolean_Array_1D); -- False means red<->green<->blue<->red, True reverses
+
+
+ -- Overloaded version of Set_Color_Map_1_Piecewise which allows simplified (non-)reversal of
+ -- the traversed hue range. This is an Ada-like way of doing what is described
+ -- in the PLplot documentation when a C user passes a null pointer as the
+ -- final argument instead of an array of booleans to indicate hue reversal.
+ procedure Set_Color_Map_1_Piecewise
+ (Color_Model : Color_Model_Type; -- HLS or RGB
+ Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ -- Note: Hue is 0.0 .. 360.0.
+ L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Reverse_Hue : Reverse_Hue_Type);
-- Set color map 1 colors using a piece-wise linear relationship between
@@ -1365,6 +1380,20 @@
S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
Alpha : Real_Vector; -- range 0.0 .. 1.0; not checked here
Reverse_Hue : Boolean_Array_1D); -- False means red<->green<->blue<->red, True reverses
+
+
+ -- Overloaded version of Set_Color_Map_1_Piecewise_And_Alpha which allows simplified (non-)reversal of
+ -- the traversed hue range. This is an Ada-like way of doing what is described
+ -- in the PLplot documentation when a C user passes a null pointer as the
+ -- final argument instead of an array of booleans to indicate hue reversal.
+ procedure Set_Color_Map_1_Piecewise_And_Alpha
+ (Color_Model : Color_Model_Type; -- HLS or RGB
+ Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Alpha : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Reverse_Hue : Reverse_Hue_Type);
-- Set number of colors in cmap 1
Modified: trunk/bindings/ada/plplot_traditional.adb.cmake
===================================================================
--- trunk/bindings/ada/plplot_traditional.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/bindings/ada/plplot_traditional.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -2105,7 +2105,7 @@
-- Set color map 1 colors using a piece-wise linear relationship between
-- intensity [0,1] (cmap 1 index) and position in HLS or RGB color space.
procedure plscmap1l
- (Color_Model : Color_Model_Type; -- HLS or RGB
+ (Color_Model : Color_Model_Type; -- HLS or RGB
Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
-- Note: Hue is 0.0 .. 360.0.
@@ -2117,6 +2117,13 @@
PL_Reverse_Hue : PL_Bool_Array (Reverse_Hue'range);
begin
+ -- Check for consistent array lengths.
+ if Control_Points'length /= H_Or_R'length or Control_Points'length /= L_or_G'length or
+ Control_Points'length /= S_Or_B'length or Control_Points'length /= Reverse_Hue'length
+ then
+ Put_Line("*** WARNING: Inconsistent array lengths when setting color map 1 ***");
+ end if;
+
if Color_Model = RGB then
PL_Color_Model := PLtrue;
else
@@ -2133,13 +2140,41 @@
PLplot_Thin.plscmap1l(PL_Color_Model, Control_Points'Length, Control_Points, H_Or_R, L_Or_G, S_Or_B, PL_Reverse_Hue);
end plscmap1l;
+
+
+ -- Overloaded version of plscmap1l which allows simplified (non-)reversal of
+ -- the traversed hue range. This is an Ada-like way of doing what is described
+ -- in the PLplot documentation when a C user passes a null pointer as the
+ -- final argument instead of an array of booleans to indicate hue reversal.
+ procedure plscmap1l
+ (Color_Model : Color_Model_Type; -- HLS or RGB
+ Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ -- Note: Hue is 0.0 .. 360.0.
+ L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Reverse_Hue : Reverse_Hue_Type) is
+
+ Reverse_Hue_Array : Boolean_Array_1D(Control_Points'range);
+ begin
+ if Reverse_Hue = Reverse_Hue_All then
+ for i in Reverse_Hue_Array'range loop
+ Reverse_Hue_Array(i) := True;
+ end loop;
+ elsif Reverse_Hue = Reverse_Hue_None then
+ for i in Reverse_Hue_Array'range loop
+ Reverse_Hue_Array(i) := False;
+ end loop;
+ end if;
+ plscmap1l(Color_Model, Control_Points, H_Or_R, L_Or_G, S_Or_B, Reverse_Hue_Array);
+ end plscmap1l;
-- Set color map 1 colors using a piece-wise linear relationship between
-- intensity [0,1] (cmap 1 index) and position in HLS or RGB color space.
-- Will also linear interpolate alpha values.
procedure plscmap1la
- (Color_Model : Color_Model_Type; -- HLS or RGB
+ (Color_Model : Color_Model_Type; -- HLS or RGB
Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
@@ -2151,8 +2186,13 @@
PL_Reverse_Hue : PL_Bool_Array (Reverse_Hue'range);
begin
- -- fix this Should check that arrays H_Or_R, S_Or_B, S_Or_B and
- -- Reverse_Hue should be the same length.
+ -- Check for consistent array lengths.
+ if Control_Points'length /= H_Or_R'length or Control_Points'length /= L_or_G'length or
+ Control_Points'length /= S_Or_B'length or Control_Points'length /= Reverse_Hue'length
+ then
+ Put_Line("*** WARNING: Inconsistent array lengths when setting color map 1 ***");
+ end if;
+
if Color_Model = RGB then
PL_Color_Model := PLtrue;
else
@@ -2169,6 +2209,34 @@
PLplot_Thin.plscmap1la(PL_Color_Model, Control_Points'Length, Control_Points, H_Or_R, L_Or_G, S_Or_B, Alpha, PL_Reverse_Hue);
end plscmap1la;
+
+
+ -- Overloaded version of plscmap1la which allows simplified (non-)reversal of
+ -- the traversed hue range. This is an Ada-like way of doing what is described
+ -- in the PLplot documentation when a C user passes a null pointer as the
+ -- final argument instead of an array of booleans to indicate hue reversal.
+ procedure plscmap1la
+ (Color_Model : Color_Model_Type; -- HLS or RGB
+ Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Alpha : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Reverse_Hue : Reverse_Hue_Type) is
+
+ Reverse_Hue_Array : Boolean_Array_1D(Control_Points'range);
+ begin
+ if Reverse_Hue = Reverse_Hue_All then
+ for i in Reverse_Hue_Array'range loop
+ Reverse_Hue_Array(i) := True;
+ end loop;
+ elsif Reverse_Hue = Reverse_Hue_None then
+ for i in Reverse_Hue_Array'range loop
+ Reverse_Hue_Array(i) := False;
+ end loop;
+ end if;
+ plscmap1la(Color_Model, Control_Points, H_Or_R, L_Or_G, S_Or_B, Alpha, Reverse_Hue_Array);
+ end plscmap1la;
-- Set number of colors in cmap 1
Modified: trunk/bindings/ada/plplot_traditional.ads.cmake
===================================================================
--- trunk/bindings/ada/plplot_traditional.ads.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/bindings/ada/plplot_traditional.ads.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -575,6 +575,7 @@
type Color_Themes_For_Map_1_Type is (Gray, Blue_Green_Red, Red_Green_Blue,
Red_Cyan_Blue, Blue_Black_Red, Red_Blue_Green, Red_Yellow);
+ type Reverse_Hue_Type is (Reverse_Hue_None, Reverse_Hue_All);
-- Quick application of pre-fabricated color schemes to color map 1.
@@ -1250,6 +1251,20 @@
L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
Reverse_Hue : Boolean_Array_1D); -- False means red<->green<->blue<->red, True reverses
+
+
+ -- Overloaded version of plscmap1l which allows simplified (non-)reversal of
+ -- the traversed hue range. This is an Ada-like way of doing what is described
+ -- in the PLplot documentation when a C user passes a null pointer as the
+ -- final argument instead of an array of booleans to indicate hue reversal.
+ procedure plscmap1l
+ (Color_Model : Color_Model_Type; -- HLS or RGB
+ Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ -- Note: Hue is 0.0 .. 360.0.
+ L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Reverse_Hue : Reverse_Hue_Type);
-- Set color map 1 colors using a piece-wise linear relationship between
@@ -1263,6 +1278,20 @@
S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
Alpha : Real_Vector; -- range 0.0 .. 1.0; not checked here
Reverse_Hue : Boolean_Array_1D); -- False means red<->green<->blue<->red, True reverses
+
+
+ -- Overloaded version of plscmap1la which allows simplified (non-)reversal of
+ -- the traversed hue range. This is an Ada-like way of doing what is described
+ -- in the PLplot documentation when a C user passes a null pointer as the
+ -- final argument instead of an array of booleans to indicate hue reversal.
+ procedure plscmap1la
+ (Color_Model : Color_Model_Type; -- HLS or RGB
+ Control_Points : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ H_Or_R : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ L_Or_G : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ S_Or_B : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Alpha : Real_Vector; -- range 0.0 .. 1.0; not checked here
+ Reverse_Hue : Reverse_Hue_Type);
-- Set number of colors in cmap 1
Modified: trunk/examples/ada/x08a.adb.cmake
===================================================================
--- trunk/examples/ada/x08a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/x08a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -69,7 +69,6 @@
procedure cmap1_init(gray : Boolean) is
i, h, l, s : Real_Vector(0 .. 1);
- Reverse_Hue : Boolean_Array_1D(0 .. 1) := (False, False);
begin
i(0) := 0.0; -- left boundary
i(1) := 1.0; -- right boundary
@@ -95,7 +94,7 @@
end if;
plscmap1n(256);
- plscmap1l(HLS, i, h, l, s, Reverse_Hue);
+ plscmap1l(HLS, i, h, l, s, Reverse_Hue_None);
end cmap1_init;
Modified: trunk/examples/ada/x11a.adb.cmake
===================================================================
--- trunk/examples/ada/x11a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/x11a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -56,8 +56,6 @@
clevel : Real_Vector(0 .. LEVELS - 1);
zmin, zmax, step : Long_Float;
- Reverse_Flag : Boolean_Array_1D(0 .. 1) := (False, False);
-
procedure cmap1_init is
i, h, l, s : Real_Vector(0 .. 1);
begin
@@ -74,7 +72,7 @@
s(1) := 0.8;
plscmap1n(256);
- plscmap1l(HLS, i, h, l, s, Reverse_Flag);
+ plscmap1l(HLS, i, h, l, s, Reverse_Hue_None);
end cmap1_init;
Modified: trunk/examples/ada/x12a.adb.cmake
===================================================================
--- trunk/examples/ada/x12a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/x12a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -52,7 +52,6 @@
r : Real_Vector (0 .. 4) := (0.0, 0.25, 0.5, 1.0, 1.0);
g : Real_Vector (0 .. 4) := (1.0, 0.5, 0.5, 0.5, 1.0);
b : Real_Vector (0 .. 4) := (1.0, 1.0, 0.5, 0.25, 0.0);
- Reverse_Flag : Boolean_Array_1D (0 .. 4) := (False, False, False, False, False);
procedure plfbox (x0, y0 : Long_Float) is
x, y : Real_Vector (0 ..3);
@@ -100,7 +99,7 @@
y0(8) := 12.0;
y0(9) := 3.0;
- plscmap1l(RGB, pos, r, g, b, Reverse_Flag);
+ plscmap1l(RGB, pos, r, g, b, Reverse_Hue_None);
for i in y0'range loop
plcol1(Long_Float(i)/9.0);
Modified: trunk/examples/ada/x15a.adb.cmake
===================================================================
--- trunk/examples/ada/x15a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/x15a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -53,7 +53,6 @@
----------------------------------------------------------------------------
procedure cmap1_init2 is
i, h, l, s : Real_Vector(0 .. 3);
- Reverse_Flag : Boolean_Array_1D(0 .. 3) := (False, False, False, False);
begin
-- Set control points.
i(0) := 0.0; -- left boundary
@@ -79,7 +78,7 @@
s(2) := 0.5; -- center
s(3) := 1.0; -- high
- plscmap1l(HLS, i, h, l, s, Reverse_Flag);
+ plscmap1l(HLS, i, h, l, s, Reverse_Hue_None);
end cmap1_init2;
----------------------------------------------------------------------------
Modified: trunk/examples/ada/x20a.adb.cmake
===================================================================
--- trunk/examples/ada/x20a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/x20a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -217,7 +217,6 @@
-- Set gray colormap.
procedure gray_cmap(num_col : Integer) is
r, g, b, pos : Real_Vector(0 .. 1);
- Reverse_Flag : Boolean_Array_1D(0 .. 1) := (False, False);
begin
r(0) := 0.0;
g(0) := 0.0;
@@ -231,7 +230,7 @@
pos(1) := 1.0;
plscmap1n(num_col);
- plscmap1l(RGB, pos, r, g, b, Reverse_Flag);
+ plscmap1l(RGB, pos, r, g, b, Reverse_Hue_None);
end gray_cmap;
Modified: trunk/examples/ada/x21a.adb.cmake
===================================================================
--- trunk/examples/ada/x21a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/x21a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -85,7 +85,6 @@
procedure cmap1_init is
i, h, l, s : Real_Vector(0 .. 1);
- Reverse_Flag : Boolean_Array_1D(0 .. 1) := (False, False);
begin
i(0) := 0.0; -- left boundary
i(1) := 1.0; -- right boundary
@@ -100,7 +99,7 @@
s(1) := 0.8;
plscmap1n(256);
- plscmap1l(HLS, i, h, l, s, Reverse_Flag);
+ plscmap1l(HLS, i, h, l, s, Reverse_Hue_None);
end cmap1_init;
Modified: trunk/examples/ada/x30a.adb.cmake
===================================================================
--- trunk/examples/ada/x30a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/x30a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -52,7 +52,6 @@
gcoord : Real_Vector(0 .. 1) := (0.0, 0.0);
bcoord : Real_Vector(0 .. 1) := (0.0, 0.0);
acoord : Real_Vector(0 .. 1) := (0.0, 1.0);
- rev : Boolean_Array_1D(0 .. 1) := (False, False);
icol, r, g, b : Integer;
a : Long_Float;
@@ -137,7 +136,7 @@
-- Create the color map with 128 colors and use plscmap1la to initialize
-- the color values with a linear varying transparency (or alpha).
plscmap1n(128);
- plscmap1la(RGB, pos, rcoord, gcoord, bcoord, acoord, rev);
+ plscmap1la(RGB, pos, rcoord, gcoord, bcoord, acoord, Reverse_Hue_None);
-- Create a 2 x 2 array that contains the z values (0.0 to 1.0) that will
-- used for the shade plot. plshades will use linear interpolation to
Modified: trunk/examples/ada/xthick08a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick08a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/xthick08a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -69,7 +69,6 @@
procedure cmap1_init(gray : Boolean) is
i, h, l, s : Real_Vector(0 .. 1);
- Reverse_Hue : Boolean_Array_1D(0 .. 1) := (False, False);
begin
i(0) := 0.0; -- left boundary
i(1) := 1.0; -- right boundary
@@ -95,7 +94,7 @@
end if;
Set_Number_Of_Colors_In_Color_Map_1(256);
- Set_Color_Map_1_Piecewise(HLS, i, h, l, s, Reverse_Hue);
+ Set_Color_Map_1_Piecewise(HLS, i, h, l, s, Reverse_Hue_None);
end cmap1_init;
Modified: trunk/examples/ada/xthick11a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick11a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/xthick11a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -56,8 +56,6 @@
clevel : Real_Vector(0 .. LEVELS - 1);
zmin, zmax, step : Long_Float;
- Reverse_Flag : Boolean_Array_1D(0 .. 1) := (False, False);
-
procedure cmap1_init is
i, h, l, s : Real_Vector(0 .. 1);
begin
@@ -74,7 +72,7 @@
s(1) := 0.8;
Set_Number_Of_Colors_In_Color_Map_1(256);
- Set_Color_Map_1_Piecewise(HLS, i, h, l, s, Reverse_Flag);
+ Set_Color_Map_1_Piecewise(HLS, i, h, l, s, Reverse_Hue_None);
end cmap1_init;
Modified: trunk/examples/ada/xthick12a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick12a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/xthick12a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -51,7 +51,6 @@
r : Real_Vector (0 .. 4) := (0.0, 0.25, 0.5, 1.0, 1.0);
g : Real_Vector (0 .. 4) := (1.0, 0.5, 0.5, 0.5, 1.0);
b : Real_Vector (0 .. 4) := (1.0, 1.0, 0.5, 0.25, 0.0);
- Reverse_Flag : Boolean_Array_1D (0 .. 4) := (False, False, False, False, False);
procedure plfbox (x0, y0 : Long_Float) is
x, y : Real_Vector (0 ..3);
@@ -99,7 +98,7 @@
y0(8) := 12.0;
y0(9) := 3.0;
- Set_Color_Map_1_Piecewise(RGB, pos, r, g, b, Reverse_Flag);
+ Set_Color_Map_1_Piecewise(RGB, pos, r, g, b, Reverse_Hue_None);
for i in y0'range loop
Set_Color_Map_1(Long_Float(i)/9.0);
Modified: trunk/examples/ada/xthick15a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick15a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/xthick15a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -53,7 +53,6 @@
----------------------------------------------------------------------------
procedure cmap1_init2 is
i, h, l, s : Real_Vector(0 .. 3);
- Reverse_Flag : Boolean_Array_1D(0 .. 3) := (False, False, False, False);
begin
-- Set control points.
i(0) := 0.0; -- left boundary
@@ -79,7 +78,7 @@
s(2) := 0.5; -- center
s(3) := 1.0; -- high
- Set_Color_Map_1_Piecewise(HLS, i, h, l, s, Reverse_Flag);
+ Set_Color_Map_1_Piecewise(HLS, i, h, l, s, Reverse_Hue_None);
end cmap1_init2;
----------------------------------------------------------------------------
Modified: trunk/examples/ada/xthick20a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick20a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/xthick20a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -217,7 +217,6 @@
-- Set gray colormap.
procedure gray_cmap(num_col : Integer) is
r, g, b, pos : Real_Vector(0 .. 1);
- Reverse_Flag : Boolean_Array_1D(0 .. 1) := (False, False);
begin
r(0) := 0.0;
g(0) := 0.0;
@@ -231,7 +230,7 @@
pos(1) := 1.0;
Set_Number_Of_Colors_In_Color_Map_1(num_col);
- Set_Color_Map_1_Piecewise(RGB, pos, r, g, b, Reverse_Flag);
+ Set_Color_Map_1_Piecewise(RGB, pos, r, g, b, Reverse_Hue_None);
end gray_cmap;
Modified: trunk/examples/ada/xthick21a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick21a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/xthick21a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -85,7 +85,6 @@
procedure cmap1_init is
i, h, l, s : Real_Vector(0 .. 1);
- Reverse_Flag : Boolean_Array_1D(0 .. 1) := (False, False);
begin
i(0) := 0.0; -- left boundary
i(1) := 1.0; -- right boundary
@@ -100,7 +99,7 @@
s(1) := 0.8;
Set_Number_Of_Colors_In_Color_Map_1(256);
- Set_Color_Map_1_Piecewise(HLS, i, h, l, s, Reverse_Flag);
+ Set_Color_Map_1_Piecewise(HLS, i, h, l, s, Reverse_Hue_None);
end cmap1_init;
Modified: trunk/examples/ada/xthick30a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick30a.adb.cmake 2009-01-13 21:00:09 UTC (rev 9299)
+++ trunk/examples/ada/xthick30a.adb.cmake 2009-01-14 05:59:01 UTC (rev 9300)
@@ -52,7 +52,6 @@
gcoord : Real_Vector(0 .. 1) := (0.0, 0.0);
bcoord : Real_Vector(0 .. 1) := (0.0, 0.0);
acoord : Real_Vector(0 .. 1) := (0.0, 1.0);
- rev : Boolean_Array_1D(0 .. 1) := (False, False);
icol, r, g, b : Integer;
a : Long_Float;
@@ -137,7 +136,7 @@
-- Create the color map with 128 colors and use Set_Color_Map_1_RGBla to initialize
-- the color values with a linear varying transparency (or alpha).
Set_Number_Of_Colors_In_Color_Map_1(128);
- Set_Color_Map_1_Piecewise_And_Alpha(RGB, pos, rcoord, gcoord, bcoord, acoord, rev);
+ Set_Color_Map_1_Piecewise_And_Alpha(RGB, pos, rcoord, gcoord, bcoord, acoord, Reverse_Hue_None);
-- Create a 2 x 2 array that contains the z values (0.0 to 1.0) that will
-- used for the shade plot. Shade_Regions will use linear interpolation to
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
