X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FLayerImageBase.cxx;h=2549d1471dc4e2a94361101c51786545b52d10a8;hb=b6368e519e4fc1e5df411489848e54d4e26bf4ec;hp=8f1fc5e04406beae38226215da1528ddab6cd2fc;hpb=d1de4d9e4121e4602daf11142cbc4b03c386d98a;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..2549d14 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -32,7 +32,7 @@
 
 #include "wxMPRBaseData.h"
 #include "wxVtk2DBaseView.h"
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 #include "vtkTextProperty.h"
 
 
@@ -67,7 +67,7 @@ class ColorLayerObserver : public vtkCommand{
 					_layerimagebase->SetX( vtkmprbasedata->GetX() );
 					_layerimagebase->SetY( vtkmprbasedata->GetY() );
 					_layerimagebase->SetZ( vtkmprbasedata->GetZ() );
-	     	   	_layerimagebase->onThresholdChange();
+	 	    	   	_layerimagebase->onThresholdChange();
 				} // if basedata
 				
 			} // if wxvtkbaseview
@@ -94,9 +94,9 @@ private:
 LayerImageBase::LayerImageBase()
 {
 	_actorPresent			=	false;
-	_X						=	0;
-	_Y						=	0;
-	_Z						=	0;
+	_X						=	-1;
+	_Y						=	-1;
+	_Z						=	-1;
 	_thresholdTable			=	NULL;
 	_thresholdMapper		=	NULL;
 	_scalarbarActor			=	NULL;
@@ -173,8 +173,25 @@ 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->Update();
 	_image->GetWholeExtent(ext);
 	dimensionOriginalLayer[0] = ext[1]-ext[0]+1;
 	dimensionOriginalLayer[1] = ext[3]-ext[2]+1;
@@ -188,21 +205,21 @@ 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 );
- 			SetY( dimBase[1]*spcBase[1]/2 );
- 			SetZ( dimBase[2]*spcBase[2]/2 );
+
+			if ((_X<0) || (_X>dimBase[0])) { SetX( dimBase[0]/2 ); } 
+			if ((_Y<0) || (_Y>dimBase[1])) { SetY( dimBase[1]/2 ); } 
+			if ((_Z<0) || (_Z>dimBase[2])) { SetZ( dimBase[2]/2 ); } 
+
+
 		} // if imagebase
 	} // if wxvtkbaseview
-	_image->Update();
 	_image->GetScalarRange( _range );
 	_thresholdTable = vtkLookupTable::New();
 
@@ -287,6 +304,12 @@ void LayerImageBase::GetDimensionBase(int *dim)
 }
 
 
+//------------------------------------------------------------------------------
+void LayerImageBase::SetColorBarPosition(std::vector<int> &colorbarposition)
+{
+   _colorBarPosition=colorbarposition;
+}
+
 //------------------------------------------------------------------------------
 void LayerImageBase::SetRangeForColorBar(std::vector<double> &range)
 {
@@ -318,7 +341,6 @@ void LayerImageBase::SetwxVtkBaseView(wxVtkBaseView *baseview)
 		ColorLayerObserver *colorlayerobserver = ColorLayerObserver::New();
 		_baseView->GetVtkBaseData()->AddObserver( 1, colorlayerobserver );
 		colorlayerobserver->SetLayerImageBase(this);
-
 	} // if _baseView
 }
 
@@ -347,61 +369,35 @@ 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;
 	}
-
 	
-/*
-
-	if ( x > (ext[1]-ext[0]) )
-	{
-		z=ext[1]-ext[0];
-	}
-
-	if ( y > (ext[3]-ext[2]) )
-	{
-		z=ext[3]-ext[2];
-	}
-
-	if ( z > (ext[5]-ext[4]) )
-	{
-		z=ext[5]-ext[4];
-	}
-*/
-
 }
 
 //----------------------------------------------------------------------------
@@ -413,10 +409,12 @@ void LayerImageBase::onThreshold()
 		double y=GetY();
 		double z=GetZ();
 
+
 		x = x*_spcBase[0];
 		y = y*_spcBase[1];
 		z = z*_spcBase[2];
 
+
 		CleanXYZ(x,y,z);
 
 		vtkCamera *camera = _baseView->GetRenderer()->GetActiveCamera();
@@ -427,6 +425,7 @@ void LayerImageBase::onThreshold()
 			directionViewer =  wxvtk2dbasevie->GetDirection();
 		} // ParallelProjection
 
+
 		if (!GetActorPresent())
 		{
 			if (_thresholdTable==NULL)
@@ -444,8 +443,16 @@ void LayerImageBase::onThreshold()
 			{
 				_thresholdActor = vtkImageActor::New( );
 				_scalarbarActor = vtkScalarBarActor::New();
-				_thresholdActor->SetOpacity( 0.6 );
+				if (_colorBarPosition.size()==2)
+				{ 
+					_scalarbarActor->SetDisplayPosition(_colorBarPosition[0],_colorBarPosition[1]);
+				} else {
+					_scalarbarActor->SetDisplayPosition(0,0);
+				}
+
+				_thresholdActor->SetOpacity( 1 );
 				_thresholdActor->InterpolateOn(  );
+				
 				if (directionViewer==0)
 				{
 					_thresholdActor->SetPosition( 900-1,0,0 );
@@ -503,8 +510,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();
@@ -548,7 +555,7 @@ void LayerImageBase::onThresholdChangeOpacity (int opacity)
 {
 	if (_actorPresent)
 	{
-		_thresholdActor->SetOpacity(opacity*0.1);
+		_thresholdActor->SetOpacity(opacity/100.0);
 	}
 }