Mercurial > hg > orthanc-wsi
changeset 132:de866753a5fa
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sat, 24 Mar 2018 11:35:20 +0100 |
parents | 3112e5edb8b6 |
children | 55e9dde3faee |
files | Resources/Orthanc/Core/DicomParsing/ITagVisitor.h Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake Resources/SyncOrthancFolder.py |
diffstat | 3 files changed, 97 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/Orthanc/Core/DicomParsing/ITagVisitor.h Sat Mar 24 11:35:20 2018 +0100 @@ -0,0 +1,93 @@ +/** + * Orthanc - A Lightweight, RESTful DICOM Store + * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics + * Department, University Hospital of Liege, Belgium + * Copyright (C) 2017-2018 Osimis S.A., Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * In addition, as a special exception, the copyright holders of this + * program give permission to link the code of its release with the + * OpenSSL project's "OpenSSL" library (or with modified versions of it + * that use the same license as the "OpenSSL" library), and distribute + * the linked executables. You must obey the GNU General Public License + * in all respects for all of the code used other than "OpenSSL". If you + * modify file(s) with this exception, you may extend this exception to + * your version of the file(s), but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source files + * in the program, then also delete it here. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + **/ + + +#pragma once + +#include "../DicomFormat/DicomTag.h" + +#include <vector> +#include <boost/noncopyable.hpp> + +namespace Orthanc +{ + class ITagVisitor : public boost::noncopyable + { + public: + enum Action + { + Action_Replace, + Action_None + }; + + virtual ~ITagVisitor() + { + } + + virtual void VisitUnknown(const std::vector<DicomTag>& parentTags, + const std::vector<size_t>& parentIndexes, + const DicomTag& tag, + ValueRepresentation vr) = 0; + + virtual void VisitBinary(const std::vector<DicomTag>& parentTags, + const std::vector<size_t>& parentIndexes, + const DicomTag& tag, + ValueRepresentation vr, + const void* data, + size_t size) = 0; + + virtual void VisitInteger(const std::vector<DicomTag>& parentTags, + const std::vector<size_t>& parentIndexes, + const DicomTag& tag, + ValueRepresentation vr, + int64_t value) = 0; + + virtual void VisitDouble(const std::vector<DicomTag>& parentTags, + const std::vector<size_t>& parentIndexes, + const DicomTag& tag, + ValueRepresentation vr, + double value) = 0; + + virtual void VisitAttribute(const std::vector<DicomTag>& parentTags, + const std::vector<size_t>& parentIndexes, + const DicomTag& tag, + ValueRepresentation vr, + const DicomTag& value) = 0; + + virtual Action VisitString(std::string& newValue, + const std::vector<DicomTag>& parentTags, + const std::vector<size_t>& parentIndexes, + const DicomTag& tag, + ValueRepresentation vr, + const std::string& value) = 0; + }; +}
--- a/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake Sat Mar 24 11:30:05 2018 +0100 +++ b/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake Sat Mar 24 11:35:20 2018 +0100 @@ -82,7 +82,9 @@ endif() else() - message("Applying patch to detect mathematic primitives in DCMTK 3.6.2") + # "3.6.2 CXX11 fails on Linux; patch suggestions included" + # https://forum.dcmtk.org/viewtopic.php?f=3&t=4637 + message("Applying patch to detect mathematic primitives in DCMTK 3.6.2 with C++11") execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.2-cmath.patch
--- a/Resources/SyncOrthancFolder.py Sat Mar 24 11:30:05 2018 +0100 +++ b/Resources/SyncOrthancFolder.py Sat Mar 24 11:35:20 2018 +0100 @@ -28,6 +28,7 @@ 'Core/DicomFormat/DicomTag.h', 'Core/DicomFormat/DicomValue.cpp', 'Core/DicomFormat/DicomValue.h', + 'Core/DicomParsing/ITagVisitor.h', 'Core/DicomParsing/FromDcmtkBridge.cpp', 'Core/DicomParsing/FromDcmtkBridge.h', 'Core/DicomParsing/ToDcmtkBridge.cpp',