comparison OrthancServer/RadiotherapyRestApi.cpp @ 544:a482948c1fd6 dicom-rt

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 04 Sep 2013 14:19:14 +0200
parents c8347eef225b
children
comparison
equal deleted inserted replaced
541:c8347eef225b 544:a482948c1fd6
161 if (!CheckSeriesModality(study, series, content, context, seriesId, "RTSTRUCT")) 161 if (!CheckSeriesModality(study, series, content, context, seriesId, "RTSTRUCT"))
162 { 162 {
163 return false; 163 return false;
164 } 164 }
165 165
166 // Check that the "ReferencedStudySequence" is the same as the parent study. 166 // Check that the "ReferencedStudySequence" (if any) is the same as the parent study.
167 if (!content.isMember(REFERENCED_STUDY_SEQUENCE) || 167 if (content.isMember(REFERENCED_STUDY_SEQUENCE))
168 content[REFERENCED_STUDY_SEQUENCE]["Value"].size() != 1 || 168 {
169 !content[REFERENCED_STUDY_SEQUENCE]["Value"][0].isMember(REFERENCED_SOP_INSTANCE_UID) || 169 if (content[REFERENCED_STUDY_SEQUENCE]["Value"].size() != 1 ||
170 content[REFERENCED_STUDY_SEQUENCE]["Value"][0][REFERENCED_SOP_INSTANCE_UID]["Value"].asString() != 170 !content[REFERENCED_STUDY_SEQUENCE]["Value"][0].isMember(REFERENCED_SOP_INSTANCE_UID) ||
171 study["MainDicomTags"]["StudyInstanceUID"].asString()) 171 content[REFERENCED_STUDY_SEQUENCE]["Value"][0][REFERENCED_SOP_INSTANCE_UID]["Value"].asString() !=
172 { 172 study["MainDicomTags"]["StudyInstanceUID"].asString())
173 return false; 173 {
174 return false;
175 }
174 } 176 }
175 177
176 // Lookup for the frame of reference. Orthanc does not support 178 // Lookup for the frame of reference. Orthanc does not support
177 // RTSTRUCT with multiple frames of reference. 179 // RTSTRUCT with multiple frames of reference.
178 if (!content.isMember(REFERENCED_FRAME_OF_REFERENCE_SEQUENCE) || 180 if (!content.isMember(REFERENCED_FRAME_OF_REFERENCE_SEQUENCE) ||