Changeset 15396 for issm/trunk/src/wrappers/Ll2xy/Ll2xy.cpp

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/wrappers/Ll2xy/Ll2xy.cpp (modified) (2 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

issm/trunk/src/wrappers/Ll2xy/Ll2xy.cpp

@@ -5 +5 @@
 
 void Ll2xyUsage(void){/*{{{*/
-        _pprintLine_("Ll2xy - lat/long to x/y coordinate transformation module:");
-        _pprintLine_("");
-        _pprintLine_("   This module transforms lat/long to x/y coordinates.");
-        _pprintLine_("");
-        _pprintLine_("   Usage:");
-        _pprintLine_("      [x,y]=Ll2xy(lat,lon,sgn,'param name',param,...);");
-        _pprintLine_("");
-        _pprintLine_("      lat         latitude coordinates (double vector)");
-        _pprintLine_("      lon         longitude coordinates (double vector)");
-        _pprintLine_("      sgn         sign for hemisphere (double, +1 (north) or -1 (south))");
-        _pprintLine_("");
-        _pprintLine_("      central_meridian     central meridian (double, optional, but must specify with sp)");
-        _pprintLine_("      standard_parallel    standard parallel (double, optional, but must specify with cm)");
-        _pprintLine_("");
-        _pprintLine_("      x           x coordinates (double vector)");
-        _pprintLine_("      y           y coordinates (double vector)");
-        _pprintLine_("");
-        _pprintLine_("   Examples:");
-        _pprintLine_("      [x,y]=Ll2xy(lat,lon, 1);");
-        _pprintLine_("      [x,y]=Ll2xy(lat,lon, 1,'central_meridian',45,'standard_parallel',70);");
-        _pprintLine_("      [x,y]=Ll2xy(lat,lon,-1,'central_meridian', 0,'standard_parallel',71);");
-        _pprintLine_("");
+        _printf0_("Ll2xy - lat/long to x/y coordinate transformation module:\n");
+        _printf0_("\n");
+        _printf0_("   This module transforms lat/long to x/y coordinates.\n");
+        _printf0_("\n");
+        _printf0_("   Usage:\n");
+        _printf0_("      [x,y]=Ll2xy(lat,lon,sgn,'param name',param,...);\n");
+        _printf0_("\n");
+        _printf0_("      lat         latitude coordinates (double vector)\n");
+        _printf0_("      lon         longitude coordinates (double vector)\n");
+        _printf0_("      sgn         sign for hemisphere (double, +1 (north) or -1 (south))\n");
+        _printf0_("\n");
+        _printf0_("      central_meridian     central meridian (double, optional, but must specify with sp)\n");
+        _printf0_("      standard_parallel    standard parallel (double, optional, but must specify with cm)\n");
+        _printf0_("\n");
+        _printf0_("      x           x coordinates (double vector)\n");
+        _printf0_("      y           y coordinates (double vector)\n");
+        _printf0_("\n");
+        _printf0_("   Examples:\n");
+        _printf0_("      [x,y]=Ll2xy(lat,lon, 1);\n");
+        _printf0_("      [x,y]=Ll2xy(lat,lon, 1,'central_meridian',45,'standard_parallel',70);\n");
+        _printf0_("      [x,y]=Ll2xy(lat,lon,-1,'central_meridian', 0,'standard_parallel',71);\n");
+        _printf0_("\n");
 }/*}}}*/
 WRAPPER(Ll2xy){
@@ -64 +64 @@
         if(options->GetOption("central_meridian") || options->GetOption("standard_parallel")){
                 options->Get(&cm,"central_meridian");
-                if (verbose) _printLine_("  cm=" << cm);
+                if (verbose) _printf_("  cm=" << cm << "\n");
                 options->Get(&sp,"standard_parallel");
-                if (verbose) _printLine_("  sp=" << sp);
+                if (verbose) _printf_("  sp=" << sp << "\n");
         }
 
         /*some checks*/
-        if (verbose) _printLine_("Checking inputs:");
+        if (verbose) _printf_("Checking inputs:\n");
         if (nlat != nlon){_error_("Must have same number of lat[" << nlat << "] and lon[" << nlon << "] coordinates.");}
         else                ncoord=nlat;

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache