Authors belongs to:
- University of LYON http://www.universite-lyon.fr/
- - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
+ - Léon Bérard cancer center http://www.centreleonberard.fr
- CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr
This software is distributed WITHOUT ANY WARRANTY; without even
#include <vtkSmartPointer.h>
#include <vtkAppendPolyData.h>
+#if GDCM_MAJOR_VERSION == 2
+#include "gdcmAttribute.h"
+#include "gdcmItem.h"
+#endif
+
//--------------------------------------------------------------------
clitk::DicomRT_ROI::DicomRT_ROI()
{
mMeshIsUpToDate = false;
mBackgroundValue = 0;
mForegroundValue = 1;
- mZDelta = 0;
+ SetDicomUptodateFlag(false);
}
//--------------------------------------------------------------------
//--------------------------------------------------------------------
-void clitk::DicomRT_ROI::Read(std::map<int, std::string> & rois, gdcm::SQItem * item)
+#if GDCM_MAJOR_VERSION == 2
+bool clitk::DicomRT_ROI::Read(gdcm::Item * itemInfo, gdcm::Item * itemContour)
{
+ // Keep dicom item
+ mItemInfo = itemInfo;
+ mItemContour = itemContour;
+ // DD(mItemInfo);
+
+ // ROI number [Referenced ROI Number]
+ const gdcm::DataSet & nesteddsInfo = mItemInfo->GetNestedDataSet();
+ gdcm::Attribute<0x3006,0x0022> roinumber;
+ roinumber.SetFromDataSet( nesteddsInfo );
+ int nb1 = roinumber.GetValue();
+
+ // Check this is the same with the other item
+ const gdcm::DataSet & nestedds = mItemContour->GetNestedDataSet();
+ gdcm::Attribute<0x3006,0x0084> referencedroinumber;
+ referencedroinumber.SetFromDataSet( nestedds );
+ int nb2 = referencedroinumber.GetValue();
+
+ // Must never be different
+ if (nb1 != nb2) {
+ DD(nb2);
+ DD(nb1);
+ FATAL("nb1 must equal nb2" << std::endl);
+ }
+ mNumber = nb1;
- // Change number if needed
+ // Retrieve ROI Name (in the info item)
+ gdcm::Attribute<0x3006,0x26> roiname;
+ roiname.SetFromDataSet( nesteddsInfo );
+ mName = roiname.GetValue();
+ // DD(mName);
- // TODO
+ // ROI Color [ROI Display Color]
+ gdcm::Attribute<0x3006,0x002a> color = {};
+ color.SetFromDataSet( nestedds );
+ assert( color.GetNumberOfValues() == 3 );
+ mColor[0] = color.GetValue(0);
+ mColor[1] = color.GetValue(1);
+ mColor[2] = color.GetValue(2);
+ // Read contours [Contour Sequence]
+ gdcm::Tag tcsq(0x3006,0x0040);
+ if( !nestedds.FindDataElement( tcsq ) )
+ {
+ std::cerr << "Warning. Could not read contour for structure <" << mName << ">, number" << mNumber << " ? I ignore it" << std::endl;
+ SetDicomUptodateFlag(true);
+ return false;
+ }
+ const gdcm::DataElement& csq = nestedds.GetDataElement( tcsq );
+ gdcm::SmartPointer<gdcm::SequenceOfItems> sqi2 = csq.GetValueAsSQ();
+ if( !sqi2 || !sqi2->GetNumberOfItems() )
+ {
+ }
+ unsigned int nitems = sqi2->GetNumberOfItems();
+
+ for(unsigned int i = 0; i < nitems; ++i)
+ {
+ const gdcm::Item & j = sqi2->GetItem(i+1); // Item start at #1
+ DicomRT_Contour::Pointer c = DicomRT_Contour::New();
+ bool b = c->Read(j);
+ if (b) {
+ mListOfContours.push_back(c);
+ }
+ }
+ SetDicomUptodateFlag(true);
+ return true;
+}
+#else
+void clitk::DicomRT_ROI::Read(std::map<int, std::string> & rois, gdcm::SQItem * item)
+{
// ROI number [Referenced ROI Number]
mNumber = atoi(item->GetEntryValue(0x3006,0x0084).c_str());
// Read contours [Contour Sequence]
gdcm::SeqEntry * contours=item->GetSeqEntry(0x3006,0x0040);
- bool contour_processed=false;
- bool delta_computed=false;
- double last_z=0;
- for(gdcm::SQItem* j=contours->GetFirstSQItem(); j!=0; j=contours->GetNextSQItem()) {
- DicomRT_Contour::Pointer c = DicomRT_Contour::New();
- bool b = c->Read(j);
- if (b) {
- mListOfContours.push_back(c);
- if (contour_processed) {
- double delta=c->GetZ() - last_z;
- if (delta_computed)
- assert(mZDelta == delta);
- else
- mZDelta = delta;
- } else
- contour_processed=true;
- last_z=c->GetZ();
+ if (contours) {
+ int i=0;
+ for(gdcm::SQItem* j=contours->GetFirstSQItem(); j!=0; j=contours->GetNextSQItem()) {
+ DicomRT_Contour::Pointer c = DicomRT_Contour::New();
+ bool b = c->Read(j);
+ if (b) {
+ mListOfContours.push_back(c);
+ }
+ ++i;
}
}
+ else {
+ std::cerr << "Warning. Could not read contour for structure <" << mName << ">, number" << mNumber << " ? I ignore it" << std::endl;
+ }
+ SetDicomUptodateFlag(true);
}
+#endif
//--------------------------------------------------------------------
}
return mMesh;
}
+//--------------------------------------------------------------------
+
+
//--------------------------------------------------------------------
clitk::DicomRT_Contour * clitk::DicomRT_ROI::GetContour(int n)
{
return mListOfContours[n];
}
+//--------------------------------------------------------------------
+
//--------------------------------------------------------------------
void clitk::DicomRT_ROI::ComputeMesh()
append->AddInput(mListOfContours[i]->GetMesh());
}
append->Update();
- mMesh = append->GetOutput();
+
+ mMesh = vtkSmartPointer<vtkPolyData>::New();
+ mMesh->DeepCopy(append->GetOutput());
mMeshIsUpToDate = true;
}
//--------------------------------------------------------------------
+#if GDCM_MAJOR_VERSION == 2
+
+//--------------------------------------------------------------------
+void clitk::DicomRT_ROI::UpdateDicomItem()
+{
+ if (GetDicomUptoDateFlag()) return;
+ DD("ROI::UpdateDicomItem");
+ DD(GetName());
+
+ // From now, only some item can be modified
+
+ // Set ROI Name 0x3006,0x26>
+ gdcm::Attribute<0x3006,0x26> roiname;
+ roiname.SetValue(GetName());
+ gdcm::DataElement de = roiname.GetAsDataElement();
+ gdcm::DataSet & ds = mItemInfo->GetNestedDataSet();
+ ds.Replace(de);
+
+ // Update contours
+ for(uint i=0; i<mListOfContours.size(); i++) {
+ DD(i);
+ DicomRT_Contour::Pointer roi = mListOfContours[i];
+ roi->UpdateDicomItem(mItemContour);
+ }
+}
+//--------------------------------------------------------------------
+#endif
+
//--------------------------------------------------------------------
void clitk::DicomRT_ROI::SetFromBinaryImage(vvImage * image, int n,
- std::string name,
- std::vector<double> color,
- std::string filename)
+ std::string name,
+ std::vector<double> color,
+ std::string filename)
{
// ROI number [Referenced ROI Number]
git://git.creatis.insa-lyon.fr / clitk.git / blobdiff