Mercurial > hg > orthanc-stone

comparison Resources/Orthanc/Core/Enumerations.cpp @ 30:1099a148f7e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 14 Dec 2016 17:05:41 +0100
parents ff1e935768e7
children 7207a407bcd8
comparison
equal deleted inserted replaced
29:22ab2d8566fa 30:1099a148f7e5
1081 1081
1082 1082
1083 bool GetDicomEncoding(Encoding& encoding, 1083 bool GetDicomEncoding(Encoding& encoding,
1084 const char* specificCharacterSet) 1084 const char* specificCharacterSet)
1085 { 1085 {
1086 std::string s = specificCharacterSet; 1086 std::string s = Toolbox::StripSpaces(specificCharacterSet);
1087 Toolbox::ToUpperCase(s); 1087 Toolbox::ToUpperCase(s);
1088 1088
1089 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.12.1.1.2 1089 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.12.1.1.2
1090 // https://github.com/dcm4che/dcm4che/blob/master/dcm4che-core/src/main/java/org/dcm4che3/data/SpecificCharacterSet.java 1090 // https://github.com/dcm4che/dcm4che/blob/master/dcm4che-core/src/main/java/org/dcm4che3/data/SpecificCharacterSet.java
1091 if (s == "ISO_IR 6" || 1091 if (s == "ISO_IR 6" ||
1092 s == "ISO_IR 192" ||
1093 s == "ISO 2022 IR 6") 1092 s == "ISO 2022 IR 6")
1093 {
1094 encoding = Encoding_Ascii;
1095 }
1096 else if (s == "ISO_IR 192")
1094 { 1097 {
1095 encoding = Encoding_Utf8; 1098 encoding = Encoding_Utf8;
1096 } 1099 }
1097 else if (s == "ISO_IR 100" || 1100 else if (s == "ISO_IR 100" ||
1098 s == "ISO 2022 IR 100") 1101 s == "ISO 2022 IR 100")
1236 const char* GetDicomSpecificCharacterSet(Encoding encoding) 1239 const char* GetDicomSpecificCharacterSet(Encoding encoding)
1237 { 1240 {
1238 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.12.1.1.2 1241 // http://dicom.nema.org/medical/dicom/current/output/html/part03.html#sect_C.12.1.1.2
1239 switch (encoding) 1242 switch (encoding)
1240 { 1243 {
1244 case Encoding_Ascii:
1245 return "ISO_IR 6";
1246
1241 case Encoding_Utf8: 1247 case Encoding_Utf8:
1242 case Encoding_Ascii:
1243 return "ISO_IR 192"; 1248 return "ISO_IR 192";
1244 1249
1245 case Encoding_Latin1: 1250 case Encoding_Latin1:
1246 return "ISO_IR 100"; 1251 return "ISO_IR 100";
1247 1252