From Benoit P, use clitkDicomRTStruct2Image with image with direction cosine

[clitk.git] / vv / vvToolROIManager.cxx

diff --git a/vv/vvToolROIManager.cxx b/vv/vvToolROIManager.cxx
index 00eff1df1472e45fef50c19338c488d03c4eacc2..1eb7d4813e6abd28a53a47b28386ee6b7b43d989 100644 (file)
--- a/vv/vvToolROIManager.cxx
+++ b/vv/vvToolROIManager.cxx
@@ -330,7 +330,7 @@ void vvToolROIManager::SelectedImageHasChanged(vvSlicerManager * m)
 void vvToolROIManager::Open()
 {
   // Open images
-  QString Extensions = "Images or Dicom-Struct files ( *.mha *.mhd *.hdr *.his *.dcm RS*)";
+  QString Extensions = "Images or Dicom-Struct files (*.nii *.nii.gz *.mha *.mhd *.hdr *.his *.dcm RS*)";
   Extensions += ";;All Files (*)";
   QStringList filename =
     QFileDialog::getOpenFileNames(this,tr("Open binary image or DICOM RT Struct"),
@@ -392,7 +392,7 @@ void vvToolROIManager::OpenBinaryImage(QStringList & filename)
 
 
 //------------------------------------------------------------------------------
-void vvToolROIManager::OpenDicomImage(std::string filename)
+void vvToolROIManager::OpenDicomImage(std::string filename, double tol)
 {
   // GUI selector of roi
   vvMeshReader reader;
@@ -412,7 +412,7 @@ void vvToolROIManager::OpenDicomImage(std::string filename)
     vtkSmartPointer<vtkMatrix4x4> transformMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
     transformMatrix = mCurrentImage->GetTransform()[0]->GetMatrix();
     s->SetTransformMatrix(transformMatrix);
-    s->Read(filename);
+    s->Read(filename, tol);
 
     // Loop on selected struct
     std::vector<int> list = selector.getSelectedItems();
@@ -428,7 +428,7 @@ void vvToolROIManager::OpenDicomImage(std::string filename)
 
       // Get image
       vvImage::Pointer binaryImage = vvImage::New();
-      binaryImage->AddVtkImage(filter.GetOutput());
+      binaryImage->AddVtkImage(filter.GetOutput(), mCurrentImage->GetTransform()[0]);
 
       // Add to gui
       AddImage(binaryImage, s->GetROIFromROINumber(list[i])->GetName(), "", 0, true); // "" = no filename