X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuDrawAxe3D.cxx;h=9d65ade80712dd580a5db61edbd0472ae07bd1a9;hb=f828884b0ce84ed5d324a6b7533c7758e53eae91;hp=821576a8304f2cf4b97b34dc5c704ed20f562354;hpb=de5cb63cdc23317a114c77f7b6184126d7988508;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
index 821576a..9d65ade 100644
--- a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
@@ -1,24 +1,45 @@
+/*# ---------------------------------------------------------------------
+#
+# 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"
 
-
 #include "vtkImageData.h"
 #include "vtkActor.h"
-#include "vtkPolyDataMapper.h"
 #include "vtkPoints.h"
 #include "vtkCellArray.h"
 #include "vtkProperty.h"
 
-
+#include "vtkLinearTransform.h"
 namespace bbcreaMaracasVisu
 {
 
-
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,DrawAxe3D)
 BBTK_BLACK_BOX_IMPLEMENTATION(DrawAxe3D,bbtk::AtomicBlackBox);
 void DrawAxe3D::Process()
 {
-
 	std::vector< double > vectx = bbGetInputlstPointX();
 	std::vector< double > vecty = bbGetInputlstPointY();
 	std::vector< double > vectz = bbGetInputlstPointZ();	
@@ -38,7 +59,7 @@ void DrawAxe3D::Process()
 
 		for( i = 0; i < vectx.size( ); i++) {	
 			//multiplicar ver parametros spacing, en maracas cuando se toca la imagen y se ve dycom
-			//hay parámetro dycom, vtkImagedata valor spacing y esos datos hay que multiplicar al polydata
+			//hay parametro dicom, vtkImagedata valor spacing y esos datos hay que multiplicar al polydata
 			allPoints->InsertNextPoint( vectx[i]*spc[0],  vecty[i]*spc[1], vectz[i]*spc[2] );
 			allTopology->InsertCellPoint( i );
 		} // rof
@@ -49,9 +70,12 @@ void DrawAxe3D::Process()
 	}
 
 	mvtkactor->GetProperty()->SetColor( bbGetInputColour()[0],  
-										bbGetInputColour()[1], 
-										bbGetInputColour()[2] );
-
+				bbGetInputColour()[1], 
+				bbGetInputColour()[2] );
+	//EC Axe Opacity property added
+	///Default Values
+	double opacity=bbGetInputOpacity();
+	mvtkactor->GetProperty()->SetOpacity( opacity );
 	if ( bbGetInputTransform()!=NULL )
 	{
 		mvtkactor->SetUserTransform( bbGetInputTransform() );
@@ -63,33 +87,60 @@ void DrawAxe3D::Process()
 		firsttime=false;
 	    bbGetInputRenderer()->AddActor( mvtkactor );
      }
-
 }
 
-void DrawAxe3D::bbUserConstructor()
+void DrawAxe3D::bbUserSetDefaultValues()
 {
-	firsttime							= true;
-	mallData							= vtkPolyData::New( );
-	vtkPolyDataMapper* polydatamapper	= vtkPolyDataMapper::New();
-	mvtkactor							= vtkActor::New();
-	polydatamapper->SetInput(mallData);
-	mvtkactor->SetMapper(polydatamapper);
-	bbSetOutputOut(mvtkactor);
+	firsttime        = true;
+	mallData         = NULL;
+	polydatamapper   = NULL;
+	mvtkactor        = NULL;
 
     std::vector<double> colour;
     colour.push_back(1.0);
     colour.push_back(0.0);
     colour.push_back(0.0);
     bbSetInputColour(colour);
+    bbSetInputOpacity(1.0);
 }
 
-void DrawAxe3D::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-void DrawAxe3D::bbUserDestructor()
-{
-}
 
+
+	//-----------------------------------------------------------------	
+	void DrawAxe3D::bbUserInitializeProcessing()
+	{
+		mallData       = vtkPolyData::New( );
+		polydatamapper = vtkPolyDataMapper::New();
+		mvtkactor      = vtkActor::New();
+		
+		polydatamapper->SetInput(mallData);
+		mvtkactor->SetMapper(polydatamapper);
+		bbSetOutputOut(mvtkactor);
+	}
+
+	//-----------------------------------------------------------------	
+	void DrawAxe3D::bbUserFinalizeProcessing()
+	{
+		if (mallData!=NULL)
+		{
+			mallData->Delete();
+			mallData=NULL;
+		}
+		
+		if (polydatamapper!=NULL)
+		{
+			polydatamapper->Delete();
+			polydatamapper=NULL;
+		}
+		
+		if (mvtkactor!=NULL)
+		{
+			mvtkactor->Delete();
+			mvtkactor=NULL;
+		}
+	}
+
+	//-----------------------------------------------------------------	
 }
 
 // EO namespace bbcreaMaracasVisu