orthanc-stone: UnitTestsSources/SortedFramesTests.cpp annotate

annotate UnitTestsSources/SortedFramesTests.cpp @ 1770:073484e33bee

fix offset of textures

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 12 May 2021 10:53:37 +0200
parents	076aeb019cf1
children	3889ae96d2e9

rev	line source
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Stone of Orthanc
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
1739 9ac2a65d4172 upgrade to year 2021 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1645 diff changeset	5 * Copyright (C) 2017-2021 Osimis S.A., Belgium
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU Affero General Public License
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * as published by the Free Software Foundation, either version 3 of
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * the License, or (at your option) any later version.
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * This program is distributed in the hope that it will be useful, but
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * Affero General Public License for more details.
1596 4fb8fdf03314 removed annoying whitespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 1587 diff changeset	16 *
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * You should have received a copy of the GNU Affero General Public License
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 **/
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	22 // Make sure to define FRIEND_TEST before including "SortedFrames.h"
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 #include <gtest/gtest.h>
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24
1587 a1405ab3a91c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 1512 diff changeset	25 #include "../OrthancStone/Sources/Toolbox/SortedFrames.h"
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26
1478 fab6c6e795a3 Framework/Toolbox/SortedFrames.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 1477 diff changeset	27 #include <OrthancException.h>
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	30 // Namespace is necessary for FRIEND_TEST() to work in "SortedFrames.h"
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	31 namespace OrthancStone
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32 {
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	33 TEST(SortedFrames, Basic)
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	34 {
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	35 SortedFrames f;
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	36 ASSERT_TRUE(f.GetStudyInstanceUid().empty());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	37 ASSERT_TRUE(f.GetSeriesInstanceUid().empty());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	38 ASSERT_EQ(0u, f.GetInstancesCount());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	39 ASSERT_THROW(f.GetInstance(0).GetTags(), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	40 ASSERT_THROW(f.GetInstance(0).GetSopInstanceUid(), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	41 ASSERT_TRUE(f.IsSorted());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	42 ASSERT_EQ(0u, f.GetFramesCount());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	43 ASSERT_THROW(f.GetInstanceOfFrame(0).GetTags(), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	44 ASSERT_THROW(f.GetInstanceOfFrame(0).GetSopInstanceUid(), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	45 ASSERT_THROW(f.GetInstanceOfFrame(0).GetNumberOfFrames(), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	46 ASSERT_THROW(f.GetFrameNumberInInstance(0), Orthanc::OrthancException);
1599 73cd85d7da6a SortedFrames::LookupSopInstanceUid() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	47
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	48 Orthanc::DicomMap tags;
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	49 ASSERT_THROW(f.AddInstance(tags), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	50 tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "study", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	51 ASSERT_THROW(f.AddInstance(tags), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	52 tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "series", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	53 ASSERT_THROW(f.AddInstance(tags), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	54 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	55 f.AddInstance(tags);
1602 b2941196cabf SortedFrames::LookupFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1601 diff changeset	56
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	57 ASSERT_EQ("study", f.GetStudyInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	58 ASSERT_EQ("series", f.GetSeriesInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	59 ASSERT_EQ(1u, f.GetInstancesCount());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	60 std::string s;
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	61 ASSERT_TRUE(f.GetInstance(0).GetTags().LookupStringValue(s, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	62 ASSERT_EQ("sop", s);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	63 ASSERT_EQ("sop", f.GetInstance(0).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	64 ASSERT_FALSE(f.IsSorted());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	65 ASSERT_THROW(f.GetFramesCount(), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	66 ASSERT_THROW(f.GetInstanceOfFrame(0).GetTags(), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	67 ASSERT_THROW(f.GetInstanceOfFrame(0).GetSopInstanceUid(), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	68 ASSERT_THROW(f.GetInstanceOfFrame(0).GetNumberOfFrames(), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	69 ASSERT_THROW(f.GetFrameNumberInInstance(0), Orthanc::OrthancException);
1599 73cd85d7da6a SortedFrames::LookupSopInstanceUid() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	70
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	71 f.Sort();
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	72 ASSERT_TRUE(f.IsSorted());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	73 ASSERT_EQ(1u, f.GetFramesCount());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	74 ASSERT_TRUE(f.GetInstanceOfFrame(0).GetTags().LookupStringValue(s, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	75 ASSERT_EQ("sop", s);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	76 ASSERT_EQ("sop", f.GetInstanceOfFrame(0).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	77 ASSERT_EQ(1u, f.GetInstanceOfFrame(0).GetNumberOfFrames());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	78 ASSERT_EQ(0u, f.GetFrameNumberInInstance(0));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	79 ASSERT_THROW(f.GetInstanceOfFrame(1).GetTags(), Orthanc::OrthancException);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	80 }
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	83 TEST(SortedFrames, SortSopInstanceUid)
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	84 {
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	85 Orthanc::DicomMap tags;
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	86 tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "study", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	87 tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "series", false);
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	89 SortedFrames f;
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	90 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop3", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	91 tags.SetValue(Orthanc::DICOM_TAG_NUMBER_OF_FRAMES, "1", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	92 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	93 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop1", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	94 tags.SetValue(Orthanc::DICOM_TAG_NUMBER_OF_FRAMES, "3", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	95 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	96 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop2", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	97 tags.SetValue(Orthanc::DICOM_TAG_NUMBER_OF_FRAMES, "2", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	98 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	99
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	100 size_t i;
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	101 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop3")); ASSERT_EQ(0u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	102 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop1")); ASSERT_EQ(1u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	103 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop2")); ASSERT_EQ(2u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	104 ASSERT_FALSE(f.LookupSopInstanceUid(i, "nope"));
1602 b2941196cabf SortedFrames::LookupFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1601 diff changeset	105
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	106 ASSERT_THROW(f.LookupFrame(i, "sop3", 0), Orthanc::OrthancException); // Not sorted yet
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	107
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	108 f.Sort();
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	109 ASSERT_EQ(3u, f.GetInstancesCount());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	110 ASSERT_EQ("sop3", f.GetInstance(0).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	111 ASSERT_EQ("sop1", f.GetInstance(1).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	112 ASSERT_EQ("sop2", f.GetInstance(2).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	113 ASSERT_EQ(6u, f.GetFramesCount());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	114 ASSERT_EQ("sop1", f.GetInstanceOfFrame(0).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(0));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	115 ASSERT_EQ("sop1", f.GetInstanceOfFrame(1).GetSopInstanceUid()); ASSERT_EQ(1u, f.GetFrameNumberInInstance(1));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	116 ASSERT_EQ("sop1", f.GetInstanceOfFrame(2).GetSopInstanceUid()); ASSERT_EQ(2u, f.GetFrameNumberInInstance(2));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	117 ASSERT_EQ("sop2", f.GetInstanceOfFrame(3).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(3));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	118 ASSERT_EQ("sop2", f.GetInstanceOfFrame(4).GetSopInstanceUid()); ASSERT_EQ(1u, f.GetFrameNumberInInstance(4));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	119 ASSERT_EQ("sop3", f.GetInstanceOfFrame(5).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(5));
1602 b2941196cabf SortedFrames::LookupFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1601 diff changeset	120
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	121 // The instances must not have been reordered, only the frames
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	122 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop1")); ASSERT_EQ(1u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	123 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop2")); ASSERT_EQ(2u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	124 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop3")); ASSERT_EQ(0u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	125 ASSERT_FALSE(f.LookupSopInstanceUid(i, "nope"));
1602 b2941196cabf SortedFrames::LookupFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1601 diff changeset	126
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	127 ASSERT_TRUE(f.LookupFrame(i, "sop1", 0)); ASSERT_EQ(0u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	128 ASSERT_TRUE(f.LookupFrame(i, "sop1", 1)); ASSERT_EQ(1u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	129 ASSERT_TRUE(f.LookupFrame(i, "sop1", 2)); ASSERT_EQ(2u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	130 ASSERT_TRUE(f.LookupFrame(i, "sop2", 0)); ASSERT_EQ(3u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	131 ASSERT_TRUE(f.LookupFrame(i, "sop2", 1)); ASSERT_EQ(4u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	132 ASSERT_TRUE(f.LookupFrame(i, "sop3", 0)); ASSERT_EQ(5u, i);
1602 b2941196cabf SortedFrames::LookupFrame() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1601 diff changeset	133
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	134 ASSERT_FALSE(f.LookupFrame(i, "nope", 0));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	135 ASSERT_FALSE(f.LookupFrame(i, "sop1", 3));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	136 ASSERT_FALSE(f.LookupFrame(i, "sop2", 2));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	137 ASSERT_FALSE(f.LookupFrame(i, "sop3", 1));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	138 }
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	141 TEST(SortedFrames, SortInstanceNumber)
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	142 {
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	143 Orthanc::DicomMap tags;
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	144 tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "study", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	145 tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "series", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	146
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	147 SortedFrames f;
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	148 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop1", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	149 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "20", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	150 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	151 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop2", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	152 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "-20", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	153 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	154 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop2a", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	155 tags.Remove(Orthanc::DICOM_TAG_INSTANCE_NUMBER);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	156 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	157 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop4", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	158 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "10", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	159 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	160 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop3", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	161 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "10", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	162 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	163 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop5", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	164 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "10", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	165 f.AddInstance(tags);
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	167 size_t i;
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	168 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop1")); ASSERT_EQ(0u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	169 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop2")); ASSERT_EQ(1u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	170 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop2a")); ASSERT_EQ(2u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	171 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop4")); ASSERT_EQ(3u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	172 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop3")); ASSERT_EQ(4u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	173 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop5")); ASSERT_EQ(5u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	174 ASSERT_FALSE(f.LookupSopInstanceUid(i, "nope"));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	175
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	176 ASSERT_THROW(f.LookupFrame(i, "sop1", 0), Orthanc::OrthancException); // Not sorted yet
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	177
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	178 f.Sort();
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	179 ASSERT_EQ(6u, f.GetInstancesCount());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	180 ASSERT_EQ("sop1", f.GetInstance(0).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	181 ASSERT_EQ("sop2", f.GetInstance(1).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	182 ASSERT_EQ("sop2a", f.GetInstance(2).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	183 ASSERT_EQ("sop4", f.GetInstance(3).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	184 ASSERT_EQ("sop3", f.GetInstance(4).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	185 ASSERT_EQ("sop5", f.GetInstance(5).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	186 ASSERT_EQ(6u, f.GetFramesCount());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	187 ASSERT_EQ("sop2", f.GetInstanceOfFrame(0).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(0));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	188 ASSERT_EQ("sop3", f.GetInstanceOfFrame(1).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(1));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	189 ASSERT_EQ("sop4", f.GetInstanceOfFrame(2).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(2));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	190 ASSERT_EQ("sop5", f.GetInstanceOfFrame(3).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(3));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	191 ASSERT_EQ("sop1", f.GetInstanceOfFrame(4).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(4));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	192 ASSERT_EQ("sop2a", f.GetInstanceOfFrame(5).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(5));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	193
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	194 // The instances must not have been reordered, only the frames
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	195 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop1")); ASSERT_EQ(0u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	196 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop2")); ASSERT_EQ(1u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	197 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop2a")); ASSERT_EQ(2u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	198 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop4")); ASSERT_EQ(3u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	199 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop3")); ASSERT_EQ(4u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	200 ASSERT_TRUE(f.LookupSopInstanceUid(i, "sop5")); ASSERT_EQ(5u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	201 ASSERT_FALSE(f.LookupSopInstanceUid(i, "nope"));
1599 73cd85d7da6a SortedFrames::LookupSopInstanceUid() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1596 diff changeset	202
1645 bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	203 ASSERT_TRUE(f.LookupFrame(i, "sop2", 0)); ASSERT_EQ(0u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	204 ASSERT_TRUE(f.LookupFrame(i, "sop3", 0)); ASSERT_EQ(1u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	205 ASSERT_TRUE(f.LookupFrame(i, "sop4", 0)); ASSERT_EQ(2u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	206 ASSERT_TRUE(f.LookupFrame(i, "sop5", 0)); ASSERT_EQ(3u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	207 ASSERT_TRUE(f.LookupFrame(i, "sop1", 0)); ASSERT_EQ(4u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	208 ASSERT_TRUE(f.LookupFrame(i, "sop2a", 0)); ASSERT_EQ(5u, i);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	209
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	210 ASSERT_FALSE(f.LookupFrame(i, "nope", 0));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	211 ASSERT_FALSE(f.LookupFrame(i, "sop1", 1));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	212 }
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	213
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	214
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	215 TEST(SortedFrames, SortInstanceNumberAndImageIndex)
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	216 {
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	217 Orthanc::DicomMap tags;
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	218 tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "study", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	219 tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "series", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	220
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	221 SortedFrames f;
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	222 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop1", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	223 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "20", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	224 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	225 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop2", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	226 tags.Remove(Orthanc::DICOM_TAG_INSTANCE_NUMBER);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	227 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_INDEX, "20", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	228 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	229 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop3", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	230 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_INDEX, "30", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	231 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	232 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "sop4", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	233 tags.Remove(Orthanc::DICOM_TAG_IMAGE_INDEX);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	234 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "30", false);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	235 f.AddInstance(tags);
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	236
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	237 f.Sort();
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	238 ASSERT_EQ(4u, f.GetInstancesCount());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	239 ASSERT_EQ("sop1", f.GetInstance(0).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	240 ASSERT_EQ("sop2", f.GetInstance(1).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	241 ASSERT_EQ("sop3", f.GetInstance(2).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	242 ASSERT_EQ("sop4", f.GetInstance(3).GetSopInstanceUid());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	243 ASSERT_EQ(4u, f.GetFramesCount());
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	244 // First instance number, then image index
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	245 ASSERT_EQ("sop1", f.GetInstanceOfFrame(0).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(0));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	246 ASSERT_EQ("sop4", f.GetInstanceOfFrame(1).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(1));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	247 ASSERT_EQ("sop2", f.GetInstanceOfFrame(2).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(2));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	248 ASSERT_EQ("sop3", f.GetInstanceOfFrame(3).GetSopInstanceUid()); ASSERT_EQ(0u, f.GetFrameNumberInInstance(3));
bc7bd8ee13f8 making private two potentially dangerous methods in SortedFrames Sebastien Jodogne <s.jodogne@gmail.com> parents: 1644 diff changeset	249 }
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 }
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252
1631 960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	253 TEST(SortedFrames, FrameOffset)
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	254 {
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	255 Orthanc::DicomMap tags;
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	256 tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "study", false);
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	257 tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "series", false);
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	258 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "1.2.276.0.7230010.3.1.4.296485376.1.1568899779.944133", false);
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	259 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-350\\-145\\-985", false);
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	260 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "1\\0\\0\\0\\1\\0", false);
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	261 tags.SetValue(Orthanc::DICOM_TAG_NUMBER_OF_FRAMES, "2", false);
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	262
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	263 for (unsigned int i = 0; i < 3; i++)
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	264 {
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	265 tags.SetValue(Orthanc::DICOM_TAG_FRAME_INCREMENT_POINTER, i != 1 ? "3004,000c" : "nope", false);
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	266 tags.SetValue(Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR, i != 2 ? "8\\11" : "1\\2\\3", false);
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	267
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	268 OrthancStone::SortedFrames f;
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	269 f.AddInstance(tags);
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	270 f.Sort();
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	271
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	272 ASSERT_EQ(2u, f.GetFramesCount());
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	273 ASSERT_TRUE(f.GetFrameGeometry(0).IsValid());
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	274 ASSERT_TRUE(f.GetFrameGeometry(1).IsValid());
1749 076aeb019cf1 Warnings fixed Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	275 ASSERT_FLOAT_EQ(-350.0f, static_cast<float>(f.GetFrameGeometry(0).GetOrigin() [0]));
076aeb019cf1 Warnings fixed Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	276 ASSERT_FLOAT_EQ(-145.0f, static_cast<float>(f.GetFrameGeometry(0).GetOrigin() [1]));
076aeb019cf1 Warnings fixed Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	277 ASSERT_FLOAT_EQ(-350.0f, static_cast<float>(f.GetFrameGeometry(1).GetOrigin() [0]));
076aeb019cf1 Warnings fixed Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	278 ASSERT_FLOAT_EQ(-145.0f, static_cast<float>(f.GetFrameGeometry(1).GetOrigin() [1]));
1631 960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	279
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	280 if (i == 0)
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	281 {
1749 076aeb019cf1 Warnings fixed Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	282 ASSERT_FLOAT_EQ(-985.0f + 8.0f, static_cast<float>(f.GetFrameGeometry(0).GetOrigin() [2]));
076aeb019cf1 Warnings fixed Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	283 ASSERT_FLOAT_EQ(-985.0f + 11.0f, static_cast<float>(f.GetFrameGeometry(1).GetOrigin() [2]));
1631 960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	284 }
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	285 else
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	286 {
1749 076aeb019cf1 Warnings fixed Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	287 ASSERT_FLOAT_EQ(-985.0f, static_cast<float>(f.GetFrameGeometry(0).GetOrigin() [2]));
076aeb019cf1 Warnings fixed Benjamin Golinvaux <bgo@osimis.io> parents: 1739 diff changeset	288 ASSERT_FLOAT_EQ(-985.0f, static_cast<float>(f.GetFrameGeometry(1).GetOrigin() [2]));
1631 960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	289 }
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	290 }
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	291 }
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	292
960bb5fcc440 SortedFrames::GetFrameGeometry() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1602 diff changeset	293
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294 TEST(SortedFrames, Knix) // Created using "SortedFramesCreateTest.py"
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 {
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 Orthanc::DicomMap tags;
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	297 tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "1.2.840.113619.2.176.2025.1499492.7391.1171285944.390", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298 tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "1.2.840.113619.2.176.2025.1499492.7391.1171285944.392", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299 OrthancStone::SortedFrames f;
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "67b44a5e-8997f88d-6e527bd6-df342483-dab1674c", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-60.7285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "10", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "a8ee83f9-1cc26ad9-ebba3043-8afc47c2-bd784610", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-42.7285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "6", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "5a2acb03-063f5063-cac452d1-a55992f9-769900fb", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-114.729\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "22", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "23d12f39-e9a4fc21-8da338c4-97feff30-48e95534", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-83.2285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "15", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "16606f69-83b48518-ab34304a-c8871b7f-a9298d74", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-78.7285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "14", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "63d595f3-327a306d-1709bb8b-2a72e11c-4f7221fe", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-96.7285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "18", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "8bdecadd-e3477e28-bbbf0297-22b0b680-37b13a7c", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-65.2285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "11", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "b590cc95-55789755-ebd10b76-911e855e-f24e4fe7", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-74.2285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "13", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "eaa49a94-b9042041-7f45150b-e414f800-d7232874", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-38.2285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "5", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "6824db93-ed4e2740-07be953f-6d0a8fb3-af0a3a0b", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-105.729\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "20", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "e0d82343-9cef01e9-e21df50a-11886a94-1d0216ea", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-51.7285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "8", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "dc1576ee-25b0b1ef-e038df76-d296fcad-a1456169", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-110.229\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "21", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "b9cf5158-06f8e713-7d5111aa-411fd75b-7be2c51e", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-20.2285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "5faf886f-bd5517cf-1a6ba06e-ac0e6ddb-47bdd8b2", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-101.229\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "19", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	371 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "3e8f8ec1-b603f874-825552f1-6fcac7fa-72ca1aa5", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-24.7285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "2", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	375 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	376 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "7a7c0120-37f6dd58-c46312e6-2559975d-5af4616f", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-87.7285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	379 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "16", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "a0ca6802-56c697c3-0205bab8-42217cfc-84ff0de6", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	382 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-33.7285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "4", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "efce9ff4-3fe07d83-745846f8-fefe5d64-bfea65e6", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-56.2285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "9", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "fa56f961-d1ae8f6a-989c04f4-7a588e9e-b41b1a13", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-92.2285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "17", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "f5e889ac-c5afdc37-c5b62074-a8bdeef3-c58d9889", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-69.7285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "12", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "c19fb4b6-ad1224f2-2c3a2b28-0ea233be-38eea0de", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-47.2285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "7", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "348efc0a-71ee4758-56bd51fa-9703cbff-9b51d4c9", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-29.2285\\-105.586\\73.7768", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "-0\\1\\0\\-0\\-0\\-1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "3", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 f.Sort();
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 ASSERT_EQ(22u, f.GetFramesCount());
1644 4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	413 ASSERT_EQ(f.GetInstanceOfFrame(0).GetSopInstanceUid(), "b9cf5158-06f8e713-7d5111aa-411fd75b-7be2c51e");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	414 ASSERT_EQ(f.GetInstanceOfFrame(1).GetSopInstanceUid(), "3e8f8ec1-b603f874-825552f1-6fcac7fa-72ca1aa5");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	415 ASSERT_EQ(f.GetInstanceOfFrame(2).GetSopInstanceUid(), "348efc0a-71ee4758-56bd51fa-9703cbff-9b51d4c9");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	416 ASSERT_EQ(f.GetInstanceOfFrame(3).GetSopInstanceUid(), "a0ca6802-56c697c3-0205bab8-42217cfc-84ff0de6");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	417 ASSERT_EQ(f.GetInstanceOfFrame(4).GetSopInstanceUid(), "eaa49a94-b9042041-7f45150b-e414f800-d7232874");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	418 ASSERT_EQ(f.GetInstanceOfFrame(5).GetSopInstanceUid(), "a8ee83f9-1cc26ad9-ebba3043-8afc47c2-bd784610");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	419 ASSERT_EQ(f.GetInstanceOfFrame(6).GetSopInstanceUid(), "c19fb4b6-ad1224f2-2c3a2b28-0ea233be-38eea0de");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	420 ASSERT_EQ(f.GetInstanceOfFrame(7).GetSopInstanceUid(), "e0d82343-9cef01e9-e21df50a-11886a94-1d0216ea");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	421 ASSERT_EQ(f.GetInstanceOfFrame(8).GetSopInstanceUid(), "efce9ff4-3fe07d83-745846f8-fefe5d64-bfea65e6");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	422 ASSERT_EQ(f.GetInstanceOfFrame(9).GetSopInstanceUid(), "67b44a5e-8997f88d-6e527bd6-df342483-dab1674c");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	423 ASSERT_EQ(f.GetInstanceOfFrame(10).GetSopInstanceUid(), "8bdecadd-e3477e28-bbbf0297-22b0b680-37b13a7c");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	424 ASSERT_EQ(f.GetInstanceOfFrame(11).GetSopInstanceUid(), "f5e889ac-c5afdc37-c5b62074-a8bdeef3-c58d9889");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	425 ASSERT_EQ(f.GetInstanceOfFrame(12).GetSopInstanceUid(), "b590cc95-55789755-ebd10b76-911e855e-f24e4fe7");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	426 ASSERT_EQ(f.GetInstanceOfFrame(13).GetSopInstanceUid(), "16606f69-83b48518-ab34304a-c8871b7f-a9298d74");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	427 ASSERT_EQ(f.GetInstanceOfFrame(14).GetSopInstanceUid(), "23d12f39-e9a4fc21-8da338c4-97feff30-48e95534");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	428 ASSERT_EQ(f.GetInstanceOfFrame(15).GetSopInstanceUid(), "7a7c0120-37f6dd58-c46312e6-2559975d-5af4616f");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	429 ASSERT_EQ(f.GetInstanceOfFrame(16).GetSopInstanceUid(), "fa56f961-d1ae8f6a-989c04f4-7a588e9e-b41b1a13");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	430 ASSERT_EQ(f.GetInstanceOfFrame(17).GetSopInstanceUid(), "63d595f3-327a306d-1709bb8b-2a72e11c-4f7221fe");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	431 ASSERT_EQ(f.GetInstanceOfFrame(18).GetSopInstanceUid(), "5faf886f-bd5517cf-1a6ba06e-ac0e6ddb-47bdd8b2");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	432 ASSERT_EQ(f.GetInstanceOfFrame(19).GetSopInstanceUid(), "6824db93-ed4e2740-07be953f-6d0a8fb3-af0a3a0b");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	433 ASSERT_EQ(f.GetInstanceOfFrame(20).GetSopInstanceUid(), "dc1576ee-25b0b1ef-e038df76-d296fcad-a1456169");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	434 ASSERT_EQ(f.GetInstanceOfFrame(21).GetSopInstanceUid(), "5a2acb03-063f5063-cac452d1-a55992f9-769900fb");
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435 }
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	437
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438 TEST(SortedFrames, Cardiac) // Created using "SortedFramesCreateTest.py"
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	439 {
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440 Orthanc::DicomMap tags;
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 tags.SetValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "1.3.51.0.1.1.192.168.29.133.1681753.1681732", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	442 tags.SetValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "1.3.12.2.1107.5.2.33.37097.2012041612474981424569674.0.0.0", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	443 OrthancStone::SortedFrames f;
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "a468da62-a8a6e0b9-f66b86b0-b15fa30b-93077161", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "14", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "1cf40ac9-e823e677-cbd5db4b-9e48b451-cccbf950", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "21", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	454 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	455 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "d52d5f21-54f1ad99-4015a995-108f7210-ee157944", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "15", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	460 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "b348f629-11d59f98-fb22710b-4964b90a-f44436ff", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "12", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "aac4f2ba-e863f124-6af96709-053258a7-3d39db26", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	467 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	468 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "13", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	469 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	470 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "8fefe14c-c4c34152-2c3d3514-04e75747-eb7f01f0", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	471 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	472 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	473 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "20", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	474 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "20b42f52-6d5f784b-cdbc0fbe-4bfc6b0c-5a199c75", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	476 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "17", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "931d0c36-8fbb4101-70e6d756-edb15431-aaa9a31b", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "19", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	485 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "9e3b97ec-25b86a67-2cbb8f77-94e73268-4509d383", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	486 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	487 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "10", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	490 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "caa62568-fdf894fe-08f830a2-5a468967-681d954b", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	491 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	492 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	493 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "18", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	494 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "e734c170-96b0a397-95e3b43e-d7a5ed74-025843c8", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	496 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "22", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "efc9f411-9f4294e0-66d292a1-b8b6b421-897f1d80", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	502 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	503 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "11", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	504 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "8346a1db-0b08a22b-9045aaad-57098aac-5b2e9159", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	507 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	508 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "16", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	509 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	510 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "8c7d1e4d-7936f799-c4b8b56b-32d0d9a6-2b492e98", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	511 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	512 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "3", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	515 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "faec09f9-ca7fe0f0-2b25c370-bb1bfaef-8ccfa560", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	517 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	518 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "4", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	519 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "99c20bcc-115ae447-84d616f2-cb6c5576-9f67aa7a", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	521 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	522 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	523 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "23", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	525 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "7906b806-47190031-72c5043c-d42704c1-688a3b23", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	526 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	527 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	528 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "9", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	529 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	530 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "c9dfc022-7b377063-08bdc5e8-fedcc463-8de22ee6", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	531 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	532 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	533 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "6", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	535 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "6570b6c0-7d2f324d-db7cad50-843f62df-d0446352", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	537 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	538 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "5", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	539 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "0be36fe7-6c7a762b-281cf109-fff9d8ea-42e16b7a", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	543 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "7", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	545 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "ec282396-a8209d00-1c5091f3-f632bf3d-a1bcebba", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	548 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "8", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	549 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	550 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "fda415d4-f1429b07-5d1cd9f0-675059ff-c0ce9e67", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	553 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "1", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 tags.SetValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "f555ef96-6b01a90c-bdc2585a-dd17bb3a-75e89920", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, "-37.318577811371\\-157.20910163001\\232.94204104611", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	557 tags.SetValue(Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, "0.73931693068262\\0.61320183243991\\-0.2781977510663\\-0.3521819177853\\-3.9073598e-009\\-0.9359315662938", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "2", false);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	559 f.AddInstance(tags);
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	560 f.Sort();
5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	561 ASSERT_EQ(23u, f.GetFramesCount());
1644 4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	562 ASSERT_EQ(f.GetInstanceOfFrame(0).GetSopInstanceUid(), "fda415d4-f1429b07-5d1cd9f0-675059ff-c0ce9e67");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	563 ASSERT_EQ(f.GetInstanceOfFrame(1).GetSopInstanceUid(), "f555ef96-6b01a90c-bdc2585a-dd17bb3a-75e89920");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	564 ASSERT_EQ(f.GetInstanceOfFrame(2).GetSopInstanceUid(), "8c7d1e4d-7936f799-c4b8b56b-32d0d9a6-2b492e98");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	565 ASSERT_EQ(f.GetInstanceOfFrame(3).GetSopInstanceUid(), "faec09f9-ca7fe0f0-2b25c370-bb1bfaef-8ccfa560");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	566 ASSERT_EQ(f.GetInstanceOfFrame(4).GetSopInstanceUid(), "6570b6c0-7d2f324d-db7cad50-843f62df-d0446352");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	567 ASSERT_EQ(f.GetInstanceOfFrame(5).GetSopInstanceUid(), "c9dfc022-7b377063-08bdc5e8-fedcc463-8de22ee6");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	568 ASSERT_EQ(f.GetInstanceOfFrame(6).GetSopInstanceUid(), "0be36fe7-6c7a762b-281cf109-fff9d8ea-42e16b7a");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	569 ASSERT_EQ(f.GetInstanceOfFrame(7).GetSopInstanceUid(), "ec282396-a8209d00-1c5091f3-f632bf3d-a1bcebba");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	570 ASSERT_EQ(f.GetInstanceOfFrame(8).GetSopInstanceUid(), "7906b806-47190031-72c5043c-d42704c1-688a3b23");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	571 ASSERT_EQ(f.GetInstanceOfFrame(9).GetSopInstanceUid(), "9e3b97ec-25b86a67-2cbb8f77-94e73268-4509d383");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	572 ASSERT_EQ(f.GetInstanceOfFrame(10).GetSopInstanceUid(), "efc9f411-9f4294e0-66d292a1-b8b6b421-897f1d80");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	573 ASSERT_EQ(f.GetInstanceOfFrame(11).GetSopInstanceUid(), "b348f629-11d59f98-fb22710b-4964b90a-f44436ff");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	574 ASSERT_EQ(f.GetInstanceOfFrame(12).GetSopInstanceUid(), "aac4f2ba-e863f124-6af96709-053258a7-3d39db26");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	575 ASSERT_EQ(f.GetInstanceOfFrame(13).GetSopInstanceUid(), "a468da62-a8a6e0b9-f66b86b0-b15fa30b-93077161");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	576 ASSERT_EQ(f.GetInstanceOfFrame(14).GetSopInstanceUid(), "d52d5f21-54f1ad99-4015a995-108f7210-ee157944");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	577 ASSERT_EQ(f.GetInstanceOfFrame(15).GetSopInstanceUid(), "8346a1db-0b08a22b-9045aaad-57098aac-5b2e9159");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	578 ASSERT_EQ(f.GetInstanceOfFrame(16).GetSopInstanceUid(), "20b42f52-6d5f784b-cdbc0fbe-4bfc6b0c-5a199c75");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	579 ASSERT_EQ(f.GetInstanceOfFrame(17).GetSopInstanceUid(), "caa62568-fdf894fe-08f830a2-5a468967-681d954b");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	580 ASSERT_EQ(f.GetInstanceOfFrame(18).GetSopInstanceUid(), "931d0c36-8fbb4101-70e6d756-edb15431-aaa9a31b");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	581 ASSERT_EQ(f.GetInstanceOfFrame(19).GetSopInstanceUid(), "8fefe14c-c4c34152-2c3d3514-04e75747-eb7f01f0");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	582 ASSERT_EQ(f.GetInstanceOfFrame(20).GetSopInstanceUid(), "1cf40ac9-e823e677-cbd5db4b-9e48b451-cccbf950");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	583 ASSERT_EQ(f.GetInstanceOfFrame(21).GetSopInstanceUid(), "e734c170-96b0a397-95e3b43e-d7a5ed74-025843c8");
4796fb60999e removing methods from SortedFrames to simplify api Sebastien Jodogne <s.jodogne@gmail.com> parents: 1631 diff changeset	584 ASSERT_EQ(f.GetInstanceOfFrame(22).GetSopInstanceUid(), "99c20bcc-115ae447-84d616f2-cb6c5576-9f67aa7a");
1477 5732edec7cbd sorting frames in 3D Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	585 }

Mercurial > hg > orthanc-stone

annotate UnitTestsSources/SortedFramesTests.cpp @ 1770:073484e33bee