summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #61 from wjp/xmlnode_cleanupWillem Jan Palenstijn2015-05-0856-730/+639
|\ | | | | Clean up XMLNode
| * Make XML array handling consistentWillem Jan Palenstijn2015-05-065-117/+127
| | | | | | | | setContent and getContent were using different XML formats previously.
| * Add extra XMLNode/XMLDocument/Config testWillem Jan Palenstijn2015-05-061-0/+16
| |
| * Change XMLNode* to XMLNodeWillem Jan Palenstijn2015-05-0656-635/+518
| | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes.
* | Merge pull request #46 from dmpelt/spot-like-pythonWillem Jan Palenstijn2015-05-085-139/+201
|\ \ | | | | | | Add SPOT-like object for Python (overrides `__mul__` and works with scipy.sparse.linalg)
| * | Rename optomo.py for Python 2 supportDaniel M. Pelt2015-05-082-1/+1
| | |
| * | Use superclass __mul__ in Python OpTomo __mul__Daniel M. Pelt2015-05-071-22/+11
| | |
| * | Add SPOT-like object for Python (overrides `__mul__` and works with ↵Daan Pelt2015-05-045-139/+212
| |/ | | | | | | scipy.sparse.linalg)
* | Merge pull request #58 from dmpelt/python-link-size-checkWillem Jan Palenstijn2015-05-084-23/+86
|\ \ | |/ |/| Check data size when using 'link' function in Python
| * Do not allow 1D input in Python link methodDaniel M. Pelt2015-05-072-16/+4
| |
| * Check data size when using 'link' function in PythonDaan Pelt2015-04-304-23/+98
| |
* | Fix memory leak in the configJeroen Bédorf2015-04-302-0/+7
|/
* Merge pull request #57 from valeriysokolov/fix-rapidxml-includesWillem Jan Palenstijn2015-04-293-11/+1
|\ | | | | Now include path is system-independent.
| * Now include path is system-independent.Valerii Sokolov2015-04-293-11/+1
|/
* Fix typo in configure python checkWillem Jan Palenstijn2015-04-161-1/+1
|
* Fix bug in astra_mex_data3d('create') zero-initializationWillem Jan Palenstijn2015-04-151-1/+1
|
* Merge pull request #52 from wjp/change_geometry3dWillem Jan Palenstijn2015-04-148-1/+218
|\ | | | | Add data3d('change_geometry')
| * Add python data3d.change_geometryWillem Jan Palenstijn2015-04-103-0/+81
| |
| * Add astra_mex_data3d('change_geometry', ...)Willem Jan Palenstijn2015-04-101-1/+109
| |
| * Add changeGeometry function to Data3D classesWillem Jan Palenstijn2015-04-104-0/+28
| |
* | Merge pull request #51 from dmpelt/python-linkWillem Jan Palenstijn2015-04-1410-9/+196
|\ \ | |/ |/| Add 'link' feature to Python (for 2D and 3D data)
| * Add 'link' feature to Python (for 2D and 3D data)Daniel M. Pelt2015-04-0910-9/+196
| |
* | Check input to mex_data3d/link is singleWillem Jan Palenstijn2015-04-101-2/+2
| |
* | Merge pull request #50 from valeriysokolov/fix-dart-smoothingWillem Jan Palenstijn2015-04-091-6/+7
|\ \ | |/ |/| Fixed a few CUDA 2D DART bugs.
| * Fixed a few CUDA 2D DART bugs.Valerii Sokolov2015-04-091-6/+7
|/ | | | | * Mixed width and height led to incorrect work on rectangular images. * Incorrect weight calculation in `devDartSmoothingRadius` (#47).
* Initialize variables to avoid warningWillem Jan Palenstijn2015-03-303-3/+3
| | | | | These variables are never used when uninitialized, but Visual Studio complains about them.
* Fix typo in error messageWillem Jan Palenstijn2015-03-301-1/+1
|
* Add missing error on wrong projgeom type in CProjector3D::initializeWillem Jan Palenstijn2015-03-301-0/+1
|
* Merge pull request #30 from dmpelt/loggingWillem Jan Palenstijn2015-03-2054-209/+2827
|\ | | | | New logging API
| * Use FlushFileBuffers in WindowsWillem Jan Palenstijn2015-03-201-1/+8
| |
| * Fix indentationWillem Jan Palenstijn2015-03-202-103/+103
| |
| * Fix commentWillem Jan Palenstijn2015-03-201-2/+2
| |
| * Add MSVC project filesWillem Jan Palenstijn2015-03-2022-10/+1080
| |
| * Merge branch 'master' into loggingWillem Jan Palenstijn2015-03-2040-5326/+7465
| |\ | |/ |/|
* | Merge pull request #34 from wjp/msvc_genWillem Jan Palenstijn2015-03-2020-5241/+7014
|\ \ | | | | | | Generate MSVC 2008/2012 project files with a Python script
| * | Add command line option to generate vc09/vc11/all filesWillem Jan Palenstijn2015-03-201-24/+33
| | |
| * | Generate MSVC 2008/2012 project files with a Python scriptWillem Jan Palenstijn2015-03-1920-5241/+7005
|/ /
* | Merge pull request #28 from dmpelt/projector3d-pythonWillem Jan Palenstijn2015-03-1818-83/+410
|\ \ | | | | | | Add projector3d and CUDA projectors to Python (to match new Matlab code)
| * | Adjust docstring and samples to new python create_sino functionWillem Jan Palenstijn2015-03-068-23/+19
| | |
| * | Avoid Python recompilation during installationDaniel M. Pelt2015-03-051-3/+16
| | |
| * | Added Python support for CUDA projectorsDaniel M. Pelt2015-03-0510-57/+375
| | |
* | | Merge pull request #29 from wjp/optional_boostutfWillem Jan Palenstijn2015-03-102-2/+26
|\ \ \ | | | | | | | | Improve configure checks for boost
| * | | Add check for required boost headersWillem Jan Palenstijn2015-03-091-0/+11
| | | |
| * | | Make boost-unit-test-framework optional in configureWillem Jan Palenstijn2015-03-062-2/+15
|/ / /
* / / Force clang to use libstdc++ on OSX (fixes Cython compilation)Daniel M. Pelt2015-03-052-0/+15
|/ /
| * Fix windows buildWillem Jan Palenstijn2015-03-192-1/+14
| |
| * Only allow stdout and stderr for screen loggingDaniel M. Pelt2015-03-131-1/+5
| |
| * Use a less verbose default fmt for screen logging and cleaner messagesDaniel M. Pelt2015-03-135-7/+8
| |
| * Enable logging to Matlab window using callback functionDaniel M. Pelt2015-03-1315-3/+125
| | | | | | | | | | Also introduces a mex initialize function that is called at the first invocation of any mex method.
| * Add logging support to MatlabDaniel M. Pelt2015-03-133-0/+336
| |