[Plplot-cvs] SF.net SVN: plplot:[9532] trunk/bindings/lua/plplotluac.i

[<sm...@us...>]

Revision: 9532
          http://plplot.svn.sourceforge.net/plplot/?rev=9532&view=rev
Author:   smekal
Date:     2009-02-16 21:09:26 +0000 (Mon, 16 Feb 2009)

Log Message:
-----------
Added support for plgriddata (needed for examples 21).

Modified Paths:
--------------
    trunk/bindings/lua/plplotluac.i

Modified: trunk/bindings/lua/plplotluac.i
===================================================================
--- trunk/bindings/lua/plplotluac.i	2009-02-16 19:07:06 UTC (rev 9531)
+++ trunk/bindings/lua/plplotluac.i	2009-02-16 21:09:26 UTC (rev 9532)
@@ -482,27 +482,48 @@
 }
 
 
-/* 2D array, check for consistency input / output version */
-%typemap(in) PLFLT **OutMatrixCk (int ii) {
-  int jj;
+/* Set Y length for later consistency checking, with trailing count */
+/* and 2D array, check for consistency input / output version */
+%typemap(in) (PLFLT *ArrayY, PLINT ny, PLFLT **OutMatrixCk) {
+  int temp, i;
   
-  $1 = read_double_Matrix(L, $input, &ii, &jj );
+  $1 = (PLFLT*)LUA_get_double_num_array_var(L, $input, &temp);
   if(!$1) SWIG_fail;
-  if( (ii!=Xlen) || (jj!=Ylen) ) {
-    lua_pushfstring(L, "Vectors must match matrix.");
-    SWIG_fail;
+  $2 = Ylen = temp;
+
+ 	$3=LUA_ALLOC_ARRAY(PLFLT*, Xlen);
+  if(!$3) SWIG_fail;
+	for (i = 0; i < Xlen; i++)
+    $3[i] = NULL;
+
+  for (i = 0; i < Xlen; i++) {
+    $3[i] = LUA_ALLOC_ARRAY(PLFLT, Ylen);
+    if(!$3[i]) SWIG_fail;
   }
 }
-%typemap(freearg) PLFLT **OutMatrixCk {
+%typemap(argout) (PLFLT *ArrayY, PLINT ny, PLFLT **OutMatrixCk) {
   int i;
   
-  if($1) {
-    for (i = 0; i < ii$argnum; i++)
-      LUA_FREE_ARRAY($1[i]);
-    LUA_FREE_ARRAY($1);
+  if($3) {
+    lua_newtable(L);
+    for (i = 0; i < Xlen; i++) {
+      SWIG_write_double_num_array(L, $3[i], Ylen);
+      lua_rawseti(L,-2,i+1); /* -1 is the inner table, -2 is the outer table*/
+    }
+    SWIG_arg++;
   }
 }
+%typemap(freearg) (PLFLT *ArrayY, PLINT ny, PLFLT **OutMatrixCk) {
+  int i;
+  
+  LUA_FREE_ARRAY($1);
 
+  if($3) {
+    for (i = 0; i < Xlen; i++)
+      LUA_FREE_ARRAY($3[i]);
+    LUA_FREE_ARRAY($3);
+  }
+}
 
 /******************************************************************************
 				 String returning functions


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