From d1ff7e5d683647184bad6dd950fdff0a12a49c1e Mon Sep 17 00:00:00 2001
From: Konstantin LEONTEV <kleontev@ubuntu2004-01.nnov.opencascade.com>
Date: Tue, 11 Oct 2022 11:05:00 +0300
Subject: [PATCH] [bos #32517][EDF] Dynamic log messages switched on and off by
 SALOME_VERBOSE environment variable

---
 src/OCCViewer/OCCViewer_ViewWindow.cxx        |  2 +-
 src/PVViewer/PVViewer_ViewManager.cxx         |  2 +-
 src/SVTK/SVTK_ImageWriter.cxx                 | 20 +++++------
 src/SVTK/SVTK_ImageWriterMgr.cxx              | 26 +++++++--------
 src/SVTK/SVTK_Recorder.cxx                    | 33 ++++++++++---------
 src/SalomeApp/SalomeApp_ListView.cxx          |  2 +-
 .../VTKViewer_ExtractUnstructuredGrid.cxx     |  8 ++---
 7 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index c7f6cc23b..3deb777cd 100644
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -3104,7 +3104,7 @@ void OCCViewer_ViewWindow::onSketchingStarted()
 */
 void OCCViewer_ViewWindow::onSketchingFinished()
 {
-  MESSAGE("OCCViewer_ViewWindow::onSketchingFinished()")
+  MESSAGE("OCCViewer_ViewWindow::onSketchingFinished()");
   if ( mypSketcher && mypSketcher->result() == OCCViewer_ViewSketcher::Accept )
   {
     Handle(AIS_InteractiveContext) ic = myModel->getAISContext();
diff --git a/src/PVViewer/PVViewer_ViewManager.cxx b/src/PVViewer/PVViewer_ViewManager.cxx
index fae7e490a..9a223eb33 100644
--- a/src/PVViewer/PVViewer_ViewManager.cxx
+++ b/src/PVViewer/PVViewer_ViewManager.cxx
@@ -44,7 +44,7 @@
 PVViewer_ViewManager::PVViewer_ViewManager(SUIT_Study* study, SUIT_Desktop* desktop)
 : SUIT_ViewManager( study, desktop, new PVViewer_Viewer() )
 {
-  MESSAGE("PVViewer - view manager created ...")
+  MESSAGE("PVViewer - view manager created ...");
   setTitle( tr( "PARAVIEW_VIEW_TITLE" ) );
 
   // Initialize minimal paraview stuff (if not already done)
diff --git a/src/SVTK/SVTK_ImageWriter.cxx b/src/SVTK/SVTK_ImageWriter.cxx
index 2d52dff70..b56b125a9 100644
--- a/src/SVTK/SVTK_ImageWriter.cxx
+++ b/src/SVTK/SVTK_ImageWriter.cxx
@@ -19,6 +19,8 @@
 
 #include "SVTK_ImageWriter.h"
 
+#include "utilities.h"
+
 #include <QSemaphore>
 
 #include <vtkAlgorithm.h>
@@ -27,12 +29,6 @@
 #include <vtkJPEGWriter.h>
 #include <vtkSmartPointer.h>
 
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
-
 
 //----------------------------------------------------------------------------
 SVTK_ImageWriter
@@ -55,7 +51,8 @@ SVTK_ImageWriter
 SVTK_ImageWriter
 ::~SVTK_ImageWriter()
 {
-  if(MYDEBUG) cout<<"SVTK_ImageWriter::~SVTK_ImageWriter - this = "<<this<<endl;
+  if(SALOME::VerbosityActivated())
+    cout << "SVTK_ImageWriter::~SVTK_ImageWriter - this = " << this << endl;
 }
 
 
@@ -101,10 +98,11 @@ SVTK_ImageWriter
   aWriter->Delete();
   myImageData->Delete();
 
-  if(MYDEBUG) cout<<"SVTK_ImageWriter::run "<<
-                "- this = "<<this<<
-                //"; total = "<<mySemaphore->total()<<
-                "; available = "<<mySemaphore->available()<<endl;
+  if(SALOME::VerbosityActivated())
+    cout << "SVTK_ImageWriter::run - this = " << this <<
+    //"; total = "<<mySemaphore->total()<<
+    "; available = " << mySemaphore->available() << endl;
+    
   mySemaphore->release();
 }
 
diff --git a/src/SVTK/SVTK_ImageWriterMgr.cxx b/src/SVTK/SVTK_ImageWriterMgr.cxx
index 4255c474a..af662569e 100644
--- a/src/SVTK/SVTK_ImageWriterMgr.cxx
+++ b/src/SVTK/SVTK_ImageWriterMgr.cxx
@@ -20,6 +20,8 @@
 #include "SVTK_ImageWriterMgr.h"
 #include "SVTK_ImageWriter.h"
 
+#include "utilities.h"
+
 #include <vtkAlgorithm.h>
 #include <vtkImageData.h>
 
@@ -27,13 +29,6 @@
 
 #include <limits>
 
-
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
-
 //----------------------------------------------------------------------------
 SVTK_ImageWriterMgr
 ::SVTK_ImageWriterMgr()
@@ -41,9 +36,8 @@ SVTK_ImageWriterMgr
   int aMax = std::numeric_limits<int>::max() / 2;
   mySemaphore = new QSemaphore(aMax);
   mySemaphore->acquire( aMax );
-  if(MYDEBUG) cout<<"SVTK_ImageWriterMgr::SVTK_ImageWriterMgr "<<
-                //"- total = "<<mySemaphore->total()<<
-                "; available = "<<mySemaphore->available()<<endl;
+  if(SALOME::VerbosityActivated())
+    cout << "SVTK_ImageWriterMgr::SVTK_ImageWriterMgr; available = " << mySemaphore->available() << endl;
 }
 
 
@@ -84,10 +78,14 @@ void
 SVTK_ImageWriterMgr
 ::Stop()
 {
-  if(MYDEBUG) cout<<"SVTK_ImageWriterMgr::Stop "<<
-                //"- total = "<<mySemaphore->total()<<
-                "; available = "<<mySemaphore->available()<<endl;
-  if(MYDEBUG) cout<<"SVTK_ImageWriterMgr::Stop - *mySemaphore += "<<myThreads.size()<<endl;
+  if(SALOME::VerbosityActivated())
+    cout << "SVTK_ImageWriterMgr::Stop " <<
+    //"- total = "<<mySemaphore->total()<<
+    "; available = " << mySemaphore->available() << endl;
+
+  if(SALOME::VerbosityActivated())
+    cout << "SVTK_ImageWriterMgr::Stop - *mySemaphore += " << myThreads.size() << endl;
+    
   mySemaphore->acquire( (int)myThreads.size() ); //!< TODO: conversion from size_t to int
 
   for(size_t anId = 0, anEnd = myThreads.size(); anId < anEnd; anId++){
diff --git a/src/SVTK/SVTK_Recorder.cxx b/src/SVTK/SVTK_Recorder.cxx
index e7ee680d7..b4ec61b7f 100644
--- a/src/SVTK/SVTK_Recorder.cxx
+++ b/src/SVTK/SVTK_Recorder.cxx
@@ -44,13 +44,7 @@
 #include <QFileInfo>
 #include <QDir>
 
-//#include "utilities.h"
-
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
+#include "utilities.h"
 
 
 namespace
@@ -313,7 +307,9 @@ SVTK_Recorder
   myPaused = myPaused ? 0 : 1;
   if(myPaused && !myFrameIndexes.empty()){
     myFrameIndexes.back() *= -1;
-    if(MYDEBUG) cout<<"SVTK_Recorder::Pause - myFrameIndexes.back() = "<<myFrameIndexes.back()<<endl;
+
+    if(SALOME::VerbosityActivated())
+      cout << "SVTK_Recorder::Pause - myFrameIndexes.back() = " << myFrameIndexes.back() << endl;
   }
 }
 
@@ -349,9 +345,11 @@ SVTK_Recorder
     if(aLastFrameIndex < 0){
       myFrameIndexes.back() = abs(myFrameIndexes.back());
       double aPauseTime = fabs((double)(aFrameIndex - myFrameIndex - 1)) / myNbFPS;
-      if(MYDEBUG)
-        cout<<"SVTK_Recorder::DoRecord - aFrameIndex = "<<aFrameIndex<<
-          "; aPauseTime = "<<aPauseTime<<endl;
+
+      if(SALOME::VerbosityActivated())
+        cout << "SVTK_Recorder::DoRecord - aFrameIndex = " << aFrameIndex <<
+        "; aPauseTime = " << aPauseTime << endl;
+
       myTimeStart += aPauseTime;
     }
 
@@ -363,7 +361,8 @@ SVTK_Recorder
   }
 
   myFrameIndexes.push_back(myFrameIndex);
-  if(MYDEBUG) cout<<"SVTK_Recorder::DoRecord - myFrameIndex = "<<myFrameIndex<<endl;
+  if(SALOME::VerbosityActivated())
+    cout << "SVTK_Recorder::DoRecord - myFrameIndex = " << myFrameIndex << endl;
 
   myRenderWindow->RemoveObserver(myCommand);
   myFilter->Modified();
@@ -445,7 +444,8 @@ SVTK_Recorder
     }
     std::string aString(aStream.str());
     system(aString.c_str());
-    if(MYDEBUG) cout<<"SVTK_Recorder::AddSkippedFrames - "<<aString<<endl;
+    if(SALOME::VerbosityActivated())
+      cout << "SVTK_Recorder::AddSkippedFrames - " << aString << endl;
   }
 }
 
