X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=f3e89ab9b5e166218f10c16332a084eacb0f8212;hb=74917aa3a592bde592130de5ece8d9315015b373;hp=7f5043856bc86ec21b918462549ad165bb5cd153;hpb=7589d23967892c94462e22a49ec50fcd225c5c38;p=gdcm.git

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 7f504385..f3e89ab9 100644
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -1,43 +1,64 @@
 // gdcmTS.cxx
-
-#include <stdio.h>
+//-----------------------------------------------------------------------------
+#include <fstream>
 
 #include "gdcmTS.h"
+#include "gdcmUtil.h"
+
+#ifndef PUB_DICT_PATH
+#  define PUB_DICT_PATH     "../Dicts/"
+#endif
+#define DICT_TS "dicomTS.dic"
 
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
 gdcmTS::gdcmTS(void) {
-   ts["1.2.840.10008.1.2"]      = "Implicit VR - Little Endian";  
-   ts["1.2.840.10008.1.2.1"]    = "Explicit VR - Little Endian";         
-   ts["1.2.840.10008.1.2.1.99"] = "Deflated Explicit VR - Little Endian";          
-   ts["1.2.840.10008.1.2.2"]    = "Explicit VR - Big Endian";                 
-   ts["1.2.840.10008.1.2.4.50"] = "JPEG Baseline (Process 1)";       
-   ts["1.2.840.10008.1.2.4.51"] = "JPEG Extended (Process 2 & 4)";            
-   ts["1.2.840.10008.1.2.4.52"] = "JPEG Extended (Process 3 & 5)"; 
-   ts["1.2.840.10008.1.2.4.53"] = "JPEG Spectral Selection, Non-Hierarchical (Process 6 & 8)"; 
-   ts["1.2.840.10008.1.2.4.54"] = "JPEG Spectral Selection, Non-Hierarchical (Process 7 & 9)";        
-   ts["1.2.840.10008.1.2.4.55"] = "JPEG Spectral Selection, Non-Hierarchical (Process 10 & 12)";           
-   ts["1.2.840.10008.1.2.4.56"] = "JPEG Spectral Selection, Non-Hierarchical (Process 11 & 13)";             
-   ts["1.2.840.10008.1.2.4.57"] = "JPEG Baseline (Process 14)";     
-   ts["1.2.840.10008.1.2.4.58"] = "JPEG Baseline (Process 15)";     
-   ts["1.2.840.10008.1.2.4.59"] = "JPEG Spectral Selection, Non-Hierarchical (Process 16 & 18)";           
-   ts["1.2.840.10008.1.2.4.60"] = "JPEG Spectral Selection, Non-Hierarchical (Process 17 & 19)";          
-   ts["1.2.840.10008.1.2.4.61"] = "JPEG Spectral Selection, Non-Hierarchical (Process 20 & 22)";           
-   ts["1.2.840.10008.1.2.4.62"] = "JPEG Spectral Selection, Non-Hierarchical (Process 21 & 23)";          
-   ts["1.2.840.10008.1.2.4.63"] = "JPEG Spectral Selection, Non-Hierarchical (Process 24 & 26)";   
-   ts["1.2.840.10008.1.2.4.64"] = "JPEG Spectral Selection, Non-Hierarchical (Process 25 & 27)";   
-   ts["1.2.840.10008.1.2.4.65"] = "JPEG Lossless, Hierarchical (Process 28)";   
-   ts["1.2.840.10008.1.2.4.66"] = "JPEG Lossless, Hierarchical (Process 29)";   
-   ts["1.2.840.10008.1.2.4.70"] = "Non-Hierarchical, First-Order Prediction (Process 14 [Selection Value 1])"; 
-   ts["1.2.840.10008.1.2.5"]    = "RLE Lossless";              
+   std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_TS);
+   std::ifstream from(filename.c_str());
+   dbg.Error(!from, "gdcmTS::gdcmTS: can't open dictionary",filename.c_str());
+
+   char buff[1024];
+   std::string key;
+   std::string name;
+
+   while (!from.eof()) {
+      eatwhite(from);
+      from.getline(buff, 1024, ' ');
+      key = buff;
+      eatwhite(from);
+      from.getline(buff, 1024, '\n');
+      name = buff;
+
+      if(key!="") {
+         ts[key]=name;
+      }
+   }
+   from.close();
 }
 
 gdcmTS::~gdcmTS() {
    ts.clear();
 }
 
+//-----------------------------------------------------------------------------
+// Print
+
+//-----------------------------------------------------------------------------
+// Public
 int gdcmTS::Count(TSKey key) {
    return ts.count(key);
 }
 
 std::string gdcmTS::GetValue(TSKey key) {
+   if (ts.count(key) == 0) 
+      return (GDCM_UNFOUND);
    return ts[key];
 }
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------