Skip to content
Snippets Groups Projects
Commit 29a099bd authored by Cyrille Valladeau's avatar Cyrille Valladeau
Browse files

REVERT : back to the last change in imageList (taht should have correct...

REVERT : back to the last change in imageList (taht should have correct monterverdi bug 134 but that leads to a bigger pb)
parent 6c966a8f
Branches
Tags
No related merge requests found
...@@ -59,6 +59,7 @@ public: ...@@ -59,6 +59,7 @@ public:
* Update images in the list. * Update images in the list.
*/ */
virtual void UpdateOutputInformation(void); virtual void UpdateOutputInformation(void);
virtual void PropagateRequestedRegion(void) throw (itk::InvalidRequestedRegionError);
virtual void UpdateOutputData(void); virtual void UpdateOutputData(void);
......
...@@ -29,7 +29,6 @@ ImageList<TImage> ...@@ -29,7 +29,6 @@ ImageList<TImage>
::UpdateOutputData() ::UpdateOutputData()
{ {
Superclass::UpdateOutputData(); Superclass::UpdateOutputData();
for (ConstIterator it = this->Begin(); it!=this->End();++it) for (ConstIterator it = this->Begin(); it!=this->End();++it)
{ {
if (it.Get()->GetUpdateMTime() < it.Get()->GetPipelineMTime() if (it.Get()->GetUpdateMTime() < it.Get()->GetPipelineMTime()
...@@ -44,6 +43,37 @@ ImageList<TImage> ...@@ -44,6 +43,37 @@ ImageList<TImage>
} }
} }
template <class TImage>
void
ImageList<TImage>
::PropagateRequestedRegion() throw (itk::InvalidRequestedRegionError)
{
Superclass::PropagateRequestedRegion();
for (ConstIterator it = this->Begin(); it!=this->End();++it)
{
if (it.Get()->GetUpdateMTime() < it.Get()->GetPipelineMTime()
|| it.Get()->GetDataReleased()
|| it.Get()->RequestedRegionIsOutsideOfTheBufferedRegion())
{
if (it.Get()->GetSource())
{
it.Get()->GetSource()->PropagateRequestedRegion(it.Get());
}
}
// Check that the requested region lies within the largest possible region
if ( ! it.Get()->VerifyRequestedRegion() )
{
// invalid requested region, throw an exception
itk::InvalidRequestedRegionError e(__FILE__, __LINE__);
e.SetLocation(ITK_LOCATION);
e.SetDataObject(it.Get());
e.SetDescription("Requested region is (at least partially) outside the largest possible region.");
throw e;
}
}
}
template <class TImage> template <class TImage>
void void
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment