#2516 creaMaracasVisu Feature New Normal - creaPanelButtonContainer ListPanel with...

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

diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
index 4a251079c787e37a1d2ba3772a0198dc429d93df..d829ab0132116d39157955adbe22a68fee364fa6 100644 (file)
--- a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
+++ b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
@@ -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.
+# ------------------------------------------------------------------------ */
+
 #include "bbmaracasvisuTransferFunctionView.h"
 #include "bbcreaMaracasVisuPackage.h"
 namespace bbcreaMaracasVisu
@@ -60,9 +85,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();
@@ -72,15 +119,17 @@ void TransferFunctionView::onColorChange(){
        bbSetOutputColorFunction(_ctfun);
 }
 
-void TransferFunctionView::onSliderChange(){
+void TransferFunctionView::onSliderChange()
+       {
        
+               //EED
+               onColorChange();
 
+               bbSignalOutputModification();
 
 
-       bbSignalOutputModification();
-
-       bbSetOutputWindowLevel(mwxwidget->GetWindowLevel());
-       bbSetOutputColorLevel(mwxwidget->GetColorLevel());
+//     bbSetOutputWindowLevel(mwxwidget->GetWindowLevel());
+//     bbSetOutputColorLevel(mwxwidget->GetColorLevel());
 
 }
 
@@ -135,16 +184,22 @@ void TransferFunctionView::bbUserSetDefaultValues()
        //-----------------------------------------------------------------     
        
 
-       HandlerTransferFunctionView::HandlerTransferFunctionView(TransferFunctionView* box){
+       HandlerTransferFunctionView::HandlerTransferFunctionView(TransferFunctionView* box)
+       {
                _box = box;             
        }
-       HandlerTransferFunctionView::~HandlerTransferFunctionView(){
-
+       
+       HandlerTransferFunctionView::~HandlerTransferFunctionView()
+       {
        }       
-       void HandlerTransferFunctionView::onColorChange(wxCommandEvent& event){
+       
+       void HandlerTransferFunctionView::onColorChange(wxCommandEvent& event)
+       {
                _box->onColorChange();
        }
-       void HandlerTransferFunctionView::onSliderChange(wxCommandEvent& event){
+       
+       void HandlerTransferFunctionView::onSliderChange(wxCommandEvent& event)
+       {
                _box->onSliderChange();
        }