From: reyes <reyes>
Date: Wed, 29 Jun 2011 13:10:18 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v1.0.4~88
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=be7adae173311be1149dba830acbccae2cb3ddf3;p=creaMaracasVisu.git

*** empty log message ***
---

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"<<endl;
-            VolRendData = new VolumeRendererManagerData(ImageData, true);
+            //cout<<"JPRG::VolumeRendererData::ShowVolume"<<endl;
+            if(VolRendData==NULL)
+            {
+                VolRendData = new VolumeRendererManagerData(ImageData, true);
+            }
             VolRendData->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"<<endl;
     }else{
+        cout<<"JPRG::VolumeRendererManagerData::EnableBoundingBox"<<endl;
         _boxWidgetS1->EnabledOn();
     }
 //EED9Juin2011  }
@@ -170,6 +172,7 @@ void VolumeRendererManagerData::EnableBoundingBox(vtkRenderWindowInteractor* int
 
 void VolumeRendererManagerData::DisableBoundingBox(){
     if(_boxWidgetS1){
+        cout<<"JPRG::VolumeRendererManagerData::DisableBoundingBox"<<endl;
         _boxWidgetS1->EnabledOff();
         //_boxWidgetS1->Delete();
         //_boxWidgetS1 = 0;