X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuDrawAxe3D.cxx;h=f7be326c61962da3983b7cab719e1fe130671dd1;hb=d79fc05657cfa43ed1cd6937a5acaeaf70e09b45;hp=5736969768048baf27802e602f6f1541859a6338;hpb=4c0b672320742ea3ced419ca0354b50c7c1f2915;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
index 5736969..f7be326 100644
--- a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
@@ -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 "bbmaracasvisuDrawAxe3D.h"
 #include "bbcreaMaracasVisuPackage.h"
 
@@ -19,6 +44,7 @@ void DrawAxe3D::Process()
 	std::vector< double > vecty = bbGetInputlstPointY();
 	std::vector< double > vectz = bbGetInputlstPointZ();	
 
+
 //	vtkImageData* img = bbGetInputImage();	
 	unsigned int i;
 	double spc[3];	
@@ -27,7 +53,8 @@ void DrawAxe3D::Process()
 	spc[1]=1;
 	spc[2]=1;
 
-	if(!vectx.empty()&&!vecty.empty()&&!vectz.empty()){
+	if(!vectx.empty()&&!vecty.empty()&&!vectz.empty())
+        {
 		vtkPoints* allPoints = vtkPoints::New( );
 		vtkCellArray* allTopology = vtkCellArray::New( );
 		allTopology->InsertNextCell( vectx.size() );
@@ -47,7 +74,10 @@ void DrawAxe3D::Process()
 	mvtkactor->GetProperty()->SetColor( bbGetInputColour()[0],  
 				bbGetInputColour()[1], 
 				bbGetInputColour()[2] );
-
+	//EC Axe Opacity property added
+	///Default Values
+	double opacity=bbGetInputOpacity();
+	mvtkactor->GetProperty()->SetOpacity( opacity );
 	if ( bbGetInputTransform()!=NULL )
 	{
 		mvtkactor->SetUserTransform( bbGetInputTransform() );
@@ -61,6 +91,9 @@ void DrawAxe3D::Process()
      }
 }
 
+
+
+
 void DrawAxe3D::bbUserSetDefaultValues()
 {
 	firsttime        = true;
@@ -73,6 +106,9 @@ void DrawAxe3D::bbUserSetDefaultValues()
     colour.push_back(0.0);
     colour.push_back(0.0);
     bbSetInputColour(colour);
+    bbSetInputOpacity(1.0);
+    bbSetInputRenderer(NULL);
+    bbSetInputTransform(NULL);
 }
 
 
@@ -84,7 +120,13 @@ void DrawAxe3D::bbUserSetDefaultValues()
 		polydatamapper = vtkPolyDataMapper::New();
 		mvtkactor      = vtkActor::New();
 		
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		polydatamapper->SetInput(mallData);
+#else
+		polydatamapper->SetInputData(mallData);
+#endif
+
 		mvtkactor->SetMapper(polydatamapper);
 		bbSetOutputOut(mvtkactor);
 	}