X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkImageViewer2_XYZ.cxx;h=3398325ba00bc385b0958886eb551361facd7c7e;hb=f9901e756bb82bd333310b47607875331616bb29;hp=69a183fd49a728ad669b2f55543f9cd41d781911;hpb=1484229c7f3dab0bc65f08edc2e8d477f92424ff;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkImageViewer2_XYZ.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkImageViewer2_XYZ.cxx
index 69a183f..3398325 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkImageViewer2_XYZ.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkImageViewer2_XYZ.cxx
@@ -27,22 +27,29 @@
 #include "vtkRenderer.h"
 #include "vtkImageActor.h"
 #include "vtkImageData.h"
+
+
+
+
+
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 vtkImageViewer2_XYZ::vtkImageViewer2_XYZ()
 {
-	_vtkimageviewer2=  vtkImageViewer2::New();
+	_colortable 		= NULL;
+	_vtkimageviewer2 	= vtkImageViewer2::New();
 	_vtkimageviewer2->GetRenderer()->GradientBackgroundOn();
 	_vtkimageviewer2->GetRenderer()->SetBackground( 0.33 , 0.33 , 0.33 );
 	_vtkimageviewer2->GetRenderer()->SetBackground2( 0.66 , 0.66 , 0.66 );
-	_colortable = NULL;
 }
+
 //-------------------------------------------------------------------
 vtkImageViewer2_XYZ::~vtkImageViewer2_XYZ()
 {
 	//_vtkimageviewer2->Delete();
 }
+
 //-------------------------------------------------------------------
 void vtkImageViewer2_XYZ::SetExtentDimension(int x1,int x2,
 											 int y1,int y2,
@@ -112,13 +119,37 @@ vtkImageViewer2 *vtkImageViewer2_XYZ::GetVtkImageViewer2()
 {
 	return _vtkimageviewer2;
 }
+
 //-------------------------------------------------------------------
 void vtkImageViewer2_XYZ::setColorTransferFunction(vtkColorTransferFunction* colortable)
 {	
-	vtkImageMapToWindowLevelColors* imagemaptowindowlevel = _vtkimageviewer2->GetWindowLevel();
-	if(colortable!=NULL&&colortable->GetSize()>0 && _colortable != colortable)
+	if(colortable!=NULL && colortable->GetSize()>0 && _colortable!=colortable)
 	{
 		_colortable = colortable;
-		imagemaptowindowlevel->SetLookupTable(colortable);
-	}
+		vtkImageMapToWindowLevelColors* imagemaptowindowlevel = _vtkimageviewer2->GetWindowLevel();
+		imagemaptowindowlevel->SetLookupTable(_colortable);
+	} // if colortable
 }
+
+//-------------------------------------------------------------------
+void vtkImageViewer2_XYZ::setScalarsToColors(vtkScalarsToColors* colortable, int outputformat)
+{
+/* outputformat      VTK-8.1.1/Common/Core/vtkSystemIncludes.h
+	VTK_LUMINANCE       1
+	VTK_LUMINANCE_ALPHA 2
+	VTK_RGB             3  OK
+	VTK_RGBA            4
+*/
+	if( _colortable!=colortable)
+	{
+		_colortable = colortable;
+		_vtkimageviewer2->GetWindowLevel()->SetOutputFormat( outputformat );
+		_vtkimageviewer2->GetWindowLevel()->SetLookupTable(colortable);
+		_vtkimageviewer2->GetWindowLevel()->SetOutputFormatToRGB();
+//	vtkLookupTableDirectionVector2 *_LutEED = vtkLookupTableDirectionVector2::New();
+//	_LutEED->SetVectorModeToRGBColors();
+//	_vtkimageviewer2->GetWindowLevel()->SetLookupTable(_LutEED);
+	} // if colortable
+}
+
+