Mercurial > hg > orthanc

comparison OrthancServer/OrthancInitialization.cpp @ 2006:6301bbcbcaed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more generic support of value representations
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 09 Jun 2016 14:48:40 +0200
parents ce90d109bb64
children 4dafe2a0d3ab
comparison
equal deleted inserted replaced
2005:9e021b2b348b 2006:6301bbcbcaed
40 #include "../Core/FileStorage/FilesystemStorage.h" 40 #include "../Core/FileStorage/FilesystemStorage.h"
41 41
42 #include "ServerEnumerations.h" 42 #include "ServerEnumerations.h"
43 #include "DatabaseWrapper.h" 43 #include "DatabaseWrapper.h"
44 #include "FromDcmtkBridge.h" 44 #include "FromDcmtkBridge.h"
45 #include "ToDcmtkBridge.h"
45 46
46 #include <boost/lexical_cast.hpp> 47 #include <boost/lexical_cast.hpp>
47 #include <boost/filesystem.hpp> 48 #include <boost/filesystem.hpp>
48 #include <curl/curl.h> 49 #include <curl/curl.h>
49 #include <boost/thread.hpp> 50 #include <boost/thread.hpp>
376 { 377 {
377 throw OrthancException(ErrorCode_BadFileFormat); 378 throw OrthancException(ErrorCode_BadFileFormat);
378 } 379 }
379 380
380 DicomTag tag(FromDcmtkBridge::ParseTag(tags[i])); 381 DicomTag tag(FromDcmtkBridge::ParseTag(tags[i]));
381 DcmEVR vr = FromDcmtkBridge::ParseValueRepresentation(content[0].asString()); 382 ValueRepresentation vr = StringToValueRepresentation(content[0].asString(), true);
382 std::string name = content[1].asString(); 383 std::string name = content[1].asString();
383 unsigned int minMultiplicity = (content.size() >= 2) ? content[2].asUInt() : 1; 384 unsigned int minMultiplicity = (content.size() >= 2) ? content[2].asUInt() : 1;
384 unsigned int maxMultiplicity = (content.size() >= 3) ? content[3].asUInt() : 1; 385 unsigned int maxMultiplicity = (content.size() >= 3) ? content[3].asUInt() : 1;
385 386
386 FromDcmtkBridge::RegisterDictionaryTag(tag, vr, name, minMultiplicity, maxMultiplicity); 387 FromDcmtkBridge::RegisterDictionaryTag(tag, vr, name, minMultiplicity, maxMultiplicity);