Changeset 1528 for trunk/src/objects/RpPlot.cc

Timestamp:

Jun 22, 2009 3:16:39 PM (15 years ago)

Author:

dkearney

Message:

updating the objects code and adding some more examples describing how i want developers to use the objects. some of the objects don't work yet, like the tree, anything with an example should work

File:

• trunk/src/objects/RpPlot.cc (modified) (8 diffs)

trunk/src/objects/RpPlot.cc

@@ -16 +16 @@
 using namespace Rappture;
 
-const char Plot::format[] = "RAPPTURE::PLOT::FORMAT";
-const char Plot::id[]     = "RAPPTURE::PLOT::ID";
-const char Plot::xaxis[]  = "RAPPTURE::PLOT::XAXIS";
-const char Plot::yaxis[]  = "RAPPTURE::PLOT::YAXIS";
+const char Plot::format[]  = "RAPPTURE::PLOT::FORMAT";
+const char Plot::id[]      = "RAPPTURE::PLOT::ID";
+const char Plot::xaxis[]   = "xaxis";
+const char Plot::yaxis[]   = "yaxis";
+const char Plot::creator[] = "RAPPTURE::PLOT::CREATOR";
+
+/*
+const char *Plot::creator[] = {
+    "plot",
+    "user"
+};
+*/
 
 Plot::Plot ()
-    :   Variable    (),
+    :   Object    (),
         _curveList  (NULL)
 {
@@ -33 +41 @@
 // copy constructor
 Plot::Plot ( const Plot& o )
-    :   Variable(o)
+    :   Object(o)
 {
     _curveList = Rp_ChainCreate();
@@ -48 +56 @@
     Rp_ChainLink *l = Rp_ChainFirstLink(_curveList);
     while (l != NULL) {
-        char *str = NULL;
         Curve * c = (Curve *) Rp_ChainGetValue(l);
-
-        str = (char *) c->propremove(Plot::format);
-        delete str;
-
-        str = (char *) c->propremove(Plot::id);
-        delete str;
-
+        c->propremove(Plot::format);
+        c->propremove(Plot::id);
         delete c;
         c = NULL;
@@ -89 +91 @@
     }
 
+    Path cpath;
+    cpath.id(name);
+    c->path(cpath.path());
+
     // can't use "xaxis" kinda strings here have to allocate it forreal
-    c->axis(xaxis,"xdesc","xunits","xcale",x,nPts);
-    c->axis(yaxis,"ydesc","yunits","ycale",y,nPts);
-    c->propstr(format,fmt);
-    c->propstr(id,name);
+    c->axis(Plot::xaxis,"","","","",x,nPts);
+    c->axis(Plot::yaxis,"","","","",y,nPts);
+    c->propstr(Plot::format,fmt);
+    c->propstr(Plot::creator,"plot");
 
     if (_curveList == NULL) {
@@ -109 +115 @@
 
 /**********************************************************************/
+// METHOD: add()
+/// Add an xy curve to the object
+/**
+ * Add an xy curve to the object.
+ * returns curve id
+ */
+
+Plot&
+Plot::add(
+    Curve *c,
+    const char *name)
+{
+    if (c == NULL) {
+       // raise memory error and exit
+       return *this;
+    }
+
+    c->propstr(Plot::id,name);
+
+    if (_curveList == NULL) {
+        _curveList = Rp_ChainCreate();
+        if (_curveList == NULL) {
+            // raise error and exit
+        }
+    }
+
+    Rp_ChainAppend(_curveList,c);
+
+    return *this;
+}
+
+
+/**********************************************************************/
 // METHOD: count()
 /// return number of curves in this object
@@ -143 +182 @@
     }
     return c;
+}
+
+/**********************************************************************/
+// METHOD: getNthCurve()
+/// Return the Nth Curve object
+/**
+ * Return the Nth Curve
+ */
+
+Curve *
+Plot::getNthCurve(size_t n) const
+{
+    Rp_ChainLink *l = NULL;
+    l = Rp_ChainGetNthLink(_curveList,n);
+
+    if (l == NULL) {
+        return NULL;
+    }
+
+    return (Curve *) Rp_ChainGetValue(l);
 }
 
@@ -163 +222 @@
     while (l != NULL) {
         Curve *c = (Curve *) Rp_ChainGetValue(l);
-        const char *cname = (const char *) c->property(id,NULL);
+        const char *cname = c->propstr(Plot::id);
         if (cname != NULL) {
             if((*cname == *name) && (strcmp(cname,name) == 0)) {
@@ -191 +250 @@
 }
 
+/**********************************************************************/
+// METHOD: xml()
+/// Return the xml of this object
+/**
+ * returns the xml of this object
+ */
+
+const char *
+Plot::xml()
+{
+
+    Rp_ChainLink *l = NULL;
+
+    _tmpBuf.clear();
+
+    l = Rp_ChainFirstLink(_curveList);
+    while (l != NULL) {
+        Curve *c = (Curve *) Rp_ChainGetValue(l);
+
+        //find who created the curve
+        const char *ccreator = c->propstr(Plot::creator);
+        if ((ccreator != NULL) &&
+            (*ccreator == 'p') &&
+            (strcmp(ccreator,"plot") == 0)) {
+            // FIXME: check fields to see if the user specified value
+            // plot defined curve, use plot's labels in curve's xml
+            const char *xlabel = propstr("xlabel");
+            const char *xdesc  = propstr("xdesc");
+            const char *xunits = propstr("xunits");
+            const char *xscale = propstr("xscale");
+            const char *ylabel = propstr("ylabel");
+            const char *ydesc  = propstr("ydesc");
+            const char *yunits = propstr("yunits");
+            const char *yscale = propstr("yscale");
+
+            if (xlabel || xdesc || xunits || xscale) {
+                Array1D *cxaxis = c->getAxis(Plot::xaxis);
+                cxaxis->label(xlabel);
+                cxaxis->desc(xdesc);
+                cxaxis->units(xunits);
+                cxaxis->scale(xscale);
+            }
+
+            if (ylabel || ydesc || yunits || yscale) {
+                Array1D *cyaxis = c->getAxis(Plot::yaxis);
+                cyaxis->label(ylabel);
+                cyaxis->desc(ydesc);
+                cyaxis->units(yunits);
+                cyaxis->scale(yscale);
+            }
+        }
+
+        _tmpBuf.append(c->xml());
+        _tmpBuf.append("\n",1);
+        l = Rp_ChainNextLink(l);
+    }
+
+    // remove trailing newline
+    _tmpBuf.remove(1);
+    // append terminating null character
+    _tmpBuf.append("\0",1);
+
+    return _tmpBuf.bytes();
+}
+
+/**********************************************************************/
+// METHOD: is()
+/// what kind of object is this
+/**
+ * return hex value telling what kind of object this is.
+ */
+
+const int
+Plot::is() const
+{
+    // return "plot" in hex
+    return 0x706C6F74;
+}
+
 // -------------------------------------------------------------------- //