X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=bbtk%2Fsrc%2FbbmaracasvisuTransferFunctionView.h;h=08e386a69509de2c4a21f7723f6e2ffa2b69c9a3;hb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;hp=5f7a0fe8ed4999a3df9f79b1ccfbab416b33c5df;hpb=cc00f80af2e160ce2af3ddd2903c4a41c023cc94;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.h b/bbtk/src/bbmaracasvisuTransferFunctionView.h
index 5f7a0fe..08e386a 100644
--- a/bbtk/src/bbmaracasvisuTransferFunctionView.h
+++ b/bbtk/src/bbmaracasvisuTransferFunctionView.h
@@ -1,17 +1,46 @@
+/*# ---------------------------------------------------------------------
+#
+# 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__
 #include "bbtkWxBlackBox.h"
 
 #include "vtkImageData.h"
-#include "HistogramWidget.h"
+//#include "HistogramWidget.h"
+#include "HistogramDialogComboBox.h"
 
 #include "vtkPiecewiseFunction.h"
 #include "vtkColorTransferFunction.h"
+#include <wx/wx.h>
 
 namespace bbcreaMaracasVisu
 {
 
+  
+
 class /*BBTK_EXPORT*/ TransferFunctionView
  : 
    public bbtk::WxBlackBox
@@ -20,6 +49,9 @@ class /*BBTK_EXPORT*/ TransferFunctionView
 	BBTK_DECLARE_INPUT(In, vtkImageData*);
 	BBTK_DECLARE_OUTPUT(OpacityFunction, vtkPiecewiseFunction*);
 	BBTK_DECLARE_OUTPUT(ColorFunction, vtkColorTransferFunction*);
+
+	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>);
@@ -30,15 +62,35 @@ class /*BBTK_EXPORT*/ TransferFunctionView
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
-  void CreateWidget(wxWindow* parent);
+  void CreateWidget(wxWindow* parent);  
+
+  void onColorChange();
+
+  void onSliderChange();
 
   private:
-	HistogramWidget *mwxwidget;
+	//HistogramWidget *mwxwidget;
+	  HistogramDialogComboBox *mwxwidget;
 	vtkImageData* _currentimg;
+	
 	vtkPiecewiseFunction* _tfun;
 	vtkColorTransferFunction* _ctfun;
 };
 
+class HandlerTransferFunctionView : public wxEvtHandler
+{
+	public:
+		HandlerTransferFunctionView(TransferFunctionView* box);
+		~HandlerTransferFunctionView();    
+		
+		 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");
@@ -47,6 +99,8 @@ BBTK_DESCRIPTION("Transfer Function Window");
   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,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>,"");
@@ -55,6 +109,8 @@ BBTK_DESCRIPTION("Transfer Function Window");
   BBTK_OUTPUT(TransferFunctionView,Blue,"Blue value according to the GreyLevelColors",std::vector<double>,"");*/
 BBTK_END_DESCRIBE_BLACK_BOX(TransferFunctionView);
 }
+
+
 // EO namespace bbcreaMaracasVisu
 
 #endif // __bbcreaMaracasVisuTransferFunctionView_h_INCLUDED__