From 0fb79a105b0a07b04479ad190861aede8ac4c345 Mon Sep 17 00:00:00 2001 From: Konstantin LEONTEV Date: Tue, 15 Nov 2022 09:20:12 +0300 Subject: [PATCH] [bos #32517][EDF] Dynamic log messages switched on and off by SALOME_VERBOSE environment variable --- src/HOMARD/HOMARD_Iteration.cxx | 2 +- src/HOMARDGUI/HOMARDGUI.cxx | 12 ++++++------ src/HOMARDGUI/MonCreateBoundaryAn.cxx | 18 +++++++++--------- src/HOMARDGUI/MonCreateHypothesis.cxx | 6 +++--- src/HOMARDGUI/MonCreateListGroup.cxx | 2 +- src/HOMARDGUI/MonCreateListGroupCAO.cxx | 2 +- src/HOMARDGUI/MonCreateZone.cxx | 16 ++++++++-------- src/HOMARDGUI/MonEditFile.cxx | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/HOMARD/HOMARD_Iteration.cxx b/src/HOMARD/HOMARD_Iteration.cxx index 2e533bd1..6a94e38a 100644 --- a/src/HOMARD/HOMARD_Iteration.cxx +++ b/src/HOMARD/HOMARD_Iteration.cxx @@ -255,7 +255,7 @@ void HOMARD_Iteration::SetFieldInterpTimeStep( const char* FieldInterp, int Time //============================================================================= void HOMARD_Iteration::SetFieldInterpTimeStepRank( const char* FieldInterp, int TimeStep, int Rank ) { - MESSAGE("Champ " << FieldInterp << ", hypothese " << _NomHypo ) + MESSAGE("Champ " << FieldInterp << ", hypothese " << _NomHypo ); // Verification de la presence du champ dans l'hypothese std::list::iterator it = find( _ListFieldInterp.begin(), _ListFieldInterp.end(), FieldInterp ); if ( it == _ListFieldInterp.end() ) diff --git a/src/HOMARDGUI/HOMARDGUI.cxx b/src/HOMARDGUI/HOMARDGUI.cxx index 956a5270..e5c07103 100644 --- a/src/HOMARDGUI/HOMARDGUI.cxx +++ b/src/HOMARDGUI/HOMARDGUI.cxx @@ -181,7 +181,7 @@ void HOMARDGUI::createActions(){ //================================================ void HOMARDGUI::createPreferences() { - MESSAGE("createPreferences") + MESSAGE("createPreferences"); int Onglet, Bloc, Pref ; // 1. Generalites @@ -233,7 +233,7 @@ void HOMARDGUI::createPreferences() //================================================ void HOMARDGUI::createMenus() { - MESSAGE("createMenus") + MESSAGE("createMenus"); // int HOMARD_Id = createMenu( tr( "HOM_MEN_HOMARD" ), -1, 5, 10 ); createMenu( 1101, HOMARD_Id, -1 ); //Create_Case @@ -349,7 +349,7 @@ void HOMARDGUI::recupPreferences() void HOMARDGUI::OnGUIEvent() //================================================ { - MESSAGE("OnGUIEvent()") + MESSAGE("OnGUIEvent()"); setOrb(); const QObject* obj = sender(); if ( !obj || !obj->inherits( "QAction" ) ) { return; } @@ -618,7 +618,7 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID) case 1301: // Information sur un maillage { - MESSAGE("etape 1301") + MESSAGE("etape 1301"); MESSAGE("command " << theCommandID << " activated"); MonMeshInfo *aDlg = new MonMeshInfo( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ; aDlg->show(); @@ -639,7 +639,7 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID) case 1401: // Création d'un schema YACS { - MESSAGE("etape 1401") + MESSAGE("etape 1401"); MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); MonCreateYACS *aDlg = new MonCreateYACS( true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ; aDlg->show(); @@ -648,7 +648,7 @@ bool HOMARDGUI::OnGUIEvent (int theCommandID) case 1402: // Ecriture d'un schéma YACS { - MESSAGE("etape 1402") + MESSAGE("etape 1402"); MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); try { homardGen->YACSWrite(_ObjectName.toStdString().c_str()); } catch( SALOME::SALOME_Exception& S_ex ) diff --git a/src/HOMARDGUI/MonCreateBoundaryAn.cxx b/src/HOMARDGUI/MonCreateBoundaryAn.cxx index 12f8ef74..0e0fe382 100644 --- a/src/HOMARDGUI/MonCreateBoundaryAn.cxx +++ b/src/HOMARDGUI/MonCreateBoundaryAn.cxx @@ -543,7 +543,7 @@ void MonCreateBoundaryAn::SetNewName() void MonCreateBoundaryAn::SetCylinder() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetCylinder") + MESSAGE("Debut de SetCylinder"); gBCylindre->setVisible(1); gBSphere->setVisible(0); gBCone->setVisible(0); @@ -558,7 +558,7 @@ void MonCreateBoundaryAn::SetCylinder() void MonCreateBoundaryAn::SetSphere() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetSphere") + MESSAGE("Debut de SetSphere"); gBCylindre->setVisible(0); gBSphere->setVisible(1); gBCone->setVisible(0); @@ -573,7 +573,7 @@ void MonCreateBoundaryAn::SetSphere() void MonCreateBoundaryAn::SetConeR() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetConeR") + MESSAGE("Debut de SetConeR"); // // Stockage et conversion des valeurs si elles ont change if ((_BoundaryAnXaxisCone != SpinBox_Cone_X1->value()) || @@ -584,7 +584,7 @@ void MonCreateBoundaryAn::SetConeR() (_BoundaryAnZorigCone != SpinBox_Cone_Z2->value()) || (_BoundaryAngle != SpinBox_Cone_V1->value()) ) { - MESSAGE("Stockage et conversion") + MESSAGE("Stockage et conversion"); _BoundaryAnXaxisCone = SpinBox_Cone_X1->value() ; _BoundaryAnYaxisCone = SpinBox_Cone_Y1->value() ; _BoundaryAnZaxisCone = SpinBox_Cone_Z1->value() ; @@ -627,7 +627,7 @@ void MonCreateBoundaryAn::SetConeR() void MonCreateBoundaryAn::SetConeA() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetConeA") + MESSAGE("Debut de SetConeA"); // Stockage et conversion des valeurs si elles ont change if ((_BoundaryAnXcone1 != SpinBox_Cone_X1->value()) || (_BoundaryAnYcone1 != SpinBox_Cone_Y1->value()) || @@ -638,7 +638,7 @@ void MonCreateBoundaryAn::SetConeA() (_BoundaryAnZcone2 != SpinBox_Cone_Z2->value()) || (_BoundaryAnRayon2 != SpinBox_Cone_V2->value()) ) { - MESSAGE("Stockage et conversion") + MESSAGE("Stockage et conversion"); _BoundaryAnXcone1 = SpinBox_Cone_X1->value() ; _BoundaryAnYcone1 = SpinBox_Cone_Y1->value() ; _BoundaryAnZcone1 = SpinBox_Cone_Z1->value() ; @@ -681,7 +681,7 @@ void MonCreateBoundaryAn::SetConeA() void MonCreateBoundaryAn::SetCone() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetCone") + MESSAGE("Debut de SetCone"); gBCylindre->setVisible(0); gBSphere->setVisible(0); gBCone->setVisible(1); @@ -703,7 +703,7 @@ void MonCreateBoundaryAn::SetCone() void MonCreateBoundaryAn::SetTore() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetTore") + MESSAGE("Debut de SetTore"); gBCylindre->setVisible(0); gBSphere->setVisible(0); gBCone->setVisible(0); @@ -721,7 +721,7 @@ void MonCreateBoundaryAn::convertRayonAngle(int option) // par deux rayons ou avec un axe et un angle. // Voir sfcoi1 de HOMARD { - MESSAGE("Debut de convertRayonAngle, option = "<show(); } @@ -325,7 +325,7 @@ void MonCreateHypothesis::PushZoneNew() void MonCreateHypothesis::PushZoneEdit() // ------------------------------------------------------------------------ { - MESSAGE("Debut de MonCreateHypothesis::PushZoneEdit") + MESSAGE("Debut de MonCreateHypothesis::PushZoneEdit"); int colonne = TWZone->currentColumn(); QTableWidgetItem * monItem = TWZone->currentItem(); if (colonne !=2 || monItem == NULL) @@ -346,7 +346,7 @@ void MonCreateHypothesis::GetAllZones() // et affichage dans le tableau // Par defaut, aucune n'est selectionnee { - MESSAGE("Debut de GetAllZones") ; + MESSAGE("Debut de GetAllZones"); HOMARD::listeZones_var mesZones = myHomardGen->GetAllZonesName(); int nbrow=TWZone->rowCount(); for ( int row=0; row< nbrow; row++) diff --git a/src/HOMARDGUI/MonCreateListGroup.cxx b/src/HOMARDGUI/MonCreateListGroup.cxx index 8bac4405..f7d619a2 100644 --- a/src/HOMARDGUI/MonCreateListGroup.cxx +++ b/src/HOMARDGUI/MonCreateListGroup.cxx @@ -47,7 +47,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate _parentHyp(parentHyp), _parentBound(parentBound) { - MESSAGE("Debut de MonCreateListGroup") + MESSAGE("Debut de MonCreateListGroup"); myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); setupUi(this); setModal(modal); diff --git a/src/HOMARDGUI/MonCreateListGroupCAO.cxx b/src/HOMARDGUI/MonCreateListGroupCAO.cxx index 799cb02c..21888e85 100644 --- a/src/HOMARDGUI/MonCreateListGroupCAO.cxx +++ b/src/HOMARDGUI/MonCreateListGroupCAO.cxx @@ -47,7 +47,7 @@ MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, Mon _parentHyp(parentHyp), _parentBound(parentBound) { - MESSAGE("Debut de MonCreateListGroupCAO") + MESSAGE("Debut de MonCreateListGroupCAO"); myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); setupUi(this); setModal(modal); diff --git a/src/HOMARDGUI/MonCreateZone.cxx b/src/HOMARDGUI/MonCreateZone.cxx index 75a2ba93..1fe477c8 100644 --- a/src/HOMARDGUI/MonCreateZone.cxx +++ b/src/HOMARDGUI/MonCreateZone.cxx @@ -623,7 +623,7 @@ void MonCreateZone::SetNewName() void MonCreateZone::SetBox() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetBox") + MESSAGE("Debut de SetBox"); gBBox->setVisible(1) ; gBSphere->setVisible(0) ; gBCylindre->setVisible(0) ; @@ -641,13 +641,13 @@ void MonCreateZone::SetBox() if ( _Zincr > 0 ) { SpinBox_Zmini->setValue(_Zcentre-10*_Zincr) ; SpinBox_Zmaxi->setValue(_Zcentre+10*_Zincr) ; } else { _Type=11 ; } - MESSAGE("Fin de SetBox") + MESSAGE("Fin de SetBox"); } // ------------------------------------------------------------------------ void MonCreateZone::SetSphere() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetSphere") + MESSAGE("Debut de SetSphere"); gBBox->setVisible(0) ; gBSphere->setVisible(1) ; gBCylindre->setVisible(0) ; @@ -658,13 +658,13 @@ void MonCreateZone::SetSphere() SpinBox_Ycentre->setValue(_Ycentre) ; SpinBox_Zcentre->setValue(_Zcentre) ; SpinBox_Rayon->setValue(_Rayon) ; - MESSAGE("Fin de SetSphere") + MESSAGE("Fin de SetSphere"); } // ------------------------------------------------------------------------ void MonCreateZone::SetCylinder() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetCylinder") + MESSAGE("Debut de SetCylinder"); gBBox->setVisible(0) ; gBSphere->setVisible(0) ; gBCylindre->setVisible(1) ; @@ -682,13 +682,13 @@ void MonCreateZone::SetCylinder() else { _Type=31 ; } SpinBox_Radius->setValue(_Rayon) ; SpinBox_Haut->setValue(_Haut) ; - MESSAGE("Fin de SetCylinder") + MESSAGE("Fin de SetCylinder"); } // ------------------------------------------------------------------------ void MonCreateZone::SetPipe() // ------------------------------------------------------------------------ { - MESSAGE("Debut de SetPipe") + MESSAGE("Debut de SetPipe"); gBBox->setVisible(0) ; gBSphere->setVisible(0) ; gBCylindre->setVisible(0) ; @@ -707,7 +707,7 @@ void MonCreateZone::SetPipe() SpinBox_Radius_int->setValue(_RayonInt) ; SpinBox_Radius_ext->setValue(_Rayon) ; SpinBox_Haut_p->setValue(_Haut) ; - MESSAGE("Fin de SetPipe") + MESSAGE("Fin de SetPipe"); } diff --git a/src/HOMARDGUI/MonEditFile.cxx b/src/HOMARDGUI/MonEditFile.cxx index c6e972b6..5cd60aa0 100644 --- a/src/HOMARDGUI/MonEditFile.cxx +++ b/src/HOMARDGUI/MonEditFile.cxx @@ -110,7 +110,7 @@ void MonEditFile::EditText() void MonEditFile::PushOnPrint() // ------------------------------------------------------------------------ { - MESSAGE("Debut de MonEditFile::PushOnPrint") + MESSAGE("Debut de MonEditFile::PushOnPrint"); QMessageBox::warning( 0, QObject::tr("HOM_WARNING"), QObject::tr("HOM_INACTIVE_BUTTON") ); return; -- 2.30.2