diff --git a/code/core/files.cmake b/code/core/files.cmake index aa6dba0..a10deda 100644 --- a/code/core/files.cmake +++ b/code/core/files.cmake @@ -1,65 +1,57 @@ SET(CPP_FILES rttbAccessorWithGeoInfoBase.cpp rttbDoseIteratorInterface.cpp rttbDVH.cpp rttbDVHCalculator.cpp rttbDVHSet.cpp - rttbDataNotAvailableException.cpp - rttbException.cpp rttbGenericDoseIterator.cpp rttbGenericMaskedDoseIterator.cpp rttbGeometricInfo.cpp - rttbIndexOutOfBoundsException.cpp - rttbInvalidDoseException.cpp - rttbInvalidParameterException.cpp - rttbMappingOutsideOfImageException.cpp rttbMaskedDoseIteratorInterface.cpp rttbMaskVoxel.cpp - rttbNullPointerException.cpp - rttbPaddingException.cpp rttbStructure.cpp rttbStructureSet.cpp rttbStrVectorStructureSetGenerator.cpp rttbUtils.cpp ) SET(H_FILES rttbAccessorInterface.h rttbAccessorWithGeoInfoBase.h rttbBaseType.h rttbDataNotAvailableException.h rttbDoseAccessorInterface.h rttbDoseIteratorInterface.h rttbDoseAccessorGeneratorBase.h rttbDoseAccessorGeneratorInterface.h rttbDVH.h rttbDVHCalculator.h rttbDVHGeneratorInterface.h rttbDVHSet.h rttbException.h rttbExceptionMacros.h rttbGenericDoseIterator.h rttbGenericMaskedDoseIterator.h rttbGeometricInfo.h rttbIndexConversionInterface.h rttbIndexOutOfBoundsException.h rttbInvalidDoseException.h rttbInvalidParameterException.h rttbMappingOutsideOfImageException.h rttbMaskAccessorGeneratorBase.h rttbMaskAccessorGeneratorInterface.h rttbMaskAccessorInterface.h rttbMaskAccessorProcessorBase.h rttbMaskAccessorProcessorInterface.h rttbMaskedDoseIteratorInterface.h rttbMaskVoxel.h rttbMutableDoseAccessorInterface.h rttbMutableMaskAccessorInterface.h rttbNullPointerException.h rttbPaddingException.h rttbStructure.h rttbStructureSet.h rttbStructureSetGeneratorInterface.h rttbStrVectorStructureSetGenerator.h rttbUtils.h ) diff --git a/code/core/rttbDataNotAvailableException.cpp b/code/core/rttbDataNotAvailableException.cpp deleted file mode 100644 index 09b2cca..0000000 --- a/code/core/rttbDataNotAvailableException.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// ----------------------------------------------------------------------- -// RTToolbox - DKFZ radiotherapy quantitative evaluation library -// -// Copyright (c) German Cancer Research Center (DKFZ), -// Software development for Integrated Diagnostics and Therapy (SIDT). -// ALL RIGHTS RESERVED. -// See rttbCopyright.txt or -// http://www.dkfz.de/en/sidt/projects/rttb/copyright.html -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notices for more information. -// -//------------------------------------------------------------------------ -/*! -// @file -// @version $Revision$ (last changed revision) -// @date $Date$ (last change date) -// @author $Author$ (last changed by) -*/ - -#include -#include - -#include "rttbDataNotAvailableException.h" - -namespace rttb -{ - namespace core - { - - const char* DataNotAvailableException::what() const throw() - { - return rttb_what.c_str(); - } - - const char* DataNotAvailableException::GetNameOfClass() const - { - return "DataNotAvailableException"; - } - - }//end namespace core -}//end namespace rttb diff --git a/code/core/rttbDataNotAvailableException.h b/code/core/rttbDataNotAvailableException.h index 942b418..2de51df 100644 --- a/code/core/rttbDataNotAvailableException.h +++ b/code/core/rttbDataNotAvailableException.h @@ -1,60 +1,49 @@ // ----------------------------------------------------------------------- // RTToolbox - DKFZ radiotherapy quantitative evaluation library // // Copyright (c) German Cancer Research Center (DKFZ), // Software development for Integrated Diagnostics and Therapy (SIDT). // ALL RIGHTS RESERVED. // See rttbCopyright.txt or // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html // // This software is distributed WITHOUT ANY WARRANTY; without even // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notices for more information. // //------------------------------------------------------------------------ /*! // @file // @version $Revision$ (last changed revision) // @date $Date$ (last change date) // @author $Author$ (last changed by) */ #ifndef __DATA_NOT_AVAILABLE_EXCEPTION_H #define __DATA_NOT_AVAILABLE_EXCEPTION_H #include -#include #include "rttbException.h" #include "RTTBCoreExports.h" namespace rttb { namespace core { /*! @class DataNotAvailableException @brief This exception will be thrown if the requested data is not available. */ class RTTBCore_EXPORT DataNotAvailableException : public Exception { public: DataNotAvailableException(const std::string& aWhat) : Exception(aWhat) {} - - ~DataNotAvailableException() throw() override = default; - - /*! @brief Get the exception description - */ - const char* what() const throw() override; - - /*! @brief Get the name of the exception class - */ - virtual const char* GetNameOfClass() const; }; } } #endif diff --git a/code/core/rttbException.cpp b/code/core/rttbException.cpp deleted file mode 100644 index f2271cc..0000000 --- a/code/core/rttbException.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// ----------------------------------------------------------------------- -// RTToolbox - DKFZ radiotherapy quantitative evaluation library -// -// Copyright (c) German Cancer Research Center (DKFZ), -// Software development for Integrated Diagnostics and Therapy (SIDT). -// ALL RIGHTS RESERVED. -// See rttbCopyright.txt or -// http://www.dkfz.de/en/sidt/projects/rttb/copyright.html -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notices for more information. -// -//------------------------------------------------------------------------ -/*! -// @file -// @version $Revision$ (last changed revision) -// @date $Date$ (last change date) -// @author $Author$ (last changed by) -*/ - -#include -#include - -#include "rttbException.h" - -namespace rttb -{ - namespace core - { - - const char* Exception::what() const throw() - { - return rttb_what.c_str(); - } - - const char* Exception::GetNameOfClass() const - { - return "Exception"; - } - - }//end namespace core -}//end namespace rttb diff --git a/code/core/rttbException.h b/code/core/rttbException.h index fab03ec..e9728b2 100644 --- a/code/core/rttbException.h +++ b/code/core/rttbException.h @@ -1,63 +1,50 @@ // ----------------------------------------------------------------------- // RTToolbox - DKFZ radiotherapy quantitative evaluation library // // Copyright (c) German Cancer Research Center (DKFZ), // Software development for Integrated Diagnostics and Therapy (SIDT). // ALL RIGHTS RESERVED. // See rttbCopyright.txt or // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html // // This software is distributed WITHOUT ANY WARRANTY; without even // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notices for more information. // //------------------------------------------------------------------------ /*! // @file // @version $Revision$ (last changed revision) // @date $Date$ (last change date) // @author $Author$ (last changed by) */ -#ifndef __EXCEPTION_H -#define __EXCEPTION_H +#ifndef __RTTBEXCEPTION_H +#define __RTTBEXCEPTION_H #include -#include -#include +#include #include "RTTBCoreExports.h" namespace rttb { namespace core { /*! @class Exception @brief Exception interface used by all RTToolbox exceptions. */ - class RTTBCore_EXPORT Exception : public std::exception + class RTTBCore_EXPORT Exception : public std::runtime_error { - protected: - std::string rttb_what; - public: - explicit Exception(const std::string& aWhat) - : rttb_what(aWhat) - {} - ~Exception() throw() override = default; - - /*! @brief Get the exception description - */ - const char* what() const throw() override; - - /*! @brief Get the name of the exception class that was thrown - */ - const char* GetNameOfClass() const; + Exception(const std::string& aWhat) + : runtime_error(aWhat) + {}; }; } } #endif diff --git a/code/core/rttbIndexOutOfBoundsException.cpp b/code/core/rttbIndexOutOfBoundsException.cpp deleted file mode 100644 index d21f802..0000000 --- a/code/core/rttbIndexOutOfBoundsException.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// ----------------------------------------------------------------------- -// RTToolbox - DKFZ radiotherapy quantitative evaluation library -// -// Copyright (c) German Cancer Research Center (DKFZ), -// Software development for Integrated Diagnostics and Therapy (SIDT). -// ALL RIGHTS RESERVED. -// See rttbCopyright.txt or -// http://www.dkfz.de/en/sidt/projects/rttb/copyright.html -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notices for more information. -// -//------------------------------------------------------------------------ -/*! -// @file -// @version $Revision$ (last changed revision) -// @date $Date$ (last change date) -// @author $Author$ (last changed by) -*/ - -#include -#include - -#include "rttbIndexOutOfBoundsException.h" - -namespace rttb -{ - namespace core - { - - const char* IndexOutOfBoundsException::what() const throw() - { - return rttb_what.c_str(); - } - - const char* IndexOutOfBoundsException::GetNameOfClass() const - { - return "IndexOutOfBoundsException"; - } - - }//end namespace core -}//end namespace rttb diff --git a/code/core/rttbIndexOutOfBoundsException.h b/code/core/rttbIndexOutOfBoundsException.h index fe626fe..33dcdf3 100644 --- a/code/core/rttbIndexOutOfBoundsException.h +++ b/code/core/rttbIndexOutOfBoundsException.h @@ -1,58 +1,47 @@ // ----------------------------------------------------------------------- // RTToolbox - DKFZ radiotherapy quantitative evaluation library // // Copyright (c) German Cancer Research Center (DKFZ), // Software development for Integrated Diagnostics and Therapy (SIDT). // ALL RIGHTS RESERVED. // See rttbCopyright.txt or // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html // // This software is distributed WITHOUT ANY WARRANTY; without even // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notices for more information. // //------------------------------------------------------------------------ /*! // @file // @version $Revision$ (last changed revision) // @date $Date$ (last change date) // @author $Author$ (last changed by) */ #ifndef __INDEX_OUT_OF_BOUNDS_EXCEPTION_H #define __INDEX_OUT_OF_BOUNDS_EXCEPTION_H #include -#include #include "rttbException.h" #include "RTTBCoreExports.h" namespace rttb { namespace core { /*! @class IndexOutOfBoundsException @brief This exception will be thrown if any index out of bound. */ class RTTBCore_EXPORT IndexOutOfBoundsException : public Exception { public: IndexOutOfBoundsException(const std::string& aWhat): Exception(aWhat) {} - - ~IndexOutOfBoundsException() throw() override = default; - - /*! @brief Get the exception description - */ - const char* what() const throw() override; - - /*! @brief Get the name of the exception class - */ - virtual const char* GetNameOfClass() const; }; } } #endif diff --git a/code/core/rttbInvalidDoseException.cpp b/code/core/rttbInvalidDoseException.cpp deleted file mode 100644 index de222c7..0000000 --- a/code/core/rttbInvalidDoseException.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// ----------------------------------------------------------------------- -// RTToolbox - DKFZ radiotherapy quantitative evaluation library -// -// Copyright (c) German Cancer Research Center (DKFZ), -// Software development for Integrated Diagnostics and Therapy (SIDT). -// ALL RIGHTS RESERVED. -// See rttbCopyright.txt or -// http://www.dkfz.de/en/sidt/projects/rttb/copyright.html -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notices for more information. -// -//------------------------------------------------------------------------ -/*! -// @file -// @version $Revision$ (last changed revision) -// @date $Date$ (last change date) -// @author $Author$ (last changed by) -*/ - -#include -#include - -#include "rttbInvalidDoseException.h" - -namespace rttb -{ - - namespace core - { - - const char* InvalidDoseException::what() const throw() - { - return rttb_what.c_str(); - } - - const char* InvalidDoseException::GetNameOfClass() const - { - return "InvalidDoseException"; - } - - }//end namespace core -}//end namespace rttb diff --git a/code/core/rttbInvalidDoseException.h b/code/core/rttbInvalidDoseException.h index 0a7d16a..84a9e4a 100644 --- a/code/core/rttbInvalidDoseException.h +++ b/code/core/rttbInvalidDoseException.h @@ -1,59 +1,48 @@ // ----------------------------------------------------------------------- // RTToolbox - DKFZ radiotherapy quantitative evaluation library // // Copyright (c) German Cancer Research Center (DKFZ), // Software development for Integrated Diagnostics and Therapy (SIDT). // ALL RIGHTS RESERVED. // See rttbCopyright.txt or // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html // // This software is distributed WITHOUT ANY WARRANTY; without even // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notices for more information. // //------------------------------------------------------------------------ /*! // @file // @version $Revision$ (last changed revision) // @date $Date$ (last change date) // @author $Author$ (last changed by) */ #ifndef __INVALID_DOSE_EXCEPTION_H #define __INVALID_DOSE_EXCEPTION_H #include -#include #include "rttbException.h" #include "RTTBCoreExports.h" namespace rttb { namespace core { /*! @class InvalidDoseException @brief This exception will be thrown if dose is invalid. */ class RTTBCore_EXPORT InvalidDoseException : public Exception { public: InvalidDoseException(const std::string& aWhat): Exception(aWhat) {} - - ~InvalidDoseException() throw() override = default; - - /*! @brief Get the exception description - */ - const char* what() const throw() override; - - /*! @brief Get the name of the exception class - */ - virtual const char* GetNameOfClass() const; }; } } #endif diff --git a/code/core/rttbInvalidParameterException.cpp b/code/core/rttbInvalidParameterException.cpp deleted file mode 100644 index ab7e762..0000000 --- a/code/core/rttbInvalidParameterException.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// ----------------------------------------------------------------------- -// RTToolbox - DKFZ radiotherapy quantitative evaluation library -// -// Copyright (c) German Cancer Research Center (DKFZ), -// Software development for Integrated Diagnostics and Therapy (SIDT). -// ALL RIGHTS RESERVED. -// See rttbCopyright.txt or -// http://www.dkfz.de/en/sidt/projects/rttb/copyright.html -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notices for more information. -// -//------------------------------------------------------------------------ -/*! -// @file -// @version $Revision$ (last changed revision) -// @date $Date$ (last change date) -// @author $Author$ (last changed by) -*/ - -#include -#include - -#include "rttbInvalidParameterException.h" - -namespace rttb -{ - namespace core - { - - const char* InvalidParameterException::what() const throw() - { - return rttb_what.c_str(); - } - - const char* InvalidParameterException::GetNameOfClass() const - { - return "InvalidParameterException"; - } - - }//end namespace core -}//end namespace rttb diff --git a/code/core/rttbInvalidParameterException.h b/code/core/rttbInvalidParameterException.h index 6e45f92..e3b2aad 100644 --- a/code/core/rttbInvalidParameterException.h +++ b/code/core/rttbInvalidParameterException.h @@ -1,58 +1,47 @@ // ----------------------------------------------------------------------- // RTToolbox - DKFZ radiotherapy quantitative evaluation library // // Copyright (c) German Cancer Research Center (DKFZ), // Software development for Integrated Diagnostics and Therapy (SIDT). // ALL RIGHTS RESERVED. // See rttbCopyright.txt or // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html // // This software is distributed WITHOUT ANY WARRANTY; without even // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notices for more information. // //------------------------------------------------------------------------ /*! // @file // @version $Revision$ (last changed revision) // @date $Date$ (last change date) // @author $Author$ (last changed by) */ #ifndef __INVALID_PARAMETER_EXCEPTION_H #define __INVALID_PARAMETER_EXCEPTION_H #include -#include #include "rttbException.h" #include "RTTBCoreExports.h" namespace rttb { namespace core { /*! @class InvalidParameterException @brief This exception will be thrown if any parameter is invalid. */ class RTTBCore_EXPORT InvalidParameterException : public Exception { public: InvalidParameterException(const std::string& aWhat): Exception(aWhat) {} - - ~InvalidParameterException() throw() override = default; - - /*! @brief Get the exception description - */ - const char* what() const throw() override; - - /*! @brief Get the name of the exception class - */ - virtual const char* GetNameOfClass() const; }; } } #endif diff --git a/code/core/rttbMappingOutsideOfImageException.cpp b/code/core/rttbMappingOutsideOfImageException.cpp deleted file mode 100644 index bddaaa8..0000000 --- a/code/core/rttbMappingOutsideOfImageException.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// ----------------------------------------------------------------------- -// RTToolbox - DKFZ radiotherapy quantitative evaluation library -// -// Copyright (c) German Cancer Research Center (DKFZ), -// Software development for Integrated Diagnostics and Therapy (SIDT). -// ALL RIGHTS RESERVED. -// See rttbCopyright.txt or -// http://www.dkfz.de/en/sidt/projects/rttb/copyright.html -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notices for more information. -// -//------------------------------------------------------------------------ -/*! -// @file -// @version $Revision$ (last changed revision) -// @date $Date$ (last change date) -// @author $Author$ (last changed by) -*/ - -#include -#include - -#include "rttbMappingOutsideOfImageException.h" - -namespace rttb -{ - namespace core - { - - const char* MappingOutsideOfImageException::what() const throw() - { - return rttb_what.c_str(); - } - - const char* MappingOutsideOfImageException::GetNameOfClass() const - { - return "MappingOutsideOfImageException"; - } - - }//end namespace core -}//end namespace rttb diff --git a/code/core/rttbMappingOutsideOfImageException.h b/code/core/rttbMappingOutsideOfImageException.h index 5a52c6b..e5d0b8a 100644 --- a/code/core/rttbMappingOutsideOfImageException.h +++ b/code/core/rttbMappingOutsideOfImageException.h @@ -1,60 +1,49 @@ // ----------------------------------------------------------------------- // RTToolbox - DKFZ radiotherapy quantitative evaluation library // // Copyright (c) German Cancer Research Center (DKFZ), // Software development for Integrated Diagnostics and Therapy (SIDT). // ALL RIGHTS RESERVED. // See rttbCopyright.txt or // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html // // This software is distributed WITHOUT ANY WARRANTY; without even // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notices for more information. // //------------------------------------------------------------------------ /*! // @file // @version $Revision$ (last changed revision) // @date $Date$ (last change date) // @author $Author$ (last changed by) */ #ifndef __MAPPING_OUTSIDE_OF_IMAGE_EXCEPTION_H #define __MAPPING_OUTSIDE_OF_IMAGE_EXCEPTION_H #include -#include #include "rttbException.h" #include "RTTBCoreExports.h" namespace rttb { namespace core { /*! @class MappingOutsideOfImageException @brief This exception will be thrown if a transformation leads to an invalid position outside of the image. */ class RTTBCore_EXPORT MappingOutsideOfImageException : public Exception { public: MappingOutsideOfImageException(const std::string& aWhat): Exception(aWhat) {} - - ~MappingOutsideOfImageException() throw() override = default; - - /*! @brief Get the exception description - */ - const char* what() const throw() override; - - /*! @brief Get the name of the exception class - */ - virtual const char* GetNameOfClass() const; }; } } #endif diff --git a/code/core/rttbNullPointerException.cpp b/code/core/rttbNullPointerException.cpp deleted file mode 100644 index 5af4c2d..0000000 --- a/code/core/rttbNullPointerException.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// ----------------------------------------------------------------------- -// RTToolbox - DKFZ radiotherapy quantitative evaluation library -// -// Copyright (c) German Cancer Research Center (DKFZ), -// Software development for Integrated Diagnostics and Therapy (SIDT). -// ALL RIGHTS RESERVED. -// See rttbCopyright.txt or -// http://www.dkfz.de/en/sidt/projects/rttb/copyright.html -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notices for more information. -// -//------------------------------------------------------------------------ -/*! -// @file -// @version $Revision$ (last changed revision) -// @date $Date$ (last change date) -// @author $Author$ (last changed by) -*/ - -#include -#include - -#include "rttbNullPointerException.h" - -namespace rttb -{ - namespace core - { - - const char* NullPointerException::what() const throw() - { - return rttb_what.c_str(); - } - - const char* NullPointerException::GetNameOfClass() const - { - return "NullPointerException"; - } - - }//end namespace core -}//end namespace rttb diff --git a/code/core/rttbNullPointerException.h b/code/core/rttbNullPointerException.h index 0454383..3de5e2f 100644 --- a/code/core/rttbNullPointerException.h +++ b/code/core/rttbNullPointerException.h @@ -1,60 +1,47 @@ // ----------------------------------------------------------------------- // RTToolbox - DKFZ radiotherapy quantitative evaluation library // // Copyright (c) German Cancer Research Center (DKFZ), // Software development for Integrated Diagnostics and Therapy (SIDT). // ALL RIGHTS RESERVED. // See rttbCopyright.txt or // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html // // This software is distributed WITHOUT ANY WARRANTY; without even // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notices for more information. // //------------------------------------------------------------------------ /*! // @file // @version $Revision$ (last changed revision) // @date $Date$ (last change date) // @author $Author$ (last changed by) */ #ifndef __NULL_POINTER_EXCEPTION_H #define __NULL_POINTER_EXCEPTION_H #include -#include - #include "rttbException.h" #include "RTTBCoreExports.h" namespace rttb { namespace core { /*! @class NullPointerException @brief This exception will be thrown if any pointer is nullptr. */ - class RTTBCore_EXPORT NullPointerException : public Exception - { + class RTTBCore_EXPORT NullPointerException : public Exception { public: NullPointerException(const std::string& aWhat): Exception(aWhat) {} - - ~NullPointerException() throw() override = default; - - /*! @brief Get the exception description - */ - const char* what() const throw() override; - - /*! @brief Get the name of the exception class - */ - virtual const char* GetNameOfClass() const; }; } } #endif diff --git a/code/core/rttbPaddingException.cpp b/code/core/rttbPaddingException.cpp deleted file mode 100644 index 0d3e883..0000000 --- a/code/core/rttbPaddingException.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// ----------------------------------------------------------------------- -// RTToolbox - DKFZ radiotherapy quantitative evaluation library -// -// Copyright (c) German Cancer Research Center (DKFZ), -// Software development for Integrated Diagnostics and Therapy (SIDT). -// ALL RIGHTS RESERVED. -// See rttbCopyright.txt or -// http://www.dkfz.de/en/sidt/projects/rttb/copyright.html -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notices for more information. -// -//------------------------------------------------------------------------ -/*! -// @file -// @version $Revision$ (last changed revision) -// @date $Date$ (last change date) -// @author $Author$ (last changed by) -*/ - -#include -#include - -#include "rttbPaddingException.h" - -namespace rttb -{ - namespace core - { - - const char* PaddingException::what() const throw() - { - return rttb_what.c_str(); - } - - const char* PaddingException::GetNameOfClass() const - { - return "PaddingException"; - } - - }//end namespace core -}//end namespace rttb diff --git a/code/core/rttbPaddingException.h b/code/core/rttbPaddingException.h index e7d4a05..0d76de0 100644 --- a/code/core/rttbPaddingException.h +++ b/code/core/rttbPaddingException.h @@ -1,58 +1,47 @@ // ----------------------------------------------------------------------- // RTToolbox - DKFZ radiotherapy quantitative evaluation library // // Copyright (c) German Cancer Research Center (DKFZ), // Software development for Integrated Diagnostics and Therapy (SIDT). // ALL RIGHTS RESERVED. // See rttbCopyright.txt or // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html // // This software is distributed WITHOUT ANY WARRANTY; without even // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notices for more information. // //------------------------------------------------------------------------ /*! // @file // @version $Revision$ (last changed revision) // @date $Date$ (last change date) // @author $Author$ (last changed by) */ #ifndef __PADDING_EXCEPTION_H #define __PADDING_EXCEPTION_H #include -#include #include "rttbException.h" namespace rttb { namespace core { /*! @class PaddingException @brief This exception will be thrown if it can't be guaranteed that a transformation covers only a part of the target space. */ class PaddingException: public Exception { public: PaddingException(const std::string& aWhat): Exception(aWhat) {} - - ~PaddingException() throw() override = default; - - /*! @brief Get the exception description - */ - const char* what() const throw() override; - - /*! @brief Get the name of the exception class - */ - virtual const char* GetNameOfClass() const; }; } } #endif diff --git a/code/io/dicom/files.cmake b/code/io/dicom/files.cmake index 587b85f..0af7e8c 100644 --- a/code/io/dicom/files.cmake +++ b/code/io/dicom/files.cmake @@ -1,23 +1,22 @@ SET(CPP_FILES - rttbDcmrtException.cpp rttbDicomDoseAccessor.cpp rttbDicomFileDoseAccessorGenerator.cpp rttbDicomFileDoseAccessorWriter.cpp rttbDicomFileReaderHelper.cpp rttbDicomFileStructureSetGenerator.cpp rttbDicomIODDoseAccessorGenerator.cpp rttbDicomIODStructureSetGenerator.cpp rttbDVHDicomFileReader.cpp ) SET(H_FILES rttbDcmrtException.h rttbDicomDoseAccessor.h rttbDicomFileDoseAccessorGenerator.h rttbDicomFileDoseAccessorWriter.h rttbDicomFileReaderHelper.h rttbDicomFileStructureSetGenerator.h rttbDicomIODDoseAccessorGenerator.h rttbDicomIODStructureSetGenerator.h rttbDVHDicomFileReader.h ) diff --git a/code/io/dicom/rttbDcmrtException.cpp b/code/io/dicom/rttbDcmrtException.cpp deleted file mode 100644 index 45d315f..0000000 --- a/code/io/dicom/rttbDcmrtException.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// ----------------------------------------------------------------------- -// RTToolbox - DKFZ radiotherapy quantitative evaluation library -// -// Copyright (c) German Cancer Research Center (DKFZ), -// Software development for Integrated Diagnostics and Therapy (SIDT). -// ALL RIGHTS RESERVED. -// See rttbCopyright.txt or -// http://www.dkfz.de/en/sidt/projects/rttb/copyright.html -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notices for more information. -// -//------------------------------------------------------------------------ -/*! -// @file -// @version $Revision$ (last changed revision) -// @date $Date$ (last change date) -// @author $Author$ (last changed by) -*/ - -#include - -#include "rttbDcmrtException.h" - -namespace rttb -{ - namespace io - { - namespace dicom - { - const char* DcmrtException::what() const throw() - { - return rttb_what.c_str(); - } - - const char* DcmrtException::GetNameOfClass() const - { - return "DcmrtException"; - } - } - - }//end namespace io -}//end namespace rttb diff --git a/code/io/dicom/rttbDcmrtException.h b/code/io/dicom/rttbDcmrtException.h index 5d90748..1707420 100644 --- a/code/io/dicom/rttbDcmrtException.h +++ b/code/io/dicom/rttbDcmrtException.h @@ -1,60 +1,49 @@ // ----------------------------------------------------------------------- // RTToolbox - DKFZ radiotherapy quantitative evaluation library // // Copyright (c) German Cancer Research Center (DKFZ), // Software development for Integrated Diagnostics and Therapy (SIDT). // ALL RIGHTS RESERVED. // See rttbCopyright.txt or // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html // // This software is distributed WITHOUT ANY WARRANTY; without even // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notices for more information. // //------------------------------------------------------------------------ /*! // @file // @version $Revision$ (last changed revision) // @date $Date$ (last change date) // @author $Author$ (last changed by) */ #ifndef __DCMRT_EXCEPTION_H #define __DCMRT_EXCEPTION_H #include -#include #include "rttbException.h" namespace rttb { namespace io { namespace dicom { /*! @class DcmrtException @brief This class represents a DcmrtException. Any dcmrt error will throw this exception. */ class DcmrtException: public core::Exception { public: DcmrtException(const std::string& aWhat): Exception(aWhat) {} - - ~DcmrtException() throw() override = default; - - /*! @brief Get the exception description - */ - const char* what() const throw() override; - - /*! @brief Get the name of the class that was thrown - */ - const char* GetNameOfClass() const; }; } } } #endif diff --git a/code/io/itk/files.cmake b/code/io/itk/files.cmake index ff05187..56e4ece 100644 --- a/code/io/itk/files.cmake +++ b/code/io/itk/files.cmake @@ -1,41 +1,40 @@ SET(CPP_FILES rttbFileDispatch.cpp rttbGenericImageReader.cpp rttbImageWriter.cpp - rttbITKException.cpp rttbITKImageAccessor.cpp rttbITKImageAccessorConverter.cpp rttbITKImageAccessorGenerator.cpp rttbITKImageFileAccessorGenerator.cpp rttbITKImageFileMaskAccessorGenerator.cpp rttbITKImageMaskAccessor.cpp rttbITKImageMaskAccessorGenerator.cpp rttbITKImageMaskAccessorConverter.cpp rttbITKIOHelper.cpp itkDoseAccessorImageFilter.cpp itkMaskAccessorImageSource.cpp ) SET(H_FILES rttbDoseAccessorConversionSettingInterface.h rttbDoseAccessorProcessorBase.h rttbDoseAccessorProcessorInterface.h rttbFileDispatch.h rttbGenericImageReader.h rttbImageReader.h rttbImageReader.tpp rttbImageWriter.h rttbITKException.h rttbITKImageAccessor.h rttbITKImageAccessorConverter.h rttbITKImageAccessorGenerator.h rttbITKImageFileAccessorGenerator.h rttbITKImageFileMaskAccessorGenerator.h rttbITKImageMaskAccessor.h rttbITKImageMaskAccessorConverter.h rttbITKImageMaskAccessorGenerator.h rttbITKIOHelper.h rttbITKIOHelper.tpp itkDoseAccessorImageFilter.h itkMaskAccessorImageSource.h ) diff --git a/code/io/itk/rttbITKException.cpp b/code/io/itk/rttbITKException.cpp deleted file mode 100644 index 4335913..0000000 --- a/code/io/itk/rttbITKException.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// ----------------------------------------------------------------------- -// RTToolbox - DKFZ radiotherapy quantitative evaluation library -// -// Copyright (c) German Cancer Research Center (DKFZ), -// Software development for Integrated Diagnostics and Therapy (SIDT). -// ALL RIGHTS RESERVED. -// See rttbCopyright.txt or -// http://www.dkfz.de/en/sidt/projects/rttb/copyright.html -// -// This software is distributed WITHOUT ANY WARRANTY; without even -// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -// PURPOSE. See the above copyright notices for more information. -// -//------------------------------------------------------------------------ -/*! -// @file -// @version $Revision$ (last changed revision) -// @date $Date$ (last change date) -// @author $Author$ (last changed by) -*/ - -#include - -#include "rttbITKException.h" - -namespace rttb -{ - namespace io - { - namespace itk - { - const char* ITKException::what() const throw() - { - return rttb_what.c_str(); - } - - const char* ITKException::GetNameOfClass() const - { - return "ITKException"; - } - } - - }//end namespace io -}//end namespace rttb diff --git a/code/io/itk/rttbITKException.h b/code/io/itk/rttbITKException.h index b823957..0cfb43b 100644 --- a/code/io/itk/rttbITKException.h +++ b/code/io/itk/rttbITKException.h @@ -1,60 +1,49 @@ // ----------------------------------------------------------------------- // RTToolbox - DKFZ radiotherapy quantitative evaluation library // // Copyright (c) German Cancer Research Center (DKFZ), // Software development for Integrated Diagnostics and Therapy (SIDT). // ALL RIGHTS RESERVED. // See rttbCopyright.txt or // http://www.dkfz.de/en/sidt/projects/rttb/copyright.html // // This software is distributed WITHOUT ANY WARRANTY; without even // the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR // PURPOSE. See the above copyright notices for more information. // //------------------------------------------------------------------------ /*! // @file // @version $Revision$ (last changed revision) // @date $Date$ (last change date) // @author $Author$ (last changed by) */ #ifndef __ITK_EXCEPTION_H #define __ITK_EXCEPTION_H #include -#include #include "rttbException.h" namespace rttb { namespace io { namespace itk { /*! @class ITKException @brief This class represents a ITKException. Any itk error will throw this exception. */ class ITKException: public core::Exception { public: ITKException(const std::string& aWhat): Exception(aWhat) {} - - ~ITKException() throw() override = default; - - /*! @brief Get the exception description - */ - const char* what() const throw() override; - - /*! @brief Get the name of the class that was thrown - */ - const char* GetNameOfClass() const; }; } } } #endif