X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_ROI.cxx;h=1fd9fe1f1c6b806bd0f08be65c15d32d47a42f7f;hb=c25dc5b9c8094da27269fa006f847ddd8154c8e1;hp=783b97227921af73bf540c60a6f3e18c0d8c938a;hpb=ef33edbce5ce9f897e3e6acbc5d36718407329c0;p=clitk.git diff --git a/common/clitkDicomRT_ROI.cxx b/common/clitkDicomRT_ROI.cxx index 783b972..1fd9fe1 100644 --- a/common/clitkDicomRT_ROI.cxx +++ b/common/clitkDicomRT_ROI.cxx @@ -41,6 +41,7 @@ clitk::DicomRT_ROI::DicomRT_ROI() mBackgroundValue = 0; mForegroundValue = 1; SetDicomUptodateFlag(false); + mFilename = ""; } //-------------------------------------------------------------------- @@ -141,6 +142,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; @@ -286,10 +288,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 +378,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 @@ -468,7 +472,19 @@ void clitk::DicomRT_ROI::Read(vtkSmartPointer & 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);