Merge branch 'bug-17914-DwiDeepCopy2'

Author: peterneher

Modules/DiffusionImaging/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkDiffusionImage.h

@@ -151,12 +151,6 @@ class DiffusionImage : public Image
   void AverageRedundantGradients(double precision);
   void SetDisplayIndexForRendering(int displayIndex);
 
-
-  /**
-  * \brief Return deep copy of this image
-  */
-  mitk::DiffusionImage< TPixelType >* GetDeepCopy();
-
 protected:
   mitkCloneMacro(Self);
 

Modules/DiffusionImaging/DiffusionCore/IODataStructures/DiffusionWeightedImages/mitkDiffusionImage.txx

@@ -150,30 +150,6 @@ void mitk::DiffusionImage<TPixelType>
   MITK_INFO << "Diffusion-Image successfully initialized.";
 }
 
-
-template<typename TPixelType>
-typename mitk::DiffusionImage< TPixelType >* mitk::DiffusionImage<TPixelType>::GetDeepCopy()
-{
-    typename DwiDuplicatorType::Pointer duplicator = DwiDuplicatorType::New();
-    duplicator->SetInputImage(this->GetVectorImage());
-    duplicator->Update();
-
-    mitk::DiffusionImage< TPixelType >::Pointer newDwi = mitk::DiffusionImage< TPixelType >::New();
-    newDwi->SetVectorImage( duplicator->GetOutput() );
-    newDwi->SetReferenceBValue(this->GetReferenceBValue());
-
-    GradientDirectionContainerType::Pointer newDirectionContainer = GradientDirectionContainerType::New();
-    for (unsigned int i=0; i<this->GetDirectionsWithoutMeasurementFrame()->Size(); i++)
-    {
-        newDirectionContainer->InsertElement(i, this->GetDirectionsWithoutMeasurementFrame()->GetElement(i));
-    }
-    newDwi->SetDirections(newDirectionContainer);
-    newDwi->SetMeasurementFrame(this->GetMeasurementFrame());
-    newDwi->InitializeFromVectorImage();
-
-    return newDwi;
-}
-
 template<typename TPixelType>
 void mitk::DiffusionImage<TPixelType>
 ::SetDisplayIndexForRendering(int displayIndex)

Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.cpp

@@ -484,7 +484,7 @@ void QmitkPreprocessingView::DoApplyDirectionMatrix()
 {
     if (m_DiffusionImage.IsNotNull())
     {
-        MitkDwiType::Pointer newDwi = m_DiffusionImage->GetDeepCopy();
+        MitkDwiType::Pointer newDwi = m_DiffusionImage->Clone();
         ItkDwiType::DirectionType newDirection;
         for (int r=0; r<3; r++)
             for (int c=0; c<3; c++)
@@ -1023,7 +1023,8 @@ void QmitkPreprocessingView::Deactivated()
 
 void QmitkPreprocessingView::DoHalfSphereGradientDirections()
 {
-    MitkDwiType::Pointer newDwi = m_DiffusionImage->GetDeepCopy();
+
+    MitkDwiType::Pointer newDwi = m_DiffusionImage->Clone();
     GradientDirectionContainerType::Pointer gradientContainer = newDwi->GetDirections();
 
     for (unsigned int j=0; j<gradientContainer->Size(); j++)
@@ -1054,7 +1055,7 @@ void QmitkPreprocessingView::DoApplyMesurementFrame()
             mf[r][c] = item->text().toDouble();
         }
 
-    MitkDwiType::Pointer newDwi = m_DiffusionImage->GetDeepCopy();
+    MitkDwiType::Pointer newDwi = m_DiffusionImage->Clone();
     newDwi->SetMeasurementFrame(mf);
 
     mitk::DataNode::Pointer imageNode = mitk::DataNode::New();
@@ -1375,7 +1376,7 @@ void QmitkPreprocessingView::AverageGradients()
                 static_cast<mitk::DiffusionImage<DiffusionPixelType>*>(
                     (*itemiter)->GetData());
 
-        MitkDwiType::Pointer newDwi = mitkDwi->GetDeepCopy();
+        MitkDwiType::Pointer newDwi = mitkDwi->Clone();
         newDwi->AverageRedundantGradients(m_Controls->m_Blur->value());
 
         mitk::DataNode::Pointer imageNode = mitk::DataNode::New();