X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FLayerImageBase.cxx;h=d7e3e7284cfb40319a7f7f6176bcbccf876ae29a;hb=2154a89395b7e9869b0e3dea859425d52a5aa9bd;hp=8f1fc5e04406beae38226215da1528ddab6cd2fc;hpb=94b0c79651e564f4627916e0f605b928457d39a5;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
index 8f1fc5e..d7e3e72 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -173,7 +173,23 @@ bool LayerImageBase::GetActorPresent()
 void LayerImageBase::SetImage(vtkImageData* image)
 {
 	int 	ext[6];
+	double 	spcBase[3];
 	int 	dimensionOriginalLayer[3];
+	int 	dimBase[6];
+
+	ext[0]=0;
+	ext[1]=0;
+	ext[2]=0;
+	ext[3]=0;
+	ext[4]=0;
+	ext[5]=0;
+	spcBase[0]=0;
+	spcBase[1]=0;
+	spcBase[2]=0;
+	spcBase[3]=0;
+	spcBase[4]=0;
+	spcBase[5]=0;
+
 	_image = image;
 	_image->GetWholeExtent(ext);
 	dimensionOriginalLayer[0] = ext[1]-ext[0]+1;
@@ -188,13 +204,11 @@ void LayerImageBase::SetImage(vtkImageData* image)
 		vtkImageData 	*imagebase		=	GetwxVtkBaseView()->GetVtkBaseData()->GetImageData();
 		if (imagebase!=NULL) 
 		{	
-			int dimBase[6];
 			imagebase->GetWholeExtent(ext);
 			dimBase[0]=ext[1]-ext[0]+1;				
 			dimBase[1]=ext[3]-ext[2]+1;				
 			dimBase[2]=ext[5]-ext[4]+1;				
 			SetDimensionBase(dimBase);
-			double 	spcBase[3];
 			imagebase->GetSpacing(spcBase);
 			SetSpcBase(spcBase);
 		 	SetX( dimBase[0]*spcBase[0]/2 );
@@ -318,7 +332,6 @@ void LayerImageBase::SetwxVtkBaseView(wxVtkBaseView *baseview)
 		ColorLayerObserver *colorlayerobserver = ColorLayerObserver::New();
 		_baseView->GetVtkBaseData()->AddObserver( 1, colorlayerobserver );
 		colorlayerobserver->SetLayerImageBase(this);
-
 	} // if _baseView
 }
 
@@ -347,42 +360,34 @@ vtkLookupTable* LayerImageBase::GetThresholdTable()
 //----------------------------------------------------------------------------
 void LayerImageBase::CleanXYZ(double &x, double &y, double &z)
 {
-
 	if (x<0)
 	{
 		x=0;
 	}
-
 	if (y<0)
 	{
 		y=0;
 	}
-
 	if (z<0)
 	{
 		z=0;
 	}
-
 	double maxSize;
-
 	maxSize=_dimOriginalLayer[0]*_newSpcLayer[0];
 	if ( x > maxSize  )
 	{
 		x=maxSize;
 	}
-
 	maxSize=_dimOriginalLayer[1]*_newSpcLayer[1];
 	if ( y > maxSize  )
 	{
 		y = maxSize;
 	}
-
 	maxSize=_dimOriginalLayer[2]*_newSpcLayer[2];
 	if ( z > maxSize  )
 	{
 		z = maxSize;
 	}
-
 	
 /*
 
@@ -503,8 +508,8 @@ void LayerImageBase::onThreshold()
 		_thresholdMapper->SetLookupTable( _thresholdTable );
 		_thresholdActor->SetInput( _thresholdMapper->GetOutput() );
 		
-//		_scalarbarActor->SetLookupTable( _thresholdTable );
-		_scalarbarActor->SetLookupTable( _thresholdMapper->GetLookupTable() );
+		_scalarbarActor->SetLookupTable( _thresholdTable );
+//		_scalarbarActor->SetLookupTable( _thresholdMapper->GetLookupTable() );
 		_scalarbarActor->SetTitle("Value");
 		_scalarbarActor->SetNumberOfLabels(4);
 		int fontsize = _scalarbarActor->GetLabelTextProperty()->GetFontSize();