*** empty log message ***

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

diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
index 4a251079c787e37a1d2ba3772a0198dc429d93df..cef78ac1773d70427ed140a63dcaa8a80390a23c 100644 (file)
--- a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
+++ b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
@@ -60,9 +60,31 @@ void TransferFunctionView::onColorChange(){
                std::cout<<"TransferFunctionView::Process()transfer function "<<greylevel[i]<<" "<< value[i]<<std::endl;
        }
        _ctfun->RemoveAllPoints();
-       for(int i = 0; i < greylevelcolors.size();i++){
+       _ctfun->SetScaleToLinear ();
+       _ctfun->ClampingOff();
+       _ctfun->AllowDuplicateScalarsOn();
+       double w=mwxwidget->GetWindowLevel();
+       double c=mwxwidget->GetColorLevel();
+
+       if (greylevelcolors.size()>1)
+       {
+           double min = greylevelcolors[0];
+               double max = greylevelcolors[greylevelcolors.size()-1];
+               double dif = max-min;
+               if (dif==0) dif=0.0001;
+               double nc;
+               int i;
+               i=0;
                _ctfun->AddRGBPoint(greylevelcolors[i], red[i],green[i], blue[i]);
-       std::cout<<"TransferFunctionView::Process()transfer color function "<<greylevelcolors[i]<<" "<<red[i]<<" "<<green[i]<<" "<<blue[i]<<std::endl;
+               for(i = 0; i < greylevelcolors.size();i++)
+               {
+                       nc = ((greylevelcolors[i]-min)/dif)*w + c-w/2;
+//                     _ctfun->AddRGBPoint(greylevelcolors[i], red[i],green[i], blue[i]);
+                       _ctfun->AddRGBPoint( nc , red[i],green[i], blue[i]);
+               std::cout<<"EED TransferFunctionView::Process()transfer color function <<"<<nc<<" "<<red[i]<<" "<<green[i]<<" "<<blue[i]<<std::endl;
+               }
+               i=greylevelcolors.size()-1;
+               _ctfun->AddRGBPoint( greylevelcolors[i] , red[i],green[i], blue[i]);
        }               
 
        bbSignalOutputModification();
@@ -74,13 +96,13 @@ void TransferFunctionView::onColorChange(){
 
 void TransferFunctionView::onSliderChange(){
        
-
-
+//EED
+onColorChange();
 
        bbSignalOutputModification();
 
-       bbSetOutputWindowLevel(mwxwidget->GetWindowLevel());
-       bbSetOutputColorLevel(mwxwidget->GetColorLevel());
+//     bbSetOutputWindowLevel(mwxwidget->GetWindowLevel());
+//     bbSetOutputColorLevel(mwxwidget->GetColorLevel());
 
 }