and vtkErrorMacro use.
* gdcmPython/gdcm.i : corrections to avoid warnings at compilation
-- BeNours
+2004-12-02 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+ * vtk/vtkGdcmReader.cxx : correct error in vtkDebugMacro, vtkWarningMacro
+ and vtkErrorMacro use.
+ * gdcmPython/gdcm.i : corrections to avoid warnings at compilation
+
2004-12-02 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
* Test/TestCopyDicom.cxx : the new dicom created is created empty, without
file name in input
2004-12-02 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
* Test/TestCopyDicom.cxx : the new dicom created is created empty, without
file name in input
// The gdcm::Header class doesn't have any SetFilename method anyhow, and
// this constructor is only used internaly (not from the API) so this is
// not a big loss.
// The gdcm::Header class doesn't have any SetFilename method anyhow, and
// this constructor is only used internaly (not from the API) so this is
// not a big loss.
+%ignore gdcm::binary_write(std::ostream &,uint32_t const &);
+%ignore gdcm::binary_write(std::ostream &,uint16_t const &);
+
%ignore gdcm::Header::Header();
%ignore gdcm::DicomDir::DicomDir();
////////////////////////////////////////////////////////////////////////////
// Warning: Order matters !
%include "gdcmCommon.h"
%ignore gdcm::Header::Header();
%ignore gdcm::DicomDir::DicomDir();
////////////////////////////////////////////////////////////////////////////
// Warning: Order matters !
%include "gdcmCommon.h"
-//CLEANME %include "gdcmRLEFramesInfo.h"
-//CLEANME %include "gdcmJPEGFragmentsInfo.h"
-//CLEANME %include "gdcmDictEntry.h"
-//CLEANME %include "gdcmDict.h"
-//CLEANME %include "gdcmDocEntry.h"
+%include "gdcmDictEntry.h"
+%include "gdcmDict.h"
%include "gdcmDocEntrySet.h"
%include "gdcmDocEntrySet.h"
-//CLEANME %include "gdcmElementSet.h"
-//CLEANME %include "gdcmDictSet.h"
-//CLEANME %include "gdcmTS.h"
-//CLEANME %include "gdcmVR.h"
-//CLEANME %include "gdcmSQItem.h"
+%include "gdcmElementSet.h"
+%include "gdcmDictSet.h"
+%include "gdcmSQItem.h"
%include "gdcmDicomDirElement.h"
%include "gdcmDicomDirObject.h"
%include "gdcmDicomDirImage.h"
%include "gdcmDicomDirElement.h"
%include "gdcmDicomDirObject.h"
%include "gdcmDicomDirImage.h"
#include <vtkPointData.h>
#include <vtkLookupTable.h>
#include <vtkPointData.h>
#include <vtkLookupTable.h>
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.57 $");
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.58 $");
vtkStandardNewMacro(vtkGdcmReader);
//-----------------------------------------------------------------------------
vtkStandardNewMacro(vtkGdcmReader);
//-----------------------------------------------------------------------------
// Since we maintain a list of filenames, when building a volume,
// (see vtkGdcmReader::AddFileName), we additionaly need to purge
// this list when we manually positionate the filename.
// Since we maintain a list of filenames, when building a volume,
// (see vtkGdcmReader::AddFileName), we additionaly need to purge
// this list when we manually positionate the filename.
- vtkDebugMacro("Clearing all files given with AddFileName");
+ vtkDebugMacro(<< "Clearing all files given with AddFileName");
this->FileNameList.clear();
this->Modified();
}
this->FileNameList.clear();
this->Modified();
}
this->TotalNumberOfPlanes = this->CheckFileCoherence();
if ( this->TotalNumberOfPlanes == 0)
{
this->TotalNumberOfPlanes = this->CheckFileCoherence();
if ( this->TotalNumberOfPlanes == 0)
{
- vtkErrorMacro("File set is not coherent. Exiting...");
+ vtkErrorMacro(<< "File set is not coherent. Exiting...");
(this->DataVOI[4] < 0) ||
(this->DataVOI[5] >= this->TotalNumberOfPlanes ))
{
(this->DataVOI[4] < 0) ||
(this->DataVOI[5] >= this->TotalNumberOfPlanes ))
{
- vtkWarningMacro("The requested VOI is larger than expected extent.");
+ vtkWarningMacro(<< "The requested VOI is larger than expected extent.");
this->DataVOI[0] = 0;
this->DataVOI[1] = this->NumColumns - 1;
this->DataVOI[2] = 0;
this->DataVOI[0] = 0;
this->DataVOI[1] = this->NumColumns - 1;
this->DataVOI[2] = 0;
// But we do need to set up the data type for downstream filters:
if ( ImageType == "8U" )
{
// But we do need to set up the data type for downstream filters:
if ( ImageType == "8U" )
{
- vtkDebugMacro("8 bits unsigned image");
+ vtkDebugMacro(<< "8 bits unsigned image");
this->SetDataScalarTypeToUnsignedChar();
}
else if ( ImageType == "8S" )
{
this->SetDataScalarTypeToUnsignedChar();
}
else if ( ImageType == "8S" )
{
- vtkErrorMacro("Cannot handle 8 bit signed files");
+ vtkErrorMacro(<< "Cannot handle 8 bit signed files");
return;
}
else if ( ImageType == "16U" )
{
return;
}
else if ( ImageType == "16U" )
{
- vtkDebugMacro("16 bits unsigned image");
+ vtkDebugMacro(<< "16 bits unsigned image");
this->SetDataScalarTypeToUnsignedShort();
}
else if ( ImageType == "16S" )
{
this->SetDataScalarTypeToUnsignedShort();
}
else if ( ImageType == "16S" )
{
- vtkDebugMacro("16 bits signed image");
+ vtkDebugMacro(<< "16 bits signed image");
this->SetDataScalarTypeToShort();
this->SetDataScalarTypeToShort();
- //vtkErrorMacro("Cannot handle 16 bit signed files");
+ //vtkErrorMacro(<< "Cannot handle 16 bit signed files");
}
else if ( ImageType == "32U" )
{
}
else if ( ImageType == "32U" )
{
- vtkDebugMacro("32 bits unsigned image");
+ vtkDebugMacro(<< "32 bits unsigned image");
vtkDebugMacro("WARNING: forced to signed int !");
this->SetDataScalarTypeToInt();
}
else if ( ImageType == "32S" )
{
vtkDebugMacro("WARNING: forced to signed int !");
this->SetDataScalarTypeToInt();
}
else if ( ImageType == "32S" )
{
- vtkDebugMacro("32 bits signed image");
+ vtkDebugMacro(<< "32 bits signed image");
this->SetDataScalarTypeToInt();
}
else if ( ImageType == "FD" )
{
this->SetDataScalarTypeToInt();
}
else if ( ImageType == "FD" )
{
- vtkDebugMacro("64 bits Double image");
+ vtkDebugMacro(<< "64 bits Double image");
this->SetDataScalarTypeToDouble();
}
//Set number of scalar components:
this->SetDataScalarTypeToDouble();
}
//Set number of scalar components:
{
if (this->InternalFileNameList.empty())
{
{
if (this->InternalFileNameList.empty())
{
- vtkErrorMacro("A least a valid FileName must be specified.");
+ vtkErrorMacro(<< "A least a valid FileName must be specified.");
if ((! this->FileNameList.empty()) && this->FileName )
{
if ((! this->FileNameList.empty()) && this->FileName )
{
- vtkErrorMacro("Both AddFileName and SetFileName schemes were used");
- vtkErrorMacro("No images loaded ! ");
+ vtkErrorMacro(<< "Both AddFileName and SetFileName schemes were used");
+ vtkErrorMacro(<< "No images loaded ! ");
return;
}
if ((! this->FileNameList.empty()) && this->FilePrefix )
{
return;
}
if ((! this->FileNameList.empty()) && this->FilePrefix )
{
- vtkErrorMacro("Both AddFileName and SetFilePrefix schemes were used");
- vtkErrorMacro("No images loaded ! ");
+ vtkErrorMacro(<< "Both AddFileName and SetFilePrefix schemes were used");
+ vtkErrorMacro(<< "No images loaded ! ");
return;
}
if (this->FileName && this->FilePrefix)
{
return;
}
if (this->FileName && this->FilePrefix)
{
- vtkErrorMacro("Both SetFileName and SetFilePrefix schemes were used");
- vtkErrorMacro("No images loaded ! ");
+ vtkErrorMacro(<< "Both SetFileName and SetFilePrefix schemes were used");
+ vtkErrorMacro(<< "No images loaded ! ");
return;
}
if (! this->FileNameList.empty() )
{
return;
}
if (! this->FileNameList.empty() )
{
- vtkDebugMacro("Using the AddFileName specified files");
+ vtkDebugMacro(<< "Using the AddFileName specified files");
this->InternalFileNameList=this->FileNameList;
return;
}
if (!this->FileName && !this->FilePrefix)
{
this->InternalFileNameList=this->FileNameList;
return;
}
if (!this->FileName && !this->FilePrefix)
{
- vtkErrorMacro("FileNames are not set. Either use AddFileName() or");
- vtkErrorMacro("specify a FileName or FilePrefix.");
+ vtkErrorMacro(<< "FileNames are not set. Either use AddFileName() or");
+ vtkErrorMacro(<< "specify a FileName or FilePrefix.");
// Single file loading (as given with ::SetFileName()):
// Case of multi-frame file considered here
this->ComputeInternalFileName(this->DataExtent[4]);
// Single file loading (as given with ::SetFileName()):
// Case of multi-frame file considered here
this->ComputeInternalFileName(this->DataExtent[4]);
- vtkDebugMacro("Adding file " << this->InternalFileName);
+ vtkDebugMacro(<< "Adding file " << this->InternalFileName);
this->AddInternalFileName(this->InternalFileName);
}
else
this->AddInternalFileName(this->InternalFileName);
}
else
for (int idx = this->DataExtent[4]; idx <= this->DataExtent[5]; ++idx)
{
this->ComputeInternalFileName(idx);
for (int idx = this->DataExtent[4]; idx <= this->DataExtent[5]; ++idx)
{
this->ComputeInternalFileName(idx);
- vtkDebugMacro("Adding file " << this->InternalFileName);
+ vtkDebugMacro(<< "Adding file " << this->InternalFileName);
this->AddInternalFileName(this->InternalFileName);
}
}
this->AddInternalFileName(this->InternalFileName);
}
}
this->BuildFileListFromPattern();
if (this->InternalFileNameList.empty())
{
this->BuildFileListFromPattern();
if (this->InternalFileNameList.empty())
{
- vtkErrorMacro("FileNames are not set.");
+ vtkErrorMacro(<< "FileNames are not set.");
fp = fopen(filename->c_str(),"rb");
if (!fp)
{
fp = fopen(filename->c_str(),"rb");
if (!fp)
{
- vtkErrorMacro("Unable to open file " << filename->c_str());
- vtkErrorMacro("Removing this file from readed files "
+ vtkErrorMacro(<< "Unable to open file " << filename->c_str());
+ vtkErrorMacro(<< "Removing this file from readed files "
<< filename->c_str());
*filename = "GDCM_UNREADABLE";
continue;
<< filename->c_str());
*filename = "GDCM_UNREADABLE";
continue;
gdcm::Header GdcmHeader(filename->c_str() );
if (!GdcmHeader.IsReadable())
{
gdcm::Header GdcmHeader(filename->c_str() );
if (!GdcmHeader.IsReadable())
{
- vtkErrorMacro("Gdcm cannot parse file " << filename->c_str());
- vtkErrorMacro("Removing this file from readed files "
+ vtkErrorMacro(<< "Gdcm cannot parse file " << filename->c_str());
+ vtkErrorMacro(<< "Removing this file from readed files "
<< filename->c_str());
*filename = "GDCM_UNREADABLE";
continue;
<< filename->c_str());
*filename = "GDCM_UNREADABLE";
continue;
&& (type != "16U") && (type != "16S")
&& (type != "32U") && (type != "32S") )
{
&& (type != "16U") && (type != "16S")
&& (type != "32U") && (type != "32S") )
{
- vtkErrorMacro("Bad File Type for file" << filename->c_str());
- vtkErrorMacro(" " << type.c_str());
- vtkErrorMacro("Removing this file from readed files "
+ vtkErrorMacro(<< "Bad File Type for file" << filename->c_str());
+ vtkErrorMacro(<< " " << type.c_str());
+ vtkErrorMacro(<< "Removing this file from readed files "
<< filename->c_str());
*filename = "GDCM_UNREADABLE";
continue;
<< filename->c_str());
*filename = "GDCM_UNREADABLE";
continue;
|| ( NY != this->NumLines )
|| ( type != this->ImageType ) )
{
|| ( NY != this->NumLines )
|| ( type != this->ImageType ) )
{
- vtkErrorMacro("This file is not coherent with previous ones"
+ vtkErrorMacro(<< "This file is not coherent with previous ones"
- vtkErrorMacro("Removing this file from readed files "
+ vtkErrorMacro(<< "Removing this file from readed files "
<< filename->c_str());
*filename = "GDCM_UNREADABLE";
continue;
<< filename->c_str());
*filename = "GDCM_UNREADABLE";
continue;
// Stage 2.2: optional coherence stage
if ( NZ != ReferenceNZ )
{
// Stage 2.2: optional coherence stage
if ( NZ != ReferenceNZ )
{
- vtkErrorMacro("File is not coherent in Z with previous ones"
+ vtkErrorMacro(<< "File is not coherent in Z with previous ones"
<< filename->c_str());
}
else
{
<< filename->c_str());
}
else
{
- vtkDebugMacro("File is coherent with previous ones"
+ vtkDebugMacro(<< "File is coherent with previous ones"
// notify the caller.
if (NZ > 1)
{
// notify the caller.
if (NZ > 1)
{
- vtkErrorMacro("This file contains multiple planes (images)"
+ vtkErrorMacro(<< "This file contains multiple planes (images)"
// We didn't have a workable reference file yet. Set this one
// as the reference.
FoundReferenceFile = true;
// We didn't have a workable reference file yet. Set this one
// as the reference.
FoundReferenceFile = true;
- vtkDebugMacro("This file taken as coherence reference:"
+ vtkDebugMacro(<< "This file taken as coherence reference:"
- vtkDebugMacro("Image dimension of reference file as read from Gdcm:"
+ vtkDebugMacro(<< "Image dimension of reference file as read from Gdcm:"
<< NX << " " << NY << " " << NZ);
<< NX << " " << NY << " " << NZ);
- vtkDebugMacro("Number of planes added to the stack: " << NZ);
+ vtkDebugMacro(<< "Number of planes added to the stack: " << NZ);
// Set aside the size of the image
this->NumColumns = NX;
this->NumLines = NY;
// Set aside the size of the image
this->NumColumns = NX;
this->NumLines = NY;
NumberCoherentFiles++;
}
}
NumberCoherentFiles++;
}
}
- vtkDebugMacro("Number of coherent files: " << NumberCoherentFiles);
+ vtkDebugMacro(<< "Number of coherent files: " << NumberCoherentFiles);
if (ReturnedTotalNumberOfPlanes == 0)
{
if (ReturnedTotalNumberOfPlanes == 0)
{
- vtkErrorMacro("No loadable file.");
+ vtkErrorMacro(<< "No loadable file.");
- vtkDebugMacro("Total number of planes on the stack: "
+ vtkDebugMacro(<< "Total number of planes on the stack: "
<< ReturnedTotalNumberOfPlanes);
return ReturnedTotalNumberOfPlanes;
<< ReturnedTotalNumberOfPlanes);
return ReturnedTotalNumberOfPlanes;
const unsigned long updateProgressTarget,
unsigned long & updateProgressCount)
{
const unsigned long updateProgressTarget,
unsigned long & updateProgressCount)
{
- vtkDebugMacro("Copying to memory image [" << fileName.c_str() << "]");
+ vtkDebugMacro(<< "Copying to memory image [" << fileName.c_str() << "]");
gdcm::File file( fileName.c_str() );
size_t size;
gdcm::File file( fileName.c_str() );
size_t size;