diff --git a/Modules/IO/Bruker/src/itkBruker2dseqImageIO.cxx b/Modules/IO/Bruker/src/itkBruker2dseqImageIO.cxx index 44eb510658e..6d5e4456b6e 100644 --- a/Modules/IO/Bruker/src/itkBruker2dseqImageIO.cxx +++ b/Modules/IO/Bruker/src/itkBruker2dseqImageIO.cxx @@ -582,7 +582,7 @@ Bruker2dseqImageIO::Read(void * buffer) Rescale(static_cast(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)); } // @@ -641,7 +641,7 @@ Bruker2dseqImageIO::Read(void * buffer) SwapSlicesAndVolumes(static_cast(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)); } } } @@ -686,7 +686,7 @@ Bruker2dseqImageIO::Read(void * buffer) ReverseSliceOrder(static_cast(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)); } } } diff --git a/Modules/IO/ImageBase/include/itkImageFileReader.hxx b/Modules/IO/ImageBase/include/itkImageFileReader.hxx index 957cb6b7ae8..499d6bd3266 100644 --- a/Modules/IO/ImageBase/include/itkImageFileReader.hxx +++ b/Modules/IO/ImageBase/include/itkImageFileReader.hxx @@ -399,8 +399,8 @@ ImageFileReader::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()); @@ -496,12 +496,12 @@ ImageFileReader::DoConvertBuffer(const void * ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::DOUBLE, double) else { -#define TYPENAME(x) m_ImageIO->GetComponentTypeAsString(ImageIOBase::MapPixelType::CType) +#define TYPENAME(x) ImageIOBase::GetComponentTypeAsString(ImageIOBase::MapPixelType::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 diff --git a/Modules/IO/ImageBase/src/itkImageIOBase.cxx b/Modules/IO/ImageBase/src/itkImageIOBase.cxx index 30b57082ca6..d29702b91e1 100644 --- a/Modules/IO/ImageBase/src/itkImageIOBase.cxx +++ b/Modules/IO/ImageBase/src/itkImageIOBase.cxx @@ -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; diff --git a/Modules/IO/MRC/src/itkMRCImageIO.cxx b/Modules/IO/MRC/src/itkMRCImageIO.cxx index 339bc31f7e7..1b492b8e944 100644 --- a/Modules/IO/MRC/src/itkMRCImageIO.cxx +++ b/Modules/IO/MRC/src/itkMRCImageIO.cxx @@ -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"); } diff --git a/Modules/IO/MeshBase/include/itkMeshFileReader.hxx b/Modules/IO/MeshBase/include/itkMeshFileReader.hxx index 3ba8b9bcba4..5aaef5836cc 100644 --- a/Modules/IO/MeshBase/include/itkMeshFileReader.hxx +++ b/Modules/IO/MeshBase/include/itkMeshFileReader.hxx @@ -356,8 +356,8 @@ MeshFileReader::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::CType) << "ConvertPointPixelTraits::NumberOfComponents " << ConvertPointPixelTraits::GetNumberOfComponents() << " m_MeshIO->NumberOfComponents " << m_MeshIO->GetNumberOfPointPixelComponents()); @@ -397,8 +397,8 @@ MeshFileReader::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::CType) << "ConvertCellPixelTraits::NumberOfComponents " << ConvertCellPixelTraits::GetNumberOfComponents() << " m_MeshIO->NumberOfComponents " << m_MeshIO->GetNumberOfCellPixelComponents()); @@ -722,23 +722,27 @@ MeshFileReader::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::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl; + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << std::endl; e.SetDescription(msg.str().c_str()); e.SetLocation(ITK_LOCATION); throw e; @@ -793,23 +797,27 @@ MeshFileReader::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::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl - << " " << m_MeshIO->GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl; + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) << std::endl + << " " << MeshIOBase::GetComponentTypeAsString(MeshIOBase::MapComponentType::CType) + << std::endl; e.SetDescription(msg.str().c_str()); e.SetLocation(ITK_LOCATION); throw e; diff --git a/Modules/IO/MeshBase/include/itkMeshIOBase.h b/Modules/IO/MeshBase/include/itkMeshIOBase.h index 12fced90e49..aafd77fd4ce 100644 --- a/Modules/IO/MeshBase/include/itkMeshIOBase.h +++ b/Modules/IO/MeshBase/include/itkMeshIOBase.h @@ -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. */ diff --git a/Modules/IO/MeshBase/src/itkMeshIOBase.cxx b/Modules/IO/MeshBase/src/itkMeshIOBase.cxx index 4f20c3a70f3..c585802c0e4 100644 --- a/Modules/IO/MeshBase/src/itkMeshIOBase.cxx +++ b/Modules/IO/MeshBase/src/itkMeshIOBase.cxx @@ -125,7 +125,7 @@ MeshIOBase::GetByteOrderAsString(IOByteOrderEnum t) const } std::string -MeshIOBase::GetComponentTypeAsString(IOComponentEnum t) const +MeshIOBase::GetComponentTypeAsString(IOComponentEnum t) { switch (t) { @@ -160,11 +160,11 @@ MeshIOBase::GetComponentTypeAsString(IOComponentEnum t) const default: break; } - itkExceptionMacro("Unknown component type: " << static_cast(t)); + itkGenericExceptionMacro("Unknown component type: " << static_cast(t)); } std::string -MeshIOBase::GetPixelTypeAsString(IOPixelEnum t) const +MeshIOBase::GetPixelTypeAsString(IOPixelEnum t) { switch (t) { @@ -203,7 +203,7 @@ MeshIOBase::GetPixelTypeAsString(IOPixelEnum t) const default: break; } - itkExceptionMacro("Unknown pixel type: " << static_cast(t)); + itkGenericExceptionMacro("Unknown pixel type: " << static_cast(t)); } void diff --git a/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx b/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx index 3e30e492826..550d63bb2fe 100644 --- a/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx +++ b/Modules/IO/NIFTI/src/itkNiftiImageIO.cxx @@ -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"); } } } @@ -820,7 +821,7 @@ NiftiImageIO::Read(void * buffer) ConvertRASToFromLPS_CXYZT(static_cast(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"); } } @@ -2492,8 +2493,8 @@ NiftiImageIO::Write(const void * buffer) ConvertRASToFromLPS_XYZTC(reinterpret_cast(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"); } } diff --git a/Modules/IO/VTK/include/itkVTKImageIO.h b/Modules/IO/VTK/include/itkVTKImageIO.h index 2c65dca74f0..7e1f3caeb55 100644 --- a/Modules/IO/VTK/include/itkVTKImageIO.h +++ b/Modules/IO/VTK/include/itkVTKImageIO.h @@ -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 diff --git a/Modules/IO/VTK/src/itkVTKImageIO.cxx b/Modules/IO/VTK/src/itkVTKImageIO.cxx index 824612ec3a5..81c43a67ebb 100644 --- a/Modules/IO/VTK/src/itkVTKImageIO.cxx +++ b/Modules/IO/VTK/src/itkVTKImageIO.cxx @@ -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"; } diff --git a/Modules/Video/IO/include/itkVideoFileReader.hxx b/Modules/Video/IO/include/itkVideoFileReader.hxx index a57a7859495..a4fc1821be0 100644 --- a/Modules/Video/IO/include/itkVideoFileReader.hxx +++ b/Modules/Video/IO/include/itkVideoFileReader.hxx @@ -195,8 +195,8 @@ VideoFileReader::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; @@ -290,12 +290,12 @@ VideoFileReader::DoConvertBuffer(const void * inputData, Fra ITK_CONVERT_BUFFER_IF_BLOCK(IOComponentEnum::DOUBLE, double) else { -#define TYPENAME_VideoFileReader(x) m_VideoIO->GetComponentTypeAsString(ImageIOBase::MapPixelType::CType) +#define TYPENAME_VideoFileReader(x) ImageIOBase::GetComponentTypeAsString(ImageIOBase::MapPixelType::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