Changeset 1568 for trunk/src

Timestamp:

Sep 16, 2009 5:39:51 AM (15 years ago)

Author:

dkearney

Message:

adding dump/configure interface to curve object, plot object is broken

Location:

trunk/src/objects

Files:

• RpCurve.cc (modified) (5 diffs)
• RpCurve.h (modified) (3 diffs)
• RpNumber.cc (modified) (2 diffs)
• RpObjConfig.h (modified) (1 diff)
• RpParserXML.cc (modified) (1 diff)
• RpPlot.cc (modified) (3 diffs)

trunk/src/objects/RpCurve.cc

@@ -28 +28 @@
       _axisList (NULL)
 {
+    this->name("");
     this->path("");
     this->label("");
@@ -34 +35 @@
 }
 
-Curve::Curve (const char *path)
+Curve::Curve (const char *name)
     : Object (),
       _axisList (NULL)
 {
-    this->path(path);
+    this->name(name);
+    this->path("");
     this->label("");
     this->desc("");
@@ -44 +46 @@
 }
 
-Curve::Curve (const char *path, const char *label, const char *desc,
+Curve::Curve (const char *name, const char *label, const char *desc,
               const char *group)
     : Object (),
       _axisList (NULL)
 {
-    this->path(path);
+    this->name(name);
+    this->path("");
     this->label(label);
     this->desc(desc);
@@ -59 +62 @@
     :   Object(o)
 {
+    this->name(o.name());
     this->path(o.path());
     this->label(o.label());
@@ -252 +256 @@
 
 /**********************************************************************/
-// METHOD: xml()
-/// Return the xml of the object
-/**
- * Return the xml of the object
- */
-
-const char *
-Curve::xml(size_t indent, size_t tabstop)
-{
-    size_t l1width = indent + tabstop;
-    size_t l2width = indent + (2*tabstop);
-    const char *sp = "";
-
-    Path p(path());
-
-    Array1D *tmpAxis = NULL;
+// METHOD: configure(Rp_ParserXml *p)
+/// construct a number object from the provided tree
+/**
+ * construct a number object from the provided tree
+ */
+
+void
+Curve::configure(size_t as, void *p)
+{
+    if (as == RPCONFIG_XML) {
+        __configureFromXml((const char *)p);
+    } else if (as == RPCONFIG_TREE) {
+        __configureFromTree((Rp_ParserXml *)p);
+    }
+}
+
+/**********************************************************************/
+// METHOD: configureFromXml(const char *xmltext)
+/// configure the object based on Rappture1.1 xmltext
+/**
+ * Configure the object based on the provided xml
+ */
+
+void
+Curve::__configureFromXml(const char *xmltext)
+{
+    if (xmltext == NULL) {
+        // FIXME: setup error
+        return;
+    }
+
+    Rp_ParserXml *p = Rp_ParserXmlCreate();
+    Rp_ParserXmlParse(p, xmltext);
+    configure(RPCONFIG_TREE, p);
+
+    return;
+}
+
+
+// This is really, __configureFromTree_1.0
+// because it only allows for an xaxis and yaxis
+// and component.xy formated data
+void
+Curve::__configureFromTree(Rp_ParserXml *p)
+{
+    if (p == NULL) {
+        // FIXME: setup error
+        return;
+    }
+
+    Rp_TreeNode node = Rp_ParserXmlElement(p,NULL);
+
+    Rappture::Path pathObj(Rp_ParserXmlNodePath(p,node));
+
+    path(pathObj.parent());
+    name(Rp_ParserXmlNodeId(p,node));
+    label(Rp_ParserXmlGet(p,"about.label"));
+    desc(Rp_ParserXmlGet(p,"about.description"));
+
+    Array1D *xaxis = axis("xaxis","","","","",NULL,0);
+    xaxis->label(Rp_ParserXmlGet(p,"xaxis.label"));
+    xaxis->desc(Rp_ParserXmlGet(p,"xaxis.description"));
+    xaxis->units(Rp_ParserXmlGet(p,"xaxis.units"));
+    xaxis->scale(Rp_ParserXmlGet(p,"xaxis.scale"));
+
+    Array1D *yaxis = axis("yaxis","","","","",NULL,0);
+    yaxis->label(Rp_ParserXmlGet(p,"yaxis.label"));
+    yaxis->desc(Rp_ParserXmlGet(p,"yaxis.description"));
+    yaxis->units(Rp_ParserXmlGet(p,"yaxis.units"));
+    yaxis->scale(Rp_ParserXmlGet(p,"yaxis.scale"));
+
+    const char *values = Rp_ParserXmlGet(p,"component.xy");
+
+    double x,y;
+    int n;
+    while (sscanf(values,"%lf%lf%n",&x,&y,&n) == 2) {
+        xaxis->append(&x,1);
+        yaxis->append(&y,1);
+        values += n;
+    }
+
+    return;
+}
+
+/**********************************************************************/
+// METHOD: dump(size_t as, void *p)
+/// construct a number object from the provided tree
+/**
+ * construct a number object from the provided tree
+ */
+
+void
+Curve::dump(size_t as, ClientData p)
+{
+    if (as == RPCONFIG_XML) {
+        __dumpToXml(p);
+    } else if (as == RPCONFIG_TREE) {
+        __dumpToTree(p);
+    }
+}
+
+/**********************************************************************/
+// METHOD: dumpToXml(ClientData p)
+/// configure the object based on Rappture1.1 xmltext
+/**
+ * Configure the object based on the provided xml
+ */
+
+void
+Curve::__dumpToXml(ClientData c)
+{
+    if (c == NULL) {
+        // FIXME: setup error
+        return;
+    }
+
+    ClientDataXml *d = (ClientDataXml *)c;
+    Rp_ParserXml *parser = Rp_ParserXmlCreate();
+    __dumpToTree(parser);
+    const char *xmltext = Rp_ParserXmlXml(parser);
+    _tmpBuf.appendf("%s",xmltext);
+    Rp_ParserXmlDestroy(&parser);
+    d->retStr = _tmpBuf.bytes();
+}
+
+/**********************************************************************/
+// METHOD: dumpToTree(ClientData p)
+/// dump the object to a Rappture1.1 based tree
+/**
+ * Dump the object to a Rappture1.1 based tree
+ */
+
+void
+Curve::__dumpToTree(ClientData c)
+{
+    if (c == NULL) {
+        // FIXME: setup error
+        return;
+    }
+
+    Rp_ParserXml *parser = (Rp_ParserXml *)c;
+
+    Path p;
+
+    p.parent(path());
+    p.last();
+
+    p.add("curve");
+    p.id(name());
+
+    p.add("about");
+
+    p.add("group");
+    Rp_ParserXmlPutF(parser,p.path(),"%s",group());
+
+    p.del();
+    p.add("label");
+    Rp_ParserXmlPutF(parser,p.path(),"%s",label());
+
+    p.del();
+    p.add("description");
+    Rp_ParserXmlPutF(parser,p.path(),"%s",desc());
+
+    p.del();
+    p.add("type");
+    Rp_ParserXmlPutF(parser,p.path(),"%s",propstr("type"));
+
+    p.del();
+    p.del();
+
+    const double *dataArr[dims()];
     size_t nmemb = 0;
-
-    const double *dataArr[dims()];
-    const char *type = propstr("type");
-
-    _tmpBuf.clear();
-
-    _tmpBuf.appendf(
-"%9$*6$s<curve id=\"%1$s\">\n\
-%9$*7$s<about>\n\
-%9$*8$s<group>%2$s</group>\n\
-%9$*8$s<label>%3$s</label>\n\
-%9$*8$s<description>%4$s</description>\n\
-%9$*8$s<type>%5$s</type>\n\
-%9$*7$s</about>\n",
-        p.id(),group(),label(),desc(),type,indent,l1width,l2width,sp);
-
-    for (size_t dim=0; dim < dims(); dim++) {
-        tmpAxis = getNthAxis(dim);
-        nmemb = tmpAxis->nmemb();
-        dataArr[dim] = tmpAxis->data();
-        _tmpBuf.appendf(
-"%8$*6$s<%1$s>\n\
-%8$*7$s<label>%2$s</label>\n\
-%8$*7$s<description>%3$s</description>\n\
-%8$*7$s<units>%4$s</units>\n\
-%8$*7$s<scale>%5$s</scale>\n\
-%8$*6$s</%1$s>\n",
-        tmpAxis->name(), tmpAxis->label(), tmpAxis->desc(),
-        tmpAxis->units(), tmpAxis->scale(),l1width,l2width,sp);
-    }
-
-    _tmpBuf.appendf("%3$*1$s<component>\n%3$*2$s<xy>\n",l1width,l2width,sp);
+    for (size_t dim = 0; dim < dims(); dim++) {
+        Array1D *a = getNthAxis(dim);
+        nmemb = a->nmemb();
+        dataArr[dim] = a->data();
+        p.add(a->name());
+
+        p.add("label");
+        Rp_ParserXmlPutF(parser,p.path(),"%s",a->label());
+        p.del();
+
+        p.add("description");
+        Rp_ParserXmlPutF(parser,p.path(),"%s",a->desc());
+        p.del();
+
+        p.add("units");
+        Rp_ParserXmlPutF(parser,p.path(),"%s",a->units());
+        p.del();
+
+        p.add("scale");
+        Rp_ParserXmlPutF(parser,p.path(),"%s",a->scale());
+        p.del();
+
+        p.del();
+    }
+
+    SimpleCharBuffer tmpBuf;
     for (size_t idx=0; idx < nmemb; idx++) {
         for(size_t dim=0; dim < dims(); dim++) {
-            _tmpBuf.appendf("%10g",dataArr[dim][idx]);
+            tmpBuf.appendf("%10g",dataArr[dim][idx]);
         }
-        _tmpBuf.append("\n",1);
-    }
-    _tmpBuf.appendf("%4$*3$s</xy>\n%4$*2$s</component>\n%4$*1$s</curve>",
-        indent, l1width, l2width, sp);
-
-    return _tmpBuf.bytes();
+        tmpBuf.appendf("\n");
+    }
+    p.add("component.xy");
+    Rp_ParserXmlPutF(parser,p.path(),"%s",tmpBuf.bytes());
+
+    return;
 }
 

trunk/src/objects/RpCurve.h

@@ -24 +24 @@
         Curve();
 
-        Curve(const char *path);
+        Curve(const char *name);
 
-        Curve(const char *path, const char *label, const char *desc,
+        Curve(const char *name, const char *label, const char *desc,
               const char *group);
 
@@ -48 +48 @@
         size_t dims() const;
 
-        const char *xml(size_t indent, size_t tabstop);
+        void configure(size_t as, ClientData p);
+        void dump(size_t as, ClientData p);
+
         const int is() const;
 
@@ -60 +62 @@
 
         Rp_ChainLink *__searchAxisList(const char * name) const;
+
+        void __configureFromXml(const char *p);
+        void __configureFromTree(Rp_ParserXml *p);
+        void __dumpToXml(ClientData c);
+        void __dumpToTree(ClientData c);
 };
 

trunk/src/objects/RpNumber.cc

@@ -397 +397 @@
 {
     if (as == RPCONFIG_XML) {
-        __dumpToXml((clientdata_xml *)p);
+        __dumpToXml(p);
     } else if (as == RPCONFIG_TREE) {
-        __dumpToTree((clientdata_tree *)p);
+        __dumpToTree(p);
     }
 }
@@ -418 +418 @@
     }
 
-    clientdata_xml *d = (clientdata_xml *)c;
-
-    size_t l1width = d->indent + (1*d->tabstop);
-    size_t l2width = d->indent + (2*d->tabstop);
-    const char *sp = "";
-
-    Path p(path());
-    _tmpBuf.clear();
-
-    _tmpBuf.appendf(
-"%8$*5$s<number id='%1$s'>\n\
-%8$*6$s<about>\n\
-%8$*7$s<label>%2$s</label>\n\
-%8$*7$s<description>%3$s</description>\n\
-%8$*6$s</about>\n\
-%8$*6$s<units>%4$s</units>\n",
-       p.id(),label(),desc(),units(),d->indent,l1width,l2width,sp);
-
-    if (_minSet) {
-        _tmpBuf.appendf("%4$*3$s<min>%1$g%2$s</min>\n", min(),units(),l1width,sp);
-    }
-    if (_maxSet) {
-        _tmpBuf.appendf("%4$*3$s<max>%1$g%2$s</max>\n", max(),units(),l1width,sp);
-    }
-
-    _tmpBuf.appendf(
-"%6$*5$s<default>%1$g%3$s</default>\n\
-%6$*5$s<current>%2$g%3$s</current>\n\
-%6$*4$s</number>",
-       def(),cur(),units(),d->indent,l1width,sp);
-
-    d->retStr =  _tmpBuf.bytes();
+    Rp_ParserXml *parser = Rp_ParserXmlCreate();
+    __dumpToTree(parser);
+    const char *xmltext = Rp_ParserXmlXml(parser);
+    _tmpBuf.appendf("%s",xmltext);
+    Rp_ParserXmlDestroy(&parser);
 }
 

trunk/src/objects/RpObjConfig.h

@@ -23 +23 @@
     size_t tabstop;
     const char *retStr;
-} clientdata_xml;
-
-typedef struct {
-    const char *retStr;
-} clientdata_tree;
+} ClientDataXml;
 
 } // end namespace Rappture

