Mercurial > hg > orthanc-stone
diff UnitTestsSources/TestStructureSet.cpp @ 1834:126522623e20
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 |
line wrap: on
line diff
--- a/UnitTestsSources/TestStructureSet.cpp Mon Jun 07 18:47:10 2021 +0200 +++ b/UnitTestsSources/TestStructureSet.cpp Thu Jun 10 12:07:04 2021 +0200 @@ -4270,7 +4270,7 @@ #ifdef BGO_ENABLE_DICOMSTRUCTURESETLOADER2 static void CheckGroundTruth( - const std::vector<OrthancStone::DicomStructure2>& structures, + const std::vector<DicomStructure2>& structures, const size_t structureIndex, const size_t sliceIndex, std::vector<double> groundTruth) @@ -4305,7 +4305,10 @@ { DicomStructureSet2 structureSet; - OrthancPlugins::FullOrthancDataset dicom(GetTestJson()); + Json::Value test; + Orthanc::Toolbox::ReadJson(test, k_rtStruct_json00); + + FullOrthancDataset dicom(test); //loader.content_.reset(new DicomStructureSet(dicom)); structureSet.Clear(); @@ -5363,14 +5366,16 @@ #ifdef BGO_ENABLE_DICOMSTRUCTURESETLOADER2 +#include <SystemToolbox.h> + TEST(StructureSet, ReadFromJsonPart2) { DicomStructureSet2 structureSet; std::string jsonText; - SystemToolbox::ReadFile(jsonText, "72c773ac-5059f2c4-2e6a9120-4fd4bca1-45701661.json"); + Orthanc::SystemToolbox::ReadFile(jsonText, "72c773ac-5059f2c4-2e6a9120-4fd4bca1-45701661.json"); - OrthancPlugins::FullOrthancDataset dicom(jsonText); + FullOrthancDataset dicom(jsonText); //loader.content_.reset(new DicomStructureSet(dicom)); structureSet.Clear();