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

[<ai...@us...>]

Revision: 12331
          http://sourceforge.net/p/plplot/code/12331
Author:   airwin
Date:     2013-05-03 02:41:21 +0000 (Fri, 03 May 2013)
Log Message:
-----------
Adjust Lua bindings and examples for backwards-incompatible
C API change from PLINT to PLFLT type for line-width related
arguments of plshade* and pllegend.

Modified Paths:
--------------
    trunk/cmake/modules/lua.cmake
    trunk/examples/lua/x04.lua
    trunk/examples/lua/x15.lua
    trunk/examples/lua/x16.lua
    trunk/examples/lua/x21.lua
    trunk/examples/lua/x26.lua
    trunk/examples/lua/x33.lua

Modified: trunk/cmake/modules/lua.cmake
===================================================================
--- trunk/cmake/modules/lua.cmake	2013-05-03 02:02:05 UTC (rev 12330)
+++ trunk/cmake/modules/lua.cmake	2013-05-03 02:41:21 UTC (rev 12331)
@@ -25,7 +25,7 @@
 if(DEFAULT_NO_BINDINGS)
   option(ENABLE_lua "Enable Lua bindings" OFF)
 else(DEFAULT_NO_BINDINGS)
-  option(ENABLE_lua "Enable Lua bindings" OFF)
+  option(ENABLE_lua "Enable Lua bindings" ON)
 endif(DEFAULT_NO_BINDINGS)
 
 if(ENABLE_lua AND NOT BUILD_SHARED_LIBS)

Modified: trunk/examples/lua/x04.lua
===================================================================
--- trunk/examples/lua/x04.lua	2013-05-03 02:02:05 UTC (rev 12330)
+++ trunk/examples/lua/x04.lua	2013-05-03 02:41:21 UTC (rev 12331)
@@ -125,10 +125,10 @@
   box_colors[1] = 0
   box_patterns[1] = 0
   box_scales[1] = 0
-  box_line_widths[1] = 0
+  box_line_widths[1] = 0.
   line_colors[1] = 2
   line_styles[1] = 1
-  line_widths[1] = 1
+  line_widths[1] = 1.
   -- unused arbitrary data
   symbol_colors[1]  = 0
   symbol_scales[1]  = 0
@@ -144,10 +144,10 @@
     box_colors[2] = 0
     box_patterns[2] = 0
     box_scales[2] = 0
-    box_line_widths[2] = 0
+    box_line_widths[2] = 0.
     line_colors[2]    = 3
     line_styles[2]    = 1
-    line_widths[2]    = 1
+    line_widths[2]    = 1.
     symbol_colors[2]  = 3
     symbol_scales[2]  = 1.
     symbol_numbers[2] = 4

Modified: trunk/examples/lua/x15.lua
===================================================================
--- trunk/examples/lua/x15.lua	2013-05-03 02:02:05 UTC (rev 12330)
+++ trunk/examples/lua/x15.lua	2013-05-03 02:41:21 UTC (rev 12331)
@@ -87,11 +87,11 @@
   shade_min = zmin + (zmax-zmin)*0.4
   shade_max = zmin + (zmax-zmin)*0.6
   sh_color = 7
-  sh_width = 2
+  sh_width = 2.
   min_color = 9
   max_color = 2
