diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-05-13 11:56:24 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-05-13 11:56:24 +0200 |
| commit | de30f7538a865a2ee7acb7dd8294fb6cdc4f98be (patch) | |
| tree | ba11189e6e83e83e73167518b45641fc287c8eda /src/ConeVecProjectionGeometry3D.cpp | |
| parent | 6504cffdbe74d9b671222a7ec24b26fbb4f871f0 (diff) | |
| parent | 86ad56f005d9d3871f654390739459d5634dd5d5 (diff) | |
| download | astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.gz astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.bz2 astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.tar.xz astra-de30f7538a865a2ee7acb7dd8294fb6cdc4f98be.zip | |
Merge branch 'master'
Diffstat (limited to 'src/ConeVecProjectionGeometry3D.cpp')
| -rw-r--r-- | src/ConeVecProjectionGeometry3D.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/ConeVecProjectionGeometry3D.cpp b/src/ConeVecProjectionGeometry3D.cpp index 9dc273d..47ed630 100644 --- a/src/ConeVecProjectionGeometry3D.cpp +++ b/src/ConeVecProjectionGeometry3D.cpp @@ -73,33 +73,30 @@ bool CConeVecProjectionGeometry3D::initialize(const Config& _cfg) ASTRA_ASSERT(_cfg.self); ConfigStackCheck<CProjectionGeometry3D> CC("ConeVecProjectionGeometry3D", this, _cfg); - XMLNode* node; + XMLNode node; // TODO: Fix up class hierarchy... this class doesn't fit very well. // initialization of parent class //CProjectionGeometry3D::initialize(_cfg); // Required: DetectorRowCount - node = _cfg.self->getSingleNode("DetectorRowCount"); + node = _cfg.self.getSingleNode("DetectorRowCount"); ASTRA_CONFIG_CHECK(node, "ConeVecProjectionGeometry3D", "No DetectorRowCount tag specified."); - m_iDetectorRowCount = boost::lexical_cast<int>(node->getContent()); - ASTRA_DELETE(node); + m_iDetectorRowCount = boost::lexical_cast<int>(node.getContent()); CC.markNodeParsed("DetectorRowCount"); // Required: DetectorColCount - node = _cfg.self->getSingleNode("DetectorColCount"); + node = _cfg.self.getSingleNode("DetectorColCount"); ASTRA_CONFIG_CHECK(node, "ConeVecProjectionGeometry3D", "No DetectorColCount tag specified."); - m_iDetectorColCount = boost::lexical_cast<int>(node->getContent()); + m_iDetectorColCount = boost::lexical_cast<int>(node.getContent()); m_iDetectorTotCount = m_iDetectorRowCount * m_iDetectorColCount; - ASTRA_DELETE(node); CC.markNodeParsed("DetectorColCount"); // Required: Vectors - node = _cfg.self->getSingleNode("Vectors"); + node = _cfg.self.getSingleNode("Vectors"); ASTRA_CONFIG_CHECK(node, "ConeVecProjectionGeometry3D", "No Vectors tag specified."); - vector<double> data = node->getContentNumericalArrayDouble(); + vector<double> data = node.getContentNumericalArrayDouble(); CC.markNodeParsed("Vectors"); - ASTRA_DELETE(node); ASTRA_CONFIG_CHECK(data.size() % 12 == 0, "ConeVecProjectionGeometry3D", "Vectors doesn't consist of 12-tuples."); m_iProjectionAngleCount = data.size() / 12; m_pProjectionAngles = new SConeProjection[m_iProjectionAngleCount]; @@ -208,9 +205,9 @@ Config* CConeVecProjectionGeometry3D::getConfiguration() const Config* cfg = new Config(); cfg->initialize("ProjectionGeometry3D"); - cfg->self->addAttribute("type", "cone_vec"); - cfg->self->addChildNode("DetectorRowCount", m_iDetectorRowCount); - cfg->self->addChildNode("DetectorColCount", m_iDetectorColCount); + cfg->self.addAttribute("type", "cone_vec"); + cfg->self.addChildNode("DetectorRowCount", m_iDetectorRowCount); + cfg->self.addChildNode("DetectorColCount", m_iDetectorColCount); std::string vectors = ""; for (int i = 0; i < m_iProjectionAngleCount; ++i) { @@ -229,7 +226,7 @@ Config* CConeVecProjectionGeometry3D::getConfiguration() const vectors += boost::lexical_cast<string>(p.fDetVZ); if (i < m_iProjectionAngleCount-1) vectors += ';'; } - cfg->self->addChildNode("Vectors", vectors); + cfg->self.addChildNode("Vectors", vectors); return cfg; } |