X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkXml2DicomRTStructFilter.txx;h=4945a55675d1803a402b87f7b77ea12719e467d0;hb=a523f5be1e221995c0d4d29a0077b5e8b984c96d;hp=9c106ec4ac8a49f76c613a1cf73a03b1e260f391;hpb=a8a4ad6db4f75c4e0ac66a9aca10ff47b424e919;p=clitk.git

diff --git a/common/clitkXml2DicomRTStructFilter.txx b/common/clitkXml2DicomRTStructFilter.txx
index 9c106ec..4945a55 100644
--- a/common/clitkXml2DicomRTStructFilter.txx
+++ b/common/clitkXml2DicomRTStructFilter.txx
@@ -23,12 +23,17 @@
 // xml parser
 #include "../utilities/pugixml/pugixml.hpp"
 
+// itk
+#include "itkImage.h"
+#include "itkImageFileReader.h"
+
 // vtk
 #include <vtkSmartPointer.h>
 #include <vtkMetaImageWriter.h>
 #include <vtkImageData.h>
 #include <vtkPolygon.h>
 #include <vtkAppendPolyData.h>
+#include <vtkPointData.h>
 
 // FIXME to remove
 #include "vtkPolyDataMapper.h"
@@ -51,6 +56,7 @@
 template<class PixelType>
 clitk::Xml2DicomRTStructFilter<PixelType>::Xml2DicomRTStructFilter()
 {
+  m_ImageMHD = "";
   m_StructureSetFilename = "";
   m_DicomFolder = "";
   m_OutputFilename = "default-output.dcm";
@@ -87,6 +93,20 @@ void clitk::Xml2DicomRTStructFilter<PixelType>::Update()
   reader->SetFileName(m_StructureSetFilename.c_str());
   reader->Update();
 
+  //Check id use pixel is set and if imageMHD is present in such case
+  typedef itk::Image<double, 3> Input3DType;
+  typedef itk::ImageFileReader<Input3DType> InputReader3DType;
+  InputReader3DType::Pointer mhdReader = InputReader3DType::New();
+  if (m_UsePixel) {
+    if (m_ImageMHD != "") {
+      mhdReader->SetFileName(m_ImageMHD);
+      mhdReader->Update();
+    } else {
+      std::cout << "Set MHD image (option -j) when pixel is set" << std::endl;
+      return;
+    }
+  }
+
   // Get properties
   vtkRTStructSetProperties * p = reader->GetRTStructSetProperties();
   if (GetVerboseFlag()) {
@@ -107,6 +127,14 @@ void clitk::Xml2DicomRTStructFilter<PixelType>::Update()
   pugi::xml_node mainDict = doc.child("plist").child("dict").child("array");
   for (pugi::xml_node_iterator mainDictIt = mainDict.begin(); mainDictIt != mainDict.end(); ++mainDictIt) { //Look for all slice (one slice per dict)
     if (!std::strcmp(mainDictIt->name(), "dict")) {
+      pugi::xml_node_iterator sliceDescriptionIt = mainDictIt->begin();
+      while (sliceDescriptionIt != mainDictIt->end() && std::abs(std::strcmp(sliceDescriptionIt->child_value(), "ImageIndex"))) //Look for the ImageIndex for the current slice
+        ++sliceDescriptionIt;
+      int sliceNb = 0;
+      if (sliceDescriptionIt != mainDictIt->end()) { //take the following node to have the values
+        ++sliceDescriptionIt;
+        sliceNb = std::atoi(sliceDescriptionIt->child_value());
+      }
       for (pugi::xml_node_iterator sliceIt = mainDictIt->child("array").begin(); sliceIt != mainDictIt->child("array").end(); ++sliceIt) { //Look for all struct in the current slice (one struct per dict)
         if (!std::strcmp(sliceIt->name(), "dict")) {
           pugi::xml_node_iterator structureIt = sliceIt->begin();
@@ -115,15 +143,20 @@ void clitk::Xml2DicomRTStructFilter<PixelType>::Update()
           if (structureIt != sliceIt->end()) { //take the following node to have the values
             ++structureIt;
             std::string name(structureIt->child_value());
-            while (structureIt != sliceIt->end() && std::abs(std::strcmp(structureIt->child_value(), "Point_mm"))) //Look for the Point_mm for the current struct
-              ++structureIt;
+            if (m_UsePixel) {
+              while (structureIt != sliceIt->end() && std::abs(std::strcmp(structureIt->child_value(), "Point_px"))) //Look for the Point_px for the current struct
+                ++structureIt;
+            } else {
+              while (structureIt != sliceIt->end() && std::abs(std::strcmp(structureIt->child_value(), "Point_mm"))) //Look for the Point_mm for the current struct
+                ++structureIt;
+            }
             if (structureIt != sliceIt->end()) { //take the following node to have the values
               ++structureIt;
               // Insert all points for 1 struct into vtkPoints
               vtkSmartPointer<vtkPoints> points = vtkSmartPointer<vtkPoints>::New();
               for (pugi::xml_node_iterator pointIt = structureIt->begin(); pointIt != structureIt->end(); ++pointIt) { //Look for all points in mm in the current struct (one point per string)
                 if (!std::strcmp(pointIt->name(), "string")) {
-                  // Split the string to save the 3 values (remove the useless char) as double
+                  // Split the string to save the 2 or 3 values (remove the useless char) as double
                   char* copy = (char*)pointIt->child_value();
                   std::vector<char*> v;
                   char* chars_array = strtok(copy, ", ");
@@ -131,12 +164,28 @@ void clitk::Xml2DicomRTStructFilter<PixelType>::Update()
                       v.push_back(chars_array);
                       chars_array = strtok(NULL, ", ");
                   }
-                  v[0] = v[0] + 1;
-                  v[2][strlen(v[2])-1] = '\0';
                   double x, y, z;
-                  x = std::atof(v[0]);
-                  y = std::atof(v[1]);
-                  z = std::atof(v[2]);
+                  v[0] = v[0] + 1;
+                  if (m_UsePixel) {
+                    v[1][strlen(v[1])-1] = '\0';
+                    x = std::atof(v[0]);
+                    y = std::atof(v[1]);
+                    z = sliceNb;
+                    Input3DType::PointType position;
+                    Input3DType::IndexType index;
+                    index[0] = x;
+                    index[1] = y;
+                    index[2] = z;
+                    mhdReader->GetOutput()->TransformIndexToPhysicalPoint(index, position);
+                    x = position[0];
+                    y = position[1];
+                    z = position[2];
+                  } else {
+                    v[2][strlen(v[2])-1] = '\0';
+                    x = std::atof(v[0]);
+                    y = std::atof(v[1]);
+                    z = std::atof(v[2]);
+                  }
                   points->InsertNextPoint(x, y, z);
                 }
               }
@@ -207,8 +256,12 @@ void clitk::Xml2DicomRTStructFilter<PixelType>::Update()
   /*
   //  Visu DEBUG
   vtkPolyDataMapper *cubeMapper = vtkPolyDataMapper::New();
-  cubeMapper->SetInputData( mapName2Data[0]->GetOutput() );
-  cubeMapper->SetScalarRange(0,7);
+  cubeMapper->SetInputData( mapName2Data.begin()->second->GetOutput() );
+  double range[2];
+  mapName2Data.begin()->second->GetOutput()->GetPointData()->GetScalars()->GetRange(range);
+  std::cout << numMasks << std::endl;
+  cubeMapper->SetScalarRange(range);
+  std::cout << range[0] << " " << range[1] << std::endl;
   vtkActor *cubeActor = vtkActor::New();
   cubeActor->SetMapper(cubeMapper);
   vtkProperty * property = cubeActor->GetProperty();