X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FvtkPlane2DView.cxx;h=306b6e3f60fef7d5d2ec4aff70c4bf74de16ec55;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=1f5ceee9bdbcfefc0a59f14e18dc02b7e05404b2;hpb=ba3bf1e05af2b03d6b013606b9d885d8fb0b2cb4;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx
index 1f5ceee..306b6e3 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkPlane2DView.cxx
@@ -248,10 +248,14 @@ void vtkPlane2DView::Extract_One_PlaneVTK()
 //	_change	  -> SetInput( _stPoints );  
 //	_change	  -> Update();    //important
 	_imageViewer2XYZ->GetVtkImageViewer2()->SetInput ( _stPoints );
-
 #else
-	_stPoints -> SetScalarType( imagedata->GetScalarType() );
-	_stPoints -> SetScalarTypeToShort();
+printf("EED Warning!  vtkPlane2DView::Extract_One_PlaneVTK     VTK 5->7   ???? SetScalarTypeToShort  \n");
+printf("EED Warning!  vtkPlane2DView::Extract_One_PlaneVTK     VTK 5->7   ???? SetScalarTypeToShort  \n");
+printf("EED Warning!  vtkPlane2DView::Extract_One_PlaneVTK     VTK 5->7   ???? SetScalarTypeToShort  \n");
+printf("EED Warning!  vtkPlane2DView::Extract_One_PlaneVTK     VTK 5->7   ???? SetScalarTypeToShort  \n");
+printf("EED Warning!  vtkPlane2DView::Extract_One_PlaneVTK     VTK 5->7   ???? SetScalarTypeToShort  \n");
+	vtkInformation* info=_stPoints->GetInformation();
+	vtkDataObject::SetPointDataActiveScalarInfo(info, VTK_SHORT, 1);
 	_imageViewer2XYZ->GetVtkImageViewer2()->SetInputData( _stPoints );
 
 #endif
@@ -378,7 +382,7 @@ void vtkPlane2DView::Configure( )
 	_stPoints	 = vtkStructuredPoints::New( );
  	_change		 = vtkImageChangeInformation::New();
 
-	wxVTKRenderWindowInteractor *iren		= GetWxVTKRenderWindowInteractor();
+	crea::wxVTKRenderWindowInteractor *iren		= GetWxVTKRenderWindowInteractor();
 	ExtractPlane();
 //	SetActive(false);
 	_imageViewer2XYZ -> GetVtkImageViewer2()	-> SetupInteractor ( iren );
@@ -444,10 +448,10 @@ void vtkPlane2DView::HorizontalLine()
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
 	_lineMapper->SetInput(_pd);
+	_lineMapper->ImmediateModeRenderingOn();
 #else
 	_lineMapper->SetInputData(_pd);
 #endif
-	_lineMapper->ImmediateModeRenderingOn();
 	_lineActor->SetMapper(_lineMapper);
 	_lineActor->GetProperty()->BackfaceCullingOn();
 	_lineActor->GetProperty()->SetDiffuseColor(0,0,1);