Changeset 1569 for trunk/src/objects/RpNumber.cc

Timestamp:

Sep 16, 2009, 2:22:36 PM (15 years ago)

Author:

dkearney

Message:

adding configure/dump functions to plot object, creating simple test case for dumping xml
all objects should have "run" as their parent path if no parent path is provided.

File:

• trunk/src/objects/RpNumber.cc (modified) (9 diffs)

trunk/src/objects/RpNumber.cc

@@ -28 +28 @@
     // FIXME: empty names should be autoname'd
     this->name("");
-    this->path("");
+    this->path("run");
     this->label("");
     this->desc("");
@@ -48 +48 @@
 
     this->name(name);
-    this->path("");
+    this->path("run");
     this->label("");
     this->desc("");
@@ -74 +74 @@
 
     this->name(name);
-    this->path("");
+    this->path("run");
     this->label(label);
     this->desc(desc);
@@ -301 +301 @@
 
 /**********************************************************************/
-// METHOD: configure(Rp_ParserXml *p)
+// METHOD: configure(ClientData c)
 /// construct a number object from the provided tree
 /**
@@ -308 +308 @@
 
 void
-Number::configure(size_t as, void *p)
+Number::configure(size_t as, ClientData c)
 {
     if (as == RPCONFIG_XML) {
-        __configureFromXml((const char *)p);
+        __configureFromXml(c);
     } else if (as == RPCONFIG_TREE) {
-        __configureFromTree((Rp_ParserXml *)p);
+        __configureFromTree(c);
     }
 }
@@ -325 +325 @@
 
 void
-Number::__configureFromXml(const char *xmltext)
-{
+Number::__configureFromXml(ClientData c)
+{
+    const char *xmltext = (const char *)c;
     if (xmltext == NULL) {
         // FIXME: setup error
@@ -340 +341 @@
 
 void
-Number::__configureFromTree(Rp_ParserXml *p)
-{
+Number::__configureFromTree(ClientData c)
+{
+    Rp_ParserXml *p = (Rp_ParserXml *)c;
     if (p == NULL) {
         // FIXME: setup error
@@ -353 +355 @@
     path(pathObj.parent());
     name(Rp_ParserXmlNodeId(p,node));
-    label(Rp_ParserXmlGet(p,"about.label"));
-    desc(Rp_ParserXmlGet(p,"about.description"));
+
+    pathObj.clear();
+    pathObj.add("about");
+    pathObj.add("label");
+    label(Rp_ParserXmlGet(p,pathObj.path()));
+    pathObj.type("description");
+    desc(Rp_ParserXmlGet(p,pathObj.path()));
     units(Rp_ParserXmlGet(p,"units"));
     minFromStr(Rp_ParserXmlGet(p,"min"));
@@ -418 +425 @@
     }
 
+    ClientDataXml *d = (ClientDataXml *)c;
     Rp_ParserXml *parser = Rp_ParserXmlCreate();
     __dumpToTree(parser);
-    const char *xmltext = Rp_ParserXmlXml(parser);
-    _tmpBuf.appendf("%s",xmltext);
+    _tmpBuf.appendf("%s",Rp_ParserXmlXml(parser));
+    d->retStr = _tmpBuf.bytes();
     Rp_ParserXmlDestroy(&parser);
 }