add bool verbose to STEPfile class

mpictor · mpictor · commit 0173945c9b18 · 2012-07-14T17:51:02.000-04:00
Defaults to false, in which case nothing is printed unless there is an error
diff --git a/src/cleditor/STEPfile.cc b/src/cleditor/STEPfile.cc
@@ -1680,24 +1680,28 @@ Severity STEPfile::AppendFile( istream * in, bool useTechCor ) {
         return SEVERITY_INPUT_ERROR;
     }
 
-    cout << "Reading Data from " << ( ( FileName().compare( "-" ) == 0 ) ? "standard input" : FileName().c_str() ) << "...\n";
+    if( _verbose || _errorCount || _warningCount ) {
+        cout << "Reading Data from " << ( ( FileName().compare( "-" ) == 0 ) ? "standard input" : FileName().c_str() ) << "...\n";
+    }
 
     //  Read header
     rval = ReadHeader( *in );
-    cout << "\nHEADER read:";
-    if( rval < SEVERITY_WARNING ) {
-        sprintf( errbuf,
-                 "Error: non-recoverable error in reading header section. "
-                 "There were %d errors encountered. Rest of file is ignored.\n",
-                 _errorCount );
-        _error.AppendToUserMsg( errbuf );
-        return rval;
-    } else if( rval != SEVERITY_NULL ) {
-        sprintf( errbuf, "  %d  ERRORS\t  %d  WARNINGS\n\n",
-                 _errorCount, _warningCount );
-        cout << errbuf;
-    } else {
-        cout << endl;
+    if( _verbose || _errorCount || _warningCount ) {
+        cout << "\nHEADER read:";
+        if( rval < SEVERITY_WARNING ) {
+            sprintf( errbuf,
+                    "Error: non-recoverable error in reading header section. "
+                    "There were %d errors encountered. Rest of file is ignored.\n",
+                    _errorCount );
+            _error.AppendToUserMsg( errbuf );
+            return rval;
+        } else if( rval != SEVERITY_NULL ) {
+            sprintf( errbuf, "  %d  ERRORS\t  %d  WARNINGS\n\n",
+                    _errorCount, _warningCount );
+            cout << errbuf;
+        } else {
+            cout << endl;
+        }
     }
 
     if( !FindDataSection( *in ) ) {
@@ -1709,12 +1713,14 @@ Severity STEPfile::AppendFile( istream * in, bool useTechCor ) {
     _errorCount = 0;
     total_insts = ReadData1( *in );
 
-    cout << "\nFIRST PASS complete:  " << total_insts
+    if( _verbose || _errorCount || _warningCount ) {
+        cout << "\nFIRST PASS complete:  " << total_insts
          << " instances created.\n";
-    sprintf( errbuf,
-             "  %d  ERRORS\t  %d  WARNINGS\n\n",
-             _errorCount, _warningCount );
-    cout << errbuf;
+        sprintf( errbuf,
+                "  %d  ERRORS\t  %d  WARNINGS\n\n",
+                _errorCount, _warningCount );
+        cout << errbuf;
+    }
 
     //  PASS 2
     //  This would be nicer if you didn't actually have to close the
@@ -1762,13 +1768,15 @@ Severity STEPfile::AppendFile( istream * in, bool useTechCor ) {
         return _error.GreaterSeverity( SEVERITY_WARNING );
     }
 
-    cout << "\nSECOND PASS complete:  " << valid_insts
+    if( _verbose || _errorCount || _warningCount ) {
+        cout << "\nSECOND PASS complete:  " << valid_insts
          << " instances valid.\n";
-    sprintf( errbuf,
-             "  %d  ERRORS\t  %d  WARNINGS\n\n",
-             _errorCount, _warningCount );
-    _error.AppendToUserMsg( errbuf );
-    cout << errbuf;
+        sprintf( errbuf,
+                "  %d  ERRORS\t  %d  WARNINGS\n\n",
+                _errorCount, _warningCount );
+        _error.AppendToUserMsg( errbuf );
+        cout << errbuf;
+    }
 
 
     //check for "ENDSTEP;" || "END-ISO-10303-21;"
@@ -1796,7 +1804,9 @@ Severity STEPfile::AppendFile( istream * in, bool useTechCor ) {
         return _error.GreaterSeverity( SEVERITY_WARNING );
     }
     CloseInputFile( in2 );
-    cout << "Finished reading file.\n\n";
+    if( _verbose || _errorCount || _warningCount ) {
+        cout << "Finished reading file.\n\n";
+    }
     return SEVERITY_NULL;
 }
 
diff --git a/src/cleditor/STEPfile.h b/src/cleditor/STEPfile.h
@@ -86,6 +86,7 @@ class SCL_EDITOR_EXPORT STEPfile {
         int _maxErrorCount;
 
         bool _strict;       ///< If false, "missing and required" attributes are replaced with a generic value when file is read
+        bool _verbose;      ///< Defaults to false; if true, info is always printed to stdout.
 
     protected:
 
@@ -168,7 +169,7 @@ class SCL_EDITOR_EXPORT STEPfile {
         void Renumber();
 
 //constructors
-        STEPfile( Registry & r, InstMgr & i, const std::string filename = "", bool strict = true );
+        STEPfile( Registry & r, InstMgr & i, const std::string filename = "", bool strict = true, bool verbose = false );
         virtual ~STEPfile();
 
     protected:
diff --git a/src/cleditor/STEPfile.inline.cc b/src/cleditor/STEPfile.inline.cc
@@ -25,13 +25,13 @@ extern void HeaderSchemaInit( Registry & reg );
 
 //constructor & destructor
 
-STEPfile::STEPfile( Registry & r, InstMgr & i, const std::string filename, bool strict ) :
+STEPfile::STEPfile( Registry & r, InstMgr & i, const std::string filename, bool strict, bool verbose ) :
     _instances( i ), _reg( r ), _fileIdIncr( 0 ), _headerId( 0 ),
     _entsNotCreated( 0 ), _entsInvalid( 0 ), _entsIncomplete( 0 ),
     _entsWarning( 0 ), _errorCount( 0 ), _warningCount( 0 ),
-    _maxErrorCount( 5000 ), _strict( strict ),_iFileSize( 0 ),
-    _iFileCurrentPosition( 0 ), _oFileInstsWritten( 0 ),
-    _iFileStage1Done( false ) {
+    _maxErrorCount( 5000 ), _strict( strict ), _verbose( verbose ),
+    _iFileSize( 0 ), _iFileCurrentPosition( 0 ),
+    _oFileInstsWritten( 0 ), _iFileStage1Done( false ) {
     SetFileType( VERSION_CURRENT );
     SetFileIdIncrement();
     _currentDir = new DirObj( "" );
