Skip to content
Snippets Groups Projects
Commit 6ce027b1 authored by Antoine Regimbeau's avatar Antoine Regimbeau
Browse files

REFAC: add register pipeline methode on some application in imageutils module

parent c2e43d33
No related branches found
No related tags found
1 merge request!22Register Pipeline Services (ProcessObjects and DataObjects)
......@@ -172,9 +172,12 @@ private:
void DoExecute() ITK_OVERRIDE
{
// Init filters
m_ExtractRefFilter = ExtractROIMonoFilterType::New();
m_ExtractMeasFilter = ExtractROIMonoFilterType::New();
m_CompareFilter = StreamingCompareImageFilterType::New();
ExtractROIMonoFilterType::Pointer m_ExtractRefFilter =
ExtractROIMonoFilterType::New();
ExtractROIMonoFilterType::Pointer m_ExtractMeasFilter =
ExtractROIMonoFilterType::New();
StreamingCompareImageFilterType::Pointer m_CompareFilter =
StreamingCompareImageFilterType::New();
// Get input image pointers
FloatVectorImageType::Pointer refIm = this->GetParameterImage("ref.in");
......@@ -229,12 +232,8 @@ private:
SetParameterFloat( "mae",m_CompareFilter->GetMAE() , false);
SetParameterFloat( "psnr",m_CompareFilter->GetPSNR() , false);
SetParameterFloat( "count",m_CompareFilter->GetDiffCount() , false);
RegisterPipeline();
}
ExtractROIMonoFilterType::Pointer m_ExtractRefFilter;
ExtractROIMonoFilterType::Pointer m_ExtractMeasFilter;
StreamingCompareImageFilterType::Pointer m_CompareFilter;
};
}
......
......@@ -72,10 +72,6 @@ private:
AddDocTag("Concatenation");
AddDocTag("Multi-channel");
m_Concatener = ListConcatenerFilterType::New();
m_ExtractorList = ExtractROIFilterListType::New();
m_ImageList = ImageListType::New();
AddParameter(ParameterType_InputImageList, "il", "Input images list");
SetParameterDescription("il", "The list of images to concatenate, must have the same size.");
......@@ -94,15 +90,16 @@ private:
void DoUpdateParameters() ITK_OVERRIDE
{
// Nothing to do here for the parameters : all are independent
// Reinitialize the object
m_Concatener = ListConcatenerFilterType::New();
m_ImageList = ImageListType::New();
m_ExtractorList = ExtractROIFilterListType::New();
}
void DoExecute() ITK_OVERRIDE
{
ListConcatenerFilterType::Pointer m_Concatener =
ListConcatenerFilterType::New();
ExtractROIFilterListType::Pointer m_ExtractorList =
ExtractROIFilterListType::New();
ImageListType::Pointer m_ImageList =
ImageListType::New();
// Get the input image list
FloatVectorImageListType::Pointer inList = this->GetParameterImageList("il");
......@@ -140,12 +137,8 @@ private:
m_Concatener->SetInput( m_ImageList );
SetParameterOutputImage("out", m_Concatener->GetOutput());
RegisterPipeline();
}
ListConcatenerFilterType::Pointer m_Concatener;
ExtractROIFilterListType::Pointer m_ExtractorList;
ImageListType::Pointer m_ImageList;
};
}
......
......@@ -828,7 +828,7 @@ private:
this->CropRegionOfInterest();
m_ExtractROIFilter = ExtractROIFilterType::New();
ExtractROIFilterType::Pointer m_ExtractROIFilter = ExtractROIFilterType::New();
m_ExtractROIFilter->SetInput(inImage);
m_ExtractROIFilter->SetStartX(GetParameterInt("startx"));
m_ExtractROIFilter->SetStartY(GetParameterInt("starty"));
......@@ -841,10 +841,8 @@ private:
}
SetParameterOutputImage("out", m_ExtractROIFilter->GetOutput());
RegisterPipeline();
}
ExtractROIFilterType::Pointer m_ExtractROIFilter;
};
}
......
......@@ -202,8 +202,10 @@ bool CropRegionOfInterest()
{
InputImageType::Pointer inImage = GetParameterImage("in");
m_ExtractROIFilter = ExtractROIFilterType::New();
m_ResamplingFilter = ShrinkImageFilterType::New();
ExtractROIFilterType::Pointer m_ExtractROIFilter =
ExtractROIFilterType::New();
ShrinkImageFilterType::Pointer m_ResamplingFilter =
ShrinkImageFilterType::New();
// The image on which the quicklook will be generated
// Will eventually be the m_ExtractROIFilter output
......@@ -277,11 +279,9 @@ bool CropRegionOfInterest()
m_ResamplingFilter->Update();
SetParameterOutputImage("out", m_ResamplingFilter->GetOutput());
RegisterPipeline();
}
ExtractROIFilterType::Pointer m_ExtractROIFilter;
ShrinkImageFilterType::Pointer m_ResamplingFilter;
};
}
......
......@@ -100,8 +100,8 @@ private:
FloatVectorImageType::Pointer inImage = GetParameterImage("in");
otbAppLogDEBUG( << "Starting Min/Max computation" )
m_MinMaxFilter = MinMaxFilterType::New();
MinMaxFilterType::Pointer m_MinMaxFilter = MinMaxFilterType::New();
m_MinMaxFilter->SetInput( inImage );
m_MinMaxFilter->GetStreamer()->SetAutomaticAdaptativeStreaming(GetParameterInt("ram"));
......@@ -113,7 +113,8 @@ private:
FloatVectorImageType::PixelType inMin, inMax;
m_RescaleFilter = RescaleImageFilterType::New();
RescaleImageFilterType::Pointer m_RescaleFilter =
RescaleImageFilterType::New();
m_RescaleFilter->SetInput( inImage );
m_RescaleFilter->SetAutomaticInputMinMaxComputation(false);
m_RescaleFilter->SetInputMinimum( m_MinMaxFilter->GetMinimum() );
......@@ -130,10 +131,8 @@ private:
m_RescaleFilter->UpdateOutputInformation();
SetParameterOutputImage("out", m_RescaleFilter->GetOutput());
RegisterPipeline();
}
RescaleImageFilterType::Pointer m_RescaleFilter;
MinMaxFilterType::Pointer m_MinMaxFilter;
};
}
......
......@@ -103,7 +103,7 @@ private:
ext = itksys::SystemTools::GetFilenameExtension(ofname);
// Set the extract filter input image
m_Filter = FilterType::New();
FilterType::Pointer m_Filter = FilterType::New();
m_Filter->SetInput(inImage);
for (unsigned int i = 0; i < inImage->GetNumberOfComponentsPerPixel(); ++i)
......@@ -140,9 +140,8 @@ private:
// Disable the output Image parameter to avoid writing
// the last image (Application::ExecuteAndWriteOutput method)
DisableParameter("out");
RegisterPipeline();
}
FilterType::Pointer m_Filter;
};
}
}
......
......@@ -95,7 +95,7 @@ private:
itkExceptionMacro("No input Image set...");
}
m_FusionFilter = TileFilterType::New();
TileFilterType::Pointer m_FusionFilter = TileFilterType::New();
TileFilterType::SizeType layout;
layout[0] = this->GetParameterInt("cols");
......@@ -108,10 +108,9 @@ private:
}
SetParameterOutputImage("out", m_FusionFilter->GetOutput());
RegisterPipeline();
}
TileFilterType::Pointer m_FusionFilter;
};
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment