Changeset 15095

Timestamp:

05/24/13 08:22:29 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added ApiPrintf to header file and moved all printf to _printLine_ in ExpSimplify

Location:

issm/trunk-jpl/src/wrappers

Files:

• ExpSimplify/ExpSimplify.cpp (modified) (5 diffs)
• matlab/io/matlabio.h (modified) (1 diff)
• python/io/pythonio.h (modified) (1 diff)

issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.cpp

@@ -5 +5 @@
 
 void ExpSimplifyUsage(void){/*{{{*/
-        _pprintLine_("ExpSimplify - Simplify Exp contour");
-        _pprintLine_("");
-        _pprintLine_("   Recursive Douglas-Peucker Polygon Simplification");
-        _pprintLine_("");
-        _pprintLine_("   Usage:");
-        _pprintLine_("      ExpSimplify(expfile,tol);");
-        _pprintLine_("      - expfile: name of the exp file");
-        _pprintLine_("      - tol:  tolerance (maximal euclidean distance allowed between the new line and a vertex)");
-        _pprintLine_("      Additional options:");
-        _pprintLine_("      - 'min': minimum number of vertices to save contours in exp file (default is 3)");
-        _pprintLine_("");
-        _pprintLine_("   Example:");
-        _pprintLine_("      ExpSimplify('file.exp',100);");
-        _pprintLine_("      ExpSimplify('file.exp',100,'remove1',false);");
+        _printLine_("ExpSimplify - Simplify Exp contour");
+        _printLine_("");
+        _printLine_("   Recursive Douglas-Peucker Polygon Simplification");
+        _printLine_("");
+        _printLine_("   Usage:");
+        _printLine_("      ExpSimplify(expfile,tol);");
+        _printLine_("      - expfile: name of the exp file");
+        _printLine_("      - tol:  tolerance (maximal euclidean distance allowed between the new line and a vertex)");
+        _printLine_("      Additional options:");
+        _printLine_("      - 'min': minimum number of vertices to save contours in exp file (default is 3)");
+        _printLine_("");
+        _printLine_("   Example:");
+        _printLine_("      ExpSimplify('file.exp',100);");
+        _printLine_("      ExpSimplify('file.exp',100,'remove1',false);");
 }/*}}}*/
 void simplify(Contour<double>* contour,bool* flags,int ind0,int ind1,double tolerance){/*{{{*/
@@ -145 +145 @@
                 x       = contour->x;
                 y       = contour->y;
-                printf("   Initial number of vertices in contour #%i: %i\n",counter+1,nods);
+                _printLine_("   Initial number of vertices in contour #"<<counter+1<<": "<<nods);
 
                 /*Allocate flags (1=keep, 0=remove)*/
@@ -183 +183 @@
                 /*Do we save new profile?*/
                 if(newnods>=minimumvertices){
-                        printf("   Final   number of vertices in contour #%i: %i\n",counter+1,newnods);
+                        _printLine_("   Final   number of vertices in contour #"<<counter+1<<": "<<newnods);
                         newcontour       = xNew<Contour<double> >(1);
                         newcontour->nods = newnods;
@@ -202 +202 @@
                 }
                 else{
-                        printf("   Final   number of vertices in contour #%i: %i (not saved)\n",counter+1,newnods);
+                        _printLine_("   Final   number of vertices in contour #"<<counter+1<<": "<<newnods<<" (not saved)");
                 }
 
@@ -208 +208 @@
                 xDelete<bool>(flags);
         }
-        printf("   Initial number of contours: %i\n",oldcontours->Size());
-        printf("   Final   number of contours: %i\n",newcontours->Size());
+        _printLine_("   Initial number of contours: "<<oldcontours->Size());
+        _printLine_("   Final   number of contours: "<<newcontours->Size());
 
         /*Write data: */

issm/trunk-jpl/src/wrappers/matlab/io/matlabio.h

@@ -96 +96 @@
 #endif
 
-
+/*Print*/
+void ApiPrintf(char* format,const char* string);
 #endif  /* _IO_H_ */

issm/trunk-jpl/src/wrappers/python/io/pythonio.h

@@ -55 +55 @@
 PyObject* PyArrayFromCopiedData(int dimi,int dimj,bool* data);
 
+/*Print*/
+void ApiPrintf(char* format,const char* string);
+
 #endif  /* _IO_H_ */