diff options
author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2018-08-24 14:28:25 +0200 |
---|---|---|
committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2018-08-28 12:00:54 +0200 |
commit | 52987f395d423203fbb1a417961408804832c258 (patch) | |
tree | 5524d3e6d08b9278054633d258bbb5544cb1ddbe | |
parent | 0a72d3f5c67f417199dd41af373ef0e129780838 (diff) | |
download | astra-52987f395d423203fbb1a417961408804832c258.tar.gz astra-52987f395d423203fbb1a417961408804832c258.tar.bz2 astra-52987f395d423203fbb1a417961408804832c258.tar.xz astra-52987f395d423203fbb1a417961408804832c258.zip |
Make filename more consistent
-rw-r--r-- | astra_vc14.vcxproj | 4 | ||||
-rw-r--r-- | astra_vc14.vcxproj.filters | 4 | ||||
-rw-r--r-- | build/linux/Makefile.in | 2 | ||||
-rw-r--r-- | build/msvc/gen.py | 4 | ||||
-rw-r--r-- | include/astra/AstraObjectFactory.h | 2 | ||||
-rw-r--r-- | include/astra/PluginAlgorithmFactory.h (renamed from include/astra/PluginAlgorithm.h) | 0 | ||||
-rw-r--r-- | matlab/mex/astra_mex_plugin_c.cpp | 2 | ||||
-rw-r--r-- | python/astra/plugin_c.pyx | 2 | ||||
-rw-r--r-- | python/astra/src/PythonPluginAlgorithm.h | 2 | ||||
-rw-r--r-- | src/PluginAlgorithmFactory.cpp (renamed from src/PluginAlgorithm.cpp) | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/astra_vc14.vcxproj b/astra_vc14.vcxproj index 893305f..6c19c41 100644 --- a/astra_vc14.vcxproj +++ b/astra_vc14.vcxproj @@ -538,7 +538,7 @@ <ClCompile Include="src\ParallelVecProjectionGeometry2D.cpp" /> <ClCompile Include="src\ParallelVecProjectionGeometry3D.cpp" /> <ClCompile Include="src\PlatformDepSystemCode.cpp" /> - <ClCompile Include="src\PluginAlgorithm.cpp" /> + <ClCompile Include="src\PluginAlgorithmFactory.cpp" /> <ClCompile Include="src\ProjectionGeometry2D.cpp" /> <ClCompile Include="src\ProjectionGeometry3D.cpp" /> <ClCompile Include="src\Projector2D.cpp" /> @@ -626,7 +626,7 @@ <ClInclude Include="include\astra\ParallelVecProjectionGeometry2D.h" /> <ClInclude Include="include\astra\ParallelVecProjectionGeometry3D.h" /> <ClInclude Include="include\astra\PlatformDepSystemCode.h" /> - <ClInclude Include="include\astra\PluginAlgorithm.h" /> + <ClInclude Include="include\astra\PluginAlgorithmFactory.h" /> <ClInclude Include="include\astra\ProjectionGeometry2D.h" /> <ClInclude Include="include\astra\ProjectionGeometry3D.h" /> <ClInclude Include="include\astra\Projector2D.h" /> diff --git a/astra_vc14.vcxproj.filters b/astra_vc14.vcxproj.filters index fef6a8a..226068e 100644 --- a/astra_vc14.vcxproj.filters +++ b/astra_vc14.vcxproj.filters @@ -108,7 +108,7 @@ <ClCompile Include="src\ForwardProjectionAlgorithm.cpp"> <Filter>Algorithms\source</Filter> </ClCompile> - <ClCompile Include="src\PluginAlgorithm.cpp"> + <ClCompile Include="src\PluginAlgorithmFactory.cpp"> <Filter>Algorithms\source</Filter> </ClCompile> <ClCompile Include="src\ReconstructionAlgorithm2D.cpp"> @@ -374,7 +374,7 @@ <ClInclude Include="include\astra\ForwardProjectionAlgorithm.h"> <Filter>Algorithms\headers</Filter> </ClInclude> - <ClInclude Include="include\astra\PluginAlgorithm.h"> + <ClInclude Include="include\astra\PluginAlgorithmFactory.h"> <Filter>Algorithms\headers</Filter> </ClInclude> <ClInclude Include="include\astra\ReconstructionAlgorithm2D.h"> diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 0b90bd9..2ec3851 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -168,7 +168,7 @@ BASE_OBJECTS=\ src/ParallelProjectionGeometry3D.lo \ src/ParallelVecProjectionGeometry3D.lo \ src/PlatformDepSystemCode.lo \ - src/PluginAlgorithm.lo \ + src/PluginAlgorithmFactory.lo \ src/ProjectionGeometry2D.lo \ src/ProjectionGeometry3D.lo \ src/Projector2D.lo \ diff --git a/build/msvc/gen.py b/build/msvc/gen.py index 47e7440..a42d8e5 100644 --- a/build/msvc/gen.py +++ b/build/msvc/gen.py @@ -188,7 +188,7 @@ P_astra["filters"]["Algorithms\\source"] = [ "src\\CglsAlgorithm.cpp", "src\\FilteredBackProjectionAlgorithm.cpp", "src\\ForwardProjectionAlgorithm.cpp", -"src\\PluginAlgorithm.cpp", +"src\\PluginAlgorithmFactory.cpp", "src\\ReconstructionAlgorithm2D.cpp", "src\\ReconstructionAlgorithm3D.cpp", "src\\SartAlgorithm.cpp", @@ -327,7 +327,7 @@ P_astra["filters"]["Algorithms\\headers"] = [ "include\\astra\\CudaBackProjectionAlgorithm3D.h", "include\\astra\\FilteredBackProjectionAlgorithm.h", "include\\astra\\ForwardProjectionAlgorithm.h", -"include\\astra\\PluginAlgorithm.h", +"include\\astra\\PluginAlgorithmFactory.h", "include\\astra\\ReconstructionAlgorithm2D.h", "include\\astra\\ReconstructionAlgorithm3D.h", "include\\astra\\SartAlgorithm.h", diff --git a/include/astra/AstraObjectFactory.h b/include/astra/AstraObjectFactory.h index c963e35..91efa61 100644 --- a/include/astra/AstraObjectFactory.h +++ b/include/astra/AstraObjectFactory.h @@ -40,7 +40,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "AlgorithmTypelist.h" #ifdef ASTRA_PYTHON -#include "PluginAlgorithm.h" +#include "PluginAlgorithmFactory.h" #endif diff --git a/include/astra/PluginAlgorithm.h b/include/astra/PluginAlgorithmFactory.h index afaaf05..afaaf05 100644 --- a/include/astra/PluginAlgorithm.h +++ b/include/astra/PluginAlgorithmFactory.h diff --git a/matlab/mex/astra_mex_plugin_c.cpp b/matlab/mex/astra_mex_plugin_c.cpp index 3bc812a..f39e87e 100644 --- a/matlab/mex/astra_mex_plugin_c.cpp +++ b/matlab/mex/astra_mex_plugin_c.cpp @@ -34,7 +34,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "mexHelpFunctions.h" #include "mexInitFunctions.h" -#include "astra/PluginAlgorithm.h" +#include "astra/PluginAlgorithmFactory.h" #include <Python.h> diff --git a/python/astra/plugin_c.pyx b/python/astra/plugin_c.pyx index dcc22e9..2f473c1 100644 --- a/python/astra/plugin_c.pyx +++ b/python/astra/plugin_c.pyx @@ -48,7 +48,7 @@ cdef extern from "src/PythonPluginAlgorithm.h" namespace "astra": cdef extern from "src/PythonPluginAlgorithm.h" namespace "astra::CPythonPluginAlgorithmFactory": cdef CPythonPluginAlgorithmFactory* getSingletonPtr() -cdef extern from "astra/PluginAlgorithm.h" namespace "astra::CPluginAlgorithmFactory": +cdef extern from "astra/PluginAlgorithmFactory.h" namespace "astra::CPluginAlgorithmFactory": # NB: Using wrong pointer type here for convenience cdef void registerFactory(CPythonPluginAlgorithmFactory *) diff --git a/python/astra/src/PythonPluginAlgorithm.h b/python/astra/src/PythonPluginAlgorithm.h index b7072d6..f2fd76d 100644 --- a/python/astra/src/PythonPluginAlgorithm.h +++ b/python/astra/src/PythonPluginAlgorithm.h @@ -34,7 +34,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. #include "astra/Singleton.h" #include "astra/XMLDocument.h" #include "astra/XMLNode.h" -#include "astra/PluginAlgorithm.h" +#include "astra/PluginAlgorithmFactory.h" #include <Python.h> diff --git a/src/PluginAlgorithm.cpp b/src/PluginAlgorithmFactory.cpp index ea1e104..a6b445f 100644 --- a/src/PluginAlgorithm.cpp +++ b/src/PluginAlgorithmFactory.cpp @@ -25,7 +25,7 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- */ -#include "astra/PluginAlgorithm.h" +#include "astra/PluginAlgorithmFactory.h" namespace astra { |