diff options
author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-04-14 14:54:38 +0200 |
---|---|---|
committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-04-14 14:54:38 +0200 |
commit | d24877997bfe77e7177e3208328d99e1f99ac6b9 (patch) | |
tree | 58a86e22618775acfb5e761201727eec558c9200 /src/Float32VolumeData2D.cpp | |
parent | 306b3b5613ccb039122d38e8deb1e0ecc9e43403 (diff) | |
parent | 1b32573046f33050b9300324e6c74e10abb6caaf (diff) | |
download | astra-d24877997bfe77e7177e3208328d99e1f99ac6b9.tar.gz astra-d24877997bfe77e7177e3208328d99e1f99ac6b9.tar.bz2 astra-d24877997bfe77e7177e3208328d99e1f99ac6b9.tar.xz astra-d24877997bfe77e7177e3208328d99e1f99ac6b9.zip |
Merge pull request #51 from dmpelt/python-link
Add 'link' feature to Python (for 2D and 3D data)
Diffstat (limited to 'src/Float32VolumeData2D.cpp')
-rw-r--r-- | src/Float32VolumeData2D.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/Float32VolumeData2D.cpp b/src/Float32VolumeData2D.cpp index e11c4e4..c903c66 100644 --- a/src/Float32VolumeData2D.cpp +++ b/src/Float32VolumeData2D.cpp @@ -72,6 +72,15 @@ CFloat32VolumeData2D::CFloat32VolumeData2D(const CFloat32VolumeData2D& _other) : m_bInitialized = true; } +//---------------------------------------------------------------------------------------- +// Create an instance of the CFloat32VolumeData2D class with pre-allocated data +CFloat32VolumeData2D::CFloat32VolumeData2D(CVolumeGeometry2D* _pGeometry, CFloat32CustomMemory* _pCustomMemory) +{ + m_bInitialized = false; + m_bInitialized = initialize(_pGeometry, _pCustomMemory); +} + + // Assignment operator CFloat32VolumeData2D& CFloat32VolumeData2D::operator=(const CFloat32VolumeData2D& _other) @@ -122,6 +131,17 @@ bool CFloat32VolumeData2D::initialize(CVolumeGeometry2D* _pGeometry, float32 _fS m_bInitialized = _initialize(m_pGeometry->getGridColCount(), m_pGeometry->getGridRowCount(), _fScalar); return m_bInitialized; } + +//---------------------------------------------------------------------------------------- +// Initialization +bool CFloat32VolumeData2D::initialize(CVolumeGeometry2D* _pGeometry, CFloat32CustomMemory* _pCustomMemory) +{ + m_pGeometry = _pGeometry->clone(); + m_bInitialized = _initialize(m_pGeometry->getGridColCount(), m_pGeometry->getGridRowCount(), _pCustomMemory); + return m_bInitialized; +} + + //---------------------------------------------------------------------------------------- void CFloat32VolumeData2D::changeGeometry(CVolumeGeometry2D* _pGeometry) { |