Update version to 1.3

1 files changed, 154 insertions, 0 deletions

diff --git a/include/astra/ConeVecProjectionGeometry3D.h b/include/astra/ConeVecProjectionGeometry3D.h
new file mode 100644
index 0000000..1765cdd
--- /dev/null
+++ b/include/astra/ConeVecProjectionGeometry3D.h
@@ -0,0 +1,154 @@
+/*
+-----------------------------------------------------------------------
+Copyright 2012 iMinds-Vision Lab, University of Antwerp
+
+Contact: astra@ua.ac.be
+Website: http://astra.ua.ac.be
+
+
+This file is part of the
+All Scale Tomographic Reconstruction Antwerp Toolbox ("ASTRA Toolbox").
+
+The ASTRA Toolbox is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+The ASTRA Toolbox is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
+
+-----------------------------------------------------------------------
+$Id$
+*/
+
+#ifndef _INC_ASTRA_CONEVECPROJECTIONGEOMETRY3D
+#define _INC_ASTRA_CONEVECPROJECTIONGEOMETRY3D
+
+#include "ProjectionGeometry3D.h"
+#include "../cuda/3d/dims3d.h"
+
+namespace astra
+{
+
+/**
+ * This class defines a 3D cone beam projection geometry. 
+ *
+ * \par XML Configuration
+ * \astra_xml_item{DetectorRowCount, int, Number of detectors for each projection.}
+ * \astra_xml_item{DetectorColCount, int, Number of detectors for each projection.}
+ * \astra_xml_item{Vectors, matrix defining the 3D position of source and detector.}
+ *
+ * \par MATLAB example
+ * \astra_code{
+ *		proj_geom = astra_struct('cone_vec');\n
+ *		proj_geom.DetectorRowCount = 512;\n
+ *		proj_geom.DetectorColCount = 512;\n
+ *		proj_geom.Vectors = V;\n
+ * }
+ *
+ * \par Vectors
+ * Vectors is a matrix containing the actual geometry. Each row corresponds
+ * to a single projection, and consists of:
+ * ( srcX, srcY, srcZ, dX, dY, dZ, uX, uY, uZ, vX, vY, vZ )
+ *      src: the ray source
+ *      d  : the corner of the detector
+ *      u  : the vector from detector pixel (0,0) to (0,1)
+ *      v  : the vector from detector pixel (0,0) to (1,0)
+ */
+class _AstraExport CConeVecProjectionGeometry3D : public CProjectionGeometry3D
+{
+protected:
+
+	SConeProjection *m_pProjectionAngles;
+
+public:
+
+	/** Default constructor. Sets all numeric member variables to 0 and all pointer member variables to NULL.
+	 *
+	 * If an object is constructed using this default constructor, it must always be followed by a call 
+	 * to one of the initialize() methods before the object can be used. Any use before calling initialize() 
+	 * is not allowed, except calling the member function isInitialized().
+	 */
+	CConeVecProjectionGeometry3D();
+
+	/** Constructor. Create an instance of the CConeVecProjectionGeometry3D class.
+	 *
+	 *  @param _iProjectionAngleCount Number of projection angles.
+	 *  @param _iDetectorRowCount Number of rows of detectors.
+	 *  @param _iDetectorColCount Number of columns detectors.
+	 *  @param _pfProjectionAngles Pointer to an array of projection angles. The angles will be copied from this array.
+	 */
+	CConeVecProjectionGeometry3D(int _iProjectionAngleCount, 
+	                             int _iDetectorRowCount, 
+	                             int _iDetectorColCount,
+	                             const SConeProjection* _pProjectionAngles);
+
+	/** Copy constructor. 
+	 */
+	CConeVecProjectionGeometry3D(const CConeVecProjectionGeometry3D& _projGeom);
+
+	/** Destructor.
+	 */
+	~CConeVecProjectionGeometry3D();
+
+	/** Initialize the geometry with a config object.
+	 *
+	 * @param _cfg Configuration Object
+	 * @return initialization successful?
+	 */
+	virtual bool initialize(const Config& _cfg);
+
+	/** Initialize the geometry. If the object has been initialized before, the object is reinitialized 
+	 * and memory is freed and reallocated if necessary.
+	 *
+	 *  @param _iProjectionAngleCount Number of projection angles.
+	 *  @param _iDetectorRowCount Number of rows of detectors.
+	 *  @param _iDetectorColCount Number of columns detectors.
+	 *  @param _pProjectionAngles Pointer to an array of projection angles. The angles will be copied from this array.
+	 */
+	bool initialize(int _iProjectionAngleCount, 
+					int _iDetectorRowCount, 
+					int _iDetectorColCount,
+	                const SConeProjection* _pProjectionAngles);
+
+	virtual bool _check();
+
+	/** Create a hard copy. 
+	*/
+	virtual CProjectionGeometry3D* clone() const;
+
+    /** Return true if this geometry instance is the same as the one specified.
+	 *
+	 * @return true if this geometry instance is the same as the one specified.
+	 */
+	virtual bool isEqual(const CProjectionGeometry3D*) const;
+
+	/** Returns true if the type of geometry defined in this class is the one specified in _sType.
+	 *
+	 * @param _sType geometry type to compare to.
+	 * @return true if _sType == "cone_vec".
+	 */
+	 virtual bool isOfType(const std::string& _sType) const;
+
+	/** Turn this object into an XML object.
+	 *
+	 * @param _sNode The XML object to fill.
+	 */
+	 virtual void toXML(XMLNode* _sNode) const;
+
+	 /**
+	  * Returns a vector giving the projection direction for a projection and detector index
+	  */
+	 virtual CVector3D getProjectionDirection(int _iProjectionIndex, int _iDetectorIndex) const;
+
+	const SConeProjection* getProjectionVectors() const { return m_pProjectionAngles; }
+};
+
+} // namespace astra
+
+#endif /* _INC_ASTRA_CONEVECPROJECTIONGEOMETRY3D */