[bos #32517][EDF] Dynamic log messages switched on and off by SALOME_VERBOSE environment variable

This commit is contained in:
jfa 2022-10-27 16:31:43 +03:00 committed by Konstantin LEONTEV
parent 66be812a4e
commit 888b3b52e1
14 changed files with 115 additions and 156 deletions

View File

@ -88,7 +88,7 @@ void VolumeSection::CenterOfGravity()
TopoDS_Face F = TopoDS::Face(ex.Current()); TopoDS_Face F = TopoDS::Face(ex.Current());
Handle(Poly_Triangulation) Tr = BRep_Tool::Triangulation(F, L); Handle(Poly_Triangulation) Tr = BRep_Tool::Triangulation(F, L);
if(Tr.IsNull()) if(Tr.IsNull())
MESSAGE("Error, null layer" ) MESSAGE("Error, null layer" );
nbNodes = Tr->NbNodes(); nbNodes = Tr->NbNodes();
const TColgp_Array1OfPnt& Nodes = Tr->Nodes(); const TColgp_Array1OfPnt& Nodes = Tr->Nodes();
@ -113,8 +113,8 @@ void VolumeSection::CenterOfGravity()
} }
} }
// Creation du point d'initialisation, c'est € dire le centre de gravit‰ // Creation du point d'initialisation, c'est e dire le centre de gravite
//g‰om‰trique de la boite englobante // geometrique de la boite englobante
InitPoint.SetX(0.5 * (Xmin + Xmax)); InitPoint.SetX(0.5 * (Xmin + Xmax));
InitPoint.SetY(0.5 * (Ymin + Ymax)); InitPoint.SetY(0.5 * (Ymin + Ymax));
@ -141,14 +141,14 @@ Standard_Real VolumeSection::CalculateVolume(Standard_Real Elevation)
TopoDS_Face F = TopoDS::Face(ex.Current()); TopoDS_Face F = TopoDS::Face(ex.Current());
Handle(Poly_Triangulation) Tr = BRep_Tool::Triangulation(F, L); Handle(Poly_Triangulation) Tr = BRep_Tool::Triangulation(F, L);
if(Tr.IsNull()) if(Tr.IsNull())
MESSAGE("Error, null layer" ) MESSAGE("Error, null layer" );
const Poly_Array1OfTriangle& triangles = Tr->Triangles(); const Poly_Array1OfTriangle& triangles = Tr->Triangles();
Standard_Integer nbTriangles = Tr->NbTriangles(); Standard_Integer nbTriangles = Tr->NbTriangles();
//nbNodes = Tr->NbNodes(); //nbNodes = Tr->NbNodes();
const TColgp_Array1OfPnt& Nodes = Tr->Nodes(); const TColgp_Array1OfPnt& Nodes = Tr->Nodes();
// Calcul des volumes de chaque triangle, de chaque face // Calcul des volumes de chaque triangle, de chaque face
//en tenant compte des triangles coup‰s par le plan de section // en tenant compte des triangles coupes par le plan de section
for (i=1;i<=nbTriangles;i++) for (i=1;i<=nbTriangles;i++)
{ {
@ -234,7 +234,7 @@ Standard_Real VolumeSection::Archimede(Standard_Real Constante , Standard_Real E
Bsup = Zmax; Bsup = Zmax;
if(Binf>Bsup) if(Binf>Bsup)
{ {
MESSAGE("error, Bound + < Bound - in dichotomy") MESSAGE("error, Bound + < Bound - in dichotomy");
return -1; return -1;
} }
tempBsupVolume = CalculateVolume(Bsup); tempBsupVolume = CalculateVolume(Bsup);
@ -242,7 +242,7 @@ Standard_Real VolumeSection::Archimede(Standard_Real Constante , Standard_Real E
if (Constante>tempBsupVolume || Constante<tempBinfVolume) if (Constante>tempBsupVolume || Constante<tempBinfVolume)
{ {
MESSAGE("error, algorithm start Impossible. Wrong constant value" ) MESSAGE("error, algorithm start Impossible. Wrong constant value" );
return -1; return -1;
} }
@ -286,7 +286,7 @@ Standard_Real VolumeSection::Archimede(Standard_Real Constante , Standard_Real E
} }
endMethod: endMethod:
MESSAGE("La ligne de flottaison correspondant a la constante :"<<Constante<<" est a la cote Z = "<<c) MESSAGE("La ligne de flottaison correspondant a la constante :"<<Constante<<" est a la cote Z = "<<c);
return c; return c;
} }
@ -372,7 +372,7 @@ gp_Pnt VolumeSection::Intersection(gp_Pnt P1,gp_Pnt P2,Standard_Real Hauteur)
return Point; return Point;
} }
//Fonction calculant le volume ‰l‰mentaire de chaque t‰traedre € partir de 3 points // Fonction calculant le volume elementaire de chaque tetraedre e partir de 3 points
Standard_Real VolumeSection::ElementaryVolume(gp_Pnt P1,gp_Pnt P2,gp_Pnt P3) Standard_Real VolumeSection::ElementaryVolume(gp_Pnt P1,gp_Pnt P2,gp_Pnt P3)
{ {
Standard_Real Determinant; Standard_Real Determinant;

View File

@ -352,7 +352,7 @@ bool EntityGUI::OnMouseMove( QMouseEvent* pe, SUIT_Desktop* /*parent*/, SUIT_Vie
//===================================================================================== //=====================================================================================
void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Shape& S2 ) void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Shape& S2 )
{ {
MESSAGE("EntityGUI::DisplaySimulationShape") MESSAGE("EntityGUI::DisplaySimulationShape");
SalomeApp_Application* app = getGeometryGUI()->getApp(); SalomeApp_Application* app = getGeometryGUI()->getApp();
if ( !app ) return; if ( !app ) return;
@ -401,7 +401,7 @@ void EntityGUI::DisplaySimulationShape( const TopoDS_Shape& S1, const TopoDS_Sha
//================================================================================== //==================================================================================
void EntityGUI::EraseSimulationShape() void EntityGUI::EraseSimulationShape()
{ {
MESSAGE("EntityGUI::EraseSimulationShape") MESSAGE("EntityGUI::EraseSimulationShape");
SalomeApp_Application* app = getGeometryGUI()->getApp(); SalomeApp_Application* app = getGeometryGUI()->getApp();
if ( !app ) return; if ( !app ) return;

View File

@ -505,7 +505,7 @@ bool EntityGUI_FeatureDetectorDlg::ClickOnApply()
//================================================================================= //=================================================================================
void EntityGUI_FeatureDetectorDlg::ConstructorsClicked(int id) void EntityGUI_FeatureDetectorDlg::ConstructorsClicked(int id)
{ {
MESSAGE("Constructor id ="<<id) MESSAGE("Constructor id ="<<id);
myConstructorId = id; myConstructorId = id;
switch (id) switch (id)
{ {
@ -671,7 +671,7 @@ ShapeRec_Parameters* EntityGUI_FeatureDetectorDlg::parametersChanged()
void EntityGUI_FeatureDetectorDlg::setStartPnt(const gp_Pnt& theStartPnt) void EntityGUI_FeatureDetectorDlg::setStartPnt(const gp_Pnt& theStartPnt)
{ {
myStartPnt = theStartPnt; myStartPnt = theStartPnt;
MESSAGE("myStartPnt = ("<<theStartPnt.X()<<", "<<theStartPnt.Y()<<")") MESSAGE("myStartPnt = ("<<theStartPnt.X()<<", "<<theStartPnt.Y()<<")");
} }
//================================================================================= //=================================================================================
@ -681,7 +681,7 @@ void EntityGUI_FeatureDetectorDlg::setStartPnt(const gp_Pnt& theStartPnt)
void EntityGUI_FeatureDetectorDlg::setEndPnt(const gp_Pnt& theEndPnt) void EntityGUI_FeatureDetectorDlg::setEndPnt(const gp_Pnt& theEndPnt)
{ {
myEndPnt = theEndPnt; myEndPnt = theEndPnt;
MESSAGE("myEndPnt = ("<<theEndPnt.X()<<", "<<theEndPnt.Y()<<")") MESSAGE("myEndPnt = ("<<theEndPnt.X()<<", "<<theEndPnt.Y()<<")");
if (setSelectionRect() && myDetector->GetImgHeight() > 0) if (setSelectionRect() && myDetector->GetImgHeight() > 0)
showImageSample(); showImageSample();
} }
@ -814,7 +814,7 @@ bool EntityGUI_FeatureDetectorDlg::execute( ObjectList& objects )
bool insert; bool insert;
MESSAGE("hierarchy.size() =" << hierarchy.size()) MESSAGE("hierarchy.size() =" << hierarchy.size());
if ( hierarchy.size() < 1 ) { if ( hierarchy.size() < 1 ) {
getOperation()->SetErrorCode( "Impossible detected contours" ); getOperation()->SetErrorCode( "Impossible detected contours" );
return false; return false;

View File

@ -135,7 +135,7 @@ void EntityGUI_PictureImportDlg::FileSelectionClicked()
//================================================================================= //=================================================================================
void EntityGUI_PictureImportDlg::ClickOnOk() void EntityGUI_PictureImportDlg::ClickOnOk()
{ {
MESSAGE("EntityGUI_PictureImportDlg::ClickOnOk()") MESSAGE("EntityGUI_PictureImportDlg::ClickOnOk()");
setIsApplyAndClose( true ); setIsApplyAndClose( true );
if ( ClickOnApply() ) if ( ClickOnApply() )
ClickOnCancel(); ClickOnCancel();
@ -147,7 +147,7 @@ void EntityGUI_PictureImportDlg::ClickOnOk()
//================================================================================= //=================================================================================
bool EntityGUI_PictureImportDlg::ClickOnApply() bool EntityGUI_PictureImportDlg::ClickOnApply()
{ {
MESSAGE("EntityGUI_PictureImportDlg::ClickOnApply()") MESSAGE("EntityGUI_PictureImportDlg::ClickOnApply()");
if ( !onAccept() ) if ( !onAccept() )
return false; return false;

View File

@ -671,7 +671,7 @@ gp_Ax3 EntityGUI_PolylineDlg::WPlaneToLCS(GEOM::GeomObjPtr theGeomObj)
gp_Ax3 aLCS; gp_Ax3 aLCS;
if (theGeomObj || aShape.IsNull()) { if (theGeomObj || aShape.IsNull()) {
MESSAGE("CORBA::is_nil(theGeomObj) || aShape.IsNull()") MESSAGE("CORBA::is_nil(theGeomObj) || aShape.IsNull()");
} }
aLCS.Transform(aShape.Location().Transformation()); aLCS.Transform(aShape.Location().Transformation());

View File

@ -529,7 +529,7 @@ void EntityGUI_SketcherDlg::Init()
//================================================================================= //=================================================================================
void EntityGUI_SketcherDlg::InitClick() void EntityGUI_SketcherDlg::InitClick()
{ {
MESSAGE("EntityGUI_SketcherDlg::InitClick()") MESSAGE("EntityGUI_SketcherDlg::InitClick()");
disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 ); disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 );
myCheckFlag = 0; myCheckFlag = 0;
@ -694,7 +694,7 @@ void EntityGUI_SketcherDlg::DestClicked( int constructorId )
//================================================================================= //=================================================================================
void EntityGUI_SketcherDlg::PointClicked( int constructorId ) void EntityGUI_SketcherDlg::PointClicked( int constructorId )
{ {
MESSAGE("PointClicked") MESSAGE("PointClicked");
myConstructorPntId = constructorId; myConstructorPntId = constructorId;
GroupPt->RB_Point3->setEnabled( true ); GroupPt->RB_Point3->setEnabled( true );
int buttonId = GroupPt2->ButtonGroup->checkedId(); int buttonId = GroupPt2->ButtonGroup->checkedId();
@ -713,7 +713,7 @@ void EntityGUI_SketcherDlg::PointClicked( int constructorId )
//================================================================================= //=================================================================================
void EntityGUI_SketcherDlg::Point2Clicked( int constructorId ) void EntityGUI_SketcherDlg::Point2Clicked( int constructorId )
{ {
MESSAGE("Point2Clicked") MESSAGE("Point2Clicked");
InitClick(); InitClick();
// Get setting of step value from file configuration // Get setting of step value from file configuration
@ -1134,7 +1134,7 @@ void EntityGUI_SketcherDlg::ClickOnCancel()
//================================================================================= //=================================================================================
void EntityGUI_SketcherDlg::ClickOnEnd() void EntityGUI_SketcherDlg::ClickOnEnd()
{ {
MESSAGE("EntityGUI_SketcherDlg::ClickOnEnd()") MESSAGE("EntityGUI_SketcherDlg::ClickOnEnd()");
if ( sender() == MainWidget->buttonClose ) { if ( sender() == MainWidget->buttonClose ) {
// Verify validity of commands // Verify validity of commands
if ( myCommand.count() <= 2 ) { if ( myCommand.count() <= 2 ) {
@ -1190,7 +1190,7 @@ void EntityGUI_SketcherDlg::ClickOnEnd()
//================================================================================= //=================================================================================
bool EntityGUI_SketcherDlg::ClickOnApply() bool EntityGUI_SketcherDlg::ClickOnApply()
{ {
MESSAGE("EntityGUI_SketcherDlg::ClickOnApply()") MESSAGE("EntityGUI_SketcherDlg::ClickOnApply()");
if ( sender() && sender()->inherits( "QPushButton" ) ) if ( sender() && sender()->inherits( "QPushButton" ) )
( (QPushButton*)sender() )->setFocus(); // to update value of currently edited spin-box (PAL11948) ( (QPushButton*)sender() )->setFocus(); // to update value of currently edited spin-box (PAL11948)
@ -1357,7 +1357,7 @@ void EntityGUI_SketcherDlg::setEnabledRedo( bool value )
//================================================================================= //=================================================================================
void EntityGUI_SketcherDlg::SelectionIntoArgument() void EntityGUI_SketcherDlg::SelectionIntoArgument()
{ {
MESSAGE("EntityGUI_SketcherDlg::SelectionIntoArgument") MESSAGE("EntityGUI_SketcherDlg::SelectionIntoArgument");
myEditCurrentArgument->setText( "" ); myEditCurrentArgument->setText( "" );
LightApp_SelectionMgr* aSelMgr = myGeometryGUI->getApp()->selectionMgr(); LightApp_SelectionMgr* aSelMgr = myGeometryGUI->getApp()->selectionMgr();
@ -1627,7 +1627,7 @@ void EntityGUI_SketcherDlg::DeactivateActiveDialog()
//================================================================================= //=================================================================================
void EntityGUI_SketcherDlg::ActivateThisDialog() void EntityGUI_SketcherDlg::ActivateThisDialog()
{ {
MESSAGE("EntityGUI_SketcherDlg::ActivateThisDialog()") MESSAGE("EntityGUI_SketcherDlg::ActivateThisDialog()");
myGeometryGUI->EmitSignalDeactivateDialog(); myGeometryGUI->EmitSignalDeactivateDialog();
setEnabled( true ); setEnabled( true );
myGeometryGUI->SetActiveDialogBox( this ); myGeometryGUI->SetActiveDialogBox( this );
@ -1679,7 +1679,7 @@ void EntityGUI_SketcherDlg::enterEvent( QEvent* )
//================================================================================= //=================================================================================
void EntityGUI_SketcherDlg::closeEvent( QCloseEvent* e ) void EntityGUI_SketcherDlg::closeEvent( QCloseEvent* e )
{ {
MESSAGE("EntityGUI_SketcherDlg::closeEvent") MESSAGE("EntityGUI_SketcherDlg::closeEvent");
//myGeometryGUI->SetState( -1 ); //myGeometryGUI->SetState( -1 );
disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 ); disconnect( myGeometryGUI->getApp()->selectionMgr(), 0, this, 0 );
myGeometryGUI->getApp()->updateActions(); myGeometryGUI->getApp()->updateActions();
@ -2317,7 +2317,7 @@ bool EntityGUI_SketcherDlg::isValid( QString& msg )
//================================================================================= //=================================================================================
bool EntityGUI_SketcherDlg::execute( ObjectList& objects ) bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
{ {
MESSAGE("EntityGUI_SketcherDlg::execute") MESSAGE("EntityGUI_SketcherDlg::execute");
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
int aPrecision = resMgr->integerValue( "Geometry", "length_precision", 6 ); int aPrecision = resMgr->integerValue( "Geometry", "length_precision", 6 );
int DigNum = qAbs(aPrecision); // options for the format of numbers in myNewCommand int DigNum = qAbs(aPrecision); // options for the format of numbers in myNewCommand
@ -2789,7 +2789,7 @@ gp_Ax3 EntityGUI_SketcherDlg::WPlaneToLCS( GEOM::GEOM_Object_var geomObj )
gp_Ax3 aLCS; gp_Ax3 aLCS;
if (CORBA::is_nil( geomObj ) || aShape.IsNull()) if (CORBA::is_nil( geomObj ) || aShape.IsNull())
{ {
MESSAGE("CORBA::is_nil( geomObj ) || aShape.IsNull()") MESSAGE("CORBA::is_nil( geomObj ) || aShape.IsNull()");
} }
aLCS.Transform(aShape.Location().Transformation()); aLCS.Transform(aShape.Location().Transformation());
if (aShape.ShapeType() == TopAbs_FACE) if (aShape.ShapeType() == TopAbs_FACE)

View File

@ -83,13 +83,6 @@
#define C_SQR_BRACKET ']' #define C_SQR_BRACKET ']'
#define PY_NULL "None" #define PY_NULL "None"
#ifdef _DEBUG_
static int MYDEBUG = 0;
using namespace std;
#else
static int MYDEBUG = 0;
#endif
// VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump // VSR 29/08/2017: 0023327, 0023428: eliminate unnecessary lines in Python dump
// Next macro, when defined, causes appearing of SubShapeAllIDs(), SubShapeAllSortedIDs(), GetSameIDs() // Next macro, when defined, causes appearing of SubShapeAllIDs(), SubShapeAllSortedIDs(), GetSameIDs()
// and other such commands in Python dump. // and other such commands in Python dump.
@ -1302,10 +1295,10 @@ Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theStrin
void ReplaceVariables(TCollection_AsciiString& theCommand, void ReplaceVariables(TCollection_AsciiString& theCommand,
const TVariablesList& theVariables) const TVariablesList& theVariables)
{ {
if (MYDEBUG) if (SALOME::VerbosityActivated())
std::cout<<"Command : "<<theCommand<<std::endl; std::cout<<"Command : "<<theCommand<<std::endl;
if (MYDEBUG) { if (SALOME::VerbosityActivated()) {
std::cout<<"All Entries:"<<std::endl; std::cout<<"All Entries:"<<std::endl;
TVariablesList::const_iterator it = theVariables.begin(); TVariablesList::const_iterator it = theVariables.begin();
for(;it != theVariables.end();it++) for(;it != theVariables.end();it++)
@ -1319,7 +1312,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
if( aCommand.Length() == 0 ) if( aCommand.Length() == 0 )
break; break;
if (MYDEBUG) if (SALOME::VerbosityActivated())
std::cout<<"Sub-command : "<<aCommand<<std::endl; std::cout<<"Sub-command : "<<aCommand<<std::endl;
Standard_Integer aStartCommandPos = theCommand.Location(aCommand,1,theCommand.Length()); Standard_Integer aStartCommandPos = theCommand.Location(aCommand,1,theCommand.Length());
@ -1337,7 +1330,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
//Remove white spaces //Remove white spaces
anEntry.RightAdjust(); anEntry.RightAdjust();
anEntry.LeftAdjust(); anEntry.LeftAdjust();
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"Result entry : '" <<anEntry<<"'"<<std::endl; std::cout<<"Result entry : '" <<anEntry<<"'"<<std::endl;
if ( anEntry.IsEmpty() ) { if ( anEntry.IsEmpty() ) {
@ -1355,7 +1348,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
anEntry.Remove( 1, 1 ); anEntry.Remove( 1, 1 );
anEntry.RightAdjust(); anEntry.RightAdjust();
anEntry.LeftAdjust(); anEntry.LeftAdjust();
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"Sub-entry : '" <<anEntry<<"'"<<std::endl; std::cout<<"Sub-entry : '" <<anEntry<<"'"<<std::endl;
} }
@ -1366,7 +1359,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
aStates = (*it).second; aStates = (*it).second;
if(!aStates) { if(!aStates) {
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"Valiables list empty!!!"<<std::endl; std::cout<<"Valiables list empty!!!"<<std::endl;
aCommandIndex++; aCommandIndex++;
continue; continue;
@ -1374,7 +1367,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
TState aVariables = aStates->GetCurrectState(); TState aVariables = aStates->GetCurrectState();
if(MYDEBUG) { if(SALOME::VerbosityActivated()) {
std::cout<<"Variables from SObject:"<<std::endl; std::cout<<"Variables from SObject:"<<std::endl;
for (size_t i = 0; i < aVariables.size();i++) for (size_t i = 0; i < aVariables.size();i++)
std::cout<<"\t Variable["<<i<<"] = "<<aVariables[i].myVariable<<std::endl; std::cout<<"\t Variable["<<i<<"] = "<<aVariables[i].myVariable<<std::endl;
@ -1385,7 +1378,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
while(aCommand.Location(aTotalNbParams,COMMA,1,aCommand.Length())) while(aCommand.Location(aTotalNbParams,COMMA,1,aCommand.Length()))
aTotalNbParams++; aTotalNbParams++;
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"aTotalNbParams = "<<aTotalNbParams<<std::endl; std::cout<<"aTotalNbParams = "<<aTotalNbParams<<std::endl;
Standard_Integer aFirstParam = aNbEntries; Standard_Integer aFirstParam = aNbEntries;
@ -1427,14 +1420,14 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
if ( aStartPos == aEndPos ) if ( aStartPos == aEndPos )
continue; // PAL20889: for "[]" continue; // PAL20889: for "[]"
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<std::endl; std::cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<std::endl;
aVar = aCommand.SubString(aStartPos, aEndPos-1); aVar = aCommand.SubString(aStartPos, aEndPos-1);
aVar.RightAdjust(); aVar.RightAdjust();
aVar.LeftAdjust(); aVar.LeftAdjust();
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"Variable: '"<< aVar <<"'"<<std::endl; std::cout<<"Variable: '"<< aVar <<"'"<<std::endl;
// specific case for sketcher // specific case for sketcher
@ -1454,7 +1447,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
aEndSectionPos = aVar.Length(); aEndSectionPos = aVar.Length();
aSection = aVar.SubString(aStartSectionPos, aEndSectionPos-1); aSection = aVar.SubString(aStartSectionPos, aEndSectionPos-1);
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"aSection: "<<aSection<<std::endl; std::cout<<"aSection: "<<aSection<<std::endl;
Standard_Integer aNbParams = 1; Standard_Integer aNbParams = 1;
@ -1471,14 +1464,14 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
else else
aEndParamPos = aSection.Length() + 1; aEndParamPos = aSection.Length() + 1;
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"aParamIndex: "<<aParamIndex<<" aStartParamPos: " <<aStartParamPos<<" aEndParamPos: "<<aEndParamPos<<std::endl; std::cout<<"aParamIndex: "<<aParamIndex<<" aStartParamPos: " <<aStartParamPos<<" aEndParamPos: "<<aEndParamPos<<std::endl;
if ( aStartParamPos == aEndParamPos) if ( aStartParamPos == aEndParamPos)
continue; continue;
aParameter = aSection.SubString(aStartParamPos, aEndParamPos-1); aParameter = aSection.SubString(aStartParamPos, aEndParamPos-1);
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"aParameter: "<<aParameter<<std::endl; std::cout<<"aParameter: "<<aParameter<<std::endl;
if(iVar >= aVariables.size()) if(iVar >= aVariables.size())
@ -1495,27 +1488,30 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
aReplacedParameter.InsertAfter(aReplacedParameter.Length(),"'"); aReplacedParameter.InsertAfter(aReplacedParameter.Length(),"'");
} }
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"aSection before : "<<aSection<< std::endl; std::cout<<"aSection before : "<<aSection<< std::endl;
aSection.Remove(aStartParamPos, aEndParamPos - aStartParamPos); aSection.Remove(aStartParamPos, aEndParamPos - aStartParamPos);
aSection.Insert(aStartParamPos, aReplacedParameter); aSection.Insert(aStartParamPos, aReplacedParameter);
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"aSection after : "<<aSection<<std::endl<<std::endl; std::cout<<"aSection after : "<<aSection<<std::endl<<std::endl;
iVar++; iVar++;
} }
if(MYDEBUG)
if(SALOME::VerbosityActivated())
std::cout<<"aVar before : "<<aVar<<std::endl; std::cout<<"aVar before : "<<aVar<<std::endl;
aVar.Remove(aStartSectionPos, aEndSectionPos - aStartSectionPos); aVar.Remove(aStartSectionPos, aEndSectionPos - aStartSectionPos);
aVar.Insert(aStartSectionPos, aSection); aVar.Insert(aStartSectionPos, aSection);
if(MYDEBUG)
if(SALOME::VerbosityActivated())
std::cout<<"aVar after : "<<aVar<<std::endl<<std::endl; std::cout<<"aVar after : "<<aVar<<std::endl<<std::endl;
} }
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"aCommand before : "<<aCommand<<std::endl; std::cout<<"aCommand before : "<<aCommand<<std::endl;
aCommand.Remove(aStartPos, aEndPos - aStartPos); aCommand.Remove(aStartPos, aEndPos - aStartPos);
aCommand.Insert(aStartPos, aVar); aCommand.Insert(aStartPos, aVar);
if(MYDEBUG) if(SALOME::VerbosityActivated())
std::cout<<"aCommand after : "<<aCommand<<std::endl; std::cout<<"aCommand after : "<<aCommand<<std::endl;
break; break;
@ -1552,7 +1548,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
aStates->IncrementState(); aStates->IncrementState();
} }
if (MYDEBUG) if (SALOME::VerbosityActivated())
std::cout<<"Command : "<<theCommand<<std::endl; std::cout<<"Command : "<<theCommand<<std::endl;
} }

View File

@ -754,7 +754,7 @@ bool GEOMBase_Helper::openCommand()
bool res = false; bool res = false;
if ( !getStudy() || hasCommand() ) if ( !getStudy() || hasCommand() )
{ {
MESSAGE("Getting out from openCommand()") MESSAGE("Getting out from openCommand()");
return res; return res;
} }
@ -766,7 +766,7 @@ bool GEOMBase_Helper::openCommand()
} }
else else
{ {
MESSAGE("anOp->_is_nil() = true") MESSAGE("anOp->_is_nil() = true");
} }
return res; return res;
@ -857,7 +857,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() ); SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
if ( !appStudy ) if ( !appStudy )
{ {
MESSAGE("appStudy is empty") MESSAGE("appStudy is empty");
return false; return false;
} }
_PTR(Study) aStudy = appStudy->studyDS(); _PTR(Study) aStudy = appStudy->studyDS();
@ -968,12 +968,12 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
catch( const SALOME::SALOME_Exception& e ) { catch( const SALOME::SALOME_Exception& e ) {
SalomeApp_Tools::QtCatchCorbaException( e ); SalomeApp_Tools::QtCatchCorbaException( e );
abortCommand(); abortCommand();
MESSAGE("Exception caught") MESSAGE("Exception caught");
} }
updateViewer(); updateViewer();
MESSAGE("result ="<<result) MESSAGE("result ="<<result);
return result; return result;
} }

View File

@ -1846,7 +1846,7 @@ Standard_Integer GEOMImpl_IShapesOperations::GetSubShapeIndex (Handle(GEOM_Objec
Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSubShapesIndices (Handle(GEOM_Object) theMainShape, Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSubShapesIndices (Handle(GEOM_Object) theMainShape,
std::list<Handle(GEOM_Object)> theSubShapes) std::list<Handle(GEOM_Object)> theSubShapes)
{ {
MESSAGE("GEOMImpl_IShapesOperations::GetSubShapesIndices") MESSAGE("GEOMImpl_IShapesOperations::GetSubShapesIndices");
SetErrorCode(KO); SetErrorCode(KO);
Handle(TColStd_HSequenceOfInteger) aSeq = new TColStd_HSequenceOfInteger; Handle(TColStd_HSequenceOfInteger) aSeq = new TColStd_HSequenceOfInteger;
@ -1854,7 +1854,7 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSubShapesIndic
TopoDS_Shape aMainShape = theMainShape->GetValue(); TopoDS_Shape aMainShape = theMainShape->GetValue();
if (aMainShape.IsNull()) if (aMainShape.IsNull())
{ {
MESSAGE("NULL main shape") MESSAGE("NULL main shape");
return NULL; return NULL;
} }
@ -1867,7 +1867,7 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetSubShapesIndic
TopoDS_Shape aSubShape = (*it)->GetValue(); TopoDS_Shape aSubShape = (*it)->GetValue();
if (aSubShape.IsNull()) if (aSubShape.IsNull())
{ {
MESSAGE("NULL subshape") MESSAGE("NULL subshape");
return NULL; return NULL;
} }
int id = anIndices.FindIndex(aSubShape); int id = anIndices.FindIndex(aSubShape);

View File

@ -19,6 +19,7 @@
#include "GEOMUtils_XmlHandler.hxx" #include "GEOMUtils_XmlHandler.hxx"
#include <Basics_Utils.hxx> #include <Basics_Utils.hxx>
#include "utilities.h"
#include <libxml/parser.h> #include <libxml/parser.h>
#include <algorithm> #include <algorithm>
@ -30,8 +31,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
//#define MYDEBUG
namespace namespace
{ {
const char* env_var = "GEOM_PluginsList"; const char* env_var = "GEOM_PluginsList";
@ -186,7 +185,6 @@ namespace
return xmlPaths; return xmlPaths;
} }
#ifdef MYDEBUG
void dumpinfo(const GEOMUtils::PluginInfo& info) void dumpinfo(const GEOMUtils::PluginInfo& info)
{ {
printf("DUMPING PLUGIN INFO\n"); printf("DUMPING PLUGIN INFO\n");
@ -210,7 +208,6 @@ namespace
printf("-----\n"); printf("-----\n");
} }
} }
#endif
} }
namespace GEOMUtils namespace GEOMUtils
@ -284,9 +281,10 @@ namespace GEOMUtils
//xmlCleanupParser();//vsr: xmlCleanupParser should not be called from the application //xmlCleanupParser();//vsr: xmlCleanupParser should not be called from the application
} // end xml doc } // end xml doc
} }
#ifdef MYDEBUG
if (SALOME::VerbosityActivated())
dumpinfo(info); dumpinfo(info);
#endif
return info; return info;
} }
} }

View File

@ -977,7 +977,7 @@ GEOM::ListOfLong* GEOM_IShapesOperations_i::GetSubShapesIndices
Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]); Handle(::GEOM_Object) aSh = GetObjectImpl(theSubShapes[ind]);
if (aSh.IsNull()) if (aSh.IsNull())
{ {
MESSAGE("NULL shape") MESSAGE("NULL shape");
return aSeq._retn(); return aSeq._retn();
} }
aShapes.push_back(aSh); aShapes.push_back(aSh);

View File

@ -73,10 +73,6 @@
//vtkStandardNewMacro(GEOM_Actor) //vtkStandardNewMacro(GEOM_Actor)
#ifndef MYDEBUG
//#define MYDEBUG
#endif
GEOM_Actor::GEOM_Actor(): GEOM_Actor::GEOM_Actor():
isOnlyVertex(false), isOnlyVertex(false),
@ -127,9 +123,8 @@ GEOM_Actor::GEOM_Actor():
// defined in this class !!! // defined in this class !!!
myPolyDataMapper(GEOM_PainterPolyDataMapper::New(),true) myPolyDataMapper(GEOM_PainterPolyDataMapper::New(),true)
{ {
#ifdef MYDEBUG
MESSAGE(this<< " GEOM_Actor::GEOM_Actor"); MESSAGE(this<< " GEOM_Actor::GEOM_Actor");
#endif
myPolyDataMapper->SetInputConnection(myAppendFilter->GetOutputPort()); myPolyDataMapper->SetInputConnection(myAppendFilter->GetOutputPort());
vtkProperty* aProperty; vtkProperty* aProperty;
@ -215,9 +210,8 @@ GEOM_Actor::GEOM_Actor():
GEOM_Actor::~GEOM_Actor() GEOM_Actor::~GEOM_Actor()
{ {
#ifdef MYDEBUG
MESSAGE(this << " ~GEOM_Actor::GEOM_Actor"); MESSAGE(this << " ~GEOM_Actor::GEOM_Actor");
#endif
myTextActor->Delete(); myTextActor->Delete();
myHighlightProp->Delete(); myHighlightProp->Delete();
myPreHighlightProp->Delete(); myPreHighlightProp->Delete();
@ -319,9 +313,7 @@ void
GEOM_Actor:: GEOM_Actor::
setDisplayMode(int theMode) setDisplayMode(int theMode)
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::setDisplayMode = " << theMode); MESSAGE("GEOM_Actor::setDisplayMode = " << theMode);
#endif
if ( theMode == (int)eShadingWithEdges ) { if ( theMode == (int)eShadingWithEdges ) {
// Coloring edges // Coloring edges
@ -356,9 +348,7 @@ void
GEOM_Actor:: GEOM_Actor::
SetSelected(bool theIsSelected) SetSelected(bool theIsSelected)
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::SetSelected = " << theIsSelected); MESSAGE("GEOM_Actor::SetSelected = " << theIsSelected);
#endif
myIsSelected = theIsSelected; myIsSelected = theIsSelected;
SetVisibility(GetVisibility()); SetVisibility(GetVisibility());
@ -368,10 +358,8 @@ void
GEOM_Actor:: GEOM_Actor::
SetVisibility(int theVisibility) SetVisibility(int theVisibility)
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::SetVisibility = " << theVisibility << " myIsSelected=" << myIsSelected MESSAGE("GEOM_Actor::SetVisibility = " << theVisibility << " myIsSelected=" << myIsSelected
<< " theVisibility=" << theVisibility << " myIsPreselected=" << myIsPreselected); << " theVisibility=" << theVisibility << " myIsPreselected=" << myIsPreselected);
#endif
SALOME_Actor::SetVisibility(theVisibility); SALOME_Actor::SetVisibility(theVisibility);
@ -553,18 +541,16 @@ void GEOM_Actor::SetShape (const TopoDS_Shape& theShape,
void GEOM_Actor::SetHighlightProperty(vtkProperty* Prop) void GEOM_Actor::SetHighlightProperty(vtkProperty* Prop)
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::SetHighlightProperty"); MESSAGE("GEOM_Actor::SetHighlightProperty");
#endif
this->myHighlightActor->GetProperty()->DeepCopy(Prop); this->myHighlightActor->GetProperty()->DeepCopy(Prop);
} }
void GEOM_Actor::SetWireframeProperty(vtkProperty* Prop) void GEOM_Actor::SetWireframeProperty(vtkProperty* Prop)
{ {
#ifdef MYDEBUG
MESSAGE(this << " GEOM_Actor::SetWireframeProperty"); MESSAGE(this << " GEOM_Actor::SetWireframeProperty");
#endif
// must be filled // must be filled
myWireframeFaceActor->SetProperty(Prop); myWireframeFaceActor->SetProperty(Prop);
} }
@ -602,9 +588,8 @@ vtkProperty* GEOM_Actor::GetFaceEdgeProperty()
void GEOM_Actor::SetShadingProperty(vtkProperty* Prop) void GEOM_Actor::SetShadingProperty(vtkProperty* Prop)
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::SetShadingProperty"); MESSAGE("GEOM_Actor::SetShadingProperty");
#endif
myShadingFaceProp->DeepCopy(Prop); myShadingFaceProp->DeepCopy(Prop);
} }
@ -617,9 +602,7 @@ vtkProperty* GEOM_Actor::GetShadingProperty()
void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper) void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper)
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::Render"); MESSAGE("GEOM_Actor::Render");
#endif
if(!GetVisibility()) if(!GetVisibility())
return; return;
@ -695,18 +678,13 @@ void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper)
void GEOM_Actor::ReleaseGraphicsResources(vtkWindow *) void GEOM_Actor::ReleaseGraphicsResources(vtkWindow *)
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::ReleaseGraphicsResources"); MESSAGE("GEOM_Actor::ReleaseGraphicsResources");
#endif
} }
void GEOM_Actor::ShallowCopy(vtkProp *prop) void GEOM_Actor::ShallowCopy(vtkProp *prop)
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::ShallowCopy"); MESSAGE("GEOM_Actor::ShallowCopy");
#endif
GEOM_Actor *f = GEOM_Actor::SafeDownCast(prop); GEOM_Actor *f = GEOM_Actor::SafeDownCast(prop);
if ( f != NULL ) if ( f != NULL )
{ {
@ -717,48 +695,40 @@ void GEOM_Actor::ShallowCopy(vtkProp *prop)
this->SALOME_Actor::ShallowCopy(prop); this->SALOME_Actor::ShallowCopy(prop);
} }
const TopoDS_Shape& GEOM_Actor::getTopo() { const TopoDS_Shape& GEOM_Actor::getTopo()
#ifdef MYDEBUG {
MESSAGE("GEOM_Actor::getTopo"); MESSAGE("GEOM_Actor::getTopo");
#endif
return myShape; return myShape;
} }
void GEOM_Actor::setInputShape(const TopoDS_Shape& /*ashape*/, double /*adef1*/, void GEOM_Actor::setInputShape(const TopoDS_Shape& /*ashape*/, double /*adef1*/,
int /*imode*/, bool /*isVector*/) int /*imode*/, bool /*isVector*/)
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::setInputShape"); MESSAGE("GEOM_Actor::setInputShape");
#endif
} }
double GEOM_Actor::isVector() double GEOM_Actor::isVector()
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::isVector"); MESSAGE("GEOM_Actor::isVector");
#endif
return 0; return 0;
} }
void GEOM_Actor::SubShapeOn() void GEOM_Actor::SubShapeOn()
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::SubShapeOn"); MESSAGE("GEOM_Actor::SubShapeOn");
#endif
} }
void GEOM_Actor::SubShapeOff() void GEOM_Actor::SubShapeOff()
{ {
#ifdef MYDEBUG
MESSAGE("GEOM_Actor::SubShapeOff"); MESSAGE("GEOM_Actor::SubShapeOff");
#endif
} }
void GEOM_Actor::highlight(bool highlight) void GEOM_Actor::highlight(bool highlight)
{ {
#ifdef MYDEBUG
MESSAGE(this << " GEOM_Actor::highlight highlight=" << highlight); MESSAGE(this << " GEOM_Actor::highlight highlight=" << highlight);
#endif
SALOME_Actor::highlight(highlight); SALOME_Actor::highlight(highlight);
} }
@ -973,9 +943,8 @@ GEOM_Actor
::Highlight(bool theIsHighlight) ::Highlight(bool theIsHighlight)
{ {
myIsSelected = theIsHighlight; myIsSelected = theIsHighlight;
#ifdef MYDEBUG
MESSAGE(this << " GEOM_Actor::Highlight myIsSelected=" << myIsSelected); MESSAGE(this << " GEOM_Actor::Highlight myIsSelected=" << myIsSelected);
#endif
SALOME_Actor::Highlight(theIsHighlight); // this method call ::highlight(theIsHighlight) in the end SALOME_Actor::Highlight(theIsHighlight); // this method call ::highlight(theIsHighlight) in the end
SetVisibility(GetVisibility()); SetVisibility(GetVisibility());
@ -990,9 +959,7 @@ GEOM_Actor
SVTK_SelectionEvent* theSelectionEvent, SVTK_SelectionEvent* theSelectionEvent,
bool theIsHighlight) bool theIsHighlight)
{ {
#ifdef MYDEBUG
MESSAGE(this << " GEOM_Actor::PreHighlight (3) theIsHighlight=" << theIsHighlight); MESSAGE(this << " GEOM_Actor::PreHighlight (3) theIsHighlight=" << theIsHighlight);
#endif
if ( !GetPickable() ) if ( !GetPickable() )
return false; return false;
@ -1040,15 +1007,13 @@ GEOM_Actor
bool theIsHighlight) bool theIsHighlight)
{ {
// define the selection of object // define the selection of object
#ifdef MYDEBUG
MESSAGE(std::endl << this << " GEOM_Actor::Highlight (3) myIsSelected=" << myIsSelected); MESSAGE(std::endl << this << " GEOM_Actor::Highlight (3) myIsSelected=" << myIsSelected);
#endif
bool aRet = SALOME_Actor::Highlight(theInteractorStyle,theSelectionEvent,theIsHighlight); bool aRet = SALOME_Actor::Highlight(theInteractorStyle,theSelectionEvent,theIsHighlight);
SetSelected(theIsHighlight); SetSelected(theIsHighlight);
if(theIsHighlight) if(theIsHighlight)
SetPreSelected(false); SetPreSelected(false);
return aRet; return aRet;
} }

View File

@ -253,9 +253,9 @@ void GEOM_OCCReader::createIsos(const GEOMUtils::Hatcher &theHatcher,
if (anIndices.IsNull() || aParams.IsNull()) { if (anIndices.IsNull() || aParams.IsNull()) {
if (IsUIso) { if (IsUIso) {
MESSAGE("GEOMUtils_Hatcher: null U-isoline indices") MESSAGE("GEOMUtils_Hatcher: null U-isoline indices");
} else { } else {
MESSAGE("GEOMUtils_Hatcher: null V-isoline indices") MESSAGE("GEOMUtils_Hatcher: null V-isoline indices");
} }
} else { } else {
const GeomAbs_IsoType aType = (IsUIso ? GeomAbs_IsoU : GeomAbs_IsoV); const GeomAbs_IsoType aType = (IsUIso ? GeomAbs_IsoU : GeomAbs_IsoV);
@ -271,9 +271,9 @@ void GEOM_OCCReader::createIsos(const GEOMUtils::Hatcher &theHatcher,
if (aNbDomains < 0) { if (aNbDomains < 0) {
if (IsUIso) { if (IsUIso) {
MESSAGE("GEOMUtils_Hatcher: U iso of parameter: "<<aParam) MESSAGE("GEOMUtils_Hatcher: U iso of parameter: "<<aParam);
} else { } else {
MESSAGE("GEOMUtils_Hatcher: V iso of parameter: "<<aParam) MESSAGE("GEOMUtils_Hatcher: V iso of parameter: "<<aParam);
} }
switch (theHatcher.GetHatcher().Status (aHatchingIndex)) { switch (theHatcher.GetHatcher().Status (aHatchingIndex)) {

View File

@ -257,7 +257,7 @@ bool ShapeRec_FeatureDetector::ComputeContours( bool useROI, ShapeRec_Parameters
Computes the lines in the image located at imagePath Computes the lines in the image located at imagePath
*/ */
bool ShapeRec_FeatureDetector::ComputeLines(){ bool ShapeRec_FeatureDetector::ComputeLines(){
MESSAGE("ShapeRec_FeatureDetector::ComputeLines()") MESSAGE("ShapeRec_FeatureDetector::ComputeLines()");
// Initialising images // Initialising images
cv::Mat src, src_gray, detected_edges, dst; cv::Mat src, src_gray, detected_edges, dst;