X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fwxvtk%2Fsrc%2FbbwxvtkViewer3D.h;h=25dc71231fad950babc9d346cc61ea3f70c08de9;hb=85be7d05390ee84a66308c17c740565456ce15d2;hp=edb896306598083179f6e5575d55614a395c904a;hpb=b60f4996d8155665b79e20f85999f287bf1d73d3;p=bbtk.git

diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.h b/packages/wxvtk/src/bbwxvtkViewer3D.h
index edb8963..25dc712 100644
--- a/packages/wxvtk/src/bbwxvtkViewer3D.h
+++ b/packages/wxvtk/src/bbwxvtkViewer3D.h
@@ -1,19 +1,38 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
                                                                                 
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.h,v $
   Language:  C++
-  Date:      $Date: 2008/06/10 19:19:55 $
-  Version:   $Revision: 1.7 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2012/11/16 08:52:36 $
+  Version:   $Revision: 1.15 $
+ 
 =========================================================================*//**
  * \brief Short description in one line
  * 
@@ -60,8 +79,10 @@ namespace bbwxvtk
     void Update();
     vtkRenderer *GetRenderer();
     wxVTKRenderWindowInteractor * GetInteractor();
+    virtual void Refresh(bool eraseBackground = true, const wxRect* rect = NULL);
+
   private:
-    Viewer3D                     *mBox;
+    Viewer3D*            mBox;
     vtkRenderer                  *renderer;
     vtkRenderWindow              *renderwindow;
     vtkInteractorStyleTrackballCamera *interactorstyle;
@@ -86,15 +107,21 @@ namespace bbwxvtk
     BBTK_DECLARE_INPUT(Obs4, vtkInteractorObserver *);
     BBTK_DECLARE_INPUT(Obs5, vtkInteractorObserver *);
     BBTK_DECLARE_INPUT(Stereo, bool);
+    BBTK_DECLARE_INPUT(BackgroundColor,std::vector<double>);
     BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer*);
     BBTK_DECLARE_OUTPUT(Interactor,wxVTKRenderWindowInteractor*);
     BBTK_PROCESS(Process);
-    void Process();
     BBTK_CREATE_WIDGET(CreateWidget);
-    void CreateWidget();
+    BBTK_ON_SHOW_WIDGET(OnShowWidget);
+  
+    void Process();
+    void CreateWidget(wxWindow*);
+    void OnShowWidget();
+
+    void DisableObservers();
 
   protected:
-    virtual void bbUserConstructor();
+    bool firsttime;
   };
    
   //=================================================================
@@ -102,8 +129,9 @@ namespace bbwxvtk
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(Viewer3D,bbtk::WxBlackBox);
   BBTK_NAME("Viewer3D");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("3D Viewer (vtk)");
+  BBTK_DESCRIPTION("3D Viewer widget (vtk)");
   BBTK_CATEGORY("viewer");
+  BBTK_INPUT(Viewer3D,BackgroundColor,"Render background's color",std::vector<double>,"");
   BBTK_INPUT(Viewer3D,In1,"Input actor",vtkProp3D *,"");
   BBTK_INPUT(Viewer3D,In2,"Input actor",vtkProp3D *,"");
   BBTK_INPUT(Viewer3D,In3,"Input actor",vtkProp3D *,"");