Mercurial > hg > orthanc-stone

comparison OrthancStone/UnitTestsSources/TestStructureSet.cpp @ 1893:90b5e116a5f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed DicomStructureSet::GetStructureColor()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 19 Jan 2022 14:01:57 +0100
parents a05529952510
children 438071a29f77
comparison
equal deleted inserted replaced
1892:cdf91ad891a5 1893:90b5e116a5f9
29 // warning C4748: /GS can not protect parameters and local variables from 29 // warning C4748: /GS can not protect parameters and local variables from
30 // local buffer overrun because optimizations are disabled in function 30 // local buffer overrun because optimizations are disabled in function
31 # pragma warning(disable: 4748) 31 # pragma warning(disable: 4748)
32 #endif 32 #endif
33 33
34 #include "../Sources/Loaders/DicomStructureSetLoader.h"
35 #include "../Sources/Loaders/OrthancSeriesVolumeProgressiveLoader.h"
36 #include "../Sources/Toolbox/DicomStructureSet2.h" 34 #include "../Sources/Toolbox/DicomStructureSet2.h"
37 #include "../Sources/Toolbox/DicomStructureSetUtils.h" 35 #include "../Sources/Toolbox/DicomStructureSetUtils.h"
38 #include "../Sources/Toolbox/DisjointDataSet.h" 36 #include "../Sources/Toolbox/DisjointDataSet.h"
39 37
40 #include <EmbeddedResources.h> 38 #include <EmbeddedResources.h>
104 Json::Value test; 102 Json::Value test;
105 Orthanc::Toolbox::ReadJson(test, Orthanc::EmbeddedResources::GetFileResourceBuffer(Orthanc::EmbeddedResources::RT_STRUCT_00), 103 Orthanc::Toolbox::ReadJson(test, Orthanc::EmbeddedResources::GetFileResourceBuffer(Orthanc::EmbeddedResources::RT_STRUCT_00),
106 Orthanc::EmbeddedResources::GetFileResourceSize(Orthanc::EmbeddedResources::RT_STRUCT_00)); 104 Orthanc::EmbeddedResources::GetFileResourceSize(Orthanc::EmbeddedResources::RT_STRUCT_00));
107 105
108 FullOrthancDataset dicom(test); 106 FullOrthancDataset dicom(test);
109 //loader.content_.reset(new DicomStructureSet(dicom));
110 structureSet.Clear(); 107 structureSet.Clear();
111 108
112 structureSet.FillStructuresFromDataset(dicom); 109 structureSet.FillStructuresFromDataset(dicom);
113 structureSet.ComputeDependentProperties(); 110 structureSet.ComputeDependentProperties();
114 111
226 TEST(StructureSet, ReadFromJsonAndCompute1) 223 TEST(StructureSet, ReadFromJsonAndCompute1)
227 { 224 {
228 DicomStructureSet2 structureSet; 225 DicomStructureSet2 structureSet;
229 226
230 OrthancPlugins::FullOrthancDataset dicom(GetTestJson()); 227 OrthancPlugins::FullOrthancDataset dicom(GetTestJson());
231 //loader.content_.reset(new DicomStructureSet(dicom));
232 structureSet.Clear(); 228 structureSet.Clear();
233 229
234 structureSet.FillStructuresFromDataset(dicom); 230 structureSet.FillStructuresFromDataset(dicom);
235 231
236 structureSet.ComputeDependentProperties(); 232 structureSet.ComputeDependentProperties();
239 TEST(StructureSet, ReadFromJsonAndCompute2) 235 TEST(StructureSet, ReadFromJsonAndCompute2)
240 { 236 {
241 DicomStructureSet2 structureSet; 237 DicomStructureSet2 structureSet;
242 238
243 OrthancPlugins::FullOrthancDataset dicom(GetTestJson()); 239 OrthancPlugins::FullOrthancDataset dicom(GetTestJson());
244 //loader.content_.reset(new DicomStructureSet(dicom));
245 structureSet.Clear(); 240 structureSet.Clear();
246 241
247 structureSet.SetContents(dicom); 242 structureSet.SetContents(dicom);
248 } 243 }
249 #endif 244 #endif
1171 std::string jsonText; 1166 std::string jsonText;
1172 1167
1173 Orthanc::SystemToolbox::ReadFile(jsonText, "72c773ac-5059f2c4-2e6a9120-4fd4bca1-45701661.json"); 1168 Orthanc::SystemToolbox::ReadFile(jsonText, "72c773ac-5059f2c4-2e6a9120-4fd4bca1-45701661.json");
1174 1169
1175 FullOrthancDataset dicom(jsonText); 1170 FullOrthancDataset dicom(jsonText);
1176 //loader.content_.reset(new DicomStructureSet(dicom));
1177 structureSet.Clear(); 1171 structureSet.Clear();
1178 1172
1179 structureSet.FillStructuresFromDataset(dicom); 1173 structureSet.FillStructuresFromDataset(dicom);
1180 structureSet.ComputeDependentProperties(); 1174 structureSet.ComputeDependentProperties();
1181 1175