-  min_width = 2
-  max_width = 2
+  min_width = 2.
+  max_width = 2.
 
   pl.psty(8)
   pl.shade(z, -1, 1, -1, 1, shade_min, shade_max, sh_cmap, sh_color, sh_width,
@@ -114,16 +114,16 @@
 function plot2()
   sh_cmap = 0
   min_color = 0
-  min_width = 0
+  min_width = 0.
   max_color = 0
-  max_width = 0
+  max_width = 0.
 
   inc = { {450}, {-450}, {0}, {900}, {300},
           {450,-450}, {0, 900}, {0, 450}, {450, -450}, {0, 900} }
   del = { {2000}, {2000}, {2000}, {2000}, {2000}, 
           {2000, 2000}, {2000, 2000}, {2000, 2000}, {4000, 4000}, {4000, 2000} }
 
-  sh_width = 2
+  sh_width = 2.
 
   pl.adv(0)
   pl.vpor(0.1, 0.9, 0.1, 0.9)

Modified: trunk/examples/lua/x16.lua
===================================================================
--- trunk/examples/lua/x16.lua	2013-05-03 02:02:05 UTC (rev 12330)
+++ trunk/examples/lua/x16.lua	2013-05-03 02:41:21 UTC (rev 12331)
@@ -82,9 +82,9 @@
 px = {}
 py = {}
 
-fill_width = 2
+fill_width = 2.
 cont_color = 0
-cont_width = 0
+cont_width = 0.
 
 -- Parse and process command line arguments 
 pl.parseopts(arg, pl.PL_PARSE_FULL)
@@ -237,7 +237,7 @@
 
 pl.psty(0)
 
-pl.shades(z, -1, 1, -1, 1, shedge, fill_width, 2, 3, 0, "pltr2", cgrid2)
+pl.shades(z, -1, 1, -1, 1, shedge, fill_width, 2, 3., 0, "pltr2", cgrid2)
 
 pl.col0(1)
 pl.box("bcnst", 0, 0, "bcnstv", 0, 0)

Modified: trunk/examples/lua/x21.lua
===================================================================
--- trunk/examples/lua/x21.lua	2013-05-03 02:02:05 UTC (rev 12330)
+++ trunk/examples/lua/x21.lua	2013-05-03 02:41:21 UTC (rev 12331)
@@ -232,7 +232,7 @@
       pl.env0(xm, xM, ym, yM, 2, 0)
       pl.col0(15)
       pl.lab("X", "Y", title[alg])
-      pl.shades(zg, xm, xM, ym, yM, clev, 1, 0, 1, 1)
+      pl.shades(zg, xm, xM, ym, yM, clev, 1., 0, 1., 1)
       pl.col0(2)
     else 
       for i = 1, nl do

Modified: trunk/examples/lua/x26.lua
===================================================================
--- trunk/examples/lua/x26.lua	2013-05-03 02:02:05 UTC (rev 12330)
+++ trunk/examples/lua/x26.lua	2013-05-03 02:41:21 UTC (rev 12331)
@@ -177,10 +177,10 @@
   box_colors[1] = 0
   box_patterns[1] = 0
   box_scales[1] = 0
-  box_line_widths[1] = 0
+  box_line_widths[1] = 0.
   line_colors[1] = 2
   line_styles[1] = 1
-  line_widths[1] = 1
+  line_widths[1] = 1.
   -- unused arbitrary data
   symbol_colors[1]  = 0
   symbol_scales[1]  = 0
@@ -196,10 +196,10 @@
     box_colors[2] = 0
     box_patterns[2] = 0
     box_scales[2] = 0
-    box_line_widths[2] = 0
+    box_line_widths[2] = 0.
     line_colors[2]    = 3
     line_styles[2]    = 1
-    line_widths[2]    = 1
+    line_widths[2]    = 1.
     symbol_colors[2]  = 3
     symbol_scales[2]  = 1.
     symbol_numbers[2] = 4

Modified: trunk/examples/lua/x33.lua
===================================================================
--- trunk/examples/lua/x33.lua	2013-05-03 02:02:05 UTC (rev 12330)
+++ trunk/examples/lua/x33.lua	2013-05-03 02:41:21 UTC (rev 12331)
@@ -67,10 +67,10 @@
     box_colors[i] = 0
     box_patterns[i] = 0
     box_scales[i] = 0.0
-    box_line_widths[i] = 0
+    box_line_widths[i] = 0.
     line_colors[i] = 0
     line_styles[i] = 0
-    line_widths[i] = 0
+    line_widths[i] = 0.
     symbol_colors[i] = 0
     symbol_scales[i] = 0.0
     symbol_numbers[i] = 0
@@ -135,7 +135,7 @@
 opt_base = lor(pl.PL_LEGEND_BACKGROUND, pl.PL_LEGEND_BOUNDING_BOX)
 opt_array[1] = lor(pl.PL_LEGEND_LINE, pl.PL_LEGEND_SYMBOL)
 line_styles[1] = 1
-line_widths[1] = 1
+line_widths[1] = 1.
 symbol_scales[1] = 1.0
 symbol_numbers[1] = 4
 symbols[1] = "*"
@@ -180,7 +180,7 @@
 for k = 0, nlegend-1 do
   opt_array[k+1] = lor(pl.PL_LEGEND_LINE, pl.PL_LEGEND_SYMBOL)
   line_styles[k+1] = 1
-  line_widths[k+1] = 1
+  line_widths[k+1] = 1.
   symbol_scales[k+1] = 1.0
   symbol_numbers[k+1] = 2
   symbols[k+1] = "*"
@@ -320,7 +320,7 @@
   for k = 0, nlegend-1 do
     opt_array[k+1] = lor(pl.PL_LEGEND_LINE, pl.PL_LEGEND_SYMBOL)
     line_styles[k+1] = 1
-    line_widths[k+1] = 1
+    line_widths[k+1] = 1.
     symbol_scales[k+1] = 1.0
     symbol_numbers[k+1] = 2
     symbols[k+1] = "*"
@@ -387,14 +387,14 @@
 box_colors[2] = 2
 box_patterns[2] = 0
 box_scales[2] = 0.8
-box_line_widths[2] = 1
+box_line_widths[2] = 1.
 
 opt_array[3] = pl.PL_LEGEND_LINE
 text[3] = "Line"
 text_colors[3] = 3
 line_colors[3] = 3
 line_styles[3] = 1
-line_widths[3] = 1
+line_widths[3] = 1.
 
 opt_array[4] = pl.PL_LEGEND_SYMBOL
 text[4] = "Symbol"
@@ -409,7 +409,7 @@
 text_colors[5] = 5
 line_colors[5] = 5
 line_styles[5] = 1
-line_widths[5] = 1
+line_widths[5] = 1.
 symbol_colors[5] = 5
 symbol_scales[5] = text_scale
 symbol_numbers[5] = 4
@@ -479,7 +479,7 @@
   box_colors[i+1] = i+1
   box_patterns[i+1] = 0
   box_scales[i+1] = 0.8
-  box_line_widths[i+1] = 1
+  box_line_widths[i+1] = 1.
 end
 
 opt = opt_base
@@ -505,7 +505,7 @@
   box_colors[i+1] = 2
   box_patterns[i+1] = i
   box_scales[i+1] = 0.8
-  box_line_widths[i+1] = 1
+  box_line_widths[i+1] = 1.
 end
 
 opt = opt_base
@@ -550,7 +550,7 @@
   text_colors[i+1] = i+1
   line_colors[i+1] = i+1
   line_styles[i+1] = 1
-  line_widths[i+1] = 1
+  line_widths[i+1] = 1.
 end
 
 opt = opt_base
@@ -575,7 +575,7 @@
   text_colors[i+1] = 2
   line_colors[i+1] = 2
   line_styles[i+1] = i+1
-  line_widths[i+1] = 1
+  line_widths[i+1] = 1.
 end
 
 opt = opt_base

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