X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuTransferFunctionView.h;h=3bbcf899e72851ea8476de624a0f283d63558d51;hb=542063db4a06b1a74587bcab7d5c450ebdd53272;hp=bcd1a09e348676de01513ce2fccb004fa9edad5c;hpb=6a3077638c3045db3888c8c5641d141ff078c8dc;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.h b/bbtk/src/bbmaracasvisuTransferFunctionView.h
index bcd1a09..3bbcf89 100644
--- a/bbtk/src/bbmaracasvisuTransferFunctionView.h
+++ b/bbtk/src/bbmaracasvisuTransferFunctionView.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 __bbcreaMaracasVisuTransferFunctionView_h_INCLUDED__
 #define __bbcreaMaracasVisuTransferFunctionView_h_INCLUDED__
@@ -25,8 +50,9 @@ class /*BBTK_EXPORT*/ TransferFunctionView
 	BBTK_DECLARE_OUTPUT(OpacityFunction, vtkPiecewiseFunction*);
 	BBTK_DECLARE_OUTPUT(ColorFunction, vtkColorTransferFunction*);
 
-	BBTK_DECLARE_OUTPUT(WindowLevel, double);
-	BBTK_DECLARE_OUTPUT(ColorLevel, double);
+	BBTK_DECLARE_OUTPUT(Active		, bool		);
+	BBTK_DECLARE_OUTPUT(WindowLevel	, double	);
+	BBTK_DECLARE_OUTPUT(ColorLevel	, double	);
 	/*BBTK_DECLARE_OUTPUT(GreyLevel, std::vector<double> );
 	BBTK_DECLARE_OUTPUT(Value, std::vector<double> );
 	BBTK_DECLARE_OUTPUT(GreyLevelColors, std::vector<double>);
@@ -38,44 +64,44 @@ class /*BBTK_EXPORT*/ TransferFunctionView
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
   void CreateWidget(wxWindow* parent);  
-
+//  void onActive();
   void onColorChange();
-
   void onSliderChange();
 
   private:
 	//HistogramWidget *mwxwidget;
-	  HistogramDialogComboBox *mwxwidget;
-	vtkImageData* _currentimg;
+	  HistogramDialogComboBox 	*mwxwidget;
+	vtkImageData* 				_currentimg;
 	
-	vtkPiecewiseFunction* _tfun;
-	vtkColorTransferFunction* _ctfun;
+	vtkPiecewiseFunction* 		_tfun;
+	vtkColorTransferFunction* 	_ctfun;
 };
 
+
 class HandlerTransferFunctionView : public wxEvtHandler
 {
 	public:
 		HandlerTransferFunctionView(TransferFunctionView* box);
-		~HandlerTransferFunctionView();    
-		
+		~HandlerTransferFunctionView();    		
+//		 void onActive(wxCommandEvent& event);
 		 void onColorChange(wxCommandEvent& event);
-
 		 void onSliderChange(wxCommandEvent& event);
-		
 	private:
 		TransferFunctionView			*_box;	
 };
 
+
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(TransferFunctionView,bbtk::WxBlackBox);
 BBTK_NAME("TransferFunctionView");
 BBTK_AUTHOR("eduardo.davila [at] creatis.insa-lyon.fr");
 BBTK_DESCRIPTION("Transfer Function Window");
 //BBTK_CATEGORY("__CategoryBlackBox__");
-  BBTK_INPUT(TransferFunctionView,In,"Input image",vtkImageData*,"");
+    BBTK_INPUT(TransferFunctionView,In,"Input image",vtkImageData*,"");
 	BBTK_OUTPUT(TransferFunctionView,OpacityFunction,"Transfer function for the opacity", vtkPiecewiseFunction*,"");
 	BBTK_OUTPUT(TransferFunctionView,ColorFunction,"Transfer function for the color", vtkColorTransferFunction*,"");  
 	BBTK_OUTPUT(TransferFunctionView,WindowLevel,"WidowLevel for the current window", double,"");  
 	BBTK_OUTPUT(TransferFunctionView,ColorLevel,"ColorLevel for the current window", double,"");  
+	BBTK_OUTPUT(TransferFunctionView,Active,"Active", bool,"");  
   /*BBTK_OUTPUT(TransferFunctionView,GreyLevel,"Greylevel related to the transparency",std::vector<double>,"");
   BBTK_OUTPUT(TransferFunctionView,Value,"Value of the transparency in the transfer function",std::vector<double>,"");
   BBTK_OUTPUT(TransferFunctionView,GreyLevelColors,"Grey level of the color in the transfer function",std::vector<double>,"");