Mercurial > hg > orthanc-stone

annotate OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp @ 2094:7c3d65166c26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
partial integration dicom-sr->mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 08 Nov 2023 14:54:15 +0100
parents 51c8b21b81e4
children 79e984a89a38 67db5afb305d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Stone of Orthanc
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 *
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * This program is free software: you can redistribute it and/or
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * modify it under the terms of the GNU Lesser General Public License
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * as published by the Free Software Foundation, either version 3 of
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * the License, or (at your option) any later version.
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 *
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * This program is distributed in the hope that it will be useful, but
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * Lesser General Public License for more details.
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 *
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * You should have received a copy of the GNU Lesser General Public
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * License along with this program. If not, see
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 * <http://www.gnu.org/licenses/>.
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 **/
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 #include "DicomStructuredReport.h"
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 #include "../Scene2D/ScenePoint2D.h"
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 #include <OrthancException.h>
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 #include <SerializationToolbox.h>
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 #include <dcmtk/dcmdata/dcdeftag.h>
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 #include <dcmtk/dcmdata/dcsequen.h>
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 #include <dcmtk/dcmdata/dcfilefo.h>
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
2087
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2085
diff changeset
36 static std::string FormatTag(const DcmTagKey& key)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2085
diff changeset
37 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2085
diff changeset
38 OFString s = key.toString();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2085
diff changeset
39 return std::string(s.c_str());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2085
diff changeset
40 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2085
diff changeset
41
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2085
diff changeset
42
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 static std::string GetStringValue(DcmItem& dataset,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 const DcmTagKey& key)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 const char* value = NULL;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 if (dataset.findAndGetString(key, value).good() &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 value != NULL)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 return value;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
2087
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2085
diff changeset
55 "Missing tag in DICOM-SR: " + FormatTag(key));
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 static DcmSequenceOfItems& GetSequenceValue(DcmItem& dataset,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 const DcmTagKey& key)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 DcmSequenceOfItems* sequence = NULL;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 if (dataset.findAndGetSequence(key, sequence).good() &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 sequence != NULL)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 return *sequence;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
2087
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2085
diff changeset
72 "Missing sequence in DICOM-SR: " + FormatTag(key));
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 static void CheckStringValue(DcmItem& dataset,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 const DcmTagKey& key,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 const std::string& expected)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 if (GetStringValue(dataset, key) != expected)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 static bool IsDicomTemplate(DcmItem& dataset,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 const std::string& tid)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 DcmSequenceOfItems& sequence = GetSequenceValue(dataset, DCM_ContentTemplateSequence);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 return (sequence.card() == 1 &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 GetStringValue(*sequence.getItem(0), DCM_MappingResource) == "DCMR" &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 GetStringValue(*sequence.getItem(0), DCM_TemplateIdentifier) == tid);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 static bool IsValidConcept(DcmItem& dataset,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 const DcmTagKey& key,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 const std::string& scheme,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 const std::string& concept)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 DcmSequenceOfItems& sequence = GetSequenceValue(dataset, key);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 return (sequence.card() == 1 &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 GetStringValue(*sequence.getItem(0), DCM_CodingSchemeDesignator) == scheme &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 GetStringValue(*sequence.getItem(0), DCM_CodeValue) == concept);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 static bool IsDicomConcept(DcmItem& dataset,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 const std::string& concept)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 return IsValidConcept(dataset, DCM_ConceptNameCodeSequence, "DCM", concept);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 namespace OrthancStone
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 {
2094
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
121 void DicomStructuredReport::ReferencedInstance::AddFrame(unsigned int frame)
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
122 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
123 if (frame == 0)
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
124 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
125 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
126 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
127 else
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
128 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
129 frames_.insert(frame - 1);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
130 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
131 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
132
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
133
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 class DicomStructuredReport::Structure : public boost::noncopyable
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 private:
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 std::string sopInstanceUid_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 bool hasFrameNumber_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 unsigned int frameNumber_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 bool hasProbabilityOfCancer_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 float probabilityOfCancer_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 public:
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 Structure(const std::string& sopInstanceUid) :
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 sopInstanceUid_(sopInstanceUid),
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 hasFrameNumber_(false),
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 hasProbabilityOfCancer_(false)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 virtual ~Structure()
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 void SetFrameNumber(unsigned int frame)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 if (frame <= 0)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 hasFrameNumber_ = true;
2094
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
164 frameNumber_ = frame - 1;
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 void SetProbabilityOfCancer(float probability)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 if (probability < 0 ||
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 probability > 100)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 hasProbabilityOfCancer_ = true;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 probabilityOfCancer_ = probability;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 bool HasFrameNumber() const
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 return hasFrameNumber_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 bool HasProbabilityOfCancer() const
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 return hasProbabilityOfCancer_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 unsigned int GetFrameNumber() const
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 if (hasFrameNumber_)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 return frameNumber_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 float GetProbabilityOfCancer() const
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 if (hasProbabilityOfCancer_)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208 return probabilityOfCancer_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
211 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215 };
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
216
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
217
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218 class DicomStructuredReport::Point : public Structure
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220 private:
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221 ScenePoint2D point_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223 public:
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
224 Point(const std::string& sopInstanceUid,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 double x,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226 double y) :
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
227 Structure(sopInstanceUid),
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
228 point_(x, y)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
229 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232 const ScenePoint2D& GetPoint() const
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
233 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234 return point_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
236 };
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
237
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
239 class DicomStructuredReport::Polyline : public Structure
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
241 private:
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242 std::vector<ScenePoint2D> points_;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
243
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
244 public:
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
245 Polyline(const std::string& sopInstanceUid,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
246 const float* points,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
247 unsigned long pointsCount) :
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
248 Structure(sopInstanceUid)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
250 if (pointsCount % 2 != 0)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
252 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
254
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
255 points_.reserve(pointsCount / 2);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
256
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257 for (unsigned long i = 0; i < pointsCount; i += 2)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259 points_.push_back(ScenePoint2D(points[i], points[i + 1]));
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
263 size_t GetSize() const
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
264 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265 return points_.size();
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
266 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
267
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
268 const ScenePoint2D& GetPoint(size_t i) const
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
269 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
270 if (i >= points_.size())
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
271 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
272 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
273 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
274 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
275 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
276 return points_[i];
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
277 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
278 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
279 };
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
280
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
281
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
282 void DicomStructuredReport::AddStructure(const std::string& sopInstanceUid,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
283 DcmItem& group,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
284 bool hasFrameNumber,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
285 unsigned int frameNumber,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
286 bool hasProbabilityOfCancer,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
287 float probabilityOfCancer)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
288 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
289 const std::string graphicType = GetStringValue(group, DCM_GraphicType);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
290
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
291 const Float32* coords = NULL;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
292 unsigned long coordsCount = 0;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
293 if (!group.findAndGetFloat32Array(DCM_GraphicData, coords, &coordsCount).good() ||
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
294 (coordsCount != 0 && coords == NULL))
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
297 "Cannot read coordinates for region in DICOM-SR");
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
298 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
299
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
300 std::unique_ptr<Structure> structure;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302 if (graphicType == "POINT")
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
303 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
304 if (coordsCount != 2)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
305 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
306 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
307 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
308 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
309 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
310 structure.reset(new Point(sopInstanceUid, coords[0], coords[1]));
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
311 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
312 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
313 else if (graphicType == "POLYLINE")
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
314 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
315 structure.reset(new Polyline(sopInstanceUid, coords, coordsCount));
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
316 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
317 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
318 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
319 return; // Unsupported graphic type
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
320 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
321
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
322 assert(structure.get() != NULL);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
323
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
324 if (hasFrameNumber)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
325 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
326 structure->SetFrameNumber(frameNumber);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
327 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
328
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
329 if (hasProbabilityOfCancer)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
330 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
331 structure->SetProbabilityOfCancer(probabilityOfCancer);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
332 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
333
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
334 structures_.push_back(structure.release());
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
335 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
336
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
337
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
338 DicomStructuredReport::DicomStructuredReport(Orthanc::ParsedDicomFile& dicom)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
339 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
340 DcmDataset& dataset = *dicom.GetDcmtkObject().getDataset();
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
341
2094
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
342 studyInstanceUid_ = GetStringValue(dataset, DCM_StudyInstanceUID);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
343 seriesInstanceUid_ = GetStringValue(dataset, DCM_SeriesInstanceUID);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
344 sopInstanceUid_ = GetStringValue(dataset, DCM_SOPInstanceUID);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
345
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
346 CheckStringValue(dataset, DCM_Modality, "SR");
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
347 CheckStringValue(dataset, DCM_SOPClassUID, "1.2.840.10008.5.1.4.1.1.88.33"); // Comprehensive SR IOD
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
348 CheckStringValue(dataset, DCM_ValueType, "CONTAINER");
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
349
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
350 if (!IsDicomConcept(dataset, "126000") /* Imaging measurement report */ ||
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
351 !IsDicomTemplate(dataset, "1500"))
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
352 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
353 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
354 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
355
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
356 DcmSequenceOfItems& sequence = GetSequenceValue(dataset, DCM_CurrentRequestedProcedureEvidenceSequence);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
357
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
358 std::list<std::string> tmp;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
359
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
360 for (unsigned long i = 0; i < sequence.card(); i++)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
361 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
362 std::string studyInstanceUid = GetStringValue(*sequence.getItem(i), DCM_StudyInstanceUID);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
363
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
364 DcmSequenceOfItems* referencedSeries = NULL;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
365 if (!sequence.getItem(i)->findAndGetSequence(DCM_ReferencedSeriesSequence, referencedSeries).good() ||
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
366 referencedSeries == NULL)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
367 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
368 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
369 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
370
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
371 for (unsigned long j = 0; j < referencedSeries->card(); j++)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
372 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
373 std::string seriesInstanceUid = GetStringValue(*referencedSeries->getItem(j), DCM_SeriesInstanceUID);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
374
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
375 DcmSequenceOfItems* referencedInstances = NULL;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
376 if (!referencedSeries->getItem(j)->findAndGetSequence(DCM_ReferencedSOPSequence, referencedInstances).good() ||
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
377 referencedInstances == NULL)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
378 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
379 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
380 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
381
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
382 for (unsigned int k = 0; k < referencedInstances->card(); k++)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
383 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
384 std::string sopClassUid = GetStringValue(*referencedInstances->getItem(k), DCM_ReferencedSOPClassUID);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
385 std::string sopInstanceUid = GetStringValue(*referencedInstances->getItem(k), DCM_ReferencedSOPInstanceUID);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
386
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
387 if (instancesInformation_.find(sopInstanceUid) == instancesInformation_.end())
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
388 {
2094
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
389 instancesInformation_[sopInstanceUid] = new ReferencedInstance(studyInstanceUid, seriesInstanceUid, sopClassUid);
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
390 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
391 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
392 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
393 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
394 "Multiple occurrences of the same instance in DICOM-SR: " + sopInstanceUid);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
395 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
396
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
397 tmp.push_back(sopInstanceUid);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
398 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
399 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
400 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
401
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
402 orderedInstances_.reserve(tmp.size());
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
403
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
404 for (std::list<std::string>::const_iterator it = tmp.begin(); it != tmp.end(); ++it)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
405 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
406 orderedInstances_.push_back(*it);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
407 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
408
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
409 sequence = GetSequenceValue(dataset, DCM_ContentSequence);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
410
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
411 for (unsigned long i = 0; i < sequence.card(); i++)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
412 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
413 DcmItem& item = *sequence.getItem(i);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
414
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
415 if (GetStringValue(item, DCM_RelationshipType) == "CONTAINS" &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
416 GetStringValue(item, DCM_ValueType) == "CONTAINER" &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
417 IsDicomConcept(item, "126010" /* Imaging measurements */))
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
418 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
419 DcmSequenceOfItems& measurements = GetSequenceValue(item, DCM_ContentSequence);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
420
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
421 for (unsigned long j = 0; j < measurements.card(); j++)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
422 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
423 DcmItem& measurement = *measurements.getItem(j);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
424
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
425 if (GetStringValue(measurement, DCM_RelationshipType) == "CONTAINS" &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
426 GetStringValue(measurement, DCM_ValueType) == "CONTAINER" &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
427 IsDicomConcept(measurement, "125007" /* Measurement group */) &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
428 IsDicomTemplate(measurement, "1410"))
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
429 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
430 DcmSequenceOfItems& groups = GetSequenceValue(measurement, DCM_ContentSequence);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
431
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
432 bool hasProbabilityOfCancer = false;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
433 float probabilityOfCancer = 0;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
434
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
435 for (unsigned int k = 0; k < groups.card(); k++)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
436 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
437 DcmItem& group = *groups.getItem(k);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
438
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
439 if (GetStringValue(group, DCM_RelationshipType) == "CONTAINS" &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
440 GetStringValue(group, DCM_ValueType) == "NUM" &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
441 IsDicomConcept(group, "111047" /* Probability of cancer */))
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
442 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
443 DcmSequenceOfItems& values = GetSequenceValue(group, DCM_MeasuredValueSequence);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
444
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
445 if (values.card() == 1 &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
446 IsValidConcept(*values.getItem(0), DCM_MeasurementUnitsCodeSequence, "UCUM", "%"))
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
447 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
448 std::string value = GetStringValue(*values.getItem(0), DCM_NumericValue);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
449 if (Orthanc::SerializationToolbox::ParseFloat(probabilityOfCancer, value))
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
450 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
451 hasProbabilityOfCancer = true;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
452 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
453 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
454 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
455 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
456 "Cannot parse float in DICOM-SR: " + value);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
457 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
458 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
459 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
460 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
461
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
462 for (unsigned int k = 0; k < groups.card(); k++)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
463 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
464 DcmItem& group = *groups.getItem(k);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
465
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
466 if (GetStringValue(group, DCM_RelationshipType) == "CONTAINS" &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
467 GetStringValue(group, DCM_ValueType) == "SCOORD" &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
468 IsDicomConcept(group, "111030" /* Image region */))
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
469 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
470 DcmSequenceOfItems& regions = GetSequenceValue(group, DCM_ContentSequence);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
471
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
472 for (unsigned int l = 0; l < regions.card(); l++)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
473 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
474 DcmItem& region = *regions.getItem(l);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
475
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
476 if (GetStringValue(region, DCM_RelationshipType) == "SELECTED FROM" &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
477 GetStringValue(region, DCM_ValueType) == "IMAGE" &&
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
478 IsDicomConcept(region, "111040") /* Original source */)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
479 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
480 DcmSequenceOfItems& instances = GetSequenceValue(region, DCM_ReferencedSOPSequence);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
481 if (instances.card() != 1)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
482 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
483 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
484 "Region cannot reference multiple instances in DICOM-SR");
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
485 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
486
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
487 std::string sopInstanceUid = GetStringValue(*instances.getItem(0), DCM_ReferencedSOPInstanceUID);
2094
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
488 std::map<std::string, ReferencedInstance*>::iterator instanceInformation = instancesInformation_.find(sopInstanceUid);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
489
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
490 if (instanceInformation == instancesInformation_.end())
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
491 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
492 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
493 "Referencing unknown instance in DICOM-SR: " + sopInstanceUid);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
494 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
495
2094
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
496 assert(instanceInformation->second != NULL);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
497
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
498 if (instances.getItem(0)->tagExists(DCM_ReferencedFrameNumber))
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
499 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
500 std::string frames = GetStringValue(*instances.getItem(0), DCM_ReferencedFrameNumber);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
501 std::vector<std::string> tokens;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
502 Orthanc::Toolbox::SplitString(tokens, frames, '\\');
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
503
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
504 for (size_t m = 0; m < tokens.size(); m++)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
505 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
506 uint32_t frame;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
507 if (!Orthanc::SerializationToolbox::ParseUnsignedInteger32(frame, tokens[m]))
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
508 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
509 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
510 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
511 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
512 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
513 AddStructure(sopInstanceUid, group, true, frame, hasProbabilityOfCancer, probabilityOfCancer);
2094
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
514 instanceInformation->second->AddFrame(frame);
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
515 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
516 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
517 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
518 else
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
519 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
520 AddStructure(sopInstanceUid, group, false, 0, hasProbabilityOfCancer, probabilityOfCancer);
2094
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
521 instanceInformation->second->AddFrame(1);
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
522 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
523 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
524 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
525 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
526 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
527 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
528 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
529 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
530 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
531 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
532
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
533
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
534 DicomStructuredReport::~DicomStructuredReport()
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
535 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
536 for (std::list<Structure*>::iterator it = structures_.begin(); it != structures_.end(); ++it)
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
537 {
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
538 assert(*it != NULL);
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
539 delete *it;
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
540 }
2094
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
541
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
542 for (std::map<std::string, ReferencedInstance*>::iterator
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
543 it = instancesInformation_.begin(); it != instancesInformation_.end(); ++it)
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
544 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
545 assert(it->second != NULL);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
546 delete it->second;
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
547 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
548 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
549
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
550
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
551 void DicomStructuredReport::GetReferencedInstance(std::string& studyInstanceUid,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
552 std::string& seriesInstanceUid,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
553 std::string& sopInstanceUid,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
554 std::string& sopClassUid,
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
555 size_t i) const
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
556 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
557 if (i >= orderedInstances_.size())
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
558 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
559 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
560 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
561
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
562 sopInstanceUid = orderedInstances_[i];
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
563
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
564 std::map<std::string, ReferencedInstance*>::const_iterator found = instancesInformation_.find(sopInstanceUid);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
565 if (found == instancesInformation_.end())
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
566 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
567 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
568 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
569
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
570 assert(found->second != NULL);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
571 studyInstanceUid = found->second->GetStudyInstanceUid();
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
572 seriesInstanceUid = found->second->GetSeriesInstanceUid();
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
573 sopClassUid = found->second->GetSopClassUid();
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
574 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
575
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
576
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
577 void DicomStructuredReport::ExportReferencedFrames(std::list<ReferencedFrame>& frames) const
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
578 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
579 frames.clear();
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
580
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
581 for (size_t i = 0; i < orderedInstances_.size(); i++)
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
582 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
583 std::map<std::string, ReferencedInstance*>::const_iterator found = instancesInformation_.find(orderedInstances_[i]);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
584 if (found == instancesInformation_.end())
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
585 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
586 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
587 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
588
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
589 assert(found->second != NULL);
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
590
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
591 for (std::set<unsigned int>::const_iterator frame = found->second->GetFrames().begin();
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
592 frame != found->second->GetFrames().end(); ++frame)
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
593 {
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
594 frames.push_back(ReferencedFrame(found->second->GetStudyInstanceUid(),
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
595 found->second->GetSeriesInstanceUid(),
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
596 orderedInstances_[i],
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
597 found->second->GetSopClassUid(), *frame));
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
598 }
7c3d65166c26 partial integration dicom-sr->mainline
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2087
diff changeset
599 }
2085
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
600 }
554bc96e7508 added DicomStructuredReport
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
601 }