Program: vv http://www.creatis.insa-lyon.fr/rio/vv
Main authors : XX XX XX
- Authors belongs to:
+ Authors belongs to:
- University of LYON http://www.universite-lyon.fr/
- Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
- CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr
=========================================================================*/
-#include "clitkDicomRT_Contour.h"
+#include "clitkDicomRT_Contour.h"
#include <vtkCellArray.h>
+#if GDCM_MAJOR_VERSION == 2
+#include "gdcmAttribute.h"
+#include "gdcmItem.h"
+#endif
+
//--------------------------------------------------------------------
-clitk::DicomRT_Contour::DicomRT_Contour() {
+clitk::DicomRT_Contour::DicomRT_Contour()
+{
mMeshIsUpToDate = false;
mNbOfPoints = 0;
+ mZ = -1;
}
//--------------------------------------------------------------------
//--------------------------------------------------------------------
-clitk::DicomRT_Contour::~DicomRT_Contour() {
-
+clitk::DicomRT_Contour::~DicomRT_Contour()
+{
+
}
//--------------------------------------------------------------------
//--------------------------------------------------------------------
-void clitk::DicomRT_Contour::Print(std::ostream & os) const {
+void clitk::DicomRT_Contour::Print(std::ostream & os) const
+{
DD("TODO : print Contours");
}
//--------------------------------------------------------------------
//--------------------------------------------------------------------
-bool clitk::DicomRT_Contour::Read(gdcm::SQItem * item) {
-
+#if GDCM_MAJOR_VERSION == 2
+bool clitk::DicomRT_Contour::Read(gdcm::Item const & item)
+{
+ const gdcm::DataSet& nestedds2 = item.GetNestedDataSet();
+
+ // Contour type [Contour Geometric Type]
+ gdcm::Attribute<0x3006,0x0042> contgeotype;
+ contgeotype.SetFromDataSet( nestedds2 );
+
+ if (contgeotype.GetValue() != "CLOSED_PLANAR " && contgeotype.GetValue() != "POINT ") { ///WARNING to the space after the name ...
+ //std::cerr << "Skip this contour : type=" << mType << std::endl;
+ return false;
+ }
+ if (contgeotype.GetValue() == "POINT ") {
+ std::cerr << "Warning: POINT type not fully supported. (don't use GetMesh() with this!)"
+ << std::endl;
+ }
+
+ gdcm::Attribute<0x3006,0x0046> numcontpoints;
+ numcontpoints.SetFromDataSet( nestedds2 );
+ // Number of points [Number of Contour Points]
+ mNbOfPoints = numcontpoints.GetValue();
+ // DD(mNbOfPoints);
+
+ gdcm::Attribute<0x3006,0x0050> at;
+ gdcm::Tag tcontourdata(0x3006,0x0050);
+ const gdcm::DataElement & contourdata = nestedds2.GetDataElement( tcontourdata );
+ at.SetFromDataElement( contourdata );
+ const double* points = at.GetValues();
+ unsigned int npts = at.GetNumberOfValues() / 3;
+
+ assert(at.GetNumberOfValues() == static_cast<unsigned int>(mNbOfPoints)*3);
+
+ // Organize values
+ mData = vtkSmartPointer<vtkPoints>::New();
+ mData->SetDataTypeToDouble();
+ mData->SetNumberOfPoints(mNbOfPoints);
+ for(unsigned int i=0; i<mNbOfPoints; i++) {
+ double p[3];
+ p[0] = points[i*3];
+ p[1] = points[i*3+1];
+ p[2] = points[i*3+2];
+ mData->SetPoint(i, p);
+ if (mZ == -1) mZ = p[2];
+ if (p[2] != mZ) {
+ DD(i);
+ DD(p[2]);
+ DD(mZ);
+ std::cout << "ERROR ! contour not in the same slice" << std::endl;
+ assert(p[2] == mZ);
+ }
+ }
+
+ return true;
+
+}
+#else
+bool clitk::DicomRT_Contour::Read(gdcm::SQItem * item)
+{
+
// Contour type [Contour Geometric Type]
mType = item->GetEntryValue(0x3006,0x0042);
// DD(mType);
- if (mType != "CLOSED_PLANAR ") { ///WARNING to the space after the name ...
- std::cerr << "Skip this contour : type=" << mType << std::endl;
+ if (mType != "CLOSED_PLANAR " && mType != "POINT ") { ///WARNING to the space after the name ...
+ //std::cerr << "Skip this contour : type=" << mType << std::endl;
return false;
}
-
+ if (mType == "POINT ") {
+ std::cerr << "Warning: POINT type not fully supported. (don't use GetMesh() with this!)"
+ << std::endl;
+ }
+
// Number of points [Number of Contour Points]
mNbOfPoints = parse_value<int>(item->GetEntryValue(0x3006,0x0046));
// DD(mNbOfPoints);
-
+
// Read values [Contour Data]
std::vector<float> points = parse_string<float>(item->GetEntryValue(0x3006,0x0050),'\\');
assert(points.size() == static_cast<unsigned int>(mNbOfPoints)*3);
-
+
// Organize values
- mData = vtkPoints::New();
+ mData = vtkSmartPointer<vtkPoints>::New();
mData->SetDataTypeToDouble();
mData->SetNumberOfPoints(mNbOfPoints);
- double z = -1;
for(unsigned int i=0; i<mNbOfPoints; i++) {
double p[3];
p[0] = points[i*3];
p[1] = points[i*3+1];
p[2] = points[i*3+2];
mData->SetPoint(i, p);
- if (z == -1) z = p[2];
- if (p[2] != z) {
+ if (mZ == -1) mZ = p[2];
+ if (p[2] != mZ) {
DD(i);
DD(p[2]);
- DD(z);
+ DD(mZ);
std::cout << "ERROR ! contour not in the same slice" << std::endl;
- assert(p[2] == z);
+ assert(p[2] == mZ);
}
}
return true;
}
+#endif
//--------------------------------------------------------------------
//--------------------------------------------------------------------
-vtkPolyData * clitk::DicomRT_Contour::GetMesh() {
+vtkPolyData * clitk::DicomRT_Contour::GetMesh()
+{
if (!mMeshIsUpToDate) {
ComputeMesh();
}
//--------------------------------------------------------------------
-void clitk::DicomRT_Contour::ComputeMesh() {
- // DD("ComputeMesh Contour");
- mMesh = vtkPolyData::New();
+void clitk::DicomRT_Contour::ComputeMesh()
+{
+// DD("ComputeMesh Contour");
+ mMesh = vtkSmartPointer<vtkPolyData>::New();
mMesh->Allocate(); //for cell structures
- mMesh->SetPoints(vtkPoints::New());
+ mPoints = vtkSmartPointer<vtkPoints>::New();
+ mMesh->SetPoints(mPoints);
vtkIdType ids[2];
for (unsigned int idx=0 ; idx<mNbOfPoints ; idx++) {
- mMesh->GetPoints()->InsertNextPoint(mData->GetPoint(idx)[0],
- mData->GetPoint(idx)[1],
+ mMesh->GetPoints()->InsertNextPoint(mData->GetPoint(idx)[0],
+ mData->GetPoint(idx)[1],
mData->GetPoint(idx)[2]);
- ids[0]=idx;
+ ids[0]=idx;
ids[1]=(ids[0]+1) % mNbOfPoints; //0-1,1-2,...,n-1-0
// DD(ids[0]);
// DD(ids[1]);