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

[<jb...@us...>]

Revision: 12300
          http://sourceforge.net/p/plplot/code/12300
Author:   jbauck
Date:     2013-03-20 00:49:49 +0000 (Wed, 20 Mar 2013)
Log Message:
-----------
Convert line width types that were Integer to Long_Float (second attempt to commit all the changed files).

Modified Paths:
--------------
    trunk/bindings/ada/plplot.ads
    trunk/bindings/ada/plplot_traditional.adb
    trunk/bindings/ada/plplot_traditional.ads
    trunk/examples/ada/x01a.adb
    trunk/examples/ada/x02a.adb
    trunk/examples/ada/xthick01a.adb
    trunk/examples/ada/xthick02a.adb

Modified: trunk/bindings/ada/plplot.ads
===================================================================
--- trunk/bindings/ada/plplot.ads	2013-03-20 00:33:32 UTC (rev 12299)
+++ trunk/bindings/ada/plplot.ads	2013-03-20 00:49:49 UTC (rev 12300)
@@ -2104,7 +2104,7 @@
 
     -- Set pen width.
     -- plwidth
-    procedure Set_Pen_Width(Pen_Width : Integer);
+    procedure Set_Pen_Width(Pen_Width : Long_Float);
 
 
     -- Set up world coordinates of the viewport boundaries (2d plots).

Modified: trunk/bindings/ada/plplot_traditional.adb
===================================================================
--- trunk/bindings/ada/plplot_traditional.adb	2013-03-20 00:33:32 UTC (rev 12299)
+++ trunk/bindings/ada/plplot_traditional.adb	2013-03-20 00:49:49 UTC (rev 12300)
@@ -70,7 +70,7 @@
     
     -- Set default pen width. Docs don't say, so I'll make it 1.
     -- I could make this depend on the type of outut device used.
-    Default_Pen_Width : constant Integer := 1;
+    Default_Pen_Width : constant Long_Float := 1.0;
     procedure Set_Default_Pen_Width is
     begin
         plwidth(Default_Pen_Width);
@@ -3147,7 +3147,7 @@
 
 
     -- Set pen width.
-    procedure plwidth(Pen_Width : Integer) is
+    procedure plwidth(Pen_Width : Long_Float) is
     begin
         PLplot_Thin.plwidth(Pen_Width);
     end plwidth;

Modified: trunk/bindings/ada/plplot_traditional.ads
===================================================================
--- trunk/bindings/ada/plplot_traditional.ads	2013-03-20 00:33:32 UTC (rev 12299)
+++ trunk/bindings/ada/plplot_traditional.ads	2013-03-20 00:49:49 UTC (rev 12300)
@@ -1932,7 +1932,7 @@
 
 
     -- Set pen width.
-    procedure plwidth(Pen_Width : Integer);
+    procedure plwidth(Pen_Width : Long_Float);
 
 
     -- Set up world coordinates of the viewport boundaries (2d plots).

Modified: trunk/examples/ada/x01a.adb
===================================================================
--- trunk/examples/ada/x01a.adb	2013-03-20 00:33:32 UTC (rev 12299)
+++ trunk/examples/ada/x01a.adb	2013-03-20 00:49:49 UTC (rev 12300)
@@ -98,9 +98,9 @@
         
         -- Draw the line
         plcol0(3);
-        plwidth(2);
+        plwidth(2.0);
         plline(x, y);
-        plwidth(1);
+        plwidth(1.0);
     end plot2;
 
 

Modified: trunk/examples/ada/x02a.adb
===================================================================
--- trunk/examples/ada/x02a.adb	2013-03-20 00:33:32 UTC (rev 12299)
+++ trunk/examples/ada/x02a.adb	2013-03-20 00:49:49 UTC (rev 12300)
@@ -62,14 +62,14 @@
             vmin := 0.1;
             vmax := 0.9;
             for j in 0..2 loop
-                plwidth(j + 1);
+                plwidth(Long_Float(j + 1));
                 plvpor(vmin, vmax, vmin, vmax);
                 plwind(0.0, 1.0, 0.0, 1.0);
                 plbox("bc", 0.0, 0, "bc", 0.0, 0);
                 vmin := vmin + 0.1;
                 vmax := vmax - 0.1;
             end loop;
-            plwidth(1);
+            plwidth(1.0);
             plptex(0.5, 0.5, 1.0, 0.0, 0.5, Trim(Integer'image(i), Left));
         end loop;
     end draw_windows;

Modified: trunk/examples/ada/xthick01a.adb
===================================================================
--- trunk/examples/ada/xthick01a.adb	2013-03-20 00:33:32 UTC (rev 12299)
+++ trunk/examples/ada/xthick01a.adb	2013-03-20 00:49:49 UTC (rev 12300)
@@ -98,9 +98,9 @@
         
         -- Draw the line
         Set_Pen_Color(Green);
-        Set_Pen_Width(2);
+        Set_Pen_Width(2.0);
         Draw_Curve(x, y);
-        Set_Pen_Width(1);
+        Set_Pen_Width(1.0);
     end plot2;
 
 

Modified: trunk/examples/ada/xthick02a.adb
===================================================================
--- trunk/examples/ada/xthick02a.adb	2013-03-20 00:33:32 UTC (rev 12299)
+++ trunk/examples/ada/xthick02a.adb	2013-03-20 00:49:49 UTC (rev 12300)
@@ -62,14 +62,14 @@
             vmin := 0.1;
             vmax := 0.9;
             for j in 0..2 loop
-                Set_Pen_Width(j + 1);
+                Set_Pen_Width(Long_Float(j + 1));
                 Set_Viewport_Normalized(vmin, vmax, vmin, vmax);
                 Set_Viewport_World(0.0, 1.0, 0.0, 1.0);
                 Box_Around_Viewport("bc", 0.0, 0, "bc", 0.0, 0);
                 vmin := vmin + 0.1;
                 vmax := vmax - 0.1;
             end loop;
-            Set_Pen_Width(1);
+            Set_Pen_Width(1.0);
             Write_Text_World(0.5, 0.5, 1.0, 0.0, 0.5, Trim(Integer'image(i), Left));
         end loop;
     end draw_windows;

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