From a80b23376f4b2508cc475d08645f49751c9b03b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leonardo=20Fl=C3=B3rez-Valencia?= Date: Fri, 10 Feb 2017 17:48:11 -0500 Subject: [PATCH] ... --- .../cpPlugins_ThirdParty_Install_linux.sh | 333 ++++++++++++++++++ .../{qt-4.8.6.patch => qt-4.8.6_MAC.patch} | 0 lib/cpInstances/DataObjects/Image.h | 8 +- lib/cpInstances/DataObjects/Mesh.h | 4 +- .../DataObjects/PolyLineParametricPath.h | 4 +- lib/cpInstances/DataObjects/Simple3DCurve.h | 4 +- lib/cpInstances/DataObjects/Skeleton.h | 4 +- lib/cpPlugins/Config.h.in | 40 ++- lib/cpPlugins/Interface/Loader.h | 3 +- lib/cpPlugins/Pipeline/Object.h | 2 +- lib/cpPlugins/Pipeline/Port.h | 24 +- lib/cpPlugins/Pipeline/ProcessObject.h | 2 +- lib/cpPlugins/Pipeline/Widget.h | 4 +- plugins/GenericPlugins/DataReproducer.h | 4 +- plugins/IO/ImageJSkeletonWriter.h | 2 +- plugins/ITKIO/DicomSeriesReader.h | 2 +- plugins/ITKIO/ImageReader.h | 2 +- plugins/ITKIO/ImageWriter.h | 2 +- .../BSplineInterpolateImageFunction.h | 2 +- .../InterpolateImageFunction.h | 6 +- .../LinearInterpolateImageFunction.h | 2 +- plugins/VTKIO/MeshReader.h | 2 +- plugins/VTKIO/MeshWriter.h | 2 +- plugins/VTKWidgets/LineWidget.h | 6 +- plugins/VTKWidgets/SeedWidget.h | 8 +- plugins/VTKWidgets/SplineWidget.h | 6 +- .../PolyLineParametricPathWriter.h | 2 +- plugins/cpExtensions/SkeletonReader.h | 2 +- plugins/cpExtensions/SkeletonWriter.h | 2 +- 29 files changed, 409 insertions(+), 75 deletions(-) create mode 100755 dependencies/cpPlugins_ThirdParty_Install_linux.sh rename dependencies/{qt-4.8.6.patch => qt-4.8.6_MAC.patch} (100%) diff --git a/dependencies/cpPlugins_ThirdParty_Install_linux.sh b/dependencies/cpPlugins_ThirdParty_Install_linux.sh new file mode 100755 index 0000000..0077ac7 --- /dev/null +++ b/dependencies/cpPlugins_ThirdParty_Install_linux.sh @@ -0,0 +1,333 @@ +#!/bin/bash + +## ==================================== +## == Some base configuration values == +## ==================================== + +cmake_min_version="3.0" +qt_min_version="4.8" +number_of_cores=`grep -c ^processor /proc/cpuinfo` +number_of_threads=`expr $number_of_cores / 2` + +## ================================= +## == Compare two version strings == +## ================================= + +function version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; } + +## ============================== +## == Try to locate base tools == +## ============================== + +gpp_exe=`which g++` +if [ -z "gpp_exe" ]; then + echo "ERROR: \"g++\" program was not found." + echo "ERROR: Please install \"g++\"" +fi + +make_exe=`which make` +if [ -z "$make_exe" ]; then + echo "ERROR: \"make\" program was not found." + echo "ERROR: Please install \"make\"" +fi + +## =============== +## == Verify Qt == +## =============== + +read -p "Do you want to use Qt4.8? [y/N] " -n 1 -r +echo +if [[ $REPLY =~ ^[Yy]$ ]]; then + cont=true + qmake_exe=`which qmake` + while [ $cont == true ]; do + if [ -z "$qmake_exe" ]; then + read -e -p "Please provide a valid location for qmake: " tmp + eval tmp=$tmp + qmake_exe=`readlink -f $tmp` + fi + read -p "I am going to use \"$qmake_exe\" as the entry tool for Qt. Is this ok? [y/N] " -n 1 -r + echo + if [[ $REPLY =~ ^[Nn]$ ]]; then + qmake_exe="" + else + cont=false + fi + done + qt_version=`$qmake_exe -v | grep Using\ Qt\ version | sed 's/Using\ Qt\ version\ //g'` + if version_gt $qt_min_version $qt_version; then + echo "FATAL ERROR: your Qt version is $qt_version, but needed version should be at least $qt_min_version" + fi +fi + +## ================== +## == Verify cmake == +## ================== + +cmake_qt_options="--no-qt-gui" +if [ -x "$qmake_exe" ]; then + cmake_qt_options="--qt-gui --qt-qmake=$qmake_exe" +fi + +cont=true +cmake_exe=`which cmake` +while [ $cont == true ]; do + if [ -z "$cmake_exe" ]; then + read -e -p "Please provide a valid location for cmake: " tmp + eval tmp=$tmp + cmake_exe=`readlink -f $tmp` + fi + read -p "I am going to use \"$cmake_exe\". Is this ok? [y/N] " -n 1 -r + echo + if [[ $REPLY =~ ^[Nn]$ ]]; then + cmake_exe="" + else + cont=false + fi +done +if [ -z $cmake_exe ]; then + echo "FATAL ERROR: cmake is really needed to build cpPlugins." + exit 1 +fi + +cmake_mime=`file -bzk --mime-type $cmake_exe` +if [ "$cmake_mime" != "application/x-executable" ]; then + echo "WARNING: I will try to compile cmake..." + if [[ -f $cmake_exe ]]; then + if [ "$cmake_mime" == "application/x-tar" ]; then + sub_mime=`file -b --mime-type $cmake_exe` + if [ $sub_mime == "application/gzip" ]; then + cmake_source_dir=`dirname $cmake_exe`/`basename $cmake_exe .tar.gz` + cmake_binary_dir=`dirname $cmake_exe`/`basename $cmake_exe .tar.gz`-build + echo -n "==> Extracting cmake sources... " + rm -rf $cmake_source_dir $cmake_binary_dir + mkdir -p $cmake_source_dir $cmake_binary_dir + tar xzf $cmake_exe -C $cmake_source_dir --strip-components=1 + echo "done." + fi + fi + elif [[ -d $cmake_exe ]]; then + cmake_source_dir="$cmake_exe" + cmake_binary_dir="$cmake_exe"-build + else + echo "FATAL ERROR: $cmake_exe is not a valid file/directory" + exit 1 + fi + + read -e -p "==> Please provide instalation location for \"cmake\": " tmp + eval tmp=$tmp + cmake_prefix=`readlink -f $tmp` + + echo "==> Configuring sources... " + cd $cmake_binary_dir + $cmake_source_dir/bootstrap --prefix=$cmake_prefix $cmake_qt_options + echo "==> Configuring sources... done." + + echo "==> Compiling sources..." + cd $cmake_binary_dir + make -j$number_of_threads + echo "==> Compiling sources... done." + + echo "==> Installing package..." + cd $cmake_binary_dir + make -j install + echo "==> Installing package... done." + cmake_exe=$cmake_binary_dir/bin/cmake +fi +cmake_version=`$cmake_exe --version | grep version | sed 's/cmake\ version\ //g'` + +if version_gt $cmake_min_version $cmake_version; then + echo "FATAL ERROR: your cmake version is $cmake_version, but needed version should be at least $cmake_min_version" +fi + +## =============== +## == Build VTK == +## =============== + +cont=true +vtk_sources=`which cmake` +while [ $cont == true ]; do + if [ -z "$vtk_sources" ]; then + read -e -p "Please provide a valid location for VTK: " tmp + eval tmp=$tmp + vtk_sources=`readlink -f $tmp` + fi + read -p "I am going to use \"$vtk_sources\". Is this ok? [y/N] " -n 1 -r + echo + if [[ $REPLY =~ ^[Nn]$ ]]; then + vtk_sources="" + else + cont=false + fi +done +if [ -z $vtk_sources ]; then + echo "FATAL ERROR: VTK is really needed to build cpPlugins." + exit 1 +fi + +echo "Now, I will try to compile VTK..." +vtk_mime=`file -bzk --mime-type $vtk_sources` +if [[ -f $vtk_sources ]]; then + if [ "$vtk_mime" == "application/x-tar" ]; then + sub_mime=`file -b --mime-type $vtk_sources` + if [ $sub_mime == "application/gzip" ]; then + vtk_source_dir=`dirname $vtk_sources`/`basename $vtk_sources .tar.gz` + vtk_binary_dir=`dirname $vtk_sources`/`basename $vtk_sources .tar.gz`-build + echo -n "==> Extracting VTK sources... " + rm -rf $vtk_source_dir $vtk_binary_dir + mkdir -p $vtk_source_dir $vtk_binary_dir + tar xzf $vtk_sources -C $vtk_source_dir --strip-components=1 + echo "done." + fi + fi +elif [[ -d $vtk_sources ]]; then + vtk_source_dir="$vtk_sources" + vtk_binary_dir="$vtk_sources"-build +else + echo "FATAL ERROR: $vtk_sources is not a valid file/directory" + exit 1 +fi + +read -e -p "==> Please provide instalation location for \"VTK\": " tmp +eval tmp=$tmp +vtk_prefix=`readlink -f $tmp` + +vtk_build_type=MinSizeRel + +echo "==> Configuring sources... " +cd $vtk_binary_dir +if [ -x "$qmake_exe" ]; then + $cmake_exe \ + -DCMAKE_CXX_FLAGS:STRING=-std=c++11 \ + -DBUILD_DOCUMENTATION:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ + -DQT_QMAKE_EXECUTABLE:PATH=$qmake_exe \ + -DCMAKE_BUILD_TYPE:STRING=$vtk_build_type \ + -DModule_vtkGUISupportQt:BOOL=ON \ + -DModule_vtkGUISupportQtOpenGL:BOOL=ON \ + -DModule_vtkGUISupportQtSQL:BOOL=OFF \ + -DModule_vtkGUISupportQtWebkit:BOOL=OFF \ + -DCMAKE_INSTALL_PREFIX:PATH=$vtk_prefix \ + $vtk_source_dir +else + $cmake_exe \ + -DCMAKE_CXX_FLAGS:STRING=-std=c++11 \ + -DBUILD_DOCUMENTATION:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ + -DCMAKE_BUILD_TYPE:STRING=$build_type \ + -DCMAKE_INSTALL_PREFIX:PATH=$vtk_prefix \ + $vtk_source_dir +fi +echo "==> Configuring sources... done." + +echo "==> Compiling sources..." +cd $vtk_binary_dir +make -j$number_of_threads +echo "==> Compiling sources... done." + +echo "==> Installing package..." +cd $vtk_binary_dir +make -j install +echo "==> Installing package... done." + +## =============== +## == Build ITK == +## =============== + +cont=true +itk_sources=`which cmake` +while [ $cont == true ]; do + if [ -z "$itk_sources" ]; then + read -e -p "Please provide a valid location for ITK: " tmp + eval tmp=$tmp + itk_sources=`readlink -f $tmp` + fi + read -p "I am going to use \"$itk_sources\". Is this ok? [y/N] " -n 1 -r + echo + if [[ $REPLY =~ ^[Nn]$ ]]; then + itk_sources="" + else + cont=false + fi +done +if [ -z $itk_sources ]; then + echo "FATAL ERROR: ITK is really needed to build cpPlugins." + exit 1 +fi + +echo "Now, I will try to compile ITK..." +itk_mime=`file -bzk --mime-type $itk_sources` +if [[ -f $itk_sources ]]; then + if [ "$itk_mime" == "application/x-tar" ]; then + sub_mime=`file -b --mime-type $itk_sources` + if [ $sub_mime == "application/gzip" ]; then + itk_source_dir=`dirname $itk_sources`/`basename $itk_sources .tar.gz` + itk_binary_dir=`dirname $itk_sources`/`basename $itk_sources .tar.gz`-build + echo -n "==> Extracting ITK sources... " + rm -rf $itk_source_dir $itk_binary_dir + mkdir -p $itk_source_dir $itk_binary_dir + tar xzf $itk_sources -C $itk_source_dir --strip-components=1 + echo "done." + fi + fi +elif [[ -d $itk_sources ]]; then + itk_source_dir="$itk_sources" + itk_binary_dir="$itk_sources"-build +else + echo "FATAL ERROR: $itk_sources is not a valid file/directory" + exit 1 +fi + +read -e -p "==> Please provide instalation location for \"ITK\": " tmp +eval tmp=$tmp +itk_prefix=`readlink -f $tmp` + +itk_build_type=MinSizeRel + +echo "==> Configuring sources... " +cd $itk_binary_dir +if [ -x "$qmake_exe" ]; then + $cmake_exe \ + -DCMAKE_CXX_FLAGS:STRING=-std=c++11 \ + -DBUILD_DOCUMENTATION:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ + -DQT_QMAKE_EXECUTABLE:PATH=$qmake_exe \ + -DCMAKE_BUILD_TYPE:STRING=$itk_build_type \ + -DModule_itkGUISupportQt:BOOL=ON \ + -DModule_itkGUISupportQtOpenGL:BOOL=ON \ + -DModule_itkGUISupportQtSQL:BOOL=OFF \ + -DModule_itkGUISupportQtWebkit:BOOL=OFF \ + -DCMAKE_INSTALL_PREFIX:PATH=$itk_prefix \ + $itk_source_dir +else + $cmake_exe \ + -DCMAKE_CXX_FLAGS:STRING=-std=c++11 \ + -DBUILD_DOCUMENTATION:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DBUILD_TESTING:BOOL=OFF \ + -DCMAKE_BUILD_TYPE:STRING=$build_type \ + -DCMAKE_INSTALL_PREFIX:PATH=$itk_prefix \ + $itk_source_dir +fi +echo "==> Configuring sources... done." + +echo "==> Compiling sources..." +cd $itk_binary_dir +make -j$number_of_threads +echo "==> Compiling sources... done." + +echo "==> Installing package..." +cd $itk_binary_dir +make -j install +echo "==> Installing package... done." + + + +## eof - $RCSfile$ diff --git a/dependencies/qt-4.8.6.patch b/dependencies/qt-4.8.6_MAC.patch similarity index 100% rename from dependencies/qt-4.8.6.patch rename to dependencies/qt-4.8.6_MAC.patch diff --git a/lib/cpInstances/DataObjects/Image.h b/lib/cpInstances/DataObjects/Image.h index a3ee5ef..7a4a387 100644 --- a/lib/cpInstances/DataObjects/Image.h +++ b/lib/cpInstances/DataObjects/Image.h @@ -31,15 +31,15 @@ namespace cpInstances cpPlugins_Compatibility_Macro; public: - virtual void SetITK( itk::LightObject* o ) cpPlugins_OVERRIDE; - virtual void SetVTK( vtkObjectBase* o ) cpPlugins_OVERRIDE; + virtual void SetITK( itk::LightObject* o ) override; + virtual void SetVTK( vtkObjectBase* o ) override; protected: Image( ); virtual ~Image( ); - virtual void _UpdateITK( ) const cpPlugins_OVERRIDE; - virtual void _UpdateVTK( ) const cpPlugins_OVERRIDE; + virtual void _UpdateITK( ) const override; + virtual void _UpdateVTK( ) const override; template< class _TImage > inline void _ITK_2_VTK_0( _TImage* image ) const; diff --git a/lib/cpInstances/DataObjects/Mesh.h b/lib/cpInstances/DataObjects/Mesh.h index fa658ed..f15c1b4 100644 --- a/lib/cpInstances/DataObjects/Mesh.h +++ b/lib/cpInstances/DataObjects/Mesh.h @@ -28,8 +28,8 @@ namespace cpInstances cpPlugins_Compatibility_Macro; public: - virtual void SetITK( itk::LightObject* o ) cpPlugins_OVERRIDE; - virtual void SetVTK( vtkObjectBase* o ) cpPlugins_OVERRIDE; + virtual void SetITK( itk::LightObject* o ) override; + virtual void SetVTK( vtkObjectBase* o ) override; protected: Mesh( ); diff --git a/lib/cpInstances/DataObjects/PolyLineParametricPath.h b/lib/cpInstances/DataObjects/PolyLineParametricPath.h index b563d41..49e30a0 100644 --- a/lib/cpInstances/DataObjects/PolyLineParametricPath.h +++ b/lib/cpInstances/DataObjects/PolyLineParametricPath.h @@ -28,8 +28,8 @@ namespace cpInstances cpPlugins_Compatibility_Macro; public: - virtual void SetITK( itk::LightObject* o ) cpPlugins_OVERRIDE; - virtual void SetVTK( vtkObjectBase* o ) cpPlugins_OVERRIDE; + virtual void SetITK( itk::LightObject* o ) override; + virtual void SetVTK( vtkObjectBase* o ) override; protected: PolyLineParametricPath( ); diff --git a/lib/cpInstances/DataObjects/Simple3DCurve.h b/lib/cpInstances/DataObjects/Simple3DCurve.h index 5ea0047..e1e7ab5 100644 --- a/lib/cpInstances/DataObjects/Simple3DCurve.h +++ b/lib/cpInstances/DataObjects/Simple3DCurve.h @@ -33,13 +33,13 @@ namespace cpInstances cpPlugins_Compatibility_Macro; public: - virtual void SetVTK( vtkObjectBase* o ) cpPlugins_OVERRIDE; + virtual void SetVTK( vtkObjectBase* o ) override; protected: Simple3DCurve( ); virtual ~Simple3DCurve( ); - virtual void _UpdateVTK( ) const cpPlugins_OVERRIDE; + virtual void _UpdateVTK( ) const override; template< class _TCurve > inline void _ITK_2_VTK( _TCurve* curve ) const; diff --git a/lib/cpInstances/DataObjects/Skeleton.h b/lib/cpInstances/DataObjects/Skeleton.h index 16592a6..18d4731 100644 --- a/lib/cpInstances/DataObjects/Skeleton.h +++ b/lib/cpInstances/DataObjects/Skeleton.h @@ -28,8 +28,8 @@ namespace cpInstances cpPlugins_Compatibility_Macro; public: - virtual void SetITK( itk::LightObject* o ) cpPlugins_OVERRIDE; - virtual void SetVTK( vtkObjectBase* o ) cpPlugins_OVERRIDE; + virtual void SetITK( itk::LightObject* o ) override; + virtual void SetVTK( vtkObjectBase* o ) override; protected: Skeleton( ); diff --git a/lib/cpPlugins/Config.h.in b/lib/cpPlugins/Config.h.in index c10ee8d..4e58a1d 100644 --- a/lib/cpPlugins/Config.h.in +++ b/lib/cpPlugins/Config.h.in @@ -70,19 +70,21 @@ * Language related macros * ========================================================================= */ -#if __cplusplus >= 201103L -# define cpPlugins_OVERRIDE override -# define cpPlugins_DELETE_FUNCTION =delete -# define cpPlugins_NULLPTR nullptr -# define cpPlugins_NOEXCEPT noexcept -# define cpPlugins_HAS_CXX11_STATIC_ASSERT -# define cpPlugins_HAS_CXX11_RVREF -#else // __cplusplus >= 201103L -# define cpPlugins_OVERRIDE -# define cpPlugins_DELETE_FUNCTION -# define cpPlugins_NULLPTR NULL -# define cpPlugins_NOEXCEPT throw() -#endif // __cplusplus >= 201103L +/* TODO + #if __cplusplus >= 201103L + # define override override + # define cpPlugins_DELETE_FUNCTION =delete + # define cpPlugins_NULLPTR nullptr + # define cpPlugins_NOEXCEPT noexcept + # define cpPlugins_HAS_CXX11_STATIC_ASSERT + # define cpPlugins_HAS_CXX11_RVREF + #else // __cplusplus >= 201103L + # define override + # define cpPlugins_DELETE_FUNCTION + # define cpPlugins_NULLPTR NULL + # define cpPlugins_NOEXCEPT throw() + #endif // __cplusplus >= 201103L +*/ /* * ========================================================================= @@ -92,9 +94,9 @@ #define cpPlugins_Id_Macro( _class, _category ) \ public: \ - virtual const char* GetClassName( ) const cpPlugins_OVERRIDE \ + virtual const char* GetClassName( ) const override \ { return( #_class ); } \ - virtual const char* GetClassCategory( ) const cpPlugins_OVERRIDE \ + virtual const char* GetClassCategory( ) const override \ { return( #_category ); } #define cpPluginsObject( _cls, _scls, _cat ) \ @@ -107,14 +109,14 @@ itkNewMacro( Self ); \ itkTypeMacro( _cls, _scls ); \ public: \ - virtual const char* GetClassName( ) const cpPlugins_OVERRIDE \ + virtual const char* GetClassName( ) const override \ { return( #_cls ); } \ - virtual const char* GetClassCategory( ) const cpPlugins_OVERRIDE \ + virtual const char* GetClassCategory( ) const override \ { return( #_cat ); } \ protected: \ _cls( ); \ virtual ~_cls( ); \ - virtual void _GenerateData( ) cpPlugins_OVERRIDE; \ + virtual void _GenerateData( ) override; \ private: \ _cls( const Self& ); \ Self& operator=( const Self& ) @@ -122,7 +124,7 @@ #define cpPlugins_Compatibility_Macro \ virtual bool IsCompatible( \ const DataObject* other \ - ) const cpPlugins_OVERRIDE \ + ) const override \ { \ return( dynamic_cast< const Self* >( other ) != NULL ); \ } diff --git a/lib/cpPlugins/Interface/Loader.h b/lib/cpPlugins/Interface/Loader.h index 115196c..84a1819 100644 --- a/lib/cpPlugins/Interface/Loader.h +++ b/lib/cpPlugins/Interface/Loader.h @@ -23,8 +23,7 @@ namespace cpPlugins typedef void ( *TCreatorFunc )( itk::LightObject::Pointer& ptr, const std::string& c, const std::string& f ); typedef std::tuple< void*, TContentsFunc, TCreatorFunc > THandlers; typedef std::map< std::string, THandlers > TLibraries; - typedef std::map< std::string, std::map< std::string, std::string > > - TFiltersToLibrariesReferences; + typedef std::map< std::string, std::map< std::string, std::string > > TFiltersToLibrariesReferences; public: Loader( ); diff --git a/lib/cpPlugins/Pipeline/Object.h b/lib/cpPlugins/Pipeline/Object.h index c920abb..4f2b2bd 100644 --- a/lib/cpPlugins/Pipeline/Object.h +++ b/lib/cpPlugins/Pipeline/Object.h @@ -35,7 +35,7 @@ namespace cpPlugins const float& GetViewY( ) const; void SetViewCoords( float x, float y ); - virtual void Modified( ) const cpPlugins_OVERRIDE; + virtual void Modified( ) const override; virtual void SetITK( itk::LightObject* o ); virtual void SetVTK( vtkObjectBase* o ); diff --git a/lib/cpPlugins/Pipeline/Port.h b/lib/cpPlugins/Pipeline/Port.h index db912ff..98d81e7 100644 --- a/lib/cpPlugins/Pipeline/Port.h +++ b/lib/cpPlugins/Pipeline/Port.h @@ -49,12 +49,12 @@ namespace cpPlugins SingleDataPort( bool required = true ); virtual ~SingleDataPort( ); - virtual void Add( DataObject* o ) cpPlugins_OVERRIDE; - virtual DataObject* Get( unsigned int i = 0 ) cpPlugins_OVERRIDE; - virtual const DataObject* Get( unsigned int i = 0 ) const cpPlugins_OVERRIDE; - virtual unsigned int Size( ) const cpPlugins_OVERRIDE; - virtual bool IsValid( ) const cpPlugins_OVERRIDE; - virtual void Clear( ) cpPlugins_OVERRIDE; + virtual void Add( DataObject* o ) override; + virtual DataObject* Get( unsigned int i = 0 ) override; + virtual const DataObject* Get( unsigned int i = 0 ) const override; + virtual unsigned int Size( ) const override; + virtual bool IsValid( ) const override; + virtual void Clear( ) override; protected: DataObject::Pointer m_Data; @@ -105,12 +105,12 @@ namespace cpPlugins MultipleInputsPort( bool required = true ); virtual ~MultipleInputsPort( ); - virtual void Add( DataObject* o ) cpPlugins_OVERRIDE; - virtual DataObject* Get( unsigned int i = 0 ) cpPlugins_OVERRIDE; - virtual const DataObject* Get( unsigned int i = 0 ) const cpPlugins_OVERRIDE; - virtual unsigned int Size( ) const cpPlugins_OVERRIDE; - virtual bool IsValid( ) const cpPlugins_OVERRIDE; - virtual void Clear( ) cpPlugins_OVERRIDE; + virtual void Add( DataObject* o ) override; + virtual DataObject* Get( unsigned int i = 0 ) override; + virtual const DataObject* Get( unsigned int i = 0 ) const override; + virtual unsigned int Size( ) const override; + virtual bool IsValid( ) const override; + virtual void Clear( ) override; void Delete( unsigned int id ); diff --git a/lib/cpPlugins/Pipeline/ProcessObject.h b/lib/cpPlugins/Pipeline/ProcessObject.h index 77b4a3d..6456097 100644 --- a/lib/cpPlugins/Pipeline/ProcessObject.h +++ b/lib/cpPlugins/Pipeline/ProcessObject.h @@ -104,7 +104,7 @@ namespace cpPlugins void Disconnect( ); // Pipeline execution - virtual void Modified( ) const cpPlugins_OVERRIDE; + virtual void Modified( ) const override; virtual void Update( ); // Qt dialog creation diff --git a/lib/cpPlugins/Pipeline/Widget.h b/lib/cpPlugins/Pipeline/Widget.h index 91ef571..5d35594 100644 --- a/lib/cpPlugins/Pipeline/Widget.h +++ b/lib/cpPlugins/Pipeline/Widget.h @@ -25,8 +25,8 @@ namespace cpPlugins cpPlugins_Id_Macro( Widget, Object ); public: - virtual void AddInteractor( vtkRenderWindowInteractor* i ) cpPlugins_OVERRIDE; - virtual bool IsInteractive( ) cpPlugins_OVERRIDE; + virtual void AddInteractor( vtkRenderWindowInteractor* i ) override; + virtual bool IsInteractive( ) override; virtual void EnabledOn( ); virtual void EnabledOff( ); diff --git a/plugins/GenericPlugins/DataReproducer.h b/plugins/GenericPlugins/DataReproducer.h index 9bfcbc1..e61c453 100644 --- a/plugins/GenericPlugins/DataReproducer.h +++ b/plugins/GenericPlugins/DataReproducer.h @@ -20,10 +20,10 @@ namespace cpPlugins_GenericPlugins public: virtual void AddInput( const std::string& n, cpPlugins::Pipeline::DataObject* o - ) cpPlugins_OVERRIDE; + ) override; virtual void SetInput( const std::string& n, cpPlugins::Pipeline::DataObject* o - ) cpPlugins_OVERRIDE; + ) override; }; } // ecapseman diff --git a/plugins/IO/ImageJSkeletonWriter.h b/plugins/IO/ImageJSkeletonWriter.h index 6adffbf..5c72e5d 100644 --- a/plugins/IO/ImageJSkeletonWriter.h +++ b/plugins/IO/ImageJSkeletonWriter.h @@ -14,7 +14,7 @@ namespace cpPluginsIO cpPluginsObject( ImageJSkeletonWriter, cpPlugins::BaseObjects::ProcessObject, IO ); public: - virtual QDialog* CreateQDialog( ) cpPlugins_OVERRIDE; + virtual QDialog* CreateQDialog( ) override; protected: template< class _TSkeleton > diff --git a/plugins/ITKIO/DicomSeriesReader.h b/plugins/ITKIO/DicomSeriesReader.h index 349fe7a..b1419d3 100644 --- a/plugins/ITKIO/DicomSeriesReader.h +++ b/plugins/ITKIO/DicomSeriesReader.h @@ -13,7 +13,7 @@ namespace cpPluginsITKIO cpPluginsObject( DicomSeriesReader, ImageReader, IO ); public: - virtual QDialog* CreateQDialog( ) cpPlugins_OVERRIDE; + virtual QDialog* CreateQDialog( ) override; }; } // ecapseman diff --git a/plugins/ITKIO/ImageReader.h b/plugins/ITKIO/ImageReader.h index 0e566d6..80b8a02 100644 --- a/plugins/ITKIO/ImageReader.h +++ b/plugins/ITKIO/ImageReader.h @@ -16,7 +16,7 @@ namespace cpPluginsITKIO cpPluginsObject( ImageReader, cpPlugins::Pipeline::ProcessObject, IO ); public: - virtual QDialog* CreateQDialog( ) cpPlugins_OVERRIDE; + virtual QDialog* CreateQDialog( ) override; protected: template< unsigned int _Dim > diff --git a/plugins/ITKIO/ImageWriter.h b/plugins/ITKIO/ImageWriter.h index 1c0a131..4f63885 100644 --- a/plugins/ITKIO/ImageWriter.h +++ b/plugins/ITKIO/ImageWriter.h @@ -14,7 +14,7 @@ namespace cpPluginsITKIO cpPluginsObject( ImageWriter, cpPlugins::Pipeline::ProcessObject, IO ); public: - virtual QDialog* CreateQDialog( ) cpPlugins_OVERRIDE; + virtual QDialog* CreateQDialog( ) override; protected: template< class _TImage > diff --git a/plugins/ITKImageInterpolators/BSplineInterpolateImageFunction.h b/plugins/ITKImageInterpolators/BSplineInterpolateImageFunction.h index bb0ee9f..79ac05e 100644 --- a/plugins/ITKImageInterpolators/BSplineInterpolateImageFunction.h +++ b/plugins/ITKImageInterpolators/BSplineInterpolateImageFunction.h @@ -21,7 +21,7 @@ namespace cpPluginsITKImageInterpolators virtual void CreateInterpolator( itk::LightObject* image, const std::string& precision_type - ) cpPlugins_OVERRIDE; + ) override; protected: template< class _TImage > diff --git a/plugins/ITKImageInterpolators/InterpolateImageFunction.h b/plugins/ITKImageInterpolators/InterpolateImageFunction.h index d3fd440..ebf8f52 100644 --- a/plugins/ITKImageInterpolators/InterpolateImageFunction.h +++ b/plugins/ITKImageInterpolators/InterpolateImageFunction.h @@ -22,8 +22,8 @@ namespace cpPluginsITKImageInterpolators cpPlugins_Id_Macro( InterpolateImageFunction, ImageInterpolators ); public: - virtual void SetITK( itk::LightObject* o ) cpPlugins_OVERRIDE; - virtual void SetVTK( vtkObjectBase* o ) cpPlugins_OVERRIDE; + virtual void SetITK( itk::LightObject* o ) override; + virtual void SetVTK( vtkObjectBase* o ) override; protected: InterpolateImageFunction( ); @@ -36,7 +36,7 @@ namespace cpPluginsITKImageInterpolators ) = 0; protected: - virtual void _GenerateData( ) cpPlugins_OVERRIDE; + virtual void _GenerateData( ) override; private: // Purposely not implemented. diff --git a/plugins/ITKImageInterpolators/LinearInterpolateImageFunction.h b/plugins/ITKImageInterpolators/LinearInterpolateImageFunction.h index a6fa94c..d13d4b7 100644 --- a/plugins/ITKImageInterpolators/LinearInterpolateImageFunction.h +++ b/plugins/ITKImageInterpolators/LinearInterpolateImageFunction.h @@ -21,7 +21,7 @@ namespace cpPluginsITKImageInterpolators virtual void CreateInterpolator( itk::LightObject* image, const std::string& precision_type - ) cpPlugins_OVERRIDE; + ) override; protected: template< class _TImage > diff --git a/plugins/VTKIO/MeshReader.h b/plugins/VTKIO/MeshReader.h index 69f9b8d..e75cb7d 100644 --- a/plugins/VTKIO/MeshReader.h +++ b/plugins/VTKIO/MeshReader.h @@ -14,7 +14,7 @@ namespace cpPluginsVTKIO cpPluginsObject( MeshReader, cpPlugins::Pipeline::ProcessObject, IO ); public: - virtual QDialog* CreateQDialog( ) cpPlugins_OVERRIDE; + virtual QDialog* CreateQDialog( ) override; }; } // ecapseman diff --git a/plugins/VTKIO/MeshWriter.h b/plugins/VTKIO/MeshWriter.h index 2278b01..05c14de 100644 --- a/plugins/VTKIO/MeshWriter.h +++ b/plugins/VTKIO/MeshWriter.h @@ -14,7 +14,7 @@ namespace cpPluginsVTKIO cpPluginsObject( MeshWriter, cpPlugins::Pipeline::ProcessObject, IO ); public: - virtual QDialog* CreateQDialog( ) cpPlugins_OVERRIDE; + virtual QDialog* CreateQDialog( ) override; }; } // ecapseman diff --git a/plugins/VTKWidgets/LineWidget.h b/plugins/VTKWidgets/LineWidget.h index ed16240..6c83cc5 100644 --- a/plugins/VTKWidgets/LineWidget.h +++ b/plugins/VTKWidgets/LineWidget.h @@ -20,9 +20,9 @@ namespace cpPluginsVTKWidgets cpPluginsObject( LineWidget, cpPlugins::Pipeline::Widget, Widgets ); public: - virtual void Clear( ) cpPlugins_OVERRIDE; - virtual void SetEnabled( bool v ) cpPlugins_OVERRIDE; - virtual bool GetEnabled( ) const cpPlugins_OVERRIDE; + virtual void Clear( ) override; + virtual void SetEnabled( bool v ) override; + virtual bool GetEnabled( ) const override; protected: typedef std::set< vtkProp* > TProps; diff --git a/plugins/VTKWidgets/SeedWidget.h b/plugins/VTKWidgets/SeedWidget.h index 0c70d35..b99face 100644 --- a/plugins/VTKWidgets/SeedWidget.h +++ b/plugins/VTKWidgets/SeedWidget.h @@ -41,9 +41,9 @@ namespace cpPluginsVTKWidgets typedef cpExtensions::Visualization::WindowLevelImageActor TImageActor; public: - virtual void Clear( ) cpPlugins_OVERRIDE; - virtual void SetEnabled( bool v ) cpPlugins_OVERRIDE; - virtual bool GetEnabled( ) const cpPlugins_OVERRIDE; + virtual void Clear( ) override; + virtual void SetEnabled( bool v ) override; + virtual bool GetEnabled( ) const override; protected: /** @@ -55,7 +55,7 @@ namespace cpPluginsVTKWidgets static TCallback* New( ); virtual void Execute( vtkObject* caller, unsigned long id, void* data - ) cpPlugins_OVERRIDE; + ) override; void SetSeeds( vtkPolyData* seeds ); protected: diff --git a/plugins/VTKWidgets/SplineWidget.h b/plugins/VTKWidgets/SplineWidget.h index 6822323..b17e08c 100644 --- a/plugins/VTKWidgets/SplineWidget.h +++ b/plugins/VTKWidgets/SplineWidget.h @@ -30,9 +30,9 @@ namespace cpPluginsVTKWidgets cpPluginsObject( SplineWidget, cpPlugins::Pipeline::Widget, Widgets ); public: - virtual void Clear( ) cpPlugins_OVERRIDE; - virtual void SetEnabled( bool v ) cpPlugins_OVERRIDE; - virtual bool GetEnabled( ) const cpPlugins_OVERRIDE; + virtual void Clear( ) override; + virtual void SetEnabled( bool v ) override; + virtual bool GetEnabled( ) const override; protected: bool m_Configured; diff --git a/plugins/cpExtensions/PolyLineParametricPathWriter.h b/plugins/cpExtensions/PolyLineParametricPathWriter.h index 2794132..e398b9e 100644 --- a/plugins/cpExtensions/PolyLineParametricPathWriter.h +++ b/plugins/cpExtensions/PolyLineParametricPathWriter.h @@ -18,7 +18,7 @@ namespace cpPluginscpExtensions ); public: - virtual QDialog* CreateQDialog( ) cpPlugins_OVERRIDE; + virtual QDialog* CreateQDialog( ) override; protected: template< class _TPolyLineParametricPath > diff --git a/plugins/cpExtensions/SkeletonReader.h b/plugins/cpExtensions/SkeletonReader.h index 3490682..59852e0 100644 --- a/plugins/cpExtensions/SkeletonReader.h +++ b/plugins/cpExtensions/SkeletonReader.h @@ -18,7 +18,7 @@ namespace cpPluginscpExtensions ); public: - virtual QDialog* CreateQDialog( ) cpPlugins_OVERRIDE; + virtual QDialog* CreateQDialog( ) override; protected: template< unsigned int _VDim > diff --git a/plugins/cpExtensions/SkeletonWriter.h b/plugins/cpExtensions/SkeletonWriter.h index 920ae01..f355c87 100644 --- a/plugins/cpExtensions/SkeletonWriter.h +++ b/plugins/cpExtensions/SkeletonWriter.h @@ -18,7 +18,7 @@ namespace cpPluginscpExtensions ); public: - virtual QDialog* CreateQDialog( ) cpPlugins_OVERRIDE; + virtual QDialog* CreateQDialog( ) override; protected: template< class _TSkeleton > -- 2.45.0