Changeset 12706 for issm/trunk/src/c/objects/KML/KML_MultiGeometry.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_MultiGeometry.cpp (modified) (11 diffs)

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

@@ -4 +4 @@
 
 /*Headers:*/
-/*{{{1*/
+/*{{{*/
 #ifdef HAVE_CONFIG_H
         #include <config.h>
@@ -21 +21 @@
 
 /*Constructors/destructor/copy*/
-/*FUNCTION KML_MultiGeometry::KML_MultiGeometry(){{{1*/
+/*FUNCTION KML_MultiGeometry::KML_MultiGeometry(){{{*/
 KML_MultiGeometry::KML_MultiGeometry(){
 
@@ -28 +28 @@
 }
 /*}}}*/
-/*FUNCTION KML_MultiGeometry::~KML_MultiGeometry(){{{1*/
+/*FUNCTION KML_MultiGeometry::~KML_MultiGeometry(){{{*/
 KML_MultiGeometry::~KML_MultiGeometry(){
 
@@ -40 +40 @@
 
 /*Other*/
-/*FUNCTION KML_MultiGeometry::Echo {{{1*/
+/*FUNCTION KML_MultiGeometry::Echo {{{*/
 void  KML_MultiGeometry::Echo(){
 
         bool  flag=true;
 
-        _printf_(flag,"KML_Multigeometry:\n");
+        if(flag) _pprintLine_("KML_Multigeometry:");
         KML_Geometry::Echo();
 
-        _printf_(flag,"      geometry: (size=%d)\n" ,geometry->Size());
-
-        return;
-}
-/*}}}*/
-
-/*FUNCTION KML_MultiGeometry::DeepEcho {{{1*/
+        if(flag) _pprintLine_("      geometry: (size=" << geometry->Size() << ")");
+
+        return;
+}
+/*}}}*/
+/*FUNCTION KML_MultiGeometry::DeepEcho {{{*/
 void  KML_MultiGeometry::DeepEcho(){
 
@@ -64 +63 @@
 }
 /*}}}*/
-
-/*FUNCTION KML_MultiGeometry::DeepEcho {{{1*/
+/*FUNCTION KML_MultiGeometry::DeepEcho {{{*/
 void  KML_MultiGeometry::DeepEcho(const char* indent){
 
@@ -72 +70 @@
         bool  flag=true;
 
-        _printf_(flag,"%sKML_Multigeometry:\n",indent);
+        if(flag) _pprintLine_(indent << "KML_Multigeometry:");
         KML_Geometry::DeepEcho(indent);
 
@@ -82 +80 @@
         if (geometry->Size())
                 for (i=0; i<geometry->Size(); i++) {
-                        _printf_(flag,"%s      geometry: -------- begin [%d] --------\n" ,indent,i);
+                        if(flag) _pprintLine_(indent << "      geometry: -------- begin [" << i << "] --------");
                         ((KML_Geometry *)geometry->GetObjectByOffset(i))->DeepEcho(indent2);
-                        _printf_(flag,"%s      geometry: --------  end  [%d] --------\n" ,indent,i);
+                        if(flag) _pprintLine_(indent << "      geometry: --------  end  [" << i << "] --------");
                 }
         else
-                _printf_(flag,"%s      geometry: [empty]\n"    ,indent);
-
-        return;
-}
-/*}}}*/
-
-/*FUNCTION KML_MultiGeometry::Write {{{1*/
+                if(flag) _pprintLine_(indent << "      geometry: [empty]");
+
+        return;
+}
+/*}}}*/
+/*FUNCTION KML_MultiGeometry::Write {{{*/
 void  KML_MultiGeometry::Write(FILE* filout,const char* indent){
 
@@ -120 +117 @@
 }
 /*}}}*/
-
-/*FUNCTION KML_MultiGeometry::Read {{{1*/
+/*FUNCTION KML_MultiGeometry::Read {{{*/
 void  KML_MultiGeometry::Read(FILE* fid,char* kstr){
 
@@ -144 +140 @@
                 }
                 else if (!strncmp(kstri,"</",2))
-                        _error_("KML_MultiGeometry::Read -- Unexpected closing tag %s.\n",kstri);
+                  {_error2_("KML_MultiGeometry::Read -- Unexpected closing tag " << kstri << ".\n");}
                 else if (strncmp(kstri,"<",1))
-                        _error_("KML_MultiGeometry::Read -- Unexpected field \"%s\".\n",kstri);
+                  {_error2_("KML_MultiGeometry::Read -- Unexpected field \"" << kstri << "\".\n");}
 
                 else if (!strncmp(kstri,"<Point", 6)) {
@@ -193 +189 @@
 }
 /*}}}*/
-
-/*FUNCTION KML_MultiGeometry::WriteExp {{{1*/
+/*FUNCTION KML_MultiGeometry::WriteExp {{{*/
 void  KML_MultiGeometry::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){
 
@@ -207 +202 @@
 }
 /*}}}*/
-