X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fkw%2Fsrc%2FbbkwTransferFunctionEditor.cxx;h=d3fb8650c6a62c24da859eee09ff850261bfba1f;hb=4d564eb44e4f2551c050bc422bfd4a4f4e08138c;hp=b57c8b9ff53e4fdf424491e708d9ad52252014c3;hpb=ff64736c7b0524ea73c6f1ca1ca569593c8e0946;p=bbtk.git

diff --git a/packages/kw/src/bbkwTransferFunctionEditor.cxx b/packages/kw/src/bbkwTransferFunctionEditor.cxx
index b57c8b9..d3fb865 100644
--- a/packages/kw/src/bbkwTransferFunctionEditor.cxx
+++ b/packages/kw/src/bbkwTransferFunctionEditor.cxx
@@ -1,32 +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: bbkwTransferFunctionEditor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/16 12:48:07 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2012/11/16 08:51:05 $
+  Version:   $Revision: 1.4 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  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.
-* ------------------------------------------------------------------------ */                                                                         
 
 /**
  * \file 
@@ -68,6 +74,7 @@ namespace bbkw
   { 
     bbSetInputIn(0);
     bbSetOutputOut(0);
+    bbSetInputTitle("Transfer function");
     bbSetOutputWidget(0);
   }
   
@@ -96,8 +103,7 @@ namespace bbkw
 
     vtkKWPiecewiseFunctionEditor *w = vtkKWPiecewiseFunctionEditor::New();
     bbSetOutputWidget(w);
-    //    w->SetWindowLevelModeChangedCommand((vtkObject*)this,(const char*)"OnChange");
-					//AddObserver(vtkKWPiecewiseFunctionEditor::FunctionChangedCommand,this);
+    w->AddObserver(vtkKWPiecewiseFunctionEditor::FunctionChangedEvent,this);
     w->SetParent((vtkKWWidget*)parent);
     w->Create();
 
@@ -108,8 +114,8 @@ namespace bbkw
     //    w->ExpandCanvasWidthOff();
     //    w->ExpandCanvasHeightOn();
   //    w->SetCanvasWidth(450);
-    w->SetCanvasHeight( parent->GetHeight()  );
-    w->SetLabelText("");//Transfer Function Editor");
+    w->SetCanvasHeight( parent->GetHeight() - 100 );
+    w->SetLabelText(bbGetInputTitle().c_str());
     w->SetBalloonHelpString("Edit the transfer function");
     w->LockEndPointsParameterOn();
 
@@ -159,9 +165,11 @@ namespace bbkw
 	std::cout << "TransferFunctionEditor::OnChange()" << std::endl;
       }
   
-  void TransferFunctionEditor::Execute(vtkObject* caller, unsigned long, void*)
+  void TransferFunctionEditor::Execute(vtkObject* caller, unsigned long , void*)
   {
-    std::cout << "$$$$$$$$$$$$ TransferFunctionEditor CB $$$$$$$$$$$$"<<std::endl;
+    bbSignalOutputModification("Out");    
+    //  std::cout << "$$$$$$$$$$$$ TransferFunctionEditor CB $$$$$$$$$$$$"<<std::endl;
+    
     /*
     vtkKWScale* scale = (vtkKWScale*)caller;
     bbSetOutputOut( scale->GetValue() );