[Plplot-cvs] SF.net SVN: plplot:[11437] trunk/bindings/octave/plplot_octave.i

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

Revision: 11437
          http://plplot.svn.sourceforge.net/plplot/?rev=11437&view=rev
Author:   airwin
Date:     2011-01-05 01:36:31 +0000 (Wed, 05 Jan 2011)

Log Message:
-----------
Implement proof of concept (with a test function, testppchar) of how
to deal with Octave character arrays as arguments. This should prove
useful for bindings of pllegend and plstripc (currently handled in a
clumsy way by wrapping with a function that takes four character
string arguments rather than one argument of a characer array
containing four strings).

Currently the char **ArrayCk typemap only handles the charMatrix case
(an ordinary Octave matrix filled with strings that have been extended
with blanks so they all have the same length).  Additional logic to
detect the cell matrix case and deal separately with it should be
implemented as well.  Also, logic to handle other error conditions
should be implemented.  But the current typemap should be good enough
to get all the pllegend-using examples to work for now using the
non-cell character matrix case.

Modified Paths:
--------------
    trunk/bindings/octave/plplot_octave.i

Modified: trunk/bindings/octave/plplot_octave.i
===================================================================
--- trunk/bindings/octave/plplot_octave.i	2011-01-04 06:26:41 UTC (rev 11436)
+++ trunk/bindings/octave/plplot_octave.i	2011-01-05 01:36:31 UTC (rev 11437)
@@ -1130,9 +1130,55 @@
          PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax, PLFLT zmin, PLFLT zmax,
          PLFLT valuemin, PLFLT valuemax, PLFLT *Matrix, PLFLT *Matrix );
 
+// This test function should be removed when we are confident of our
+// dealings with all types of octave string arrays.
+%{
+void testppchar(PLINT nlegend, const PLINT *opt_array, const char ** text) {
+  PLINT i;
+  printf("nlegend = %d\n", nlegend);
+  for(i=0;i<nlegend;i++) {
+    printf("opt_array[%d] = %d\n", i, opt_array[i]);
+    printf("text[%d] = %s\n", i, text[i]);
+  }
+}
+%}
+
+// No count but check consistency with previous
+%typemap(in) char **ArrayCk (charMatrix temp) {
+  int i;
+  int max_length;
+  if ( _n_dims($input) > 2 )
+      { error("argument must be a scalar or vector or matrix"); SWIG_fail; }
+  if ( _dim($input, 0) != Alen )
+      { error("first dimension must be same length as previous vector"); SWIG_fail; }
+  // Allow one extra space for null termination.
+  max_length= _dim($input, 1) + 1;
+  $1 = new char*[Alen];
+  temp = $input.char_matrix_value();
+  for(i=0; i<Alen; i++) {
+    // Must copy string to "permanent" location because the string
+    // location corresponding to tmp.c_str() gets
+    // overwritten for each iteration of loop.
+    std::string tmp_cxxstring = temp.row_as_string(i);
+    $1[i] = new char[max_length];
+    strncpy( $1[i], tmp_cxxstring.c_str(), max_length-1 );
+    $1[i][max_length] = '\0';
+  }
+}
+%typemap(freearg) char **ArrayCk {
+  int i;
+  for(i=0; i<Alen; i++) {
+    delete[] $1[i];
+  }
+  delete[] $1;
+}
+
+// This test function should be removed when we are confident of our
+// dealings with all types of octave string arrays.
+void testppchar(PLINT n, const PLINT *Array, const char **ArrayCk);
+
 // Deal with these later.
 %ignore pllegend;
-%ignore plgriddata;
 // Probably never deal with this one.
 %ignore plMinMax2dGrid;
 // swig-compatible common PLplot API definitions from here on.


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