X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClipping3DDataViewer.cxx;h=a888215dc78262188dcaa7fade05be4dc4b72176;hb=c5bb8b228d6fcd2a4ea1d6210bfa3a39d6bcac33;hp=901a7d7d4c6bb1f5aaa518917c3ef17d57b3b1a7;hpb=543dfcbe8f5ff78bbed90ef1e20c722bfa0ef248;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
index 901a7d7..a888215 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 #include "vtkClipping3DDataViewer.h"
 #include "vtkDataSetReader.h"
@@ -10,18 +35,18 @@ vtkClipping3DDataViewer::vtkClipping3DDataViewer()
 		_visibleTissue[i]		= false;
 		_representationType[i]	= true;
 	}
-	_visibleVolume=false;
-	_isRayCasting=true;
-    _isMIP=false;
-	_interpolation=false;
-	_shade=false;
+	_visibleVolume				= false;
+	_isRayCasting				= true;
+    _isMIP						= false;
+	_interpolation				= false;
+	_shade						= false;
 
-    _volumerendererdata = VolumeRendererData::New();
-    _volumeMapper = vtkVolumeRayCastMapper::New();
-    _newvol = vtkVolume::New();
-    _volumeProperty = vtkVolumeProperty::New();
-    _compositeFunction = vtkVolumeRayCastCompositeFunction::New();
-	 _compositeFunctionMIP = vtkVolumeRayCastMIPFunction::New();
+    _volumerendererdata 	= VolumeRendererData::New();
+    _volumeMapper 			= vtkVolumeRayCastMapper::New();
+    _newvol 				= vtkVolume::New();
+    _volumeProperty 		= vtkVolumeProperty::New();
+    _compositeFunction 		= vtkVolumeRayCastCompositeFunction::New();
+	 _compositeFunctionMIP 	= vtkVolumeRayCastMIPFunction::New();
 
 }
 //-------------------------------------------------------------------
@@ -176,46 +201,49 @@ void vtkClipping3DDataViewer::SetVisibleVolumeBox(bool visibleBox)
 	_visibleVolumeBox = visibleBox;
 }
 
+
 //-------------------------------------------------------------------
-void vtkClipping3DDataViewer::Configure_Tissue()
+void vtkClipping3DDataViewer::SetImage()
 {
+	int i;
+	vtkImageData *imagedata=_vtkmprbasedata->GetImageData();
+	for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++)
+	{
+		_mCubes[i]->SetInput( imagedata );
+	} // for
+	_volumeMapper->SetInput( imagedata );
+	_volumerendererdata->SetImageData( imagedata );
+}
 
-	double range[2];
+//-------------------------------------------------------------------
+void vtkClipping3DDataViewer::Configure_Tissue()
+{
 	int i;
-	for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++){
+	double range[2];
+	vtkImageData *imagedata=_vtkmprbasedata->GetImageData();
+	imagedata->GetScalarRange( range );
+	for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++)
+	{
 		// Visualisation - original volume
-		vtkImageData *imagedata=_vtkmprbasedata->GetImageData();
-		imagedata->GetScalarRange( range );
 		_mCubes[i] = vtkMarchingCubes::New( );
 		_mCubes[i]->SetInput( imagedata );
-
 		_mCubes[i]->SetValue( 0, range[1]*(4+i) / 8 );
 //		_mCubes[i]->SetValue( 0, 1500 );
-
 	    _tissueStripper[i] = vtkStripper::New();
 	    _tissueStripper[i]->SetInput( _mCubes[i]->GetOutput( ) );
-
-
-
 		_tissuePlanes[i]  = vtkPlanes::New();
-
 		int x1,x2,y1,y2,z1,z2;
 		imagedata->GetExtent(x1,x2,y1,y2,z1,z2);
 		_tissuePlanes[i]->SetBounds  (x1,x2,y1,y2,z1,z2);
-
 		_tissueClipper[i] = vtkClipPolyData::New();
 		_tissueClipper[i]->SetInput( _tissueStripper[i]->GetOutput() );
 		_tissueClipper[i]->SetClipFunction( _tissuePlanes[i] );
 		_tissueClipper[i]->InsideOutOn( );
-
 		_tissueMapper[i] = vtkPolyDataMapper::New( );
 		_tissueMapper[i]->SetInput( _tissueClipper[i]->GetOutput() );
 		_tissueMapper[i]->ScalarVisibilityOff( );
 //		_tissueMapper[i]->Update();
-
-	}
-
-
+	} // for i  
 
 	// vtkActor tissue
 	for (i=0; i< VTKMPRDATA_MAXTISSUE ; i++){
@@ -359,6 +387,7 @@ void vtkClipping3DDataViewer::Configure_Volume()
 	_observerV->SetvtkVolumeRayCastMapper( _volumeMapper );
 }
 
+//-----------------------------------------------------------------------------
 
 void vtkClipping3DDataViewer::Configure_VolumeBox()
 {
@@ -376,12 +405,15 @@ void vtkClipping3DDataViewer::Configure_VolumeBox()
        //_volumerendererdata->BoundingBoxChanged(event.IsChecked() );
 }
 
+//-----------------------------------------------------------------------------
+
 void vtkClipping3DDataViewer::SetRenderer(vtkRenderer* renderer)
 {
     _volumerendererdata->SetRenderer(renderer);
 
 }
 
+//-----------------------------------------------------------------------------
 void vtkClipping3DDataViewer::SetInteractor(vtkRenderWindowInteractor* interactor)
 {
 
@@ -389,6 +421,7 @@ void vtkClipping3DDataViewer::SetInteractor(vtkRenderWindowInteractor* interacto
 }
 
 
+//-----------------------------------------------------------------------------
 void vtkClipping3DDataViewer::BoxActorChanged(bool changed)
 {
     vector<double> *gv = this->GetGreyValuesTransferenceFVector();
@@ -400,6 +433,7 @@ void vtkClipping3DDataViewer::BoxActorChanged(bool changed)
 
 }
 
+//-----------------------------------------------------------------------------
 void vtkClipping3DDataViewer::UpdateVolumeBox(vector<double> gf, vector<double> vf, vtkColorTransferFunction* ctfun)
 {
         _volumerendererdata->SetLookUpTable((vtkLookupTable*)(ctfun));
@@ -407,6 +441,7 @@ void vtkClipping3DDataViewer::UpdateVolumeBox(vector<double> gf, vector<double>
 }
 
 
+//-----------------------------------------------------------------------------
 void vtkClipping3DDataViewer::updateVolume()
 {
 
@@ -449,11 +484,14 @@ void vtkClipping3DDataViewer::Configure()
     Configure_VolumeBox();
   // An outline provides context around the data.
   //
-	_outlineData = vtkOutlineFilter::New();
+	_outlineData 	= vtkOutlineFilter::New();
     _outlineData->SetInput((vtkDataSet *) _vtkmprbasedata->GetImageData() );
-	_mapOutline = vtkPolyDataMapper::New();
-    _mapOutline->SetInput(_outlineData->GetOutput());
-	_outline = vtkActor::New();
+	_mapOutline 	= vtkPolyDataMapper::New();
+
+//EED 4 nov 2015 Estelle 
+//    _mapOutline->SetInput(_outlineData->GetOutput());
+
+	_outline 	= vtkActor::New();
     _outline->SetMapper(_mapOutline);
     _outline->GetProperty()->SetColor(0,0,0);
 }