X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FLayerImageBase.cxx;h=1e402d3b35785d86341c215e7f797ca9285c2487;hb=d5e0666e18ece9462fa780e06a3b3a541266363c;hp=d7e3e7284cfb40319a7f7f6176bcbccf876ae29a;hpb=2154a89395b7e9869b0e3dea859425d52a5aa9bd;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 d7e3e72..1e402d3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -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;
@@ -191,7 +191,15 @@ void LayerImageBase::SetImage(vtkImageData* image)
 	spcBase[5]=0;
 
 	_image = image;
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+	_image->Update();
 	_image->GetWholeExtent(ext);
+#else
+	_image->GetExtent(ext);
+#endif
+
 	dimensionOriginalLayer[0] = ext[1]-ext[0]+1;
 	dimensionOriginalLayer[1] = ext[3]-ext[2]+1;
 	dimensionOriginalLayer[2] = ext[5]-ext[4]+1;
@@ -204,23 +212,39 @@ void LayerImageBase::SetImage(vtkImageData* image)
 		vtkImageData 	*imagebase		=	GetwxVtkBaseView()->GetVtkBaseData()->GetImageData();
 		if (imagebase!=NULL) 
 		{	
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			imagebase->GetWholeExtent(ext);
+#else
+			imagebase->GetExtent(ext);
+#endif
+
 			dimBase[0]=ext[1]-ext[0]+1;				
 			dimBase[1]=ext[3]-ext[2]+1;				
 			dimBase[2]=ext[5]-ext[4]+1;				
 			SetDimensionBase(dimBase);
 			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();
 
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_imageChangeInformation->SetInput(_image);
+#else
+	_imageChangeInformation->SetInputData(_image);
+#endif
+
 }
 
 //------------------------------------------------------------------------------
@@ -301,6 +325,12 @@ void LayerImageBase::GetDimensionBase(int *dim)
 }
 
 
+//------------------------------------------------------------------------------
+void LayerImageBase::SetColorBarPosition(std::vector<int> &colorbarposition)
+{
+   _colorBarPosition=colorbarposition;
+}
+
 //------------------------------------------------------------------------------
 void LayerImageBase::SetRangeForColorBar(std::vector<double> &range)
 {
@@ -389,24 +419,6 @@ void LayerImageBase::CleanXYZ(double &x, double &y, double &z)
 		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];
-	}
-*/
-
 }
 
 //----------------------------------------------------------------------------
@@ -418,10 +430,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();
@@ -432,6 +446,7 @@ void LayerImageBase::onThreshold()
 			directionViewer =  wxvtk2dbasevie->GetDirection();
 		} // ParallelProjection
 
+
 		if (!GetActorPresent())
 		{
 			if (_thresholdTable==NULL)
@@ -449,8 +464,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 );
@@ -472,7 +495,14 @@ void LayerImageBase::onThreshold()
 		}  // !GetActorPresent()
 
 		ConfigLookupTable();  // virtual method
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_imageReslicer->SetInput( GetImage() );
+#else
+		_imageReslicer->SetInputData( GetImage() );
+#endif
+
 		_imageReslicer->SetInformationInput( GetImage() );
 
 		if (directionViewer==0)
@@ -504,9 +534,24 @@ void LayerImageBase::onThreshold()
 //		img->UpdateInformation();
 
 //		_thresholdTable->Update();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_thresholdMapper->SetInput( img );
+#else
+		_thresholdMapper->SetInputData( img );
+#endif
+
 		_thresholdMapper->SetLookupTable( _thresholdTable );
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_thresholdActor->SetInput( _thresholdMapper->GetOutput() );
+#else
+		_thresholdActor->SetInputData( _thresholdMapper->GetOutput() );
+#endif
+
 		
 		_scalarbarActor->SetLookupTable( _thresholdTable );
 //		_scalarbarActor->SetLookupTable( _thresholdMapper->GetLookupTable() );
@@ -553,7 +598,7 @@ void LayerImageBase::onThresholdChangeOpacity (int opacity)
 {
 	if (_actorPresent)
 	{
-		_thresholdActor->SetOpacity(opacity*0.1);
+		_thresholdActor->SetOpacity(opacity/100.0);
 	}
 }