Changeset 16653

Timestamp:

11/07/13 09:06:28 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: better Echo formatting

Location:

issm/trunk-jpl/src/c/classes

Files:

• Inputs/BoolInput.cpp (modified) (1 diff)
• Inputs/ControlInput.cpp (modified) (1 diff)
• Inputs/DoubleInput.cpp (modified) (1 diff)
• Inputs/IntInput.cpp (modified) (1 diff)
• Inputs/PentaInput.cpp (modified) (1 diff)
• Inputs/SegInput.cpp (modified) (1 diff)
• Inputs/TriaInput.cpp (modified) (1 diff)
• Params/BoolParam.cpp (modified) (1 diff)
• Params/DoubleParam.cpp (modified) (1 diff)
• Params/FileParam.cpp (modified) (1 diff)
• Params/IntParam.cpp (modified) (1 diff)
• Params/StringParam.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Inputs/BoolInput.cpp

@@ -40 +40 @@
 void BoolInput::DeepEcho(void){
 
-        _printf_("BoolInput:\n");
-        _printf_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
-        _printf_("   value: " <<(value?"true":"false") << "\n");
+        _printf_("   BoolInput "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<(value?"true":"false") << "\n");
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Inputs/ControlInput.cpp

@@ -68 +68 @@
 
         _printf_("ControlInput:\n");
-        _printf_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
+        _printf_("   ControlInput "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<"\n");
         _printf_("---values: \n");     if (values)      values->Echo();
         _printf_("---savedvalues: \n");if (savedvalues) savedvalues->Echo();

issm/trunk-jpl/src/c/classes/Inputs/DoubleInput.cpp

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

issm/trunk-jpl/src/c/classes/Inputs/IntInput.cpp

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

issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp

@@ -50 +50 @@
 void PentaInput::DeepEcho(void){
 
-        _printf_("PentaInput:\n");
-        _printf_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
-        _printf_("   values: [");
+        _printf_("   PentaInput "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" [");
         for(int i=0;i<this->NumberofNodes();i++) _printf_(" "<<this->values[i]);
         _printf_("]\n");

issm/trunk-jpl/src/c/classes/Inputs/SegInput.cpp

@@ -50 +50 @@
 void SegInput::DeepEcho(void){
 
-        _printf_("SegInput:\n");
-        _printf_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
-        _printf_("   values: [");
+        _printf_("   SegInput "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" [");
         for(int i=0;i<this->NumberofNodes();i++) _printf_(" "<<this->values[i]);
         _printf_("]\n");

issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp

@@ -50 +50 @@
 void TriaInput::DeepEcho(void){
 
-        _printf_("TriaInput:\n");
-        _printf_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
-        _printf_("   values: [");
+        _printf_("   TriaInput "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" [");
         for(int i=0;i<this->NumberofNodes();i++) _printf_(" "<<this->values[i]);
         _printf_("]\n");

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

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

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

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

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

@@ -43 +43 @@
 void FileParam::DeepEcho(void){
 
-        _printf_("FileParam:\n");
-        _printf_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
-        _printf_("   value: " << this->value << "\n");
+        _printf_("   FileParam "<<setw(25)<<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:\n");
-        _printf_("   enum:  " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
-        _printf_("   value: " << this->value << "\n");
+        _printf_("   IntParam "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<this->value<<"\n");
 }
 /*}}}*/

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

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