X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkClipping3DDataViewer.cxx;h=0e301e2d79a1cbfa8590a6bd525682c5cb480a42;hb=3d1c0689f4e1844c8f170d9c20f8ad38b34d98b6;hp=e5b8804e0550d26b847db84dc98c057a63ad86ec;hpb=1b2153bfefaca680e9680b02a039fb06df0a6fba;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkClipping3DDataViewer.cxx
index e5b8804..0e301e2 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"
@@ -248,8 +273,6 @@ void vtkClipping3DDataViewer::Configure_Volume()
 {
   // Volume
 
-
-
  /** if(_newvol != NULL)
   {
     _newvol->Delete();
@@ -257,8 +280,6 @@ void vtkClipping3DDataViewer::Configure_Volume()
     _volumeProperty->Delete();
   }*/
 
-
-
   _tfun = vtkPiecewiseFunction::New();
   _ctfun = vtkColorTransferFunction::New();
 
@@ -266,8 +287,6 @@ void vtkClipping3DDataViewer::Configure_Volume()
 	this->_vtkmprbasedata->GetImageData()->GetScalarRange(range);
 	double max = range[1];
 	
-	printf("EED::vtkClipping3DDataViewer::Configure_Volume max=%f \n",max);
-
 	/*
 	adding the poinst of the transference function
 	*/
@@ -328,20 +347,14 @@ void vtkClipping3DDataViewer::Configure_Volume()
 
 	// EED 13/03/2011
 
-
-
  // _volumeMapper = vtkVolumeRayCastMapper::New();
 	_volumeMapper->SetInput( this->GetVtkMPRBaseData()->GetImageData() );
 
-
-
     _volumeMapper->SetVolumeRayCastFunction(_compositeFunction);
 
-
    // _volumeMapper->SetVolumeRayCastFunction(_compositeFunctionMIP);
-
+	
 //
-
 	_volumeMapper->SetClippingPlanes( _volumePlanes );
 	_volumeMapper->AutoAdjustSampleDistancesOn();
 
@@ -351,17 +364,9 @@ void vtkClipping3DDataViewer::Configure_Volume()
 	_volumeProperty->SetScalarOpacity( _tfun );
 
 // EED 31/03/2008
-
 	_volumeProperty->DisableGradientOpacityOn();
 
 
-
-//	_
-
-
-//	_
-
-
 //	_volumeProperty->SetInterpolationTypeToNearest();
 //	_volumeProperty->ShadeOff();
 //	_volumeProperty->SetAmbient(0.3);
@@ -373,7 +378,7 @@ void vtkClipping3DDataViewer::Configure_Volume()
 	_newvol->SetMapper(_volumeMapper );
 	_newvol->SetProperty(_volumeProperty );
 
-  _observerV = boxSurfaceObserver::New();
+    _observerV = boxSurfaceObserver::New();
 	_observerV->SetPlanes( _volumePlanes );
 	_observerV->SetActor( _newvol );
 	_observerV->SetvtkVolumeRayCastMapper( _volumeMapper );
@@ -382,25 +387,18 @@ void vtkClipping3DDataViewer::Configure_Volume()
 
 void vtkClipping3DDataViewer::Configure_VolumeBox()
 {
-    cout<<"EED::JPRG::vtkClipping3DDataViewer::Configure_VolumeBox() start"<<endl;
-
 	_volumerendererdata->SetImageData(_vtkmprbasedata->GetImageData());
 
 
     vector<double> *gv = this->GetGreyValuesTransferenceFVector();
     vector<double> *op = this->GetIntensityValuesTransferenceFVector();
 
-	printf("EED::vtkClipping3DDataViewer::Configure_VolumeBox  _ctfun=%p \n",_ctfun);
-
-
     _volumerendererdata->SetLookUpTable((vtkLookupTable*)(_ctfun));
     _volumerendererdata->OpacityChanged(*gv, *op);
 
     //_wxvtkclipping3Dview->VisibleVolumeActor( false );
     //_volumerendererdata->ShowVolume(event.IsChecked() );
        //_volumerendererdata->BoundingBoxChanged(event.IsChecked() );
-	
-    cout<<"EED::JPRG::vtkClipping3DDataViewer::Configure_VolumeBox() end"<<endl;
 }
 
 void vtkClipping3DDataViewer::SetRenderer(vtkRenderer* renderer)