summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #49 from 3cHeLoN/astra-spotWillem Jan Palenstijn2015-05-153-0/+371
|\
| * Add copyright headerWillem Jan Palenstijn2015-05-151-0/+10
| * Add note about Spot to sample scriptWillem Jan Palenstijn2015-05-151-0/+8
| * Added ASTRA-Spot operator opTomoFolkert Bleichrodt2015-05-153-0/+353
* | Sync README.txt with README.mdWillem Jan Palenstijn2015-05-131-3/+6
* | Add DOI link for JSB paper as wellWillem Jan Palenstijn2015-05-131-1/+1
* | Update README.mdWim van Aarle2015-05-131-2/+7
* | fix memleaks in testjoergkappes2015-05-082-0/+10
* | fix to small memory allocationjoergkappes2015-05-081-2/+2
* | Merge pull request #61 from wjp/xmlnode_cleanupWillem Jan Palenstijn2015-05-0856-730/+639
|\ \
| * | Make XML array handling consistentWillem Jan Palenstijn2015-05-065-117/+127
| * | Add extra XMLNode/XMLDocument/Config testWillem Jan Palenstijn2015-05-061-0/+16
| * | Change XMLNode* to XMLNodeWillem Jan Palenstijn2015-05-0656-635/+518
* | | Merge pull request #46 from dmpelt/spot-like-pythonWillem Jan Palenstijn2015-05-085-139/+201
|\ \ \
| * | | 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 scipy.spa...Daan Pelt2015-05-045-139/+212
| |/ /
* | | Merge pull request #58 from dmpelt/python-link-size-checkWillem Jan Palenstijn2015-05-084-23/+86
|\ \ \ | |/ / |/| |
| * | 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.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 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)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.Valerii Sokolov2015-04-091-6/+7
|/
* Initialize variables to avoid warningWillem Jan Palenstijn2015-03-303-3/+3
* 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
|\
| * 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
|\ \
| * | 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
|\ \
| * | 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