Bug #1373

[creaMaracasVisu.git] / lib / GUI / Base / VolumeRenderer / volumerendererdata.cxx

diff --git a/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx b/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx
index d0ab60fa5099ac7c16af6278ad20f9d96d439e1d..6361cad2af9c8a06eb6c7d61eeb0fecb1dd99866 100644 (file)
--- a/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx
+++ b/lib/GUI/Base/VolumeRenderer/volumerendererdata.cxx
@@ -1,32 +1,32 @@
 #include "volumerendererdata.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(VolumeRendererData, "$Revision: 1.8 $");
+vtkCxxRevisionMacro(VolumeRendererData, "$Revision: 1.10 $");
 vtkStandardNewMacro(VolumeRendererData);
 
 VolumeRendererData::VolumeRendererData()
 {
-    VolRendManager = 0;
-    ImageData = 0;
-    Renderer = 0;
-    Interactor = 0;
-    LookUpTable = 0;
+    VolRendManager     = NULL;
+    ImageData          = NULL;
+    Renderer           = NULL;
+    Interactor         = NULL;
+    LookUpTable                = NULL;
     //ImageDataSeparateComponents = false;
 }
 
 
 void VolumeRendererData::ShowVolume(bool checked){
-
     try{
         if(checked){
                 invariant();
-                cout<<"JPRG::VolumeRendererData::ShowVolume"<<endl;
                 if(!VolRendManager){
                     VolRendManager = new VolumeRendererManager();
                     VolRendManager->addVolume(ImageData, Interactor);
                 }
                 if(LookUpTable)
+                               {
                     VolRendManager->SetLookupTable(LookUpTable);
+                               }
                 vector< vtkProp3D* > props = VolRendManager->getProps3D();
                 for(unsigned i = 0; i < props.size(); i++){
                     Renderer->AddActor(props[i]);
@@ -48,31 +48,29 @@ void VolumeRendererData::ShowVolume(bool checked){
 
 }
 
-void VolumeRendererData::invariant(){
-    if(!ImageData){
+void VolumeRendererData::invariant()
+{
+    if(!ImageData)
+       {
         throw "Image data not set";
     }
-    if(!Renderer){
+    if(!Renderer)
+       {
         throw "renderer not initialized";
     }
 }
 
-void VolumeRendererData::OpacityChanged(vector<double> greyvalues, vector<double> values){
+void VolumeRendererData::OpacityChanged(vector<double> greyvalues, vector<double> values)
+{
     //invariant();
-
-
-       printf("EED VolumeRendererData::OpacityChanged 1\n");
-    if(VolRendManager==NULL)
-    {
-               printf("EED VolumeRendererData::OpacityChanged 2\n");
-    }else {
-               printf("EED VolumeRendererData::OpacityChanged 3\n");
+    if(VolRendManager!=NULL)
+       {
         ShowVolume(true);
                VolRendManager->setVolumeOpacity(greyvalues,values);
-       }
-       printf("EED VolumeRendererData::OpacityChanged 4\n");
+       }       
 }
 
+
 void  VolumeRendererData::BoundingBoxChanged(bool checked){
    // invariant();
 
@@ -89,12 +87,16 @@ void  VolumeRendererData::BoundingBoxChanged(bool checked){
             VolRendManager->DisableBoundingBox();
         }
     }
+       
 }
 
+
 void VolumeRendererData::changeCompositeMIPFunction(int function){
     invariant();
     if(VolRendManager)
+       {
         VolRendManager->changeCompositeMIPFunction(0, function);
+       }
 }
 
 /**
@@ -105,5 +107,7 @@ void VolumeRendererData::changeCompositeMIPFunction(int function){
 void VolumeRendererData::changeInterpolationType(int type){
     invariant();
     if(VolRendManager)
+       {
         VolRendManager->changeInterpolationType(type);
+       }       
 }