X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualViewPoint.cpp;h=ca17755e25093e7b65bd8f89bbfcdcaadd2ae73f;hb=ca35b13e046343c8b50cbd6b833828b06c9d1608;hp=4a0dedcfc1feb49cb776d0ed02119a905beee28f;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.cpp
index 4a0dedc..ca17755 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.cpp
@@ -119,14 +119,15 @@ vtkActor* manualViewPoint::CreateVtkPointActor()
 	_pts = vtkPoints::New();
 	_pts->SetNumberOfPoints(8);
 
-	_pts->SetPoint(0, -1000	, -1000	, 0 );
-	_pts->SetPoint(1,  1000	, -1000	, 0 );
-	_pts->SetPoint(2,  1000	,  1000	, 0 );
-	_pts->SetPoint(3, -1000	,  1000	, 0 );
-	_pts->SetPoint(4, -1000	,  1000	, 0 );
-	_pts->SetPoint(5, -1000	,  1000	, 0 );
-	_pts->SetPoint(6, -1000	,  1000	, 0 );
-	_pts->SetPoint(7, -1000	,  1000 , 0 );
+//EED
+//	_pts->SetPoint(0, -1000	, -1000	, 0 );
+//	_pts->SetPoint(1,  1000	, -1000	, 0 );
+//	_pts->SetPoint(2,  1000	,  1000	, 0 );
+//	_pts->SetPoint(3, -1000	,  1000	, 0 );
+//	_pts->SetPoint(4, -1000	,  1000	, 0 );
+//	_pts->SetPoint(5, -1000	,  1000	, 0 );
+//	_pts->SetPoint(6, -1000	,  1000	, 0 );
+//	_pts->SetPoint(7, -1000	,  1000 , 0 );
 	
 	vtkCellArray *lines = vtkCellArray::New();
 	lines->InsertNextCell(17);
@@ -156,7 +157,16 @@ vtkActor* manualViewPoint::CreateVtkPointActor()
 	_pointVtkActor	=	vtkActor::New();
     _bboxMapper		=	vtkPolyDataMapper::New();
 
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	_bboxMapper->SetInput(_pd);
+#else
+	_bboxMapper->SetInputData(_pd);
+#endif
+
+
 //	_bboxMapper->ImmediateModeRenderingOn();
 	_pointVtkActor->SetMapper(_bboxMapper);
 //	_pointVtkActor->GetProperty()->BackfaceCullingOn();
@@ -190,6 +200,9 @@ void manualViewPoint::SetPositionXY(double x, double y,double i_range,double pos
 		_pts->SetPoint(5, x+range, y+range, posZ+range);
 		_pts->SetPoint(6, x+range, y-range, posZ+range);
 		_pts->SetPoint(7, x-range, y-range, posZ+range);
+
+//EED 2017-03-02
+		_pts->Modified();
 	}
 }