X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMIPCreator.cxx;h=c1bf38d3f63b646b805dc302288c95191ac7ac9f;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=d5bd3492e5e590b1b8a6886a78cdc0eaf591ec18;hpb=e85546c7218522af75cec623b9419781c7c4208f;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkMIPCreator.cxx b/packages/vtk/src/bbvtkMIPCreator.cxx
index d5bd349..c1bf38d 100644
--- a/packages/vtk/src/bbvtkMIPCreator.cxx
+++ b/packages/vtk/src/bbvtkMIPCreator.cxx
@@ -1,33 +1,38 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbvtkMIPCreator.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/03/23 15:26:55 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2012/11/16 08:51:58 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  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.
-* ------------------------------------------------------------------------ */
-
 /**
  *  \file
  *  \brief
@@ -51,10 +56,9 @@ namespace bbvtk
    {
 
 
-	   std::vector<double> denPoints;
+
        std::vector<double> opaValues;
-       denPoints.push_back(0.0);
-       denPoints.push_back(255.0);
+       std::vector<double> denPoints;
        opaValues.push_back(0.0);
        opaValues.push_back(1.0);
        bbSetInputDensityPoints(denPoints);
@@ -82,13 +86,6 @@ namespace bbvtk
     mCast->SetOutputScalarTypeToUnsignedChar();
     mCast->ClampOverflowOn();
 
-     DensityPoints = bbGetInputDensityPoints();
-     OpacityValues = bbGetInputOpacityValues();
-
-     while(DensityPoints.size()>OpacityValues.size())
-     {
-         OpacityValues.push_back(1.0);
-     }
 
 }
 
@@ -138,19 +135,46 @@ namespace bbvtk
      //mCast->SetShift( -bbGetInputShift() );
 
 
-        double factor = scale/ 100.0 ;
 
 
+
+
+
+
+
+     DensityPoints = bbGetInputDensityPoints();
+
+     //We assign by default the values of density by regarding at range from the image
+     if(DensityPoints.size()==0)
+     {
+            DensityPoints.push_back(ranges[0]);
+            DensityPoints.push_back(ranges[1]);
+     }
+
+
+     OpacityValues = bbGetInputOpacityValues();
+
+     while(DensityPoints.size()>OpacityValues.size())
+     {
+         OpacityValues.push_back(1.0);
+     }
+
+
+
+      double factor = scale/ 100.0 ;
+
        double minCF = bbGetInputMinColorWindow();
        double maxCF = bbGetInputMaxColorWindow();
-        cout<<"MIPCreator::Process::minCF"<<minCF <<endl;
-        cout<<"MIPCreator::Process::maxCF"<<maxCF <<endl;
+
        grayTransferFunction->AddSegment( minCF , 0.0 , maxCF , 1.0 );
 
 
 
+
         for(int i =0; i< DensityPoints.size(); i++)
         {
+         cout<<"MIPCreator::Process::dPoint"<<i<<"::"<<DensityPoints.at(i)<<endl;
+         cout<<"MIPCreator::Process::oPoint"<<i<<"::"<<OpacityValues.at(i)<<endl;
 
             opacityTransferFunction->AddPoint(DensityPoints.at(i)*factor, OpacityValues.at(i));
         }
@@ -202,7 +226,6 @@ namespace bbvtk
      //     mVolume->GetProperty()->SetColor( bbGetInputColour()[0],  bbGetInputColour()[1], bbGetInputColour()[2] );
      //     mVolume->GetProperty()->SetOpacity( bbGetInputOpacity() );
 
-
    }
 }//namespace bbtk