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=f9901e756bb82bd333310b47607875331616bb29;hp=bcac67f98503038e7a79ff5a54b5a228bf6b90b2;hpb=5b48f9a5462110a1400b510b897b7d6a1758dca6;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 bcac67f..ca17755 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoint.cpp
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "manualViewPoint.h"
 
 // ----------------------------------------------------------------------------
@@ -94,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);
@@ -131,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();
@@ -165,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();
 	}
 }