*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / Contour / ContourExtractData.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
index 5c5f0d3c1bfdea5d35f0002e4d3fc7cee62a709f..422e0936245b08adacef5bd27b43c383966084d0 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
@@ -23,6 +23,7 @@ ContourExtractData::~ContourExtractData()
 void ContourExtractData::SetImage( vtkImageData* imagedata)
 {
        this->imagedata                 = imagedata;
+       this->imagedata->GetScalarRange(scalarRange);
 
        // RaC 20-11-09 Changes in InitLstContoursLinesYPoints
        int ext[6];
@@ -421,14 +422,16 @@ void ContourExtractData::CalculateImageResult()
 
                                if ((i>=0) && (i<=ext[1]) && (j>=0) && (j<=ext[3]))
                                {
-                                       if (isInside(i,j,_typeOperation)==true)
+                  if (isInside(i,j,_typeOperation)==true)
                                        {
-                                               value = GetDataValue(i,j,zImage);
+                                         value = GetDataValue(i,j,zImage);
+                                         if ( (value>=scalarRange[0]) && (value<=scalarRange[1]) )
+                                         {
                                                PutVtkImageDataResultValue(i,j,zImage,  value );
-                                       } // if
-
-                               }//if
+                                         } // scalarRange
+                                       } // if isInside
 
+                               } // if ext
                        } // for i
                } // for j
 
@@ -442,10 +445,11 @@ void ContourExtractData::CalculateImageResult()
 }
 
 //------------------------------------------------------------------------
-void ContourExtractData::GetValuesInsideCrown(std::vector<double> *pLstValue,
-                                                                                         std::vector<double> *pLstValuePosX,
-                                                                                         std::vector<double> *pLstValuePosY,
-                                                                                         std::vector<double> *pLstValuePosZ)
+void ContourExtractData::GetValuesInsideCrown( int *numberOfPixels, 
+                                                                                               std::vector<double> *pLstValue,
+                                                                                               std::vector<double> *pLstValuePosX,
+                                                                                               std::vector<double> *pLstValuePosY,
+                                                                                               std::vector<double> *pLstValuePosZ)
 {
        pLstValue->clear();
        pLstValuePosX->clear();
@@ -461,7 +465,7 @@ void ContourExtractData::GetValuesInsideCrown(std::vector<double> *pLstValue,
        int maxPoint[2];
        int i,j;
        double value;
-
+       int acum=0;
 
        minPoint[0] = 999999;
        minPoint[1] = 999999;
@@ -481,34 +485,24 @@ void ContourExtractData::GetValuesInsideCrown(std::vector<double> *pLstValue,
 
                        if ((i>=0) && (i<=ext[1]) && (j>=0) && (j<=ext[3]))
                        {
-
-                               if (isInside(i,j,_typeOperation)==true)
+                   if (isInside(i,j,_typeOperation)==true)
                                {
-                                       value = GetDataValue(i,j,zImage);
-
-                                       // Borrame
-                                       //                              if (okImagesResults==true){
-                                       //                                      PutVtkImageDataResultValue(i,j,zImage,  value );
-                                       //                              }
-
-                                       pLstValue               -> push_back( value );
-                                       pLstValuePosX   -> push_back( i );
-                                       pLstValuePosY   -> push_back( j );
-                                       pLstValuePosZ   -> push_back( -1 );
-                               } // if
-
-                       } //if
 
+                                       acum++;
+                                       value = GetDataValue(i,j,zImage);
+                                       if ( (value>=scalarRange[0]) && (value<=scalarRange[1]) )
+                                       {
+                                               pLstValue               -> push_back( value );
+                                               pLstValuePosX   -> push_back( i );
+                                               pLstValuePosY   -> push_back( j );
+                                               pLstValuePosZ   -> push_back( -1 );
+                                       } // scalarRange
+                               } // if isInside
+                       } // if ext
                } // for
        } // for
 
-       // Borrame
-       //      if (this->okImagesResults==true){
-       //              imagedataValueResult->Modified();
-       //              imagedataMaskResult->Modified();
-       //      }
-
-
+       *numberOfPixels = acum;
 }
 
 //------------------------------------------------------------------------
@@ -656,9 +650,9 @@ void ContourExtractData::Statistics( std::vector<double> *inputLstValue,
                                acum_standardeviation = acum_standardeviation + tmp*tmp;
                        } // for standar deviation
                        standardeviation = sqrt(acum_standardeviation/size);
-                       SetVolumeStatistics(countRange, size,
-                               min,max,
-                               acum_average,acum_standardeviation);
+                       SetVolumeStatistics(countRange, (*rsize),
+                                                               min,max,
+                                                           acum_average,acum_standardeviation);
                } // if size
        } // if NULL
 
@@ -743,6 +737,12 @@ void ContourExtractData::InitLstContoursLinesYPoints()
 
 }
 
+void ContourExtractData::SetScalarRange(double min, double max)
+{
+       scalarRange[0]=min;
+       scalarRange[1]=max;
+}
+
 void ContourExtractData::SetSizeImageY(int pSizeImageY)
 {
        _sizeImageY=pSizeImageY;