summaryrefslogtreecommitdiffstats
path: root/matlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #94 from wjp/cuda_options2Willem Jan Palenstijn2015-12-011-2/+7
|\ | | | | Improve option passing via CudaProjector(2D/3D)
| * Add options passing to projectors from matlabNicola Vigano2015-10-091-2/+7
| | | | | | | | Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>
* | astra_mex_direct: Don't initialize newly allocated mxArrayNicola Vigano2015-10-091-2/+18
| | | | | | | | | | This avoids letting matlab initialize the memory we will overwrite shortly after.
* | 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
|/
* Use mxLogical instead of bool.Willem Jan Palenstijn2015-09-172-3/+3
| | | | This should improve compatibility with Octave according to Christian Häggström.
* Fix algorithm leak in opTomoWillem Jan Palenstijn2015-09-041-0/+2
|
* 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
|\ | | | | Astra spot
| * Added ASTRA-Spot operator opTomoFolkert Bleichrodt2015-05-152-0/+309
| | | | | | | | | | | | A Spot operator for the ASTRA projectors. Wraps the forward and backprojection operation into a Spot operator, which can be used with matrix-vector syntax in Matlab.
* | Make XML array handling consistentWillem Jan Palenstijn2015-05-061-20/+2
| | | | | | | | setContent and getContent were using different XML formats previously.
* | Change XMLNode* to XMLNodeWillem Jan Palenstijn2015-05-066-42/+36
| | | | | | | | An XMLNode object is already simply a pointer, so no need to dynamically allocate XMLNodes.
* | 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
| | | | | | | | | | 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-132-0/+335
|/
* Merge pull request #20 from wvaarle/matlab-get-geometryWillem Jan Palenstijn2015-02-2711-623/+407
|\ | | | | 'get_geometry' functions in the matlab layer
| * 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
| | | | | Did not accelerate using sse2, as no intrinsics exist to convert 8-bit to 32-bit.
* fixed matlab DART implementationWim van Aarle2015-02-236-82/+885
| | | | some files were missing, cleaned up the rest
* Sync DART versionWillem Jan Palenstijn2015-01-3022-1303/+680
|
* Make astra_clear clear projector3d tooWillem Jan Palenstijn2015-01-301-0/+1
|
* Update copyright to -2015Willem Jan Palenstijn2015-01-2647-94/+94
|
* Update copyright headersWillem Jan Palenstijn2015-01-1947-304/+304
|
* Implement loading geometries into Projector3DWillem Jan Palenstijn2014-12-081-1/+1
|
* Remove unused stubs from mex_data3dWillem Jan Palenstijn2014-12-051-430/+2
|
* Add VS2012 build filesWillem Jan Palenstijn2014-12-048-0/+2316
|
* Refactor astra_mex_data3dWillem Jan Palenstijn2014-12-045-492/+822
| | | | (Modified) patch by Nicola Viganò
* Avoid mxIsSharedArrayWillem Jan Palenstijn2014-11-241-0/+6
| | | | Matlab R2014b no longer seems to support it.
* Fix leakWillem Jan Palenstijn2014-09-251-0/+4
|
* Verify data is not sparse in astra_mex_data2dWillem Jan Palenstijn2014-07-231-0/+8
|