X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=common%2FclitkDicomRT_ROI.cxx;h=7bec8c51f47b1be17104b0fb16da56c22f3e9317;hb=38230d4e1081fa1f4c4469472137c3c1bdab2a3b;hp=783b97227921af73bf540c60a6f3e18c0d8c938a;hpb=ef33edbce5ce9f897e3e6acbc5d36718407329c0;p=clitk.git

diff --git a/common/clitkDicomRT_ROI.cxx b/common/clitkDicomRT_ROI.cxx
index 783b972..7bec8c5 100644
--- a/common/clitkDicomRT_ROI.cxx
+++ b/common/clitkDicomRT_ROI.cxx
@@ -23,6 +23,7 @@
 #include <vtkImageClip.h>
 #include <vtkMarchingSquares.h>
 #include <vtkPolyDataWriter.h>
+#include <vtkVersion.h>
 
 #if GDCM_MAJOR_VERSION == 2
 #include "gdcmAttribute.h"
@@ -41,6 +42,7 @@ clitk::DicomRT_ROI::DicomRT_ROI()
   mBackgroundValue = 0;
   mForegroundValue = 1;
   SetDicomUptodateFlag(false);
+  mFilename = "";
 }
 //--------------------------------------------------------------------
 
@@ -141,6 +143,7 @@ double clitk::DicomRT_ROI::GetForegroundValueLabelImage() const
 #if GDCM_MAJOR_VERSION == 2
 bool clitk::DicomRT_ROI::Read(gdcm::Item * itemInfo, gdcm::Item * itemContour)
 {
+  FATAL("Error : compile vv with itk4 + external gdcm");
   // Keep dicom item
   mItemInfo = itemInfo;
   mItemContour = itemContour;
@@ -274,7 +277,11 @@ void clitk::DicomRT_ROI::ComputeMeshFromContour()
 {
   vtkSmartPointer<vtkAppendPolyData> append = vtkSmartPointer<vtkAppendPolyData>::New();
   for(unsigned int i=0; i<mListOfContours.size(); i++) {
-    append->AddInput(mListOfContours[i]->GetMesh());
+#if VTK_MAJOR_VERSION <= 5
+  	append->AddInput(mListOfContours[i]->GetMesh());
+#else
+  	append->AddInputData(mListOfContours[i]->GetMesh());
+#endif
   }
   append->Update();
  
@@ -286,10 +293,11 @@ void clitk::DicomRT_ROI::ComputeMeshFromContour()
 
 
 #if GDCM_MAJOR_VERSION == 2
-
 //--------------------------------------------------------------------
 void clitk::DicomRT_ROI::UpdateDicomItem()
 {
+  FATAL("Error : compile vv with itk4 + external gdcm");
+
   if (GetDicomUptoDateFlag()) return;
   DD("ROI::UpdateDicomItem");
   DD(GetName());  
@@ -375,6 +383,7 @@ vvImage * clitk::DicomRT_ROI::GetImage() const
 //--------------------------------------------------------------------
 void clitk::DicomRT_ROI::ComputeContoursFromImage()
 {
+  FATAL("ComputeContoursFromImage should not be call. To be replace");
   DD("ComputeMeshFromImage");
 
   // Check that an image is loaded
@@ -390,7 +399,12 @@ void clitk::DicomRT_ROI::ComputeContoursFromImage()
   
   // Get initial extend for the clipping
   vtkSmartPointer<vtkImageClip> clipper = vtkSmartPointer<vtkImageClip>::New();
+#if VTK_MAJOR_VERSION <= 5
   clipper->SetInput(image);
+#else
+  clipper->SetInputData(image);
+#endif
+  
   int* extent = image->GetExtent();
   DDV(extent, 6);
   //  std::vector<int> extend;
@@ -410,7 +424,11 @@ void clitk::DicomRT_ROI::ComputeContoursFromImage()
 
 
     vtkSmartPointer<vtkMarchingSquares> squares = vtkSmartPointer<vtkMarchingSquares>::New();
+#if VTK_MAJOR_VERSION <= 5
     squares->SetInput(image);
+#else
+    squares->SetInputData(image);
+#endif
     squares->SetImageRange(extent[0], extent[1], extent[2], extent[3], i, i);
     squares->SetValue(1, 1.0);
     squares->Update();
@@ -442,7 +460,11 @@ void clitk::DicomRT_ROI::ComputeContoursFromImage()
  
   vtkSmartPointer<vtkAppendPolyData> append = vtkSmartPointer<vtkAppendPolyData>::New();
   for(unsigned int i=0; i<n; i++) {
+#if VTK_MAJOR_VERSION <= 5
     append->AddInput(contours[i]);
+#else
+    append->AddInputData(contours[i]);
+#endif
   }
   append->Update();
  
@@ -451,7 +473,11 @@ void clitk::DicomRT_ROI::ComputeContoursFromImage()
   
   // Write vtk
   vtkPolyDataWriter * w = vtkPolyDataWriter::New();
+#if VTK_MAJOR_VERSION <= 5
   w->SetInput(mMesh);
+#else
+  w->SetInputData(mMesh);
+#endif
   w->SetFileName("toto.vtk");
   w->Write();
 
@@ -468,7 +494,19 @@ void clitk::DicomRT_ROI::Read(vtkSmartPointer<vtkGDCMPolyDataReader> & reader, i
   
   mName = p->GetStructureSetROIName(roiindex);
   mNumber = p->GetStructureSetROINumber(roiindex);
+
   //mColor = //FIXME !!  
+
+  // gdcm::Attribute<0x3006,0x002a> color = {};
+  
+  // const gdcm::DataSet & nestedds = mItemContour->GetNestedDataSet();
+  // color.SetFromDataSet( nestedds );
+  // assert( color.GetNumberOfValues() == 3 );
+  // mColor[0] = color.GetValue(0);
+  // mColor[1] = color.GetValue(1);
+  // mColor[2] = color.GetValue(2);
+
+
   SetDicomUptodateFlag(true);
   // Get the contour
   mMesh =  reader->GetOutput(roiindex);