#2975 BBTK Bug New Normal - Clean comments

[bbtk.git] / packages / vtk / src / bbvtkText3D.cxx

diff --git a/packages/vtk/src/bbvtkText3D.cxx b/packages/vtk/src/bbvtkText3D.cxx
index 880bd615d0343140d8d891419487c2333663e3a3..077c44f65023bd94df42660caa70b55db5526c0b 100644 (file)
--- a/packages/vtk/src/bbvtkText3D.cxx
+++ b/packages/vtk/src/bbvtkText3D.cxx
@@ -1,4 +1,31 @@
-//===== 
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
+//=====
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 #include "bbvtkText3D.h"
@@ -40,21 +67,19 @@ void Text3D::Process()
        _textProp->SetFontSize( 14 );
        _textActor->SetTextProperty( _textProp  );
     }
-  // If the text actor already exists in the scene, simply refresh its text.
-  else
-    {
-       _textProp->SetColor( bbGetInputColour()[0] , bbGetInputColour()[1], bbGetInputColour()[2] );
+  _textProp->SetColor( bbGetInputColour()[0] , bbGetInputColour()[1], bbGetInputColour()[2] );
+  
+  _textActor->SetInput( bbGetInputIn().c_str()  );
+  _textActor->SetPosition(  bbGetInputX(), bbGetInputY(),bbGetInputZ() );
+  _textActor->GetTextProperty()->SetOpacity( bbGetInputOpacity() );    
 
-       _textActor->SetInput( bbGetInputIn().c_str()  );
-       _textActor->SetPosition(  bbGetInputX(), bbGetInputY(),bbGetInputZ() );
-       
-       if ( bbGetInputTransform()!=NULL )
-       {
-               _textActor->SetUserTransform( bbGetInputTransform() );
-       }
-       
-       bbSetOutputOut(_textActor);
+  if ( bbGetInputTransform()!=NULL )
+    {
+      _textActor->SetUserTransform( bbGetInputTransform() );
     }
+  
+  bbSetOutputOut(_textActor);
+  
 }
 
 //===== 
@@ -77,6 +102,7 @@ void Text3D::bbUserSetDefaultValues()
        bbSetInputColour(colour);
        bbSetInputRenderer(NULL);
        bbSetInputTransform(NULL);
+       bbSetInputOpacity(1);
 
        _textActor = NULL;
        _textProp = NULL;