lcdd/include
diff -u -r1.1 -r1.2
--- FieldMap3DType.hh 3 Oct 2012 00:48:25 -0000 1.1
+++ FieldMap3DType.hh 3 Oct 2012 17:23:40 -0000 1.2
@@ -1,9 +1,11 @@
-// $Header: /cvs/lcd/lcdd/include/FieldMap3DType.hh,v 1.1 2012/10/03 00:48:25 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/FieldMap3DType.hh,v 1.2 2012/10/03 17:23:40 jeremy Exp $
#ifndef LCDD_FIELDMAP3DTYPE_HH
#define LCDD_FIELDMAP3DTYPE_HH 1
#include "FieldMapType.hh"
+#include <string>
+
/**
* @class
* @brief
@@ -17,6 +19,15 @@
virtual ~FieldMap3DType() {
}
+
+ void set_filename(const std::string& filename) {
+ _filename = filename;
+ }
+
+private:
+
+ std::string _filename;
+
};
#endif
lcdd/include
diff -u -r1.1 -r1.2
--- field_map_3d.hh 3 Oct 2012 00:48:25 -0000 1.1
+++ field_map_3d.hh 3 Oct 2012 17:23:40 -0000 1.2
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/include/field_map_3d.hh,v 1.1 2012/10/03 00:48:25 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/include/field_map_3d.hh,v 1.2 2012/10/03 17:23:40 jeremy Exp $
#ifndef LCDD_FIELD_MAP_3D_HH
#define LCDD_FIELD_MAP_3D_HH 1
@@ -8,19 +8,19 @@
* @class
* @brief
*/
-class field_map_3d : public SAXObject, public FieldMap3DType {
+class field_map_3d: public SAXObject, public FieldMap3DType {
public:
- field_map_3d() {
- }
+ field_map_3d() {
+ }
- virtual ~field_map_3d() {
- }
+ virtual ~field_map_3d() {
+ }
- virtual SAXObject::Type type() {
- return SAXObject::element;
- }
+ virtual SAXObject::Type type() {
+ return SAXObject::element;
+ }
};
#endif
lcdd/src
diff -u -r1.1 -r1.2
--- field_map_3dProcess.cc 3 Oct 2012 00:48:25 -0000 1.1
+++ field_map_3dProcess.cc 3 Oct 2012 17:23:40 -0000 1.2
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/lcdd/src/field_map_3dProcess.cc,v 1.1 2012/10/03 00:48:25 jeremy Exp $
+// $Header: /cvs/lcd/lcdd/src/field_map_3dProcess.cc,v 1.2 2012/10/03 17:23:40 jeremy Exp $
#include "FieldMapTypeProcess.hh"
#include <iostream>
@@ -22,15 +22,15 @@
virtual void StartElement(const std::string& name, const ASCIIAttributeList& attrs) {
- std::cout << "field_map_3d::StartElement - " << name << std::endl;
+ SAXObject** obj = Context()->GetTopObject();
- SAXObject** obj = Context()->GetTopObject();
+ field_map_3d* fmap = new field_map_3d;
- field_map_3d* field = new field_map_3d;
+ fmap->set_filename(attrs.getValue("filename"));
// Top-level caller needs to setup the SAXObject references.
- m_obj = field;
- *obj = field;
+ m_obj = fmap;
+ *obj = fmap;
// Call next process UP in inheritance chain, after the SAXObject is set.
FieldMapTypeProcess::StartElement(name, attrs);