Skip to content
Snippets Groups Projects
Commit ccf10d93 authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

Correction doxygen et francais...

parent 1ff68121
Branches
Tags
No related merge requests found
...@@ -96,7 +96,7 @@ public: ...@@ -96,7 +96,7 @@ public:
itkGetConstReferenceMacro(Deramp, double); itkGetConstReferenceMacro(Deramp, double);
/** To be allowed to use the pipeline method FrostImageFilter needs /** To be allowed to use the pipeline method FrostImageFilter needs
* a treatment input area larger than the output one. * an input processing area larger than the output one.
* \sa ImageToImageFilter::GenerateInputRequestedRegion() */ * \sa ImageToImageFilter::GenerateInputRequestedRegion() */
virtual void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError); virtual void GenerateInputRequestedRegion() throw(itk::InvalidRequestedRegionError);
......
...@@ -121,15 +121,14 @@ void FrostImageFilter< TInputImage, TOutputImage>::ThreadedGenerateData( ...@@ -121,15 +121,14 @@ void FrostImageFilter< TInputImage, TOutputImage>::ThreadedGenerateData(
// support progress methods/callbacks // support progress methods/callbacks
itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels()); itk::ProgressReporter progress(this, threadId, outputRegionForThread.GetNumberOfPixels());
// InputRealType pixel;
InputRealType sum; InputRealType sum;
InputRealType sum2; InputRealType sum2;
double Moyenne, Variance; double Mean, Variance;
double Alpha; double Alpha;
double NormFiltre; double NormFilter;
double FrostFiltre; double FrostFilter;
double CoefFiltre; double CoefFilter;
double dPixel; double dPixel;
...@@ -153,20 +152,20 @@ void FrostImageFilter< TInputImage, TOutputImage>::ThreadedGenerateData( ...@@ -153,20 +152,20 @@ void FrostImageFilter< TInputImage, TOutputImage>::ThreadedGenerateData(
sum += dPixel; sum += dPixel;
sum2 += dPixel * dPixel; sum2 += dPixel * dPixel;
} }
Moyenne = sum / double(neighborhoodSize); Mean = sum / double(neighborhoodSize);
Variance = sum2 / double(neighborhoodSize) - Moyenne * Moyenne ; Variance = sum2 / double(neighborhoodSize) - Mean * Mean ;
if(Moyenne == 0) if(Mean == 0)
{ {
Alpha = 0; Alpha = 0;
} }
else else
{ {
Alpha = m_Deramp * Variance / (Moyenne * Moyenne) ; Alpha = m_Deramp * Variance / (Mean * Mean) ;
} }
NormFiltre = 0.0; NormFilter = 0.0;
FrostFiltre = 0.0; FrostFilter = 0.0;
const double rad_x = static_cast<double>(m_Radius[0]); const double rad_x = static_cast<double>(m_Radius[0]);
const double rad_y = static_cast<double>(m_Radius[1]); const double rad_y = static_cast<double>(m_Radius[1]);
...@@ -181,22 +180,17 @@ void FrostImageFilter< TInputImage, TOutputImage>::ThreadedGenerateData( ...@@ -181,22 +180,17 @@ void FrostImageFilter< TInputImage, TOutputImage>::ThreadedGenerateData(
// i = (unsigned int)((y+rad_y)*(2*rad_y+1)+(x+rad_x)); // i = (unsigned int)((y+rad_y)*(2*rad_y+1)+(x+rad_x));
dPixel= static_cast<double>( bit.GetPixel(off)); dPixel= static_cast<double>( bit.GetPixel(off));
// dPixel= static_cast<double>( bit.GetPixel(i)); // dPixel= static_cast<double>( bit.GetPixel(i));
CoefFiltre = Alpha * vcl_exp(-Alpha *Dist); CoefFilter = Alpha * vcl_exp(-Alpha *Dist);
NormFiltre = NormFiltre + CoefFiltre; NormFilter = NormFilter + CoefFilter;
FrostFiltre = FrostFiltre + (CoefFiltre * dPixel); FrostFilter = FrostFilter + (CoefFilter * dPixel);
} }
} }
/*dPixel = (FrostFiltre/NormFiltre); if (NormFilter==0.)
if (finite(dPixel)==0){
dPixel = 0.;
}*/
// Modif pour VC++
if (NormFiltre==0.)
dPixel=0.; dPixel=0.;
else else
dPixel=FrostFiltre/NormFiltre; dPixel=FrostFilter/NormFilter;
it.Set( static_cast<OutputPixelType>( dPixel ) ); it.Set( static_cast<OutputPixelType>( dPixel ) );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment