From: Konstantin LEONTEV Date: Thu, 13 Oct 2022 06:51:17 +0000 (+0300) Subject: [bos #32517][EDF] Dynamic logging: Removed MYDEBUG forgotten in the prev commit. X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fkleontev%2F32517_dynamic_log_messages;p=modules%2Fgeom.git [bos #32517][EDF] Dynamic logging: Removed MYDEBUG forgotten in the prev commit. --- diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx index ed3010063..6ca9b475f 100644 --- a/src/OBJECT/GEOM_Actor.cxx +++ b/src/OBJECT/GEOM_Actor.cxx @@ -210,9 +210,8 @@ GEOM_Actor::GEOM_Actor(): GEOM_Actor::~GEOM_Actor() { -#ifdef MYDEBUG - MESSAGE (this<< " ~GEOM_Actor::GEOM_Actor"); -#endif + MESSAGE(this << " ~GEOM_Actor::GEOM_Actor"); + myTextActor->Delete(); myHighlightProp->Delete(); myPreHighlightProp->Delete(); @@ -314,9 +313,7 @@ void GEOM_Actor:: setDisplayMode(int theMode) { -#ifdef MYDEBUG - MESSAGE ( "GEOM_Actor::setDisplayMode = "<myHighlightActor->GetProperty()->DeepCopy(Prop); } void GEOM_Actor::SetWireframeProperty(vtkProperty* Prop) { -#ifdef MYDEBUG - MESSAGE ( this << " GEOM_Actor::SetWireframeProperty" ); -#endif + MESSAGE(this << " GEOM_Actor::SetWireframeProperty"); + // must be filled myWireframeFaceActor->SetProperty(Prop); } @@ -597,9 +588,8 @@ vtkProperty* GEOM_Actor::GetFaceEdgeProperty() void GEOM_Actor::SetShadingProperty(vtkProperty* Prop) { -#ifdef MYDEBUG - MESSAGE ( "GEOM_Actor::SetShadingProperty" ); -#endif + MESSAGE("GEOM_Actor::SetShadingProperty"); + myShadingFaceProp->DeepCopy(Prop); } @@ -612,9 +602,7 @@ vtkProperty* GEOM_Actor::GetShadingProperty() void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper) { -#ifdef MYDEBUG - MESSAGE ( "GEOM_Actor::Render" ); -#endif + MESSAGE("GEOM_Actor::Render"); if(!GetVisibility()) return; @@ -690,18 +678,13 @@ void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper) void GEOM_Actor::ReleaseGraphicsResources(vtkWindow *) { -#ifdef MYDEBUG - MESSAGE ( "GEOM_Actor::ReleaseGraphicsResources" ); -#endif + MESSAGE("GEOM_Actor::ReleaseGraphicsResources"); } - - void GEOM_Actor::ShallowCopy(vtkProp *prop) { -#ifdef MYDEBUG - MESSAGE ( "GEOM_Actor::ShallowCopy" ); -#endif + MESSAGE("GEOM_Actor::ShallowCopy"); + GEOM_Actor *f = GEOM_Actor::SafeDownCast(prop); if ( f != NULL ) { @@ -712,48 +695,40 @@ void GEOM_Actor::ShallowCopy(vtkProp *prop) this->SALOME_Actor::ShallowCopy(prop); } -const TopoDS_Shape& GEOM_Actor::getTopo() { -#ifdef MYDEBUG - MESSAGE ( "GEOM_Actor::getTopo" ); -#endif +const TopoDS_Shape& GEOM_Actor::getTopo() +{ + MESSAGE("GEOM_Actor::getTopo"); + return myShape; } void GEOM_Actor::setInputShape(const TopoDS_Shape& /*ashape*/, double /*adef1*/, int /*imode*/, bool /*isVector*/) { -#ifdef MYDEBUG - MESSAGE ( "GEOM_Actor::setInputShape" ); -#endif + MESSAGE("GEOM_Actor::setInputShape"); } double GEOM_Actor::isVector() { -#ifdef MYDEBUG - MESSAGE ( "GEOM_Actor::isVector" ); -#endif + MESSAGE("GEOM_Actor::isVector"); + return 0; } void GEOM_Actor::SubShapeOn() { -#ifdef MYDEBUG - MESSAGE ( "GEOM_Actor::SubShapeOn" ); -#endif + MESSAGE("GEOM_Actor::SubShapeOn"); } void GEOM_Actor::SubShapeOff() { -#ifdef MYDEBUG - MESSAGE ( "GEOM_Actor::SubShapeOff" ); -#endif + MESSAGE("GEOM_Actor::SubShapeOff"); } void GEOM_Actor::highlight(bool highlight) { -#ifdef MYDEBUG - MESSAGE ( this << " GEOM_Actor::highlight highlight="<