#3109 creaMaracasVisu Bug New Normal - branch vtk7itk4 compilation with vtk7

[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuTransferFunctionView.h

diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.h b/bbtk/src/bbmaracasvisuTransferFunctionView.h
index 08e386a69509de2c4a21f7723f6e2ffa2b69c9a3..665858503caa9a13c20e2e2a039b702f19051fdf 100644 (file)
--- a/bbtk/src/bbmaracasvisuTransferFunctionView.h
+++ b/bbtk/src/bbmaracasvisuTransferFunctionView.h
@@ -50,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>);
@@ -63,9 +64,8 @@ class /*BBTK_EXPORT*/ TransferFunctionView
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
   void CreateWidget(wxWindow* parent);  
-
+//  void onActive();
   void onColorChange();
-
   void onSliderChange();
 
   private:
@@ -77,30 +77,31 @@ class /*BBTK_EXPORT*/ TransferFunctionView
        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>,"");