*/
-#include <creaImageIODicomImageReader2.h>
+#include "creaImageIODicomImageReader2.h"
+#include <creaImageIOTreeAttributeDescriptor.h>
#include "gdcmStringFilter.h"
-#include "vtkGDCMImageReader.h"
-
-#include <creaImageIOSystem.h>
+#include "gdcmUIDs.h"
#include "boost/filesystem/path.hpp"
-#include <creaImageIOTreeAttributeDescriptor.h>
+#include "vtkGDCMImageReader.h"
#include <vtkStringArray.h>
-#include <creaImageIOGimmick.h>
+#if defined(_WIN32)
+#pragma warning(disable: 4996)
+#endif
-#include "gdcmUIDs.h"
#ifdef _DEBUG
#define new DEBUG_NEW
#endif
void DicomImageReader::ReadAttributes(const std::string& filename,
std::map<std::string,std::string>& attr)
{
- GimmickMessage(2,"Reading attributes from DICOM file '"
- <<filename<<"'"<<std::endl);
gdcm::Reader reader;
if ( i->first == "D0004_1500" )
{
boost::filesystem::path full_path(filename);
- std::string f = full_path.leaf();
+ std::string f = full_path.leaf().string();
i->second = f;
}
else if ( i->first == "FullFileName" )
if ( i->first == "D0004_1500" )
{
boost::filesystem::path full_path(filename);
- std::string f = full_path.leaf();
+ std::string f = full_path.leaf().string();
i->second = f;
}
else if ( i->first == "FullFileName" )
const std::string DicomImageReader::GetStringValueFromTag(const gdcm::DataElement& de)
{
+printf("EED DicomImageReader::GetStringValueFromTag Start\n");
static std::string buffer;
buffer = ""; // cleanup previous call
- const gdcm::ByteValue *bv = de.GetByteValue();
- if( bv ) // Can be Type 2
- {
+ const gdcm::ByteValue *bv = de.GetByteValue();
+ if( bv!=NULL ) // Can be Type 2
+ {
buffer = std::string( bv->GetPointer(), bv->GetLength() );
// Will be padded with at least one \0
- }
+ } // if bv
// Since return is a const char* the very first \0 will be considered
+printf("EED DicomImageReader::GetStringValueFromTag END\n");
return buffer.c_str();
}
//=====================================================================