Changeset 16655

Timestamp:

11/07/13 09:21:49 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: even better formatting

Location:

issm/trunk-jpl/src/c/classes/Params

Files:

• BoolParam.cpp (modified) (1 diff)
• DataSetParam.cpp (modified) (1 diff)
• DoubleParam.cpp (modified) (1 diff)
• DoubleVecParam.cpp (modified) (2 diffs)
• FileParam.cpp (modified) (1 diff)
• IntParam.cpp (modified) (1 diff)
• StringArrayParam.cpp (modified) (1 diff)
• StringParam.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Params/BoolParam.cpp

@@ -42 +42 @@
 /*FUNCTION BoolParam::DeepEcho{{{*/
 void BoolParam::DeepEcho(void){
-
-        _printf_("   BoolParam "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<(value?"true":"false")<<"\n");
+        _printf_(setw(22)<<"   BoolParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<(value?"true":"false")<<"\n");
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Params/DataSetParam.cpp

@@ -44 +44 @@
 void DataSetParam::DeepEcho(void){
 
-        _printf_("DataSetParam:\n");
-        _printf_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
+        _printf_(setw(22)<<"   DataSetParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" ----- begin\n");
         this->value->Echo();
+        _printf_(setw(22)<<"   DataSetParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" ----- end\n");
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Params/DoubleParam.cpp

@@ -40 +40 @@
 void DoubleParam::DeepEcho(void){
 
-        _printf_("   DoubleParam "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
+        _printf_(setw(22)<<"   DoubleParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Params/DoubleVecParam.cpp

@@ -42 +42 @@
 void DoubleVecParam::Echo(void){
 
-        _printf_("DoubleVecParam:\n");
-        _printf_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
-        _printf_("   vector size: " << this->M << "\n");
+        _printf_(setw(22)<<"   DoubleVecParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" size: "<<this->M<<"\n");
 
 }
@@ -50 +48 @@
 /*FUNCTION DoubleVecParam::DeepEcho{{{*/
 void DoubleVecParam::DeepEcho(void){
-
-        int i;
-
-        _printf_("DoubleVecParam:\n");
-        _printf_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
-        _printf_("   vector size: " << this->M << "\n");
-        for(i=0;i<this->M;i++){
-                _printf_(i << " " << this->values[i] << "\n");
-        }
+        _printf_(setw(22)<<"   DoubleVecParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<"[");
+        for(int i=0;i<this->M;i++) _printf_(" "<< this->values[i]);
+        _printf_("\n");
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Params/FileParam.cpp

@@ -43 +43 @@
 void FileParam::DeepEcho(void){
 
-        _printf_("   FileParam "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
+        _printf_(setw(22)<<"   FileParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Params/IntParam.cpp

@@ -43 +43 @@
 void IntParam::DeepEcho(void){
 
-        _printf_("   IntParam "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
+        _printf_(setw(22)<<"   IntParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Params/StringArrayParam.cpp

@@ -67 +67 @@
 void StringArrayParam::DeepEcho(void){
 
-        int i;
-        char* string=NULL;
-
-        _printf_("StringArrayParam:\n");
-        _printf_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
-        for(i=0;i<this->numstrings;i++){
-                string=this->value[i];
-                _printf_("   " << i << ": " << string << "\n");
-        }
+        _printf_(setw(22)<<"   StringArrayParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" {");
+        for(int i=0;i<this->numstrings;i++) _printf_(" '"<<this->value[i]<<"'");
+        _printf_("}\n");
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Params/StringParam.cpp

@@ -44 +44 @@
 /*FUNCTION StringParam::DeepEcho{{{*/
 void StringParam::DeepEcho(void){
-        _printf_("   StringParam "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
+        _printf_(setw(22)<<"   StringParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
 }
 /*}}}*/