Changements dans la class CutModuleMainPanel et CutModuleManager pour ajouter la...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / vtkClipping3DDataViewer.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
index d1104dff66740b5c9d6c5a473427dff93b4d1e90..9eb6ba507ac463c59d0609a2bae61c06c317e69c 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
@@ -17,29 +17,29 @@ vtkClipping3DDataViewer::~vtkClipping3DDataViewer()
 {
        int i;
        for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++){
-               _mCubes[i]                              ->Delete();
-               _tissueStripper[i]              ->Delete();
-               _tissueMapper[i]                ->Delete();
-               _tissuePlanes[i]                ->Delete();
-               _tissueClipper[i]               ->Delete();
+               _mCubes[i]->Delete();
+               _tissueStripper[i]->Delete();
+               _tissueMapper[i]->Delete();
+               _tissuePlanes[i]->Delete();
+               _tissueClipper[i]->Delete();
        }
-       _outlineData            ->Delete();
-       _mapOutline                     ->Delete();
-       _outline                        ->Delete();
+       _outlineData->Delete();
+       _mapOutline->Delete();
+       _outline->Delete();
        // Volume
-       _tfun                           ->Delete();
-       _ctfun                          ->Delete();
-       _compositeFunction      ->Delete();
-       _volumeMapper           ->Delete();
-       _volumeProperty         ->Delete();
-       _newvol                         ->Delete();
-       _volumePlanes           ->Delete();
+       _tfun->Delete();
+       _ctfun->Delete();
+       _compositeFunction->Delete();
+       _volumeMapper->Delete();
+       _volumeProperty->Delete();
+       _newvol->Delete();
+       _volumePlanes->Delete();
 
        for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++){
-               _tissue[i]              -> Delete();
-               _observerS[i]   -> Delete();
+               _tissue[i]-> Delete();
+               _observerS[i]-> Delete();
        }
-       _observerV              -> Delete();
+       _observerV-> Delete();
 }
 //-------------------------------------------------------------------
 vtkActor* vtkClipping3DDataViewer::GetOutlineActor()
@@ -238,8 +238,8 @@ void vtkClipping3DDataViewer::Configure_Volume()
        adding the poinst of the transference function
        */
        //X
-       greyValuesTransferenceFVector.push_back(max * 0/2);
-       greyValuesTransferenceFVector.push_back(max * 1/2);
+       greyValuesTransferenceFVector.push_back(max * 0/2);  // JPR ?? 0/2
+       greyValuesTransferenceFVector.push_back(max * 1/2);  // JPR ?? division entiere?
        greyValuesTransferenceFVector.push_back(max * 2/2);
        //Y
        intensityValuesTransferenceFVector.push_back(0.0);
@@ -620,4 +620,10 @@ void vtkClipping3DDataViewer::ReadMeshVTK(char *namefile)
        reader->SetFileName(namefile);
        reader->Update();
        _tissueStripper[3]->SetInput( reader->GetPolyDataOutput()  );
-}
\ No newline at end of file
+}
+
+void vtkClipping3DDataViewer::setColorTransferFunction(vtkColorTransferFunction* colortable){
+       
+       _volumeProperty->SetColor(colortable);
+       
+}