X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuDrawAxe3D.cxx;h=fa7a0cfe5c7ebf9fed64923660ecd44af0e51a30;hb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;hp=cd9997b4087ced046f0f9161465b126adfc456f2;hpb=7673025235c97a2fded5c1a8190028f21bd9930a;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
index cd9997b..fa7a0cf 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"
 
@@ -15,12 +40,11 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,DrawAxe3D)
 BBTK_BLACK_BOX_IMPLEMENTATION(DrawAxe3D,bbtk::AtomicBlackBox);
 void DrawAxe3D::Process()
 {
-	printf("EED DrawAxe3D::Process start \n");
-	
 	std::vector< double > vectx = bbGetInputlstPointX();
 	std::vector< double > vecty = bbGetInputlstPointY();
 	std::vector< double > vectz = bbGetInputlstPointZ();	
 
+
 //	vtkImageData* img = bbGetInputImage();	
 	unsigned int i;
 	double spc[3];	
@@ -29,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() );
@@ -49,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,11 +89,11 @@ void DrawAxe3D::Process()
 		firsttime=false;
 	    bbGetInputRenderer()->AddActor( mvtkactor );
      }
-	
-	printf("EED DrawAxe3D::Process end \n");
-
 }
 
+
+
+
 void DrawAxe3D::bbUserSetDefaultValues()
 {
 	firsttime        = true;
@@ -78,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);
 }