From 59c0beebb8875fc81086cb6aa5a3c4bbed8cf4cb Mon Sep 17 00:00:00 2001 From: Vivien Delmon Date: Thu, 1 Dec 2011 11:49:01 +0100 Subject: [PATCH] itk4 migration - m_Parameters disapeared in itk4. Don't use it in our ImageToImageMetric. --- .../clitkOptNormalizedCorrelationImageToImageMetric.txx | 6 ++++++ ...tNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx | 6 ++++++ ...attesMutualInformationImageToImageMetricFor3DBLUTFFD.txx | 4 ++++ .../itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx | 4 ++++ 4 files changed, 20 insertions(+) diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx index d1a89f9..5d00ffb 100644 --- a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx +++ b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx @@ -219,7 +219,9 @@ NormalizedCorrelationImageToImageMetric // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); +#if ITK_VERSION_MAJOR < 4 this->m_Parameters = parameters; +#endif // MUST BE CALLED TO INITIATE PROCESSING this->GetValueMultiThreadedInitiate(); @@ -294,7 +296,9 @@ NormalizedCorrelationImageToImageMetric // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); +#if ITK_VERSION_MAJOR < 4 this->m_Parameters = parameters; +#endif // MUST BE CALLED TO INITIATE PROCESSING this->GetValueMultiThreadedInitiate(); @@ -427,7 +431,9 @@ NormalizedCorrelationImageToImageMetric // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); +#if ITK_VERSION_MAJOR < 4 this->m_Parameters = parameters; +#endif //We need the sums and the value to be calculated first value=this->ComputeSums(parameters); diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx index 147c6fb..769171b 100644 --- a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx +++ b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx @@ -219,7 +219,9 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); +#if ITK_VERSION_MAJOR < 4 this->m_Parameters = parameters; +#endif // MUST BE CALLED TO INITIATE PROCESSING this->GetValueMultiThreadedInitiate(); @@ -294,7 +296,9 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); +#if ITK_VERSION_MAJOR < 4 this->m_Parameters = parameters; +#endif // MUST BE CALLED TO INITIATE PROCESSING this->GetValueMultiThreadedInitiate(); @@ -451,7 +455,9 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); +#if ITK_VERSION_MAJOR < 4 this->m_Parameters = parameters; +#endif //We need the sums and the value to be calculated first value=this->ComputeSums(parameters); diff --git a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx index efe9cba..b09abd3 100644 --- a/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx +++ b/registration/itkOptMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx @@ -630,7 +630,9 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD { // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); +#if ITK_VERSION_MAJOR < 4 this->m_Parameters = parameters; +#endif // MUST BE CALLED TO INITIATE PROCESSING this->GetValueMultiThreadedInitiate(); @@ -939,7 +941,9 @@ MattesMutualInformationImageToImageMetricFor3DBLUTFFD // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); +#if ITK_VERSION_MAJOR < 4 this->m_Parameters = parameters; +#endif // MUST BE CALLED TO INITIATE PROCESSING ON SAMPLES this->GetValueAndDerivativeMultiThreadedInitiate(); diff --git a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx index f7b7f96..ec32c74 100644 --- a/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx +++ b/registration/itkOptMeanSquaresImageToImageMetricFor3DBLUTFFD.txx @@ -153,7 +153,9 @@ MeanSquaresImageToImageMetricFor3DBLUTFFD // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); +#if ITK_VERSION_MAJOR < 4 this->m_Parameters = parameters; +#endif // MUST BE CALLED TO INITIATE PROCESSING this->GetValueMultiThreadedInitiate(); @@ -255,7 +257,9 @@ MeanSquaresImageToImageMetricFor3DBLUTFFD // Set up the parameters in the transform this->m_Transform->SetParameters( parameters ); +#if ITK_VERSION_MAJOR < 4 this->m_Parameters = parameters; +#endif // Reset the joint pdfs to zero memset( m_ThreaderMSE, -- 2.47.1