Mercurial > hg > orthanc-stone

annotate OrthancStone/Sources/Toolbox/SortedFrames.cpp @ 1631:960bb5fcc440

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SortedFrames::GetFrameGeometry()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Nov 2020 18:49:08 +0100
parents 78509230f0d7
children 882e2253a90e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Stone of Orthanc
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
8 * modify it under the terms of the GNU Lesser General Public License
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
15 * Lesser General Public License for more details.
1596
4fb8fdf03314 removed annoying whitespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1571
diff changeset
16 *
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
18 * License along with this program. If not, see
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
19 * <http://www.gnu.org/licenses/>.
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 **/
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #include "SortedFrames.h"
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
1490
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
25 #include "GeometryToolbox.h"
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26
1631
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
27 #include <Logging.h>
1490
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
28 #include <OrthancException.h>
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
29 #include <Toolbox.h>
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 namespace OrthancStone
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 {
1630
78509230f0d7 SortedFrames sharing code with CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1605
diff changeset
33 SortedFrames::Instance::Instance(const Orthanc::DicomMap& tags) :
78509230f0d7 SortedFrames sharing code with CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1605
diff changeset
34 geometry_(tags)
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 tags_.Assign(tags);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 if (!tags.LookupStringValue(sopInstanceUid_, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 uint32_t tmp;
1631
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
44 if (tags.ParseUnsignedInteger32(tmp, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES) &&
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
45 tmp > 0)
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 numberOfFrames_ = tmp;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 else
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 numberOfFrames_ = 1;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53
1490
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
54 std::string photometric;
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
55 if (tags.LookupStringValue(photometric, Orthanc::DICOM_TAG_PHOTOMETRIC_INTERPRETATION, false))
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
56 {
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
57 Orthanc::Toolbox::StripSpaces(photometric);
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
58 monochrome1_ = (photometric == "MONOCHROME1");
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
59 }
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
60 else
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
61 {
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
62 monochrome1_ = false;
5d892f5dd9c4 SortedFrames::IsFrameMonochrome1()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1485
diff changeset
63 }
1631
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
64
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
65 bool ok = false;
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
66
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
67 if (numberOfFrames_ > 1)
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
68 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
69 std::string offsets, increment;
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
70 if (tags.LookupStringValue(offsets, Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR, false) &&
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
71 tags.LookupStringValue(increment, Orthanc::DICOM_TAG_FRAME_INCREMENT_POINTER, false))
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
72 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
73 Orthanc::Toolbox::ToUpperCase(increment);
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
74 if (increment != "3004,000C")
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
75 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
76 LOG(WARNING) << "Bad value for the FrameIncrementPointer tags in a multiframe image";
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
77 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
78 else if (LinearAlgebra::ParseVector(frameOffsets_, offsets))
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
79 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
80 if (frameOffsets_.size() == numberOfFrames_)
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
81 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
82 ok = true;
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
83 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
84 else
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
85 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
86 LOG(WARNING) << "The size of the GridFrameOffsetVector does not correspond to the number of frames";
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
87 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
88 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
89 else
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
90 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
91 LOG(WARNING) << "Cannot parse the GridFrameOffsetVector tag";
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
92 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
93 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
94 else
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
95 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
96 LOG(INFO) << "Missing the frame offset information in a multiframe image";
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
97 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
98 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
99
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
100 if (!ok)
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
101 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
102 frameOffsets_.resize(numberOfFrames_);
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
103 for (size_t i = 0; i < numberOfFrames_; i++)
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
104 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
105 frameOffsets_[i] = 0;
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
106 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
107 }
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110
1631
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
111 double SortedFrames::Instance::GetFrameOffset(unsigned int frame) const
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
112 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
113 assert(GetNumberOfFrames() == frameOffsets_.size());
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
114
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
115 if (frame >= GetNumberOfFrames())
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
116 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
117 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
118 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
119 else
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
120 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
121 return frameOffsets_[frame];
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
122 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
123 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
124
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
125
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 SortedFrames::Frame::Frame(const Instance& instance,
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
127 unsigned int frameNumber) :
1485
60be4627ae52 fix for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1479
diff changeset
128 instance_(&instance),
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
129 frameNumber_(frameNumber)
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 {
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
131 if (frameNumber >= instance.GetNumberOfFrames())
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
138 const SortedFrames::Instance& SortedFrames::GetInstance(size_t instanceIndex) const
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 {
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
140 if (instanceIndex >= instances_.size())
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 else
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 {
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
146 assert(instances_[instanceIndex] != NULL);
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
147 return *instances_[instanceIndex];
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
152 const SortedFrames::Frame& SortedFrames::GetFrame(size_t frameIndex) const
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 if (!sorted_)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls,
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 "Sort() has not been called");
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 }
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
159 if (frameIndex >= frames_.size())
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 else
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 {
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
165 return frames_[frameIndex];
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169
1479
5e3cfe87a873 SortedFrames::Clear()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1478
diff changeset
170 void SortedFrames::Clear()
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 for (size_t i = 0; i < instances_.size(); i++)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 assert(instances_[i] != NULL);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 delete instances_[i];
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 }
1479
5e3cfe87a873 SortedFrames::Clear()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1478
diff changeset
177
5e3cfe87a873 SortedFrames::Clear()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1478
diff changeset
178 studyInstanceUid_.clear();
5e3cfe87a873 SortedFrames::Clear()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1478
diff changeset
179 seriesInstanceUid_.clear();
5e3cfe87a873 SortedFrames::Clear()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1478
diff changeset
180 frames_.clear();
1602
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
181
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
182 instancesIndex_.clear();
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
183 framesIndex_.clear();
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
184
1479
5e3cfe87a873 SortedFrames::Clear()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1478
diff changeset
185 sorted_ = true;
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 void SortedFrames::AddInstance(const Orthanc::DicomMap& tags)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 std::unique_ptr<Instance> instance(new Instance(tags));
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192
1599
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
193 std::string studyInstanceUid, seriesInstanceUid, sopInstanceUid;
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 if (!tags.LookupStringValue(studyInstanceUid, Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, false) ||
1599
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
195 !tags.LookupStringValue(seriesInstanceUid, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, false) ||
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
196 !tags.LookupStringValue(sopInstanceUid, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 if (instances_.empty())
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203 studyInstanceUid_ = studyInstanceUid;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 seriesInstanceUid_ = seriesInstanceUid;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 else
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208 if (studyInstanceUid_ != studyInstanceUid ||
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 seriesInstanceUid_ != seriesInstanceUid)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
211 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange,
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212 "Mixing instances from different series");
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215
1599
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
216 if (instancesIndex_.find(sopInstanceUid) != instancesIndex_.end())
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
217 {
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
218 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange,
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
219 "Cannot register twice the same SOP Instance UID");
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
220 }
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
221
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
222 instancesIndex_[sopInstanceUid] = instances_.size();
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
223
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
224 instances_.push_back(instance.release());
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 sorted_ = false;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226 frames_.clear();
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
227 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
228
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
229
1599
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
230 bool SortedFrames::LookupSopInstanceUid(size_t& instanceIndex,
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
231 const std::string& sopInstanceUid) const
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
232 {
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
233 InstancesIndex::const_iterator found = instancesIndex_.find(sopInstanceUid);
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
234
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
235 if (found == instancesIndex_.end())
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
236 {
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
237 return false;
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
238 }
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
239 else
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
240 {
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
241 instanceIndex = found->second;
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
242 return true;
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
243 }
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
244 }
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
245
73cd85d7da6a SortedFrames::LookupSopInstanceUid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
246
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
247 void SortedFrames::AddFramesOfInstance(std::set<size_t>& remainingInstances,
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
248 size_t instanceIndex)
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249 {
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
250 assert(instances_[instanceIndex] != NULL);
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
251 const Instance& instance = *instances_[instanceIndex];
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
252
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253 for (unsigned int i = 0; i < instance.GetNumberOfFrames(); i++)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
254 {
1602
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
255 framesIndex_[std::make_pair(instance.GetSopInstanceUid(), i)] = frames_.size();
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
256 frames_.push_back(Frame(instance, i));
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
259 assert(remainingInstances.find(instanceIndex) != remainingInstances.end());
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
260 remainingInstances.erase(instanceIndex);
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
263
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
264 namespace
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
266 template<typename T>
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
267 class SortableItem
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
268 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
269 private:
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
270 T value_;
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
271 size_t instanceIndex_;
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
272 std::string sopInstanceUid_;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
273
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
274 public:
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
275 SortableItem(const T& value,
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
276 size_t instanceIndex,
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
277 const std::string& sopInstanceUid) :
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
278 value_(value),
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
279 instanceIndex_(instanceIndex),
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
280 sopInstanceUid_(sopInstanceUid)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
281 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
282 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
283
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
284 size_t GetInstanceIndex() const
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
285 {
1600
b253b79906fa clarifying variable names: frameIndex vs numberIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1599
diff changeset
286 return instanceIndex_;
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
287 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
288
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
289 bool operator< (const SortableItem& other) const
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
290 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
291 return (value_ < other.value_ ||
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
292 (value_ == other.value_ &&
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
293 sopInstanceUid_ < other.sopInstanceUid_));
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
294 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295 };
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
297
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
298
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
299 void SortedFrames::SortUsingIntegerTag(std::set<size_t>& remainingInstances,
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
300 const Orthanc::DicomTag& tag)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302 std::vector< SortableItem<int32_t> > items;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
303 items.reserve(remainingInstances.size());
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
304
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
305 for (std::set<size_t>::const_iterator it = remainingInstances.begin();
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
306 it != remainingInstances.end(); ++it)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
307 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
308 assert(instances_[*it] != NULL);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
309 const Instance& instance = *instances_[*it];
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
310
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
311 int32_t value;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
312 std::string sopInstanceUid;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
313 if (instance.GetTags().ParseInteger32(value, tag) &&
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
314 instance.GetTags().LookupStringValue(
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
315 sopInstanceUid, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
316 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
317 items.push_back(SortableItem<int32_t>(value, *it, sopInstanceUid));
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
318 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
319 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
320
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
321 std::sort(items.begin(), items.end());
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
322
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
323 for (size_t i = 0; i < items.size(); i++)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
324 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
325 AddFramesOfInstance(remainingInstances, items[i].GetInstanceIndex());
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
326 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
327 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
328
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
329
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
330 void SortedFrames::SortUsingSopInstanceUid(std::set<size_t>& remainingInstances)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
331 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
332 std::vector<SortableItem<int32_t> > items;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
333 items.reserve(remainingInstances.size());
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
334
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
335 for (std::set<size_t>::const_iterator it = remainingInstances.begin();
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
336 it != remainingInstances.end(); ++it)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
337 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
338 assert(instances_[*it] != NULL);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
339 const Instance& instance = *instances_[*it];
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
340
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
341 std::string sopInstanceUid;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
342 if (instance.GetTags().LookupStringValue(
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
343 sopInstanceUid, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
344 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
345 items.push_back(SortableItem<int32_t>(0 /* arbitrary value */, *it, sopInstanceUid));
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
346 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
347 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
348
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
349 std::sort(items.begin(), items.end());
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
350
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
351 for (size_t i = 0; i < items.size(); i++)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
352 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
353 AddFramesOfInstance(remainingInstances, items[i].GetInstanceIndex());
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
354 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
355 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
356
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
357
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
358 void SortedFrames::SortUsing3DLocation(std::set<size_t>& remainingInstances)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
359 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
360 /**
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
361 * Compute the mean of the normal vectors, using the recursive
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
362 * formula for arithmetic means for numerical stability.
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
363 * https://diego.assencio.com/?index=c34d06f4f4de2375658ed41f70177d59
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
364 **/
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
365
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
366 Vector meanNormal;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
367 LinearAlgebra::AssignVector(meanNormal, 0, 0, 0);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
368
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
369 unsigned int n = 0;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
370
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
371 for (std::set<size_t>::const_iterator it = remainingInstances.begin();
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
372 it != remainingInstances.end(); ++it)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
373 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
374 assert(instances_[*it] != NULL);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
375 const Instance& instance = *instances_[*it];
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
376
1630
78509230f0d7 SortedFrames sharing code with CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1605
diff changeset
377 if (instance.GetGeometry().IsValid())
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
378 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
379 n += 1;
1630
78509230f0d7 SortedFrames sharing code with CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1605
diff changeset
380 meanNormal += (instance.GetGeometry().GetNormal() - meanNormal) / static_cast<float>(n);
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
381 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
382 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
383
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
384 std::vector<SortableItem<float> > items;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
385 items.reserve(n);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
386
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
387 for (std::set<size_t>::const_iterator it = remainingInstances.begin();
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
388 it != remainingInstances.end(); ++it)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
389 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
390 assert(instances_[*it] != NULL);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
391 const Instance& instance = *instances_[*it];
1630
78509230f0d7 SortedFrames sharing code with CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1605
diff changeset
392
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
393 std::string sopInstanceUid;
1630
78509230f0d7 SortedFrames sharing code with CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1605
diff changeset
394 if (instance.GetGeometry().IsValid() &&
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
395 instance.GetTags().LookupStringValue(
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
396 sopInstanceUid, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
397 {
1630
78509230f0d7 SortedFrames sharing code with CoordinateSystem3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1605
diff changeset
398 double p = LinearAlgebra::DotProduct(meanNormal, instance.GetGeometry().GetOrigin());
1605
b3c439d96d3e warning fix
Benjamin Golinvaux <bgo@osimis.io>
parents: 1602
diff changeset
399 items.push_back(SortableItem<float>(static_cast<float>(p), *it, sopInstanceUid));
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
400 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
401 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
402
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
403 assert(items.size() <= n);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
404
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
405 std::sort(items.begin(), items.end());
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
406
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
407 for (size_t i = 0; i < items.size(); i++)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
408 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
409 AddFramesOfInstance(remainingInstances, items[i].GetInstanceIndex());
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
410 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
411 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
412
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
413
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
414 size_t SortedFrames::GetFramesCount() const
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
415 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
416 if (sorted_)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
417 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
418 return frames_.size();
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
419 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
420 else
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
421 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
422 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls,
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
423 "Sort() has not been called");
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
424 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
425 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
426
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
427
1631
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
428 CoordinateSystem3D SortedFrames::GetFrameGeometry(size_t frameIndex) const
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
429 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
430 const Frame& frame = GetFrame(frameIndex);
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
431 CoordinateSystem3D geometry = frame.GetInstance().GetGeometry();
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
432
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
433 if (geometry.IsValid())
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
434 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
435 geometry.SetOrigin(geometry.GetOrigin() + geometry.GetNormal() *
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
436 frame.GetInstance().GetFrameOffset(frame.GetFrameNumberInInstance()));
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
437 return geometry;
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
438 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
439 else
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
440 {
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
441 return geometry;
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
442 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
443 }
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
444
960bb5fcc440 SortedFrames::GetFrameGeometry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1630
diff changeset
445
1602
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
446 bool SortedFrames::LookupFrame(size_t& frameIndex,
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
447 const std::string& sopInstanceUid,
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
448 unsigned int frameNumber) const
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
449 {
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
450 if (sorted_)
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
451 {
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
452 FramesIndex::const_iterator found = framesIndex_.find(
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
453 std::make_pair(sopInstanceUid, frameNumber));
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
454
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
455 if (found == framesIndex_.end())
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
456 {
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
457 return false;
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
458 }
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
459 else
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
460 {
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
461 frameIndex = found->second;
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
462 return true;
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
463 }
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
464 }
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
465 else
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
466 {
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
467 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls,
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
468 "Sort() has not been called");
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
469 }
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
470 }
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
471
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
472
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
473 void SortedFrames::Sort()
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
474 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
475 if (!sorted_)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
476 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
477 size_t totalFrames = 0;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
478 std::set<size_t> remainingInstances;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
479
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
480 for (size_t i = 0; i < instances_.size(); i++)
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
481 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
482 assert(instances_[i] != NULL);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
483 totalFrames += instances_[i]->GetNumberOfFrames();
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
484
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
485 remainingInstances.insert(i);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
486 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
487
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
488 frames_.clear();
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
489 frames_.reserve(totalFrames);
1602
b2941196cabf SortedFrames::LookupFrame()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1600
diff changeset
490 framesIndex_.clear();
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
491
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
492 SortUsingIntegerTag(remainingInstances, Orthanc::DICOM_TAG_INSTANCE_NUMBER); // VR is "IS"
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
493 SortUsingIntegerTag(remainingInstances, Orthanc::DICOM_TAG_IMAGE_INDEX); // VR is "US"
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
494 SortUsing3DLocation(remainingInstances);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
495 SortUsingSopInstanceUid(remainingInstances);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
496
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
497 // The following could in theory happen if several instances
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
498 // have the same SOPInstanceUID, no ordering is available
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
499 for (std::set<size_t>::const_iterator it = remainingInstances.begin();
1571
85e117739eca cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1512
diff changeset
500 it != remainingInstances.end(); ++it)
1478
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
501 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
502 AddFramesOfInstance(remainingInstances, *it);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
503 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
504
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
505 if (frames_.size() != totalFrames ||
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
506 !remainingInstances.empty())
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
507 {
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
508 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
509 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
510
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
511 sorted_ = true;
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
512 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
513 }
fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
514 }