@@ -471,7 +471,8 @@ SVTK_Recorder
   std::string aString(aStream.str());
   myErrorStatus = system(aString.c_str());
 
-  if(MYDEBUG) cout<<"SVTK_Recorder::MakeFileAVI - "<<aString<<endl;
+  if(SALOME::VerbosityActivated())
+    cout << "SVTK_Recorder::MakeFileAVI - " << aString << endl;
 
   QFileInfo aFileInfo(myName.c_str());
   QString aDirPath = aFileInfo.absoluteDir().path();
@@ -491,6 +492,8 @@ SVTK_Recorder
 	") & (for /f %i in (" + tmpFile + ") do (del \"%i\")) & (del " + tmpFile + "))) > NUL";
 #endif
 
-  if(MYDEBUG) cout<<"SVTK_Recorder::MakeFileAVI - "<<(const char*)aCommand.toUtf8()<<endl;
+  if(SALOME::VerbosityActivated())
+    cout << "SVTK_Recorder::MakeFileAVI - " << (const char*)aCommand.toUtf8() << endl;
+    
   system((const char*)aCommand.toUtf8());
 }
diff --git a/src/SalomeApp/SalomeApp_ListView.cxx b/src/SalomeApp/SalomeApp_ListView.cxx
index a2f0984c5..7d2c9276d 100644
--- a/src/SalomeApp/SalomeApp_ListView.cxx
+++ b/src/SalomeApp/SalomeApp_ListView.cxx
@@ -812,7 +812,7 @@ UpdateType SalomeApp_ListViewItem::finishEditing(SalomeApp_EntityEdit* theWidget
     }
   }
   catch (...) {
-    MESSAGE( "System error has been caught - SalomeApp_ListViewItem::finishEditing" )
+    MESSAGE( "System error has been caught - SalomeApp_ListViewItem::finishEditing" );
   }
   return aNeedsUpdate;
 }
diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
index 4a33aadd7..0cc0d1883 100644
--- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
+++ b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
@@ -390,13 +390,13 @@ int VTKViewer_ExtractUnstructuredGrid::RequestData(vtkInformation *vtkNotUsed(re
       cellTypesVec[ *type ] = *type;
   }
 
-/*  if(MYDEBUG){
+/*  
     MESSAGE("Execute - anInput->GetNumberOfCells() = "<<anInput->GetNumberOfCells());
     MESSAGE("Execute - myCellTypes.size() = "<<myCellTypes.size());
     MESSAGE("Execute - myCellIds.size() = "<<myCellIds.size());
     MESSAGE("Execute - myExtractionMode = "<<myExtractionMode);
     MESSAGE("Execute - myChangeMode = "<<myChangeMode);
-  }*/
+*/
   vtkIdType aNbElems = 0;
   if(myExtractionMode == eCells)
   {
@@ -618,12 +618,12 @@ int VTKViewer_ExtractUnstructuredGrid::RequestData(vtkInformation *vtkNotUsed(re
     myPassAll = true;
     TVectorId().swap( myOut2InId );
   }
-/*  if(MYDEBUG){
+/*
     MESSAGE("Execute - anOutput->GetNumberOfCells() = "<<anOutput->GetNumberOfCells());
     if(myStoreMapping){
       MESSAGE("Execute - myOut2InId.size() = "<<myOut2InId.size());
       MESSAGE("Execute - myIn2OutId.size() = "<<myIn2OutId.size());
     }
-  }*/
+*/
   return 1;
 }
-- 
2.39.2