diff options
| author | Willem Jan Palenstijn <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-16 11:13:17 +0000 |
|---|---|---|
| committer | wpalenst <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-16 11:13:17 +0000 |
| commit | 8b046691e7cf5ba603b690e5a820869f7aba0bb6 (patch) | |
| tree | f46b1b2ff42e93d1c5a8d99416c6b1c58925184f | |
| parent | 26033e740147510683e499ceda3b52b51cc67e41 (diff) | |
| download | astra-8b046691e7cf5ba603b690e5a820869f7aba0bb6.tar.gz astra-8b046691e7cf5ba603b690e5a820869f7aba0bb6.tar.bz2 astra-8b046691e7cf5ba603b690e5a820869f7aba0bb6.tar.xz astra-8b046691e7cf5ba603b690e5a820869f7aba0bb6.zip | |
Clean up sstream include
| -rw-r--r-- | include/astra/Float32Data2D.h | 12 | ||||
| -rw-r--r-- | include/astra/Float32Data3D.h | 12 | ||||
| -rw-r--r-- | src/Float32Data2D.cpp | 11 | ||||
| -rw-r--r-- | src/Float32Data3D.cpp | 12 |
4 files changed, 23 insertions, 24 deletions
diff --git a/include/astra/Float32Data2D.h b/include/astra/Float32Data2D.h index c89e9f8..062feb5 100644 --- a/include/astra/Float32Data2D.h +++ b/include/astra/Float32Data2D.h @@ -32,8 +32,6 @@ $Id$ #include "Globals.h" #include "Float32Data.h" -#include <sstream> - namespace astra { /** @@ -434,16 +432,6 @@ inline int CFloat32Data2D::getDimensionCount() const } //---------------------------------------------------------------------------------------- -inline std::string CFloat32Data2D::description() const -{ - std::stringstream res; - res << m_iWidth << "x" << m_iHeight; - if (getType() == CFloat32Data2D::PROJECTION) res << " sinogram data \t"; - if (getType() == CFloat32Data2D::VOLUME) res << " volume data \t"; - return res.str(); -} - -//---------------------------------------------------------------------------------------- // Get the type of this object. inline CFloat32Data2D::EDataType CFloat32Data2D::getType() const { diff --git a/include/astra/Float32Data3D.h b/include/astra/Float32Data3D.h index 8666890..ee385f0 100644 --- a/include/astra/Float32Data3D.h +++ b/include/astra/Float32Data3D.h @@ -182,18 +182,6 @@ inline CFloat32Data3D::EDataType CFloat32Data3D::getType() const return BASE; } -//---------------------------------------------------------------------------------------- -// To String -inline std::string CFloat32Data3D::description() const -{ - std::stringstream res; - res << m_iWidth << "x" << m_iHeight << "x" << m_iDepth; - if (getType() == CFloat32Data3D::PROJECTION) res << " sinogram data \t"; - if (getType() == CFloat32Data3D::VOLUME) res << " volume data \t"; - return res.str(); -} -//---------------------------------------------------------------------------------------- - } // end namespace astra #endif // _INC_ASTRA_FLOAT32DATA2D diff --git a/src/Float32Data2D.cpp b/src/Float32Data2D.cpp index e51935f..ae84716 100644 --- a/src/Float32Data2D.cpp +++ b/src/Float32Data2D.cpp @@ -29,6 +29,7 @@ $Id$ #include "astra/Float32Data2D.h" #include <iostream> #include <cstring> +#include <sstream> #ifdef _MSC_VER #include <malloc.h> @@ -518,6 +519,16 @@ CFloat32Data2D& CFloat32Data2D::operator-=(const float32& f) } +std::string CFloat32Data2D::description() const +{ + std::stringstream res; + res << m_iWidth << "x" << m_iHeight; + if (getType() == CFloat32Data2D::PROJECTION) res << " sinogram data \t"; + if (getType() == CFloat32Data2D::VOLUME) res << " volume data \t"; + return res.str(); +} + + } // end namespace astra diff --git a/src/Float32Data3D.cpp b/src/Float32Data3D.cpp index 4280b3b..57c72ed 100644 --- a/src/Float32Data3D.cpp +++ b/src/Float32Data3D.cpp @@ -27,6 +27,7 @@ $Id$ */ #include "astra/Float32Data3D.h" +#include <sstream> using namespace std; @@ -52,4 +53,15 @@ bool CFloat32Data3D::_data3DSizesEqual(const CFloat32Data3D * _pA, const CFloat3 return ((_pA->m_iWidth == _pB->m_iWidth) && (_pA->m_iHeight == _pB->m_iHeight) && (_pA->m_iDepth == _pB->m_iDepth)); } +std::string CFloat32Data3D::description() const +{ + std::stringstream res; + res << m_iWidth << "x" << m_iHeight << "x" << m_iDepth; + if (getType() == CFloat32Data3D::PROJECTION) res << " sinogram data \t"; + if (getType() == CFloat32Data3D::VOLUME) res << " volume data \t"; + return res.str(); +} +//---------------------------------------------------------------------------------------- + + } // end namespace astra |