#2844 creaMaracasVisu Feature New Normal - ManualPaint_model box, Refresh TransferF...

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

diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
index d829ab0132116d39157955adbe22a68fee364fa6..7d6765e4344345f820d58e3d4c81b4c9c8b5c576 100644 (file)
--- a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
+++ b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
@@ -34,12 +34,8 @@ BBTK_BLACK_BOX_IMPLEMENTATION(TransferFunctionView,bbtk::WxBlackBox);
 //-----------------------------------------------------
 void TransferFunctionView::Process()
 {
-
-       
-
-       
-
-       if(bbGetInputIn()!=NULL){
+       if(bbGetInputIn()!=NULL)
+       {
 
                if(_currentimg != bbGetInputIn()){
                        _currentimg =  bbGetInputIn();
@@ -48,24 +44,20 @@ void TransferFunctionView::Process()
                        //mwxwidget->Refresh(); 
                }               
 
-               onColorChange();
-               
-               /*bbSetOutputGreyLevel(greylevel);
+//             onColorChange();
+               /*
+               bbSetOutputGreyLevel(greylevel);
                bbSetOutputValue(value);
                bbSetOutputGreyLevelColors(greylevelcolors);
                bbSetOutputRed(red);
                bbSetOutputGreen(green);
-               bbSetOutputBlue(blue);*/
-
-
-
-
-       }
-               
-    
+               bbSetOutputBlue(blue);
+               */
+       } // if In
 }
 
-void TransferFunctionView::onColorChange(){
+void TransferFunctionView::onColorChange()
+{
 
        std::vector<double> greylevel;
        std::vector<double> value;
@@ -80,7 +72,8 @@ void TransferFunctionView::onColorChange(){
 
 
        _tfun->RemoveAllPoints();
-       for(int i = 0; i < greylevel.size();i++){
+       unsigned int i;
+       for(i = 0; i < greylevel.size();i++){
                _tfun->AddPoint(greylevel[i], value[i]);
                std::cout<<"TransferFunctionView::Process()transfer function "<<greylevel[i]<<" "<< value[i]<<std::endl;
        }
@@ -98,7 +91,7 @@ void TransferFunctionView::onColorChange(){
                double dif = max-min;
                if (dif==0) dif=0.0001;
                double nc;
-               int i;
+               unsigned int i;
                i=0;
                _ctfun->AddRGBPoint(greylevelcolors[i], red[i],green[i], blue[i]);
                for(i = 0; i < greylevelcolors.size();i++)
@@ -112,11 +105,14 @@ void TransferFunctionView::onColorChange(){
                _ctfun->AddRGBPoint( greylevelcolors[i] , red[i],green[i], blue[i]);
        }               
 
-       bbSignalOutputModification();
        
        _tfun->Update();
        bbSetOutputOpacityFunction(_tfun);
-       bbSetOutputColorFunction(_ctfun);
+       bbSetOutputColorFunction(_ctfun );
+       bbSetOutputActive( mwxwidget->GetActive() );
+
+       bbSignalOutputModification();
+
 }
 
 void TransferFunctionView::onSliderChange()
@@ -127,44 +123,47 @@ void TransferFunctionView::onSliderChange()
 
                bbSignalOutputModification();
 
+printf("EED TransferFunctionView::onSliderChange  ---------------------  \n");
 
 //     bbSetOutputWindowLevel(mwxwidget->GetWindowLevel());
 //     bbSetOutputColorLevel(mwxwidget->GetColorLevel());
 
 }
 
+/*
 //-----------------------------------------------------
-void TransferFunctionView::CreateWidget(wxWindow* parent)
+void TransferFunctionView::onActive()
 {
-       bbtkDebugMessageInc("Core",9,"TransferFunctionView::CreateWxWindow()"<<std::endl);
-       
-       mwxwidget = new HistogramDialogComboBox(parent);                                
+       bbSignalOutputModification();
 
+   printf("EED TransferFunctionView::onActive popopopopopopopop \n");
+}
+*/
 
+//-----------------------------------------------------
+void TransferFunctionView::CreateWidget(wxWindow* parent)
+{
+       bbtkDebugMessageInc("Core",9,"TransferFunctionView::CreateWxWindow()"<<std::endl);      
+       mwxwidget = new HistogramDialogComboBox(parent);                                
        HandlerTransferFunctionView* handler = new HandlerTransferFunctionView(this);
-
+//     parent->Connect(mwxwidget->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction) (&HandlerTransferFunctionView::onActive),NULL,handler);
        parent->Connect(mwxwidget->GetId(), wxEVT_COMMAND_COMBOBOX_SELECTED, (wxObjectEventFunction) (&HandlerTransferFunctionView::onColorChange),NULL,handler);
        parent->Connect(mwxwidget->GetId(), wxEVT_SCROLL_THUMBTRACK, (wxObjectEventFunction) (&HandlerTransferFunctionView::onSliderChange),NULL,handler);
-
-    bbtkDebugDecTab("Core",9);
        bbSetOutputWidget( mwxwidget );                         
+    bbtkDebugDecTab("Core",9);
 }
 
 //-----------------------------------------------------
 
 void TransferFunctionView::bbUserSetDefaultValues()
 {
-       mwxwidget = NULL;
+       mwxwidget       = NULL;
        _currentimg = NULL;
-
-       _tfun = NULL;
-       _ctfun = NULL;   
-
+       _tfun           = NULL;
+       _ctfun          = NULL;   
        bbSetOutputOpacityFunction(0);
        bbSetOutputColorFunction(0);
-
 }
-
        
        //-----------------------------------------------------------------     
        void TransferFunctionView::bbUserInitializeProcessing()
@@ -180,10 +179,7 @@ void TransferFunctionView::bbUserSetDefaultValues()
        {
        }
 
-               
        //-----------------------------------------------------------------     
-       
-
        HandlerTransferFunctionView::HandlerTransferFunctionView(TransferFunctionView* box)
        {
                _box = box;             
@@ -203,8 +199,14 @@ void TransferFunctionView::bbUserSetDefaultValues()
                _box->onSliderChange();
        }
 
-}
+/*
+       void HandlerTransferFunctionView::onActive(wxCommandEvent& event)
+       {
+               _box->onActive();
+       }
+*/
 
+}
 
 // EO namespace bbcreaMaracasVisu