Mercurial > hg > orthanc

comparison Core/DicomParsing/FromDcmtkBridge.cpp @ 3209:f6374c36a671

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
documentation of DICOMweb in SDK, compatibility with DCMTK 3.6.0
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 08 Feb 2019 12:35:35 +0100
parents 9316f341e40f
children cf8cbeb35f33
comparison
equal deleted inserted replaced
3208:c4e1977e5ed7 3209:f6374c36a671
88 #include <dcmtk/dcmdata/dcvrsh.h> 88 #include <dcmtk/dcmdata/dcvrsh.h>
89 #include <dcmtk/dcmdata/dcvrsl.h> 89 #include <dcmtk/dcmdata/dcvrsl.h>
90 #include <dcmtk/dcmdata/dcvrss.h> 90 #include <dcmtk/dcmdata/dcvrss.h>
91 #include <dcmtk/dcmdata/dcvrst.h> 91 #include <dcmtk/dcmdata/dcvrst.h>
92 #include <dcmtk/dcmdata/dcvrtm.h> 92 #include <dcmtk/dcmdata/dcvrtm.h>
93 #include <dcmtk/dcmdata/dcvruc.h>
94 #include <dcmtk/dcmdata/dcvrui.h> 93 #include <dcmtk/dcmdata/dcvrui.h>
95 #include <dcmtk/dcmdata/dcvrul.h> 94 #include <dcmtk/dcmdata/dcvrul.h>
96 #include <dcmtk/dcmdata/dcvrur.h>
97 #include <dcmtk/dcmdata/dcvrus.h> 95 #include <dcmtk/dcmdata/dcvrus.h>
98 #include <dcmtk/dcmdata/dcvrut.h> 96 #include <dcmtk/dcmdata/dcvrut.h>
97
98 #if DCMTK_VERSION_NUMBER >= 361
99 # include <dcmtk/dcmdata/dcvruc.h>
100 # include <dcmtk/dcmdata/dcvrur.h>
101 #endif
99 102
100 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1 103 #if DCMTK_USE_EMBEDDED_DICTIONARIES == 1
101 # include <EmbeddedResources.h> 104 # include <EmbeddedResources.h>
102 #endif 105 #endif
103 106
1459 return new DcmShortString(key); 1462 return new DcmShortString(key);
1460 1463
1461 case EVR_PN: // person name 1464 case EVR_PN: // person name
1462 return new DcmPersonName(key); 1465 return new DcmPersonName(key);
1463 1466
1467 #if DCMTK_VERSION_NUMBER >= 361
1464 case EVR_UC: // unlimited characters 1468 case EVR_UC: // unlimited characters
1465 return new DcmUnlimitedCharacters(key); 1469 return new DcmUnlimitedCharacters(key);
1466 1470 #endif
1471
1472 #if DCMTK_VERSION_NUMBER >= 361
1467 case EVR_UR: // URI/URL 1473 case EVR_UR: // URI/URL
1468 return new DcmUniversalResourceIdentifierOrLocator(key); 1474 return new DcmUniversalResourceIdentifierOrLocator(key);
1475 #endif
1469 1476
1470 1477
1471 /** 1478 /**
1472 * Numerical types 1479 * Numerical types
1473 **/ 1480 **/
1638 case EVR_ST: // short text 1645 case EVR_ST: // short text
1639 case EVR_LT: // long text 1646 case EVR_LT: // long text
1640 case EVR_UT: // unlimited text 1647 case EVR_UT: // unlimited text
1641 case EVR_PN: // person name 1648 case EVR_PN: // person name
1642 case EVR_UI: // unique identifier 1649 case EVR_UI: // unique identifier
1650 #if DCMTK_VERSION_NUMBER >= 361
1643 case EVR_UC: // unlimited characters 1651 case EVR_UC: // unlimited characters
1644 case EVR_UR: // URI/URL 1652 case EVR_UR: // URI/URL
1653 #endif
1645 { 1654 {
1646 ok = element.putString(decoded->c_str()).good(); 1655 ok = element.putString(decoded->c_str()).good();
1647 break; 1656 break;
1648 } 1657 }
1649 1658