Merge pull request #20 from wvaarle/matlab-get-geometry

'get_geometry' functions in the matlab layer

1 files changed, 10 insertions, 10 deletions

diff --git a/include/astra/ParallelProjectionGeometry3D.h b/include/astra/ParallelProjectionGeometry3D.h
index da60617..72401e5 100644
--- a/include/astra/ParallelProjectionGeometry3D.h
+++ b/include/astra/ParallelProjectionGeometry3D.h
@@ -41,8 +41,8 @@ namespace astra
  * \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{DetectorWidth, float, Width of each detector.}
- * \astra_xml_item{DetectorHeight, float, Width of each detector.}
+ * \astra_xml_item{DetectorSpacingX, float, Width of each detector.}
+ * \astra_xml_item{DetectorSpacingY, float, Width of each detector.}
  * \astra_xml_item{ProjectionAngles, vector of float, projection angles in radians.}
  *
  * \par MATLAB example
@@ -50,8 +50,8 @@ namespace astra
  *		proj_geom = astra_struct('parallel');\n
  *		proj_geom.DetectorRowCount = 512;\n
  *		proj_geom.DetectorColCount = 512;\n
- *		proj_geom.DetectorWidth = 1.0;\n
- *		proj_geom.DetectorHeight = 1.0;\n
+ *		proj_geom.DetectorSpacingX = 1.0;\n
+ *		proj_geom.DetectorSpacingY = 1.0;\n
  *		proj_geom.ProjectionAngles = linspace(0,pi,100);\n
  * }
  */
@@ -129,6 +129,12 @@ public:
 	 */
 	virtual bool isEqual(const CProjectionGeometry3D*) const;
 
+	/** Get all settings in a Config object.
+	 *
+	 * @return Configuration Object.
+	 */
+	virtual Config* getConfiguration() 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.
@@ -136,12 +142,6 @@ public:
 	 */
 	 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
 	  */