get_geometry now uses XML config object (for volumes)

4 files changed, 18 insertions, 0 deletions

diff --git a/include/astra/Config.h b/include/astra/Config.h
index 647462b..9893c90 100644
--- a/include/astra/Config.h
+++ b/include/astra/Config.h
@@ -31,6 +31,7 @@ $Id$
 
 #include "Globals.h"
 #include "XMLNode.h"
+#include "XMLDocument.h"
 
 #include <set>
 
@@ -46,6 +47,8 @@ struct _AstraExport Config {
 	Config(XMLNode* _self);
 	~Config();
 
+	void initialize(std::string rootname);
+
 	XMLNode* self;
 	XMLNode* global;
 };
diff --git a/include/astra/VolumeGeometry2D.h b/include/astra/VolumeGeometry2D.h
index fa0528d..28703d5 100644
--- a/include/astra/VolumeGeometry2D.h
+++ b/include/astra/VolumeGeometry2D.h
@@ -205,6 +205,12 @@ public:
 	 */
 	virtual bool isEqual(CVolumeGeometry2D*) const;
 
+	/** Get all settings in a Config object.
+	 *
+	 * @return Configuration Object.
+	 */
+	virtual Config* getConfiguration() const;
+
 	/** Get the number of columns in the volume grid.
 	 *
 	 * @return Number of columns in the volume grid.
diff --git a/include/astra/VolumeGeometry3D.h b/include/astra/VolumeGeometry3D.h
index d5c8fff..ff94844 100644
--- a/include/astra/VolumeGeometry3D.h
+++ b/include/astra/VolumeGeometry3D.h
@@ -246,6 +246,12 @@ public:
 	 */
 	virtual bool isEqual(const CVolumeGeometry3D*) const;
 
+	/** Get all settings in a Config object.
+	 *
+	 * @return Configuration Object.
+	 */
+	virtual Config* getConfiguration() const;
+
 	/** Get the number of columns in the volume grid.
 	 *
 	 * @return Number of columns in the volume grid.
diff --git a/include/astra/XMLDocument.h b/include/astra/XMLDocument.h
index c6f1b9a..869e1a3 100644
--- a/include/astra/XMLDocument.h
+++ b/include/astra/XMLDocument.h
@@ -86,6 +86,9 @@ public:
 	 */
 	void saveToFile(string sFilename);
 
+	/** convert and XML DOM tree to a string
+	 */
+	std::string toString();
 
 private: