Skip to content

ENH: Avoid duplicated code in itk::HistogramThresholdImageFilter #1732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhlegarreta merged 1 commit into from
Mar 28, 2020
Merged

ENH: Avoid duplicated code in itk::HistogramThresholdImageFilter #1732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Modules/Filtering/Thresholding/include/itkHistogramThresholdImageFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#define itkHistogramThresholdImageFilter_h

#include "itkImageToImageFilter.h"
#include "itkImageToHistogramFilter.h"
#include "itkHistogram.h"
#include "itkHistogramThresholdCalculator.h"

Expand Down Expand Up @@ -111,6 +112,9 @@ class ITK_TEMPLATE_EXPORT HistogramThresholdImageFilter : public ImageToImageFil
using CalculatorType = HistogramThresholdCalculator<HistogramType, InputPixelType>;
using CalculatorPointer = typename CalculatorType::Pointer;

using HistogramGeneratorType = Statistics::ImageToHistogramFilter<InputImageType>;
using HistogramGeneratorPointer = typename HistogramGeneratorType::Pointer;

/** Image related type alias. */
static constexpr unsigned int InputImageDimension = InputImageType::ImageDimension;
static constexpr unsigned int OutputImageDimension = OutputImageType::ImageDimension;
Expand Down Expand Up @@ -197,6 +201,9 @@ class ITK_TEMPLATE_EXPORT HistogramThresholdImageFilter : public ImageToImageFil
void
GenerateData() override;

/** Set up the histogram generator. */
void
SetUpHistogramGenerator(HistogramGeneratorPointer histogramGenerator);

void
VerifyPreconditions() ITKv5_CONST override
Expand Down
52 changes: 28 additions & 24 deletions Modules/Filtering/Thresholding/include/itkHistogramThresholdImageFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#define itkHistogramThresholdImageFilter_hxx
#include "itkHistogramThresholdImageFilter.h"

#include "itkImageToHistogramFilter.h"
#include "itkMaskedImageToHistogramFilter.h"
#include "itkBinaryThresholdImageFilter.h"
#include "itkMaskImageFilter.h"
Expand Down Expand Up @@ -55,47 +54,52 @@ HistogramThresholdImageFilter<TInputImage, TOutputImage, TMaskImage>::HistogramT
}
}

template <typename TInputImage, typename TOutputImage, typename TMaskImage>
void
HistogramThresholdImageFilter<TInputImage, TOutputImage, TMaskImage>::SetUpHistogramGenerator(
HistogramGeneratorPointer histogramGenerator)
{
histogramGenerator->SetInput(this->GetInput());
histogramGenerator->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
typename HistogramType::SizeType hsize(this->GetInput()->GetNumberOfComponentsPerPixel());
hsize.Fill(this->GetNumberOfHistogramBins());
histogramGenerator->SetHistogramSize(hsize);
histogramGenerator->SetAutoMinimumMaximum(this->GetAutoMinimumMaximum());
}

template <typename TInputImage, typename TOutputImage, typename TMaskImage>
void
HistogramThresholdImageFilter<TInputImage, TOutputImage, TMaskImage>::GenerateData()
{
typename ProgressAccumulator::Pointer progress = ProgressAccumulator::New();
progress->SetMiniPipelineFilter(this);

using HistogramGeneratorType = itk::Statistics::ImageToHistogramFilter<InputImageType>;
typename HistogramGeneratorType::Pointer histogramGenerator = HistogramGeneratorType::New();
HistogramGeneratorPointer histogramGenerator = HistogramGeneratorType::New();

using MaskedHistogramGeneratorType = itk::Statistics::MaskedImageToHistogramFilter<InputImageType, MaskImageType>;
typename MaskedHistogramGeneratorType::Pointer maskedhistogramGenerator = MaskedHistogramGeneratorType::New();
using MaskedHistogramGeneratorType = Statistics::MaskedImageToHistogramFilter<InputImageType, MaskImageType>;
typename MaskedHistogramGeneratorType::Pointer maskedHistogramGenerator = MaskedHistogramGeneratorType::New();

if (this->GetMaskImage())
{
maskedhistogramGenerator->SetInput(this->GetInput());
maskedhistogramGenerator->SetMaskImage(this->GetMaskImage());
maskedhistogramGenerator->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
typename HistogramType::SizeType hsize(this->GetInput()->GetNumberOfComponentsPerPixel());
hsize.Fill(this->GetNumberOfHistogramBins());
maskedhistogramGenerator->SetHistogramSize(hsize);
maskedhistogramGenerator->SetAutoMinimumMaximum(this->GetAutoMinimumMaximum());
maskedhistogramGenerator->SetMaskValue(this->GetMaskValue());
progress->RegisterInternalFilter(maskedhistogramGenerator, .4f);

m_Calculator->SetInput(maskedhistogramGenerator->GetOutput());
m_Calculator->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
this->SetUpHistogramGenerator(maskedHistogramGenerator);

maskedHistogramGenerator->SetMaskImage(this->GetMaskImage());
maskedHistogramGenerator->SetMaskValue(this->GetMaskValue());

progress->RegisterInternalFilter(maskedHistogramGenerator, .4f);

m_Calculator->SetInput(maskedHistogramGenerator->GetOutput());
}
else
{
histogramGenerator->SetInput(this->GetInput());
histogramGenerator->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
typename HistogramType::SizeType hsize(this->GetInput()->GetNumberOfComponentsPerPixel());
hsize.Fill(this->GetNumberOfHistogramBins());
histogramGenerator->SetHistogramSize(hsize);
histogramGenerator->SetAutoMinimumMaximum(this->GetAutoMinimumMaximum());
this->SetUpHistogramGenerator(histogramGenerator);

progress->RegisterInternalFilter(histogramGenerator, .4f);

m_Calculator->SetInput(histogramGenerator->GetOutput());
m_Calculator->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
}

m_Calculator->SetNumberOfWorkUnits(this->GetNumberOfWorkUnits());
progress->RegisterInternalFilter(m_Calculator, .2f);

using ThresholderType = BinaryThresholdImageFilter<TInputImage, TOutputImage>;
Expand Down