X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuTransferFunctionView.cxx;h=d829ab0132116d39157955adbe22a68fee364fa6;hb=a7017a8ade695bd14a4c7ee70b197d63b5e76765;hp=569e80f659653aa3f286021cd2cc10068057ebd5;hpb=6a3077638c3045db3888c8c5641d141ff078c8dc;p=creaMaracasVisu.git diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx index 569e80f..d829ab0 100644 --- 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 @@ -57,29 +82,54 @@ void TransferFunctionView::onColorChange(){ _tfun->RemoveAllPoints(); for(int i = 0; i < greylevel.size();i++){ _tfun->AddPoint(greylevel[i], value[i]); - //std::cout<<"TransferFunctionView::Process()transfer function "<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 "<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 <<"<AddRGBPoint( greylevelcolors[i] , red[i],green[i], blue[i]); } bbSignalOutputModification(); - + + _tfun->Update(); bbSetOutputOpacityFunction(_tfun); bbSetOutputColorFunction(_ctfun); } -void TransferFunctionView::onSliderChange(){ +void TransferFunctionView::onSliderChange() + { + //EED + onColorChange(); + bbSignalOutputModification(); - bbSignalOutputModification(); - - bbSetOutputWindowLevel(mwxwidget->GetWindowLevel()); - bbSetOutputColorLevel(mwxwidget->GetColorLevel()); +// bbSetOutputWindowLevel(mwxwidget->GetWindowLevel()); +// bbSetOutputColorLevel(mwxwidget->GetColorLevel()); } @@ -120,7 +170,8 @@ void TransferFunctionView::bbUserSetDefaultValues() void TransferFunctionView::bbUserInitializeProcessing() { _tfun = vtkPiecewiseFunction::New(); - _ctfun = vtkColorTransferFunction::New(); + _ctfun = vtkColorTransferFunction::New(); + _ctfun->SetClamping(-1); bbSetInputIn(NULL); } @@ -133,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(); }