trunk/src/objects/RpParserXML.cc

@@ -155 +155 @@
     delete (*p)->path;
     delete *p;
-    p = NULL;
+    *p = NULL;
 }
 

trunk/src/objects/RpPlot.cc

@@ -91 +91 @@
     }
 
-    Path cpath;
-    cpath.id(name);
-    c->path(cpath.path());
+    // Path cpath;
+    // cpath.id(name);
+    // c->path(cpath.path());
+    c->name(name);
 
     // can't use "xaxis" kinda strings here have to allocate it forreal
@@ -264 +265 @@
 
     _tmpBuf.clear();
+
+    Rp_ParserXml *parser = Rp_ParserXmlCreate();
 
     l = Rp_ChainFirstLink(_curveList);
@@ -302 +305 @@
         }
 
-        _tmpBuf.append(c->xml(indent,tabstop));
-        _tmpBuf.append("\n",1);
+        c->dump(RPCONFIG_TREE,parser);
         l = Rp_ChainNextLink(l);
     }
+    _tmpBuf.appendf("%s",Rp_ParserXmlXml(parser));
+    Rp_ParserXmlDestroy(&parser);
 
     // remove trailing newline
-    _tmpBuf.remove(1);
+    //_tmpBuf.remove(1);
     // append terminating null character
-    _tmpBuf.append("\0",1);
+    //_tmpBuf.append("\0",1);
 
     return _tmpBuf.bytes();