X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FWidgetShowNPoints.cxx;h=3cdf1e0b73b9c7108ad9da1b5a4df5cd1e74fc8d;hb=f9901e756bb82bd333310b47607875331616bb29;hp=d221713dba5553bac5ab3eb6d48f68398f77254e;hpb=dea0efc567d8332b2e7eb936e3ba4ac1c11b2542;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
index d221713..3cdf1e0 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
@@ -225,6 +225,13 @@ void WidgetShowNPoints::RefreshPoint(int id)
 	lstActorsSphere[id]->GetProperty()->SetOpacity( mopacity );
 	lstSourceSphere[id]->SetRadius( radio );
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+	// ..
+#else
+	lstSourceSphere[id]->Update();
+#endif
+
 	lstActorsText[id]->SetInput( label.c_str()  );
 	lstActorsText[id]->SetPosition(  radio+spc[0]*x , spc[1]*y , spc[2]*z );
 }
@@ -251,7 +258,15 @@ void WidgetShowNPoints::AddVtkPoint()
 	//NTU: For updating points
 	lstSourceSphere.push_back(vtksphere);
 	vtkPolyDataMapper *sphereMapper	= vtkPolyDataMapper::New();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	sphereMapper->SetInput( vtksphere->GetOutput() );
+#else
+	vtksphere->Update();
+	sphereMapper->SetInputData( vtksphere->GetOutput() );
+#endif
+
 	vtkActor *sphereActor	= vtkActor::New();
 	sphereActor->SetMapper(sphereMapper);
 	sphereActor->SetOrigin(0, 0, 0);
@@ -356,6 +371,9 @@ void WidgetShowNPoints::OnInsertPoint (wxCommandEvent& event)//CFT
 //------------------------------------------------------------------------
 	void WidgetShowNPoints::OnSavePoints(wxCommandEvent& event)
 	{
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 		wxFileDialog* FD = new wxFileDialog( 0,
                                             _T("Save points .."),
                                             _T(""),
@@ -363,7 +381,17 @@ void WidgetShowNPoints::OnInsertPoint (wxCommandEvent& event)//CFT
                                             _T("(*.xls)|*.xls"),
                                             wxSAVE | wxOVERWRITE_PROMPT,
                                             wxDefaultPosition);
-		//EED
+#else
+		wxFileDialog* FD = new wxFileDialog( 0,
+                                            _T("Save points .."),
+                                            _T(""),
+                                            _T(""),
+                                            _T("(*.xls)|*.xls"),
+                                            wxFD_SAVE | wxFD_OVERWRITE_PROMPT,
+                                            wxDefaultPosition);
+#endif
+
+
 
 		int result_FD = FD->ShowModal();
 		
@@ -381,6 +409,9 @@ void WidgetShowNPoints::OnInsertPoint (wxCommandEvent& event)//CFT
 //------------------------------------------------------------------------
 	void WidgetShowNPoints::OnLoadPoints(wxCommandEvent& event)
 	{
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 		wxFileDialog* FD = new wxFileDialog( 0,
                                              _T("Load points .."),
                                              _T(""),
@@ -388,6 +419,15 @@ void WidgetShowNPoints::OnInsertPoint (wxCommandEvent& event)//CFT
                                              _T("(*.xls)|*.xls"),
                                              wxOPEN | wxFILE_MUST_EXIST,
                                              wxDefaultPosition);
+#else
+		wxFileDialog* FD = new wxFileDialog( 0,
+                                             _T("Load points .."),
+                                             _T(""),
+                                             _T(""),
+                                             _T("(*.xls)|*.xls"),
+                                             wxFD_OPEN | wxFD_FILE_MUST_EXIST,
+                                             wxDefaultPosition);
+#endif
 		int i;
 		//EED
 		int result_FD = FD->ShowModal();