Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Modules/IO/Bruker/src/itkBruker2dseqImageIO.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ Bruker2dseqImageIO::Read(void * buffer)
Rescale(static_cast<double *>(buffer), slopes, offsets, frameSize, frameCount);
break;
default:
itkExceptionMacro("Datatype not supported: " << this->GetComponentTypeAsString(this->m_ComponentType));
itkExceptionMacro("Datatype not supported: " << ImageIOBase::GetComponentTypeAsString(this->m_ComponentType));
}

//
Expand Down Expand Up @@ -641,7 +641,7 @@ Bruker2dseqImageIO::Read(void * buffer)
SwapSlicesAndVolumes(static_cast<double *>(buffer), x, y, z, sizeToSwap, noswap);
break;
default:
itkExceptionMacro("Datatype not supported: " << this->GetComponentTypeAsString(this->m_ComponentType));
itkExceptionMacro("Datatype not supported: " << ImageIOBase::GetComponentTypeAsString(this->m_ComponentType));
}
}
}
Expand Down Expand Up @@ -686,7 +686,7 @@ Bruker2dseqImageIO::Read(void * buffer)
ReverseSliceOrder(static_cast<double *>(buffer), x, y, z, v);
break;
default:
itkExceptionMacro("Datatype not supported: " << this->GetComponentTypeAsString(this->m_ComponentType));
itkExceptionMacro("Datatype not supported: " << ImageIOBase::GetComponentTypeAsString(this->m_ComponentType));
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions Modules/IO/ImageBase/include/itkImageFileReader.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>::GenerateData()
// the pixel types don't match so a type conversion needs to be
// performed
itkDebugMacro("Buffer conversion required from: "
<< m_ImageIO->GetComponentTypeAsString(m_ImageIO->GetComponentType())
<< " to: " << m_ImageIO->GetComponentTypeAsString(ioType) << " ConvertPixelTraits::NumComponents "
<< ImageIOBase::GetComponentTypeAsString(m_ImageIO->GetComponentType())
<< " to: " << ImageIOBase::GetComponentTypeAsString(ioType) << " ConvertPixelTraits::NumComponents "
<< ConvertPixelTraits::GetNumberOfComponents() << " m_ImageIO->NumComponents "
<< m_ImageIO->GetNumberOfComponents());

Expand Down Expand Up @@ -496,12 +496,12 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>::DoConvertBuffer(const void *
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::DOUBLE, double)
else
{
#define TYPENAME(x) m_ImageIO->GetComponentTypeAsString(ImageIOBase::MapPixelType<x>::CType)
#define TYPENAME(x) ImageIOBase::GetComponentTypeAsString(ImageIOBase::MapPixelType<x>::CType)

ImageFileReaderException e(__FILE__, __LINE__);
std::ostringstream msg;
msg << "Couldn't convert component type: " << std::endl
<< " " << m_ImageIO->GetComponentTypeAsString(m_ImageIO->GetComponentType()) << std::endl
<< " " << ImageIOBase::GetComponentTypeAsString(m_ImageIO->GetComponentType()) << std::endl
<< "to one of: " << std::endl
<< " " << TYPENAME(unsigned char) << std::endl
<< " " << TYPENAME(char) << std::endl
Expand Down
4 changes: 2 additions & 2 deletions Modules/IO/ImageBase/src/itkImageIOBase.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1159,8 +1159,8 @@ ImageIOBase::PrintSelf(std::ostream & os, Indent indent) const
os << indent << "IORegion: " << std::endl;
m_IORegion.Print(os, indent.GetNextIndent());
os << indent << "NumberOfComponents/Pixel: " << m_NumberOfComponents << std::endl;
os << indent << "PixeType: " << this->GetPixelTypeAsString(m_PixelType) << std::endl;
os << indent << "ComponentType: " << this->GetComponentTypeAsString(m_ComponentType) << std::endl;
os << indent << "PixeType: " << Self::GetPixelTypeAsString(m_PixelType) << std::endl;
os << indent << "ComponentType: " << Self::GetComponentTypeAsString(m_ComponentType) << std::endl;
os << indent << "Dimensions: " << m_Dimensions << std::endl;
os << indent << "Origin: " << m_Origin << std::endl;
os << indent << "Spacing: " << m_Spacing << std::endl;
Expand Down
4 changes: 2 additions & 2 deletions Modules/IO/MRC/src/itkMRCImageIO.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,8 @@ MRCImageIO::UpdateHeaderFromImageIO()
if (header.mode == -1)
{
itkExceptionMacro("Unsupported pixel type: "
<< this->GetPixelTypeAsString(this->GetPixelType()) << ' '
<< this->GetComponentTypeAsString(this->GetComponentType()) << std::endl
<< ImageIOBase::GetPixelTypeAsString(this->GetPixelType()) << ' '
<< ImageIOBase::GetComponentTypeAsString(this->GetComponentType()) << std::endl
<< "Supported pixel types include unsigned byte, unsigned short, short, float, rgb "
"unsigned char, float complex");
}
Expand Down
72 changes: 40 additions & 32 deletions Modules/IO/MeshBase/include/itkMeshFileReader.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,8 @@ MeshFileReader<TOutputMesh, ConvertPointPixelTraits, ConvertCellPixelTraits>::Re
// the point pixel types don't match a type conversion needs to be
// performed
itkDebugMacro("Buffer conversion required from: "
<< m_MeshIO->GetComponentTypeAsString(m_MeshIO->GetPointPixelComponentType()) << " to: "
<< m_MeshIO->GetComponentTypeAsString(
<< MeshIOBase::GetComponentTypeAsString(m_MeshIO->GetPointPixelComponentType()) << " to: "
<< MeshIOBase::GetComponentTypeAsString(
MeshIOBase::MapComponentType<typename ConvertPointPixelTraits::ComponentType>::CType)
<< "ConvertPointPixelTraits::NumberOfComponents " << ConvertPointPixelTraits::GetNumberOfComponents()
<< " m_MeshIO->NumberOfComponents " << m_MeshIO->GetNumberOfPointPixelComponents());
Expand Down Expand Up @@ -397,8 +397,8 @@ MeshFileReader<TOutputMesh, ConvertPointPixelTraits, ConvertCellPixelTraits>::Re
// the cell pixel types don't match a type conversion needs to be
// performed
itkDebugMacro("Buffer conversion required from: "
<< m_MeshIO->GetComponentTypeAsString(m_MeshIO->GetCellPixelComponentType()) << " to: "
<< m_MeshIO->GetComponentTypeAsString(
<< MeshIOBase::GetComponentTypeAsString(m_MeshIO->GetCellPixelComponentType()) << " to: "
<< MeshIOBase::GetComponentTypeAsString(
MeshIOBase::MapComponentType<typename ConvertCellPixelTraits::ComponentType>::CType)
<< "ConvertCellPixelTraits::NumberOfComponents " << ConvertCellPixelTraits::GetNumberOfComponents()
<< " m_MeshIO->NumberOfComponents " << m_MeshIO->GetNumberOfCellPixelComponents());
Expand Down Expand Up @@ -722,23 +722,27 @@ MeshFileReader<TOutputMesh, ConvertPointPixelTraits, ConvertCellPixelTraits>::Co
MeshFileReaderException e(__FILE__, __LINE__);
std::ostringstream msg;
msg << "Couldn't convert component type: " << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(m_MeshIO->GetPointPixelComponentType()) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(m_MeshIO->GetPointPixelComponentType()) << std::endl
<< "to one of: " << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned char>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<char>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned short>::CType)
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned char>::CType)
<< std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<short>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned int>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<int>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned long>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<long>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned long long>::CType)
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<char>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned short>::CType)
<< std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<long long>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<float>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<double>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<long double>::CType) << std::endl;
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<short>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned int>::CType)
<< std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<int>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned long>::CType)
<< std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<long>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned long long>::CType)
<< std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<long long>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<float>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<double>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<long double>::CType)
<< std::endl;
e.SetDescription(msg.str().c_str());
e.SetLocation(ITK_LOCATION);
throw e;
Expand Down Expand Up @@ -793,23 +797,27 @@ MeshFileReader<TOutputMesh, ConvertPointPixelTraits, ConvertCellPixelTraits>::Co
MeshFileReaderException e(__FILE__, __LINE__);
std::ostringstream msg;
msg << "Couldn't convert component type: " << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(m_MeshIO->GetCellPixelComponentType()) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(m_MeshIO->GetCellPixelComponentType()) << std::endl
<< "to one of: " << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned char>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<char>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned short>::CType)
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned char>::CType)
<< std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<char>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned short>::CType)
<< std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<short>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned int>::CType)
<< std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<int>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned long>::CType)
<< std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<short>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned int>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<int>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned long>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<long>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned long long>::CType)
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<long>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<unsigned long long>::CType)
<< std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<long long>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<float>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<double>::CType) << std::endl
<< " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType<long double>::CType) << std::endl;
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<long long>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<float>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<double>::CType) << std::endl
<< " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType<long double>::CType)
<< std::endl;
e.SetDescription(msg.str().c_str());
e.SetLocation(ITK_LOCATION);
throw e;
Expand Down
4 changes: 2 additions & 2 deletions Modules/IO/MeshBase/include/itkMeshIOBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -479,11 +479,11 @@ class ITKIOMeshBase_EXPORT MeshIOBase : public LightProcessObject

/** Convenience method returns the IOComponentEnum as a string. This can be
* used for writing output files. */
std::string GetComponentTypeAsString(IOComponentEnum) const;
static std::string GetComponentTypeAsString(IOComponentEnum);

/** Convenience method returns the IOPixelEnum as a string. This can be
* used for writing output files. */
std::string GetPixelTypeAsString(IOPixelEnum) const;
static std::string GetPixelTypeAsString(IOPixelEnum);

/** These methods control whether the file is written binary or ASCII.
* Many file formats (i.e., subclasses) ignore this flag. */
Expand Down
8 changes: 4 additions & 4 deletions Modules/IO/MeshBase/src/itkMeshIOBase.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ MeshIOBase::GetByteOrderAsString(IOByteOrderEnum t) const
}

std::string
MeshIOBase::GetComponentTypeAsString(IOComponentEnum t) const
MeshIOBase::GetComponentTypeAsString(IOComponentEnum t)
{
switch (t)
{
Expand Down Expand Up @@ -160,11 +160,11 @@ MeshIOBase::GetComponentTypeAsString(IOComponentEnum t) const
default:
break;
}
itkExceptionMacro("Unknown component type: " << static_cast<char>(t));
itkGenericExceptionMacro("Unknown component type: " << static_cast<char>(t));
}

std::string
MeshIOBase::GetPixelTypeAsString(IOPixelEnum t) const
MeshIOBase::GetPixelTypeAsString(IOPixelEnum t)
{
switch (t)
{
Expand Down Expand Up @@ -203,7 +203,7 @@ MeshIOBase::GetPixelTypeAsString(IOPixelEnum t) const
default:
break;
}
itkExceptionMacro("Unknown pixel type: " << static_cast<char>(t));
itkGenericExceptionMacro("Unknown pixel type: " << static_cast<char>(t));
}

void
Expand Down
9 changes: 5 additions & 4 deletions Modules/IO/NIFTI/src/itkNiftiImageIO.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,8 @@ NiftiImageIO::Read(void * buffer)
default:
if (this->GetPixelType() == IOPixelEnum::SCALAR)
{
itkExceptionMacro("Datatype: " << this->GetComponentTypeAsString(this->m_ComponentType) << " not supported");
itkExceptionMacro("Datatype: " << ImageIOBase::GetComponentTypeAsString(this->m_ComponentType)
<< " not supported");
}
}
}
Expand All @@ -820,7 +821,7 @@ NiftiImageIO::Read(void * buffer)
ConvertRASToFromLPS_CXYZT(static_cast<double *>(buffer), numElts * numComponents);
break;
default:
itkExceptionMacro("RAS conversion of datatype " << this->GetComponentTypeAsString(this->m_ComponentType)
itkExceptionMacro("RAS conversion of datatype " << ImageIOBase::GetComponentTypeAsString(this->m_ComponentType)
<< " is not supported");
}
}
Expand Down Expand Up @@ -2492,8 +2493,8 @@ NiftiImageIO::Write(const void * buffer)
ConvertRASToFromLPS_XYZTC(reinterpret_cast<double *>(nifti_buf.get()), numComponents * seriesdist);
break;
default:
itkExceptionMacro("RAS conversion of datatype " << this->GetComponentTypeAsString(this->m_ComponentType)
<< " is not supported");
itkExceptionMacro("RAS conversion of datatype "
<< ImageIOBase::GetComponentTypeAsString(this->m_ComponentType) << " is not supported");
}
}

Expand Down
5 changes: 3 additions & 2 deletions Modules/IO/VTK/include/itkVTKImageIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,9 @@ class ITKIOVTK_EXPORT VTKImageIO : public StreamingImageIOBase

private:
void
SetPixelTypeFromString(const std::string & pixelType);
std::string GetComponentTypeAsString(IOComponentEnum);
SetPixelTypeFromString(const std::string & pixelType);

static std::string GetComponentTypeAsString(IOComponentEnum);

/** Return the number of pixels in the IOregion. */
SizeType
Expand Down
6 changes: 3 additions & 3 deletions Modules/IO/VTK/src/itkVTKImageIO.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -686,18 +686,18 @@ VTKImageIO::WriteImageInformation(const void * itkNotUsed(buffer))
// Prefer the VECTORS representation when possible:
else if (this->GetPixelType() == IOPixelEnum::VECTOR && this->GetNumberOfComponents() == 3)
{
file << "VECTORS vectors " << this->GetComponentTypeAsString(m_ComponentType) << '\n';
file << "VECTORS vectors " << Self::GetComponentTypeAsString(m_ComponentType) << '\n';
}
else if (this->GetPixelType() == IOPixelEnum::SYMMETRICSECONDRANKTENSOR)
{
file << "TENSORS tensors " << this->GetComponentTypeAsString(m_ComponentType) << '\n';
file << "TENSORS tensors " << Self::GetComponentTypeAsString(m_ComponentType) << '\n';
}
else
{
// According to VTK documentation number of components should in
// range (1,4):
// todo this should be asserted or checked earlier!
file << "SCALARS scalars " << this->GetComponentTypeAsString(m_ComponentType) << ' '
file << "SCALARS scalars " << Self::GetComponentTypeAsString(m_ComponentType) << ' '
<< this->GetNumberOfComponents() << '\n'
<< "LOOKUP_TABLE default\n";
}
Expand Down
8 changes: 4 additions & 4 deletions Modules/Video/IO/include/itkVideoFileReader.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ VideoFileReader<TOutputVideoStream>::InitializeVideoIO()
// the pixel types don't match so a type conversion needs to be
// performed
itkDebugMacro("Buffer conversion required from: "
<< m_VideoIO->GetComponentTypeAsString(m_VideoIO->GetComponentType())
<< " to: " << m_VideoIO->GetComponentTypeAsString(ioType) << " ConvertPixelTraits::NumComponents "
<< ImageIOBase::GetComponentTypeAsString(m_VideoIO->GetComponentType())
<< " to: " << ImageIOBase::GetComponentTypeAsString(ioType) << " ConvertPixelTraits::NumComponents "
<< ConvertPixelTraits::GetNumberOfComponents() << " m_VideoIO->NumComponents "
<< m_VideoIO->GetNumberOfComponents());
m_PixelConversionNeeded = true;
Expand Down Expand Up @@ -290,12 +290,12 @@ VideoFileReader<TOutputVideoStream>::DoConvertBuffer(const void * inputData, Fra
ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::DOUBLE, double)
else
{
#define TYPENAME_VideoFileReader(x) m_VideoIO->GetComponentTypeAsString(ImageIOBase::MapPixelType<x>::CType)
#define TYPENAME_VideoFileReader(x) ImageIOBase::GetComponentTypeAsString(ImageIOBase::MapPixelType<x>::CType)

ExceptionObject e(__FILE__, __LINE__);
std::ostringstream msg;
msg << "Couldn't convert component type: " << std::endl
<< " " << m_VideoIO->GetComponentTypeAsString(m_VideoIO->GetComponentType()) << std::endl
<< " " << ImageIOBase::GetComponentTypeAsString(m_VideoIO->GetComponentType()) << std::endl
<< "to one of: " << std::endl
<< " " << TYPENAME_VideoFileReader(unsigned char) << std::endl
<< " " << TYPENAME_VideoFileReader(char) << std::endl
Expand Down
Loading