X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxPanelCuttingImageData.cxx;h=d16cff956e6c4ebb0a5305d4b9078f1ab1150aa0;hb=f9901e756bb82bd333310b47607875331616bb29;hp=225204185181b37962493947f6b487c54961ace1;hpb=c5bb8b228d6fcd2a4ea1d6210bfa3a39d6bcac33;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx
index 2252041..d16cff9 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxPanelCuttingImageData.cxx
@@ -106,7 +106,12 @@ void wxPanelCuttingImageData::Create3DViewObjects()
 	_vtksphere->SetThetaResolution (20);
 	_vtksphere->SetPhiResolution (20);
 	_sphereMapper	= vtkPolyDataMapper::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_sphereMapper->SetInput( _vtksphere->GetOutput() );
+#else
+	_sphereMapper->SetInputData( _vtksphere->GetOutput() );
+#endif
 	_sphereActor	= vtkActor::New();
 	_sphereActor->SetMapper(_sphereMapper);
 	_sphereActor->SetOrigin(0, 0, 0);
@@ -120,7 +125,12 @@ void wxPanelCuttingImageData::Create3DViewObjects()
 	_vtkcube->SetYLength (1);
 	_vtkcube->SetZLength (1);
 	_cubeMapper		= vtkPolyDataMapper::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_cubeMapper->SetInput( _vtkcube->GetOutput() );
+#else
+	_cubeMapper->SetInputData( _vtkcube->GetOutput() );
+#endif
 	_cubeActor		= vtkActor::New();
 	_cubeActor->SetMapper(_cubeMapper);
 	_cubeActor->SetOrigin(0, 0, 0);
@@ -132,7 +142,14 @@ void wxPanelCuttingImageData::Create3DViewObjects()
 	_vtkcylinder	= vtkCylinderSource::New();
 	_vtkcylinder->SetResolution(20);
 	_cylinderMapper	= vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_cylinderMapper->SetInput( _vtkcylinder->GetOutput() );
+#else
+	_cylinderMapper->SetInputData( _vtkcylinder->GetOutput() );
+#endif
+
 	_cylinderActor	= vtkActor::New();
 	_cylinderActor->SetMapper(_cylinderMapper);
 	_cylinderActor->SetOrigin(0, 0, 0);
@@ -166,7 +183,12 @@ void wxPanelCuttingImageData::InitHistogramme()
 	} else {
 		_imageData->GetScalarRange(rangeA);
 	}
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
  	_xyplot->RemoveAllInputs();
+#else
+ 	_xyplot->RemoveAllDataSetInputConnections();
+#endif
 /*
 	if ( _histogrammeVector!=NULL )
 	{
@@ -175,9 +197,14 @@ void wxPanelCuttingImageData::InitHistogramme()
 */
 	_histogrammeVector =  vtkImageData::New();
     _histogrammeVector -> SetDimensions ( (int)(rangeA[1]),1,1 );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     _histogrammeVector -> SetScalarTypeToUnsignedShort();
     _histogrammeVector -> AllocateScalars();    
     _histogrammeVector -> Update(); 
+#else
+    _histogrammeVector -> AllocateScalars(VTK_UNSIGNED_SHORT,1);    
+#endif
 	
 	unsigned short *p_vol = (unsigned short*)_histogrammeVector->GetScalarPointer(0,0,0);
 	int i,size = (int) (rangeA[1]);
@@ -188,7 +215,15 @@ void wxPanelCuttingImageData::InitHistogramme()
 	}
 	_xyplot->SetXRange(0, rangeA[1]);
 	_xyplot->SetYRange(0, 10);
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_xyplot->AddInput( _histogrammeVector );
+#else
+	_xyplot->AddDataSetInput( _histogrammeVector );
+#endif
+
 }
 
 //-------------------------------------------------------------------
@@ -242,24 +277,24 @@ void wxPanelCuttingImageData::CreateInterface()
 
 	
 	_typeFig	= new wxChoice(this,-1);
-	_opacityFig	= new wxSlider(this,-1,100,0,100, wxDefaultPosition, wxSize(200,45), wxSL_HORIZONTAL | wxSL_LABELS);
+	_opacityFig	= new wxSlider(this,-1,100,0,100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
 
-	_scaleX		= new wxSlider(this,-1,6,0,500	, wxDefaultPosition, wxSize(200,45), wxSL_HORIZONTAL | wxSL_LABELS);
-	_scaleY		= new wxSlider(this,-1,20,0,500	, wxDefaultPosition, wxSize(200,45), wxSL_HORIZONTAL | wxSL_LABELS);
-	_scaleZ		= new wxSlider(this,-1,7,0,500	, wxDefaultPosition, wxSize(200,45), wxSL_HORIZONTAL | wxSL_LABELS);
+	_scaleX		= new wxSlider(this,-1,6,0,500	, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
+	_scaleY		= new wxSlider(this,-1,20,0,500	, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
+	_scaleZ		= new wxSlider(this,-1,7,0,500	, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
 
-	_rotationX	= new wxSlider(this,-1,0,-360,360, wxDefaultPosition, wxSize(200,45), wxSL_HORIZONTAL | wxSL_LABELS);
-	_rotationY	= new wxSlider(this,-1,0,-360,360, wxDefaultPosition, wxSize(200,45), wxSL_HORIZONTAL | wxSL_LABELS);
-	_rotationZ	= new wxSlider(this,-1,0,-360,360, wxDefaultPosition, wxSize(200,45), wxSL_HORIZONTAL | wxSL_LABELS);
+	_rotationX	= new wxSlider(this,-1,0,-360,360, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
+	_rotationY	= new wxSlider(this,-1,0,-360,360, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
+	_rotationZ	= new wxSlider(this,-1,0,-360,360, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
 
 	_volIntern		= new wxRadioButton(this,-1, _T("Volume intern " ));
 	_volExtern		= new wxRadioButton(this,-1, _T("Volume extern " ));
 
 	_histogrammeAccumulated = new wxCheckBox(this,-1,_T("Histogramme accumulated"));
 
-	_isoValue				= new wxSlider(this,-1, 200, 0,2000, wxDefaultPosition, wxSize(200,45), wxSL_HORIZONTAL | wxSL_LABELS);
-	_valueBeforeIsoValue	= new wxSlider(this,-1,-1,-1,2000, wxDefaultPosition, wxSize(200,45), wxSL_HORIZONTAL | wxSL_LABELS);
-	_valueAfterIsoValue		= new wxSlider(this,-1,-1,-1,2000, wxDefaultPosition, wxSize(200,45), wxSL_HORIZONTAL | wxSL_LABELS);
+	_isoValue				= new wxSlider(this,-1, 200, 0,2000, wxDefaultPosition,wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
+	_valueBeforeIsoValue	= new wxSlider(this,-1,-1,-1,2000, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
+	_valueAfterIsoValue		= new wxSlider(this,-1,-1,-1,2000, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_LABELS);
 
 	wxButton *btnExtract	= new wxButton(this, -1,_T("Extract"));
 
@@ -478,7 +513,14 @@ void wxPanelCuttingImageData::OnExtract(wxCommandEvent& event)
 		}
 	}
 	double range[2];
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_histogrammeVector->Update();
+#else
+	_histogrammeVector->Modified();
+#endif
+
 	_histogrammeVector->GetScalarRange(range);
 	_xyplot->SetYRange( 0	, range[1]	);
 	_xyplot->SetXRange( min , max		);