Mercurial > hg > orthanc-stone
changeset 2384:83ea57ed2863 refactoring
merge
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sun, 11 Oct 2026 09:56:59 +0200 |
| parents | a77e2bb865c1 (current diff) 362a33965e11 (diff) |
| children | bebd0583ebda |
| files | |
| diffstat | 3 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Applications/Samples/Sdl/CMakeLists.txt Sun Oct 11 09:56:48 2026 +0200 +++ b/Applications/Samples/Sdl/CMakeLists.txt Sun Oct 11 09:56:59 2026 +0200 @@ -137,4 +137,4 @@ "$<TARGET_FILE_DIR:UnitTests>/72c773ac-5059f2c4-2e6a9120-4fd4bca1-45701661.json" ) -target_link_libraries(UnitTests OrthancStone ${DCMTK_LIBRARIES}) +target_link_libraries(UnitTests OrthancStone ${DCMTK_LIBRARIES} ${GOOGLE_TEST_LIBRARIES})
--- a/OrthancStone/Sources/Oracle/ParseDicomFromFileCommand.cpp Sun Oct 11 09:56:48 2026 +0200 +++ b/OrthancStone/Sources/Oracle/ParseDicomFromFileCommand.cpp Sun Oct 11 09:56:59 2026 +0200 @@ -25,6 +25,7 @@ #include <OrthancException.h> +#include <algorithm> #include <boost/filesystem/path.hpp> namespace OrthancStone
--- a/OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp Sun Oct 11 09:56:48 2026 +0200 +++ b/OrthancStone/Sources/Toolbox/DicomStructuredReport.cpp Sun Oct 11 09:56:59 2026 +0200 @@ -111,20 +111,20 @@ static bool IsValidConcept(DcmItem& dataset, const DcmTagKey& key, const std::string& scheme, - const std::string& concept) + const std::string& conceptValue) { DcmSequenceOfItems& sequence = GetSequenceValue(dataset, key); return (sequence.card() == 1 && GetStringValue(*sequence.getItem(0), DCM_CodingSchemeDesignator) == scheme && - GetStringValue(*sequence.getItem(0), DCM_CodeValue) == concept); + GetStringValue(*sequence.getItem(0), DCM_CodeValue) == conceptValue); } static bool IsDicomConcept(DcmItem& dataset, - const std::string& concept) + const std::string& conceptValue) { - return IsValidConcept(dataset, DCM_ConceptNameCodeSequence, "DCM", concept); + return IsValidConcept(dataset, DCM_ConceptNameCodeSequence, "DCM", conceptValue); } @@ -529,10 +529,10 @@ if (concepts.card() == 1 && concepts.getItem(0) != NULL) { - DcmItem& concept = *concepts.getItem(0); - if (concept.tagExists(DCM_CodeMeaning)) + DcmItem& conceptValue = *concepts.getItem(0); + if (conceptValue.tagExists(DCM_CodeMeaning)) { - const std::string codeMeaning = GetStringValue(concept, DCM_CodeMeaning); + const std::string codeMeaning = GetStringValue(conceptValue, DCM_CodeMeaning); bool hasValue = false; std::string value;