X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuDrawAxe3D.h;h=da174e61361f8a1805b69f21befcd26d70c9186e;hb=132c3c066a857fbd0c3338d405b2bbc28d407ffc;hp=6058c470195d320a1bac00ad8983f72765b3c3f5;hpb=145062607fdee243503f20245361ca21d88f31af;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.h b/bbtk/src/bbmaracasvisuDrawAxe3D.h
index 6058c47..da174e6 100644
--- a/bbtk/src/bbmaracasvisuDrawAxe3D.h
+++ b/bbtk/src/bbmaracasvisuDrawAxe3D.h
@@ -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.
+# ------------------------------------------------------------------------ */
+
 #ifndef __bbcreaMaracasVisuDrawAxe3D_h_INCLUDED__
 #define __bbcreaMaracasVisuDrawAxe3D_h_INCLUDED__
 #include "bbtkAtomicBlackBox.h"
@@ -6,6 +31,7 @@
 
 #include "vtkRenderer.h"
 #include "vtkPolyData.h"
+#include "vtkPolyDataMapper.h"
 #include "vtkLinearTransform.h"
 
 namespace bbcreaMaracasVisu
@@ -16,19 +42,12 @@ class /*BBTK_EXPORT*/ DrawAxe3D
    public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(DrawAxe3D,bbtk::AtomicBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(Renderer,vtkRenderer*);
   BBTK_DECLARE_INPUT(lstPointX,std::vector<double>);
   BBTK_DECLARE_INPUT(lstPointY,std::vector<double>);
   BBTK_DECLARE_INPUT(lstPointZ,std::vector<double>);
   BBTK_DECLARE_INPUT(Colour,std::vector<double>);
+  BBTK_DECLARE_INPUT(Opacity,double);
   BBTK_DECLARE_INPUT(Transform, vtkLinearTransform *);
   BBTK_DECLARE_OUTPUT(Out,vtkProp3D *);
 
@@ -37,9 +56,10 @@ virtual void bbUserDestructor();
   void Process();
 
   private:
-    bool			firsttime;
-    vtkPolyData		*mallData;
-	vtkActor		*mvtkactor;
+    bool						firsttime;
+    vtkPolyData			*mallData;
+    vtkActor				*mvtkactor;
+    vtkPolyDataMapper	*polydatamapper;
 };
 
 
@@ -47,12 +67,13 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(DrawAxe3D,bbtk::AtomicBlackBox);
 BBTK_NAME("DrawAxe3D");
 BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
 BBTK_DESCRIPTION("Draw a 3D axe in a vtk 3D Viewer");
-BBTK_CATEGORY("__CATEGORY__");
+BBTK_CATEGORY("actor");
   BBTK_INPUT(DrawAxe3D,Renderer,"vtk Renderer 3D universe",vtkRenderer*,"");
   BBTK_INPUT(DrawAxe3D,lstPointX,"list of point X",std::vector<double>,"");
   BBTK_INPUT(DrawAxe3D,lstPointY,"list of point Y",std::vector<double>,"");
   BBTK_INPUT(DrawAxe3D,lstPointZ,"list of point Z",std::vector<double>,"");
   BBTK_INPUT(DrawAxe3D,Colour,"Color of the line R(0..1) G(0..1) B(0..1) ",std::vector<double>,"colour");
+  BBTK_INPUT(DrawAxe3D,Opacity,"Axe opacity property ",double,"intensity");
   BBTK_INPUT(DrawAxe3D,Transform,"vtkTransform", vtkLinearTransform *,"");
   BBTK_OUTPUT(DrawAxe3D,Out,"Actor",vtkProp3D*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(DrawAxe3D);