From: reyes <reyes>
Date: Wed, 23 Mar 2011 15:49:19 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=bafc00d3eee5ab3c580e0971cb2d8806b5c74f35;p=bbtk.git

*** empty log message ***
---

diff --git a/packages/vtk/src/bbvtkMIPCreator.cxx b/packages/vtk/src/bbvtkMIPCreator.cxx
index d5bd349..00ec5dc 100644
--- a/packages/vtk/src/bbvtkMIPCreator.cxx
+++ b/packages/vtk/src/bbvtkMIPCreator.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbvtkMIPCreator.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/03/23 15:26:55 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2011/03/23 15:49:19 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -51,10 +51,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 +81,6 @@ namespace bbvtk
     mCast->SetOutputScalarTypeToUnsignedChar();
     mCast->ClampOverflowOn();
 
-     DensityPoints = bbGetInputDensityPoints();
-     OpacityValues = bbGetInputOpacityValues();
-
-     while(DensityPoints.size()>OpacityValues.size())
-     {
-         OpacityValues.push_back(1.0);
-     }
 
 }
 
@@ -138,19 +130,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));
         }