Mercurial > hg > orthanc-stone

comparison UnitTestsSources/TestStructureSet.cpp @ 1834:126522623e20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replaced OrthancStone::DicomPath by new class Orthanc::DicomPath from orthanc framework
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 10 Jun 2021 12:07:04 +0200
parents 911cd9a11ad3
children f6eaf617d8e8
comparison
equal deleted inserted replaced
1833:3c0996f028a1 1834:126522623e20
4268 #define STONE_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) 4268 #define STONE_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
4269 4269
4270 #ifdef BGO_ENABLE_DICOMSTRUCTURESETLOADER2 4270 #ifdef BGO_ENABLE_DICOMSTRUCTURESETLOADER2
4271 4271
4272 static void CheckGroundTruth( 4272 static void CheckGroundTruth(
4273 const std::vector<OrthancStone::DicomStructure2>& structures, 4273 const std::vector<DicomStructure2>& structures,
4274 const size_t structureIndex, 4274 const size_t structureIndex,
4275 const size_t sliceIndex, 4275 const size_t sliceIndex,
4276 std::vector<double> groundTruth) 4276 std::vector<double> groundTruth)
4277 { 4277 {
4278 const std::vector<DicomStructurePolygon2>& polygonsForThisStruct = structures.at(structureIndex).GetPolygons(); 4278 const std::vector<DicomStructurePolygon2>& polygonsForThisStruct = structures.at(structureIndex).GetPolygons();
4303 4303
4304 TEST(StructureSet, ReadFromJsonThatsAll) 4304 TEST(StructureSet, ReadFromJsonThatsAll)
4305 { 4305 {
4306 DicomStructureSet2 structureSet; 4306 DicomStructureSet2 structureSet;
4307 4307
4308 OrthancPlugins::FullOrthancDataset dicom(GetTestJson()); 4308 Json::Value test;
4309 Orthanc::Toolbox::ReadJson(test, k_rtStruct_json00);
4310
4311 FullOrthancDataset dicom(test);
4309 //loader.content_.reset(new DicomStructureSet(dicom)); 4312 //loader.content_.reset(new DicomStructureSet(dicom));
4310 structureSet.Clear(); 4313 structureSet.Clear();
4311 4314
4312 structureSet.FillStructuresFromDataset(dicom); 4315 structureSet.FillStructuresFromDataset(dicom);
4313 structureSet.ComputeDependentProperties(); 4316 structureSet.ComputeDependentProperties();
5361 ASSERT_NEAR(segments[i].second.y, 30.000000000000000, DELTA_MAX); 5364 ASSERT_NEAR(segments[i].second.y, 30.000000000000000, DELTA_MAX);
5362 } 5365 }
5363 5366
5364 #ifdef BGO_ENABLE_DICOMSTRUCTURESETLOADER2 5367 #ifdef BGO_ENABLE_DICOMSTRUCTURESETLOADER2
5365 5368
5369 #include <SystemToolbox.h>
5370
5366 TEST(StructureSet, ReadFromJsonPart2) 5371 TEST(StructureSet, ReadFromJsonPart2)
5367 { 5372 {
5368 DicomStructureSet2 structureSet; 5373 DicomStructureSet2 structureSet;
5369 std::string jsonText; 5374 std::string jsonText;
5370 5375
5371 SystemToolbox::ReadFile(jsonText, "72c773ac-5059f2c4-2e6a9120-4fd4bca1-45701661.json"); 5376 Orthanc::SystemToolbox::ReadFile(jsonText, "72c773ac-5059f2c4-2e6a9120-4fd4bca1-45701661.json");
5372 5377
5373 OrthancPlugins::FullOrthancDataset dicom(jsonText); 5378 FullOrthancDataset dicom(jsonText);
5374 //loader.content_.reset(new DicomStructureSet(dicom)); 5379 //loader.content_.reset(new DicomStructureSet(dicom));
5375 structureSet.Clear(); 5380 structureSet.Clear();
5376 5381
5377 structureSet.FillStructuresFromDataset(dicom); 5382 structureSet.FillStructuresFromDataset(dicom);
5378 structureSet.ComputeDependentProperties(); 5383 structureSet.ComputeDependentProperties();