Changeset 12706 for issm/trunk/src/c/objects/KML/KML_Point.cpp

Timestamp:

07/24/12 10:36:19 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12703

File:

• issm/trunk/src/c/objects/KML/KML_Point.cpp (modified) (8 diffs)

issm/trunk/src/c/objects/KML/KML_Point.cpp

@@ -4 +4 @@
 
 /*Headers:*/
-/*{{{1*/
+/*{{{*/
 #ifdef HAVE_CONFIG_H
         #include <config.h>
@@ -22 +22 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_Point::KML_Point(){{{1*/
+/*FUNCTION KML_Point::KML_Point(){{{*/
 KML_Point::KML_Point(){
 
@@ -34 +34 @@
 }
 /*}}}*/
-/*FUNCTION KML_Point::~KML_Point(){{{1*/
+/*FUNCTION KML_Point::~KML_Point(){{{*/
 KML_Point::~KML_Point(){
 
@@ -43 +43 @@
 
 /*Other*/
-/*FUNCTION KML_Point::Echo {{{1*/
+/*FUNCTION KML_Point::Echo {{{*/
 void  KML_Point::Echo(){
 
         bool  flag=true;
 
-        _printf_(flag,"KML_Point:\n");
+        if(flag) _pprintLine_("KML_Point:");
         KML_Geometry::Echo();
 
-        _printf_(flag,"       extrude: %s\n"         ,(extrude ? "true" : "false"));
-        _printf_(flag,"       altmode: \"%s\"\n"     ,altmode);
-        _printf_(flag,"        coords: (%g,%g,%g)\n" ,coords[0],coords[1],coords[2]);
+        if(flag) _pprintLine_("       extrude: " << (extrude ? "true" : "false"));
+        if(flag) _pprintLine_("       altmode: \"" << altmode << "\"");
+        if(flag) _pprintLine_("        coords: (" << coords[0] << "," << coords[1] << "," << coords[2] << ")");
 
         return;
 }
 /*}}}*/
-/*FUNCTION KML_Point::DeepEcho {{{1*/
+/*FUNCTION KML_Point::DeepEcho {{{*/
 void  KML_Point::DeepEcho(){
 
@@ -68 +68 @@
 }
 /*}}}*/
-/*FUNCTION KML_Point::DeepEcho {{{1*/
+/*FUNCTION KML_Point::DeepEcho {{{*/
 void  KML_Point::DeepEcho(const char* indent){
 
         bool  flag=true;
 
-        _printf_(flag,"%sKML_Point:\n",indent);
+        if(flag) _pprintLine_(indent << "KML_Point:");
         KML_Geometry::DeepEcho(indent);
 
-        _printf_(flag,"%s       extrude: %s\n"         ,indent,(extrude ? "true" : "false"));
-        _printf_(flag,"%s       altmode: \"%s\"\n"     ,indent,altmode);
-        _printf_(flag,"%s        coords: (%g,%g,%g)\n" ,indent,coords[0],coords[1],coords[2]);
+        if(flag) _pprintLine_(indent << "       extrude: " << (extrude ? "true" : "false"));
+        if(flag) _pprintLine_(indent << "       altmode: \"" << altmode << "\"");
+        if(flag) _pprintLine_(indent << "        coords: (" << coords[0] << "," << coords[1] << "," << coords[2] << ")");
 
         return;
 }
 /*}}}*/
-/*FUNCTION KML_Point::Write {{{1*/
+/*FUNCTION KML_Point::Write {{{*/
 void  KML_Point::Write(FILE* filout,const char* indent){
 
@@ -103 +103 @@
 }
 /*}}}*/
-/*FUNCTION KML_Point::Read {{{1*/
+/*FUNCTION KML_Point::Read {{{*/
 void  KML_Point::Read(FILE* fid,char* kstr){
 
@@ -126 +126 @@
                 }
                 else if (!strncmp(kstri,"</",2))
-                        _error_("KML_Point::Read -- Unexpected closing tag %s.\n",kstri);
+                  {_error2_("KML_Point::Read -- Unexpected closing tag " << kstri << ".\n");}
                 else if (strncmp(kstri,"<",1))
-                        _error_("KML_Point::Read -- Unexpected field \"%s\".\n",kstri);
+                  {_error2_("KML_Point::Read -- Unexpected field \"" << kstri << "\".\n");}
 
                 else if (!strcmp(kstri,"<extrude>"))
-                        KMLFileTokenParse(&extrude   ,
-                                                          kstri,
-                                                          fid);
+                        KMLFileTokenParse(&extrude   , kstri, fid);
                 else if (!strcmp(kstri,"<altitudeMode>"))
-                        KMLFileTokenParse( altmode   ,NULL,KML_POINT_ALTMODE_LENGTH,
-                                                          kstri,
-                                                          fid);
+                        KMLFileTokenParse( altmode   ,NULL,KML_POINT_ALTMODE_LENGTH, kstri, fid);
                 else if (!strcmp(kstri,"<coordinates>"))
-                        KMLFileTokenParse(&pcoords   ,NULL,3,
-                                                          kstri,
-                                                          fid);
+                        KMLFileTokenParse(&pcoords   ,NULL,3, kstri, fid);
 
                 else if (!strncmp(kstri,"<",1))
@@ -158 +152 @@
 }
 /*}}}*/
-/*FUNCTION KML_Point::WriteExp {{{1*/
+/*FUNCTION KML_Point::WriteExp {{{*/
 void  KML_Point::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){