X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuRenderingViewer.h;h=c804336d104bca628ebd30423203859a2325004b;hb=880273de17de05d1237a5e8db513b58902b15d6e;hp=cfa444931c8c664dfff134b344ae5ffbde44c1d5;hpb=bee98ac008a4469f1ce8cbf67d178ec8561e19c0;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuRenderingViewer.h b/bbtk/src/bbcreaMaracasVisuRenderingViewer.h
index cfa4449..c804336 100644
--- a/bbtk/src/bbcreaMaracasVisuRenderingViewer.h
+++ b/bbtk/src/bbcreaMaracasVisuRenderingViewer.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.
+# ------------------------------------------------------------------------ */
+
 #ifdef _USE_WXWIDGETS_
 #ifndef __bbcreaMaracasVisuRenderingViewer_h_INCLUDED__
 #define __bbcreaMaracasVisuRenderingViewer_h_INCLUDED__
@@ -5,8 +30,9 @@
 #include "bbtkWxBlackBox.h"
 
 #include "vtkImageData.h"
-//#include "vtkRenderer.h"
 #include "vtkProp3D.h"
+#include "vtkRenderer.h"
+#include "wxVtkBaseView.h"
 
 namespace bbcreaMaracasVisu
 {
@@ -18,9 +44,7 @@ class bbcreaMaracasVisu_EXPORT RenderingViewer
   BBTK_BLACK_BOX_INTERFACE(RenderingViewer,bbtk::WxBlackBox);
   //BBTK_DECLARE_INPUT(Title,std::string); 
   BBTK_DECLARE_INPUT(Renderer,vtkRenderer*);
-  //BBTK_DECLARE_INPUT(RendererSA,vtkRenderer*);
-  //BBTK_DECLARE_INPUT(RendererSB,vtkRenderer*);
-  //BBTK_DECLARE_INPUT(RendererSC,vtkRenderer*);
+  BBTK_DECLARE_INPUT(wxVtkBaseView,wxVtkBaseView*);
   BBTK_DECLARE_INPUT(In1,vtkImageData*);
   BBTK_DECLARE_INPUT(In2,vtkImageData*);
   BBTK_DECLARE_INPUT(In3,vtkImageData*);
@@ -43,9 +67,10 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(RenderingViewer,bbtk::WxBlackBox);
 BBTK_NAME("RenderingViewer");
 BBTK_AUTHOR("Carolina Perez");
 BBTK_DESCRIPTION("Complex box which gathers VolumeRendering and SurfaceRendering funtionalities");
-BBTK_CATEGORY("__CategoryBlackBox__");
+BBTK_CATEGORY("actor");
 //BBTK_INPUT(RenderingViewer,Title,"Title prepended to the text",std::string,"");
 BBTK_INPUT(RenderingViewer,Renderer,"Renderer to show volume rendering image" ,vtkRenderer*, "");
+BBTK_INPUT(RenderingViewer,wxVtkBaseView,"wxVtkBaseView",wxVtkBaseView*,"");
 //BBTK_INPUT(RenderingViewer,RendererSA,"Renderer to show surface rendering image" ,vtkRenderer*, "");
 //BBTK_INPUT(RenderingViewer,RendererSB,"Renderer to show surface rendering image" ,vtkRenderer*, "");
 //BBTK_INPUT(RenderingViewer,RendererSC,"Renderer to show surface rendering image" ,vtkRenderer*, "");