Merge remote-tracking branch 'origin/13692_api_python_binding' (17fdaf7a) · Commits · mantidproject / mantid

Commit 17fdaf7a authored 9 years ago by Peterson, Peter

Browse files

Merge remote-tracking branch 'origin/13692_api_python_binding'

parents b0eaa041 6c01b253

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Framework/PythonInterface/inc/MantidPythonInterface/api/WorkspacePropertyExporter.h 5 additions, 5 deletions

...inc/MantidPythonInterface/api/WorkspacePropertyExporter.h
Framework/PythonInterface/inc/MantidPythonInterface/kernel/DataServiceExporter.h 16 additions, 9 deletions

...ce/inc/MantidPythonInterface/kernel/DataServiceExporter.h
Framework/PythonInterface/inc/MantidPythonInterface/kernel/TypedValidatorExporter.h 1 addition, 1 deletion

...inc/MantidPythonInterface/kernel/TypedValidatorExporter.h
Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp 7 additions, 12 deletions

...work/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp 5 additions, 2 deletions

...thonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp 14 additions, 12 deletions

...thonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp
Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp 8 additions, 5 deletions

...thonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp 33 additions, 19 deletions

Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp 11 additions, 7 deletions

.../PythonInterface/mantid/api/src/Exports/BoxController.cpp
Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp 15 additions, 4 deletions

...terface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp 2 additions, 2 deletions

...ork/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
Framework/PythonInterface/mantid/api/src/Exports/FileLoaderRegistry.cpp 2 additions, 1 deletion

...onInterface/mantid/api/src/Exports/FileLoaderRegistry.cpp
Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp 8 additions, 5 deletions

...thonInterface/mantid/api/src/Exports/FrameworkManager.cpp
Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp 4 additions, 4 deletions

...ythonInterface/mantid/api/src/Exports/FunctionFactory.cpp
Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp 47 additions, 34 deletions

...ork/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp 33 additions, 19 deletions

...work/PythonInterface/mantid/api/src/Exports/IFunction.cpp
Framework/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp 1 addition, 0 deletions

...rk/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp
Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp 3 additions, 3 deletions

...honInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp
Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp 17 additions, 4 deletions

...honInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp 4 additions, 4 deletions

...k/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp

with 236 additions and 152 deletions

Please register or to comment