move directory

[creaImageIO.git] / src2 / creaImageIODicomImageReader.cpp

diff --git a/src2/creaImageIODicomImageReader.cpp b/src2/creaImageIODicomImageReader.cpp
index 30c420914cc2a7ca00c96aa8ce979fd666be0ddd..8ff8b5b102c3fc64e790710e3b95a383b98a909d 100644 (file)
--- a/src2/creaImageIODicomImageReader.cpp
+++ b/src2/creaImageIODicomImageReader.cpp
@@ -1,12 +1,18 @@
 #include <creaImageIODicomImageReader.h>
 
 #include <vtkGdcmReader.h>
+
+
+
 #include <creaImageIOSystem.h>
 #include "boost/filesystem/path.hpp"
 
 #include <creaImageIOTreeAttributeDescriptor.h>
 #include <vtkStringArray.h>
-
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace creaImageIO
 {
 
@@ -14,7 +20,9 @@ namespace creaImageIO
   DicomImageReader::DicomImageReader()
   {
     mReader = vtkGdcmReader::New();
+//EED  mReader->SetFlipY(false);
     SetName ( "Dicom" );
+
   };
   //=====================================================================
   
@@ -82,11 +90,11 @@ namespace creaImageIO
                  }
                if (str[str.size()-1]==' ')
                  {
-               return str.substr(0,str.size()-1);
+               return irclean(str.substr(0,str.size()-1));
                  }
                if (str[str.size()-1]==0)
                  {
-               return str.substr(0,str.size()-1);
+               return irclean(str.substr(0,str.size()-1));
                  }
          }
     
@@ -134,18 +142,18 @@ namespace creaImageIO
              }
            else
              {
-               uint16_t gr;
                uint16_t el;
+               uint16_t gr;
+               
                tree::AttributeDescriptor::GetDicomGroupElementFromKey(i->first,gr,el);
                if ( ( gr!=0 ) && ( el!=0 ) )
                  {
-                   std::string val = file->GetEntryString(gr,el);
+                   std::string val =  file->GetEntryString(gr,el);
                    i->second = irclean(val);
                  }
              }
          }
       }
- //   file->Delete();
   }
 
   //=====================================================================