ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-03-26 09:07:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

[bos #32517][EDF] Dynamic logging: Removed MYDEBUG forgotten in the prev commit.

Browse Source
This commit is contained in:
Konstantin LEONTEV 2022-10-13 09:51:17 +03:00
parent 2ea018379d
commit 05797f38eb
1 changed files with 32 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/OBJECT/GEOM_Actor.cxx
View File

@ -210,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();
@ -314,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
@ -351,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());
@ -363,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);
@ -548,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);
} }
@ -597,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);
} }
@ -612,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;
@ -690,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 )
{ {
@ -712,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);
} }
@ -968,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());
@ -985,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;
@ -1035,14 +1007,12 @@ 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;
} }