From be7adae173311be1149dba830acbccae2cb3ddf3 Mon Sep 17 00:00:00 2001 From: reyes Date: Wed, 29 Jun 2011 13:10:18 +0000 Subject: [PATCH] *** empty log message *** --- lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx | 13 ++++++++----- .../VolumeRenderer/volumerenderermanagerdata.cxx | 5 ++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx b/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx index ddbc1c5..a63f58e 100644 --- a/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx +++ b/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx @@ -1,7 +1,7 @@ #include "volumerendererdata.h" #include "vtkObjectFactory.h" -vtkCxxRevisionMacro(VolumeRendererData, "$Revision: 1.4 $"); +vtkCxxRevisionMacro(VolumeRendererData, "$Revision: 1.5 $"); vtkStandardNewMacro(VolumeRendererData); VolumeRendererData::VolumeRendererData() @@ -16,14 +16,17 @@ VolumeRendererData::VolumeRendererData() void VolumeRendererData::ShowVolume(bool checked){ if(checked){ // invariant(); - cout<<"JPRG::VolumeRendererData::ShowVolume"<SetLookupTable(LookUpTable); Renderer->AddActor(VolRendData->getProp3D()); }else{ Renderer->RemoveActor(VolRendData->getProp3D()); - VolRendData->Delete(); - VolRendData = 0; + // VolRendData->Delete(); + // VolRendData = 0; } } diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx index 0075422..0d94038 100644 --- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx +++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanagerdata.cxx @@ -141,7 +141,7 @@ VolumeRendererManagerData::~VolumeRendererManagerData() void VolumeRendererManagerData::EnableBoundingBox(vtkRenderWindowInteractor* interactor) { //EED9Juin2011 if(_volumeMappergpu){ - if(!_boxWidgetS1){ + if(_boxWidgetS1==NULL){ _boxWidgetS1 = vtkBoxWidget::New(); _boxWidgetS1->SetInteractor( interactor ); _boxWidgetS1->SetPlaceFactor(1.01); @@ -162,7 +162,9 @@ void VolumeRendererManagerData::EnableBoundingBox(vtkRenderWindowInteractor* int callback->Delete(); _boxWidgetS1->EnabledOn(); _boxWidgetS1->GetSelectedFaceProperty()->SetOpacity(0.0); + cout<<"JPRG::VolumeRendererManagerData::EnableBoundingBox::CREATE"<EnabledOn(); } //EED9Juin2011 } @@ -170,6 +172,7 @@ void VolumeRendererManagerData::EnableBoundingBox(vtkRenderWindowInteractor* int void VolumeRendererManagerData::DisableBoundingBox(){ if(_boxWidgetS1){ + cout<<"JPRG::VolumeRendererManagerData::DisableBoundingBox"<EnabledOff(); //_boxWidgetS1->Delete(); //_boxWidgetS1 = 0; -- 2.46.1