summaryrefslogtreecommitdiffstats
path: root/matlab
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #73 from dmpelt/python-pluginsWillem Jan Palenstijn2015-12-043-0/+159
|\
| * Merge branch 'master' into python-pluginsWillem Jan Palenstijn2015-12-0116-19/+1328
| |\
| * | Add matlab plugin .m fileDaniel M. Pelt2015-07-231-0/+24
| * | Allow registering plugins without explicit name, and fix exception handling w...Daniel M. Pelt2015-07-231-15/+8
| * | Fix numpy lapack loading when running in MatlabDaniel M. Pelt2015-07-231-0/+3
| * | Add support for Python algorithm pluginsDaniel M. Pelt2015-07-231-0/+139
* | | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-12-025-2/+1317
|\ \ \
| * | | Fix Windows builds of astra_mex_directWillem Jan Palenstijn2015-12-022-0/+20
| | |/ | |/|
| * | Merge pull request #94 from wjp/cuda_options2Willem Jan Palenstijn2015-12-011-2/+7
| |\ \
| | * | Add options passing to projectors from matlabNicola Vigano2015-10-091-2/+7
| * | | astra_mex_direct: Don't initialize newly allocated mxArrayNicola Vigano2015-10-091-2/+18
| * | | Build astra_mex_direct in MSVCWillem Jan Palenstijn2015-10-072-0/+918
| * | | Add astra_mex_direct('FP3D'/'BP3D', ...)Willem Jan Palenstijn2015-10-072-0/+356
| |/ /
* | | Merge branch 'master' into volgeom3dWillem Jan Palenstijn2015-11-183-3/+5
|\| |
| * | Use mxLogical instead of bool.Willem Jan Palenstijn2015-09-172-3/+3
| * | Fix algorithm leak in opTomoWillem Jan Palenstijn2015-09-041-0/+2
* | | Let astra_create_vol_geom also generate flexible volume geometriesWillem Jan Palenstijn2015-09-251-0/+15
|/ /
* | Fix algorithm object leak in astra_create_fbp_reconstruction.mWillem Jan Palenstijn2015-08-121-0/+1
* | Fix formatting when passing strings to log from high-level codeDaniel M. Pelt2015-07-172-5/+5
* | Fix memory leak in configuration codeDaniel M. Pelt2015-06-252-5/+12
* | Fix config to struct/dict translation for array optionsDaniel M. Pelt2015-06-241-1/+5
* | Actually use the rec_type argument in astra_create_reconstruction_cudaDaniel M. Pelt2015-06-201-1/+1
* | Fix matlab compilation without CUDADaniel M. Pelt2015-06-201-2/+2
|/
* Merge pull request #49 from 3cHeLoN/astra-spotWillem Jan Palenstijn2015-05-152-0/+309
|\
| * Added ASTRA-Spot operator opTomoFolkert Bleichrodt2015-05-152-0/+309
* | Make XML array handling consistentWillem Jan Palenstijn2015-05-061-20/+2
* | Change XMLNode* to XMLNodeWillem Jan Palenstijn2015-05-066-42/+36
* | Fix bug in astra_mex_data3d('create') zero-initializationWillem Jan Palenstijn2015-04-151-1/+1
* | Add astra_mex_data3d('change_geometry', ...)Willem Jan Palenstijn2015-04-101-1/+109
* | Check input to mex_data3d/link is singleWillem Jan Palenstijn2015-04-101-2/+2
|/
* Fix indentationWillem Jan Palenstijn2015-03-201-92/+92
* Fix commentWillem Jan Palenstijn2015-03-201-2/+2
* Add MSVC project filesWillem Jan Palenstijn2015-03-2016-0/+988
* Merge branch 'master' into loggingWillem Jan Palenstijn2015-03-2014-1660/+1896
|\
| * Generate MSVC 2008/2012 project files with a Python scriptWillem Jan Palenstijn2015-03-1914-1660/+1896
* | Enable logging to Matlab window using callback functionDaniel M. Pelt2015-03-1311-0/+57
* | Add logging support to MatlabDaniel M. Pelt2015-03-132-0/+335
|/
* Merge pull request #20 from wvaarle/matlab-get-geometryWillem Jan Palenstijn2015-02-2711-623/+407
|\
| * code cleanupWim van Aarle2015-02-2611-518/+288
| * get_geometry now uses XML config object (for projections)Wim van Aarle2015-02-266-266/+96
| * get_geometry now uses XML config object (for volumes)Wim van Aarle2015-02-254-38/+80
| * re-enabled get_geometry for 3d projectorsWim van Aarle2015-02-241-8/+8
| * added get_geometry for 3d projection data objectsWim van Aarle2015-02-243-10/+123
| * fixed get_geometry for fanflat_vecWim van Aarle2015-02-242-35/+41
| * added get_geometry for 3d volume objectsWim van Aarle2015-02-243-53/+76
* | Fix include orderWillem Jan Palenstijn2015-02-261-1/+1
* | Moved pthreads defines to Globals.hDaan Pelt2015-02-251-1/+1
|/
* Added support for logical matrices in mex_data3dWim van Aarle2015-02-245-23/+53
* fixed matlab DART implementationWim van Aarle2015-02-236-82/+885
* Sync DART versionWillem Jan Palenstijn2015-01-3022-1303/+680