Mercurial > hg > orthanc

comparison OrthancServer/FromDcmtkBridge.h @ 2115:a657f7772e69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handling of private tags/creators in the "Dictionary" configuration option
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 31 Oct 2016 15:23:32 +0100
parents 6301bbcbcaed
children b9bd52c72ba2
comparison
equal deleted inserted replaced
2114:e4f8e377782f 2115:a657f7772e69
32 32
33 #pragma once 33 #pragma once
34 34
35 #include "ServerEnumerations.h" 35 #include "ServerEnumerations.h"
36 36
37 #include "../Core/DicomFormat/DicomElement.h"
37 #include "../Core/DicomFormat/DicomMap.h" 38 #include "../Core/DicomFormat/DicomMap.h"
38 39
39 #include <dcmtk/dcmdata/dcdatset.h> 40 #include <dcmtk/dcmdata/dcdatset.h>
40 #include <dcmtk/dcmdata/dcmetinf.h> 41 #include <dcmtk/dcmdata/dcmetinf.h>
41 #include <dcmtk/dcmdata/dcpixseq.h> 42 #include <dcmtk/dcmdata/dcpixseq.h>
51 52
52 static void RegisterDictionaryTag(const DicomTag& tag, 53 static void RegisterDictionaryTag(const DicomTag& tag,
53 ValueRepresentation vr, 54 ValueRepresentation vr,
54 const std::string& name, 55 const std::string& name,
55 unsigned int minMultiplicity, 56 unsigned int minMultiplicity,
56 unsigned int maxMultiplicity); 57 unsigned int maxMultiplicity,
58 const std::string& privateCreator);
57 59
58 static Encoding DetectEncoding(DcmItem& dataset, 60 static Encoding DetectEncoding(DcmItem& dataset,
59 Encoding defaultEncoding); 61 Encoding defaultEncoding);
60 62
61 static void Convert(DicomMap& target, 63 static void Convert(DicomMap& target,
92 DcmMetaInfo& header, 94 DcmMetaInfo& header,
93 DicomToJsonFormat format, 95 DicomToJsonFormat format,
94 DicomToJsonFlags flags, 96 DicomToJsonFlags flags,
95 unsigned int maxStringLength); 97 unsigned int maxStringLength);
96 98
97 static std::string GetName(const DicomTag& tag); 99 static std::string GetTagName(const DicomTag& tag,
100 const std::string& privateCreator);
101
102 static std::string GetTagName(const DcmElement& element);
103
104 static std::string GetTagName(const DicomElement& element)
105 {
106 return GetTagName(element.GetTag(), "");
107 }
98 108
99 static DicomTag ParseTag(const char* name); 109 static DicomTag ParseTag(const char* name);
100 110
101 static DicomTag ParseTag(const std::string& name) 111 static DicomTag ParseTag(const std::string& name)
102 { 112 {