Program: gdcm
Module: $RCSfile: vtkGdcmReader.cxx,v $
Language: C++
- Date: $Date: 2007/06/19 13:09:45 $
- Version: $Revision: 1.90 $
+ Date: $Date: 2011/03/29 07:36:02 $
+ Version: $Revision: 1.99 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// //////////////////////////////////////////////////////////////
//
//===> Many users expect from vtkGdcmReader it 'orders' the images
-// (that's the job of gdcm::SerieHelper ...)
+// (that's the job of GDCM_NAME_SPACE::SerieHelper ...)
// When user *knows* the files with same Serie UID
// have same sizes, same 'pixel' type, same color convention, ...
// the right way to proceed is as follow :
//
-// gdcm::SerieHelper *sh= new gdcm::SerieHelper();
+// GDCM_NAME_SPACE::SerieHelper *sh= new GDCM_NAME_SPACE::SerieHelper();
// // if user wants *not* to load some parts of the file headers
// sh->SetLoadMode(loadMode);
//
//
// // here, we suppose only the first 'Serie' is of interest
// // it's up to the user to decide !
-// gdcm::FileList *l = sh->GetFirstSingleSerieUIDFileSet();
+// GDCM_NAME_SPACE::FileList *l = sh->GetFirstSingleSerieUIDFileSet();
//
// // if user is doesn't trust too much the files with same Serie UID
// if ( !sh->IsCoherent(l) )
// sh->SetDropDuplicatePositions(true);
//
// // Sorting the list is mandatory
-// // a side effect is to compute ZSpacing for the fle set
+// // a side effect is to compute ZSpacing for the file set
// sh->OrderFileList(l); // sort the list
//
// vtkGdcmReader *reader = vtkGdcmReader::New();
// // (a *very* simple example is given in vtkgdcmSerieViewer.cxx)
// reader->SetUserFunction (userSuppliedFunction);
//
-// // to pass a 'Coherent File List' as produced by gdcm::SerieHelper
+// // to pass a 'Coherent File List' as produced by GDCM_NAME_SPACE::SerieHelper
// reader->SetCoherentFileList(l);
// reader->Update();
//
#include <vtkPointData.h>
#include <vtkLookupTable.h>
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.90 $")
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.99 $")
vtkStandardNewMacro(vtkGdcmReader)
//-----------------------------------------------------------------------------
this->OwnFile=true;
// this->Execution=false; // For VTK5.0
+
+ this->KeepOverlays = false;
+ this->FlipY = true; // to keep old behaviour
}
vtkGdcmReader::~vtkGdcmReader()
vtkDebugMacro(<< "32 bits signed image");
this->SetDataScalarTypeToInt();
}
- else if ( ImageType == "FD" )
+ else if ( ImageType == "FD" ) // This is not genuine DICOM, but so usefull
{
vtkDebugMacro(<< "64 bits Double image");
this->SetDataScalarTypeToDouble();
//} // end For VTK5.0
data->AllocateScalars(); // For VTK5.0
+
+#if (VTK_MAJOR_VERSION >= 5) || ( VTK_MAJOR_VERSION == 4 && VTK_MINOR_VERSION > 2 )
+//#if (VTK_MAJOR_VERSION >= 5)
if (this->UpdateExtentIsEmpty(output))
{
return;
}
-
-//void vtkGdcmReader::BuildData(vtkDataObject *output) // For VTK5.0
-//{
-// vtkImageData *data = this->AllocateOutputData(output); // end For VTK5.0
+#endif
data->GetPointData()->GetScalars()->SetName("DicomImage-Volume");
type = file->GetPixelType();
if ( (type != "8U") && (type != "8S")
&& (type != "16U") && (type != "16S")
- && (type != "32U") && (type != "32S") )
+ && (type != "32U") && (type != "32S")
+ && (type != "FD") ) // Sure this one is NOT kosher
{
vtkErrorMacro(<< "Bad File Type for file " << filename->c_str() << "\n"
<< " File type found : " << type.c_str()
- << " (might be 8U, 8S, 16U, 16S, 32U, 32S) \n"
+ << " (might be 8U, 8S, 16U, 16S, 32U, 32S, FD) \n"
<< " Removing this file from read files");
file->Delete();
file=NULL;
this->DataSpacing[1] = file->GetYSpacing();
// Most of the file headers have NO z spacing
- // It must be calculated from the whole gdcm::Serie (if any)
+ // It must be calculated from the whole GDCM_NAME_SPACE::Serie (if any)
// using Jolinda Smith's algoritm.
- // see gdcm::SerieHelper::ImagePositionPatientOrdering()
+ // see GDCM_NAME_SPACE::SerieHelper::ImagePositionPatientOrdering()
if (CoherentFileList == 0)
this->DataSpacing[2] = file->GetZSpacing();
else
{
- // Just because OrderFileList() is a member of gdcm::SerieHelper
+ // Just because OrderFileList() is a member of GDCM_NAME_SPACE::SerieHelper
// we need to instanciate sh.
GDCM_NAME_SPACE::SerieHelper *sh = GDCM_NAME_SPACE::SerieHelper::New();
sh->OrderFileList(CoherentFileList); // calls ImagePositionPatientOrdering()
{
vtkDebugMacro(<< "Copying to memory image [" << fileName.c_str() << "]");
- gdcm::File *f;
- f = new gdcm::File();
+ GDCM_NAME_SPACE::File *f;
+ f = new GDCM_NAME_SPACE::File();
f->SetLoadMode( LoadMode );
f->SetFileName( fileName.c_str() );
f->Load( );
}*/
/*
- * Loads the contents of the image/volume contained by gdcm::File* f at
+ * Loads the contents of the image/volume contained by GDCM_NAME_SPACE::File* f at
* the Dest memory address. Returns the size of the data loaded.
* \ param f File to consider. NULL if the file must be skiped
* \remarks Assume that if (f != NULL) then its caracteristics match
GDCM_NAME_SPACE::FileHelper *fileH = GDCM_NAME_SPACE::FileHelper::New( f );
fileH->SetUserFunction( UserFunction );
-
+
+ fileH->SetKeepOverlays ( this->KeepOverlays);
+
int numColumns = f->GetXSize();
int numLines = f->GetYSize();
int numPlanes = f->GetZSize();
this->LookupTable->SetRange(0,255);
vtkDataSetAttributes *a = this->GetOutput()->GetPointData();
a->GetScalars()->SetLookupTable(this->LookupTable);
- free(lut);
+ delete[] lut;
}
else
{
//size = fileH->GetImageDataSize();
// useless - just an accessor; 'size' unused
- src = (unsigned char*)fileH->GetImageData();
- }
+ //if (this->GetFlipY())
+ src = (unsigned char*)fileH->GetImageData();
+ //else
+ // very strange, but it doesn't work (I have to memcpy the pixels ?!?)
+ // dest = (unsigned char*)fileH->GetImageData();
+ }
+if (this->GetFlipY()) {
unsigned char *dst = dest + planeSize - lineSize;
for (int plane = 0; plane < numPlanes; plane++)
{
}
dst += 2 * planeSize;
}
-
+}
+else // we don't flip (upside down) the image
+{
+ memcpy((void*)dest, (void*)src, numPlanes * numLines * lineSize);
+}
fileH->Delete();
}