summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWim van Aarle <wimvanaarle@gmail.com>2015-02-24 16:46:39 +0100
committerWim van Aarle <wimvanaarle@gmail.com>2015-02-24 16:46:39 +0100
commit569515f3e20ef3b3c2c4a777f38f45dc67e6f9b6 (patch)
tree760c38b60558a25811a54574f7111518824d6266 /src
parent9e48494ecc1e4655bd6c25b34bb5c53c80c30d7a (diff)
downloadastra-569515f3e20ef3b3c2c4a777f38f45dc67e6f9b6.tar.gz
astra-569515f3e20ef3b3c2c4a777f38f45dc67e6f9b6.tar.bz2
astra-569515f3e20ef3b3c2c4a777f38f45dc67e6f9b6.tar.xz
astra-569515f3e20ef3b3c2c4a777f38f45dc67e6f9b6.zip
added get_geometry for 3d projection data objects
Diffstat (limited to 'src')
-rw-r--r--src/ConeVecProjectionGeometry3D.cpp4
-rw-r--r--src/ParallelProjectionGeometry3D.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ConeVecProjectionGeometry3D.cpp b/src/ConeVecProjectionGeometry3D.cpp
index cf8f76d..fd549e0 100644
--- a/src/ConeVecProjectionGeometry3D.cpp
+++ b/src/ConeVecProjectionGeometry3D.cpp
@@ -198,13 +198,13 @@ bool CConeVecProjectionGeometry3D::isEqual(const CProjectionGeometry3D * _pGeom2
// is of type
bool CConeVecProjectionGeometry3D::isOfType(const std::string& _sType) const
{
- return (_sType == "cone3d_vec");
+ return (_sType == "cone3d_vec" || _sType == "cone_vec");
}
//----------------------------------------------------------------------------------------
void CConeVecProjectionGeometry3D::toXML(XMLNode* _sNode) const
{
- _sNode->addAttribute("type","cone3d_vec");
+ _sNode->addAttribute("type","cone_vec");
_sNode->addChildNode("DetectorRowCount", m_iDetectorRowCount);
_sNode->addChildNode("DetectorColCount", m_iDetectorColCount);
// TODO:
diff --git a/src/ParallelProjectionGeometry3D.cpp b/src/ParallelProjectionGeometry3D.cpp
index 8a13f0f..2400ff9 100644
--- a/src/ParallelProjectionGeometry3D.cpp
+++ b/src/ParallelProjectionGeometry3D.cpp
@@ -154,7 +154,7 @@ bool CParallelProjectionGeometry3D::isEqual(const CProjectionGeometry3D * _pGeom
// is of type
bool CParallelProjectionGeometry3D::isOfType(const std::string& _sType) const
{
- return (_sType == "parallel");
+ return (_sType == "parallel" || _sType == "parallel3d");
}
//----------------------------------------------------------------------------------------