X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FKernel%2FVTKObjects%2FVolumeRenderer%2Fvolumerenderermanager.cxx;h=25cbf24f56d29f25fa0a70a96e208e76db6c606d;hb=1b2153bfefaca680e9680b02a039fb06df0a6fba;hp=66895417b249be748dcbd31df6cba15fa7ca028d;hpb=8185e042f64574ca43bba733ec2158a2aa994220;p=creaMaracasVisu.git

diff --git a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanager.cxx b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanager.cxx
index 6689541..25cbf24 100644
--- a/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanager.cxx
+++ b/lib/Kernel/VTKObjects/VolumeRenderer/volumerenderermanager.cxx
@@ -5,8 +5,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: volumerenderermanager.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/10/05 16:27:04 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2011/10/19 16:08:29 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -371,10 +371,18 @@ void VolumeRendererManager::addRemoveActor(int propid, bool addremove)  throw(ch
 **	Changes the opacity in a prop3D
 **/
 void VolumeRendererManager::setVolumeOpacity(int propid, std::vector<double> greylevel,std::vector<double> value)  throw(char*){
-        checkInvariant();
-
-        this->getViewData(propid)->setVolumeOpacity(greylevel, value);
-
+	checkInvariant();
+
+	printf("EED VolumeRendererManager::setVolumeOpacity %d\n",propid);
+	
+	VolumeRendererManagerData* volrenman = this->getViewData(propid);
+	if (volrenman!=NULL) 
+	{
+        volrenman->setVolumeOpacity(greylevel, value);
+	} else {
+		printf("EED  VolumeRendererManager::setVolumeOpacity  Warning volrenman NULL\n");
+	}
+	
         _renderer->Render();
 
 }
@@ -382,15 +390,26 @@ void VolumeRendererManager::setVolumeOpacity(int propid, std::vector<double> gre
 /**
 **	Set Volume Color
 **/
+
 void VolumeRendererManager::setVolumeColor(int volid, std::vector<double> greylevel,
                                                                 std::vector<double> red,
                                                                 std::vector<double> green,
                                                                 std::vector<double> blue)throw(char*){
-        checkInvariant();
-
-        this->getViewData(volid)->setVolumeColor(greylevel, red, green, blue);
-
-        _renderer->Render();
+	printf("EED VolumeRendererManager::setVolumeColor  start \n");
+	checkInvariant();
+
+	printf("EED VolumeRendererManager::setVolumeColor %d\n",volid);
+	
+	VolumeRendererManagerData* volrenman = this->getViewData(volid);
+	if (volrenman!=NULL) 
+	{
+		this->getViewData(volid)->setVolumeColor(greylevel, red, green, blue);
+	} else {
+		printf("EED  VolumeRendererManager::setVolumeColor  Warning volrenman NULL\n");
+	}
+
+	_renderer->Render();
+	printf("EED VolumeRendererManager::setVolumeColor  end \n");
 }
 
 vtkImageData* VolumeRendererManager::getImageData(std::string filename){
@@ -418,9 +437,11 @@ vtkImageData* VolumeRendererManager::getImageData(){
 }
 
 void VolumeRendererManager::checkInvariant()  throw(char*){
-        if(this->_renderer==NULL){
+	printf("EED VolumeRendererManager::checkInvariant start\n");
+	if(this->_renderer==NULL){
                 throw "Renderer not set";
         }
+	printf("EED VolumeRendererManager::checkInvariant end \n");
 }
 
 VolumeRendererManagerData* VolumeRendererManager::getViewData(int id) throw(char*){