Changeset 15099 for issm/trunk-jpl/src/wrappers/KMLOverlay/KMLOverlay.cpp

Timestamp:

05/24/13 12:38:54 (12 years ago)

Author:

Eric.Larour

Message:

CHG: greatly simplified the shared/io/Print routines. Replaced
_printf_ by _pprintString_ , then replaced all _printLine_ by _printString_
and _pprintLine_ by _pprintString_
We will then replace the _printString_ by _printf_ and _pprintString_ by _printf0_

File:

• issm/trunk-jpl/src/wrappers/KMLOverlay/KMLOverlay.cpp (modified) (4 diffs)

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

@@ -5 +5 @@
 
 void KMLOverlayUsage(void){/*{{{*/
-        _pprintLine_("KMLOverlay - KML file overlay module:");
-        _pprintLine_("");
-        _pprintLine_("   This module reads a list of image files and writes a KML or KMZ overlay file.");
-        _pprintLine_("");
-        _pprintLine_("   Usage:");
-        _pprintLine_("      ierror=KMLOverlay(kmlfile,'param name',param,...);");
-        _pprintLine_("");
-        _pprintLine_("      kmlfile     KML or KMZ file name (string)");
-        _pprintLine_("");
-        _pprintLine_("      lataxis     latitude axis (double vector [south north], required)");
-        _pprintLine_("      longaxis    longitude axis (double vector [west east], required)");
-        _pprintLine_("      images      relative or http image file names (string or array of strings or cell array of strings, required)");
-        _pprintLine_("      zip         flag to zip the doc.kml and image files into kmzfile (double, non-zero for kmz)");
-        _pprintLine_("");
-        _pprintLine_("      ierror     error flag (double, non-zero for error)");
-        _pprintLine_("");
-        _pprintLine_("   Example:");
-        _pprintLine_("      KMLOverlay(kmlfile,'lataxis',[south north],'longaxis',[west east],'images',{'file1.png','http://issm/file2.png'},'zip',1);");
-        _pprintLine_("");
+        _pprintString_("KMLOverlay - KML file overlay module:" << "\n");
+        _pprintString_("" << "\n");
+        _pprintString_("   This module reads a list of image files and writes a KML or KMZ overlay file." << "\n");
+        _pprintString_("" << "\n");
+        _pprintString_("   Usage:" << "\n");
+        _pprintString_("      ierror=KMLOverlay(kmlfile,'param name',param,...);" << "\n");
+        _pprintString_("" << "\n");
+        _pprintString_("      kmlfile     KML or KMZ file name (string)" << "\n");
+        _pprintString_("" << "\n");
+        _pprintString_("      lataxis     latitude axis (double vector [south north], required)" << "\n");
+        _pprintString_("      longaxis    longitude axis (double vector [west east], required)" << "\n");
+        _pprintString_("      images      relative or http image file names (string or array of strings or cell array of strings, required)" << "\n");
+        _pprintString_("      zip         flag to zip the doc.kml and image files into kmzfile (double, non-zero for kmz)" << "\n");
+        _pprintString_("" << "\n");
+        _pprintString_("      ierror     error flag (double, non-zero for error)" << "\n");
+        _pprintString_("" << "\n");
+        _pprintString_("   Example:" << "\n");
+        _pprintString_("      KMLOverlay(kmlfile,'lataxis',[south north],'longaxis',[west east],'images',{'file1.png','http://issm/file2.png'},'zip',1);" << "\n");
+        _pprintString_("" << "\n");
 }/*}}}*/
 WRAPPER(KMLOverlay){
@@ -63 +63 @@
 
         options->Get(&lataxis ,&nlat ,(char*)"lataxis");
-        if (verbose && lataxis) for (i=0; i<nlat; i++) _printLine_("  lataxis [" << i << "]=" << lataxis[i]);
+        if (verbose && lataxis) for (i=0; i<nlat; i++) _printString_("  lataxis [" << i << "]=" << lataxis[i] << "\n");
         options->Get(&longaxis,&nlong,(char*)"longaxis");
-        if (verbose && longaxis) for (i=0; i<nlong; i++) _printLine_("  longaxis[" << i << "]=" << longaxis[i]);
+        if (verbose && longaxis) for (i=0; i<nlong; i++) _printString_("  longaxis[" << i << "]=" << longaxis[i] << "\n");
         options->Get(&pimages,&nimages,(char*)"images");
-        if (verbose && pimages) for (i=0; i<nimages; i++) _printLine_("  pimages[" << i << "]=\"" << pimages[i] << "\"");
+        if (verbose && pimages) for (i=0; i<nimages; i++) _printString_("  pimages[" << i << "]=\"" << pimages[i] << "\"" << "\n");
         options->Get(&dzip,(char*)"zip",0.);
-        if (verbose) _printLine_("  dzip=" << dzip);
+        if (verbose) _printString_("  dzip=" << dzip << "\n");
 
         /*some checks*/
@@ -84 +84 @@
         if(!strlen(filkml)) strcpy(filkml,"stdout");
 
-        if(verbose) _printLine_("Opening kml overlay file \"" << filkml << "\".");
+        if(verbose) _printString_("Opening kml overlay file \"" << filkml << "\"." << "\n");
         fid=fopen(filkml,"w");
 
         /* Run core computations: */
-        if (verbose) _printLine_("Calling core:");
+        if (verbose) _printString_("Calling core:" << "\n");
         KMLOverlayx(&ierror,lataxis,longaxis,nimages,pimages,fid);
 
-        if (verbose) _printLine_("Closing file \"" << filkml << "\".");
+        if (verbose) _printString_("Closing file \"" << filkml << "\"." << "\n");
         fclose(fid);
 
@@ -108 +108 @@
                                 strcat(czip,pimages[i]);
                         }
-                if (verbose) _printLine_("Zipping file \"" << filkmz << "\".");
-                if (verbose) _printLine_(czip);
+                if (verbose) _printString_("Zipping file \"" << filkmz << "\"." << "\n");
+                if (verbose) _printString_(czip << "\n");
 
                 if (mexEvalString(czip)) _error_("Error zipping file \"" << filkmz << "\".");