Changeset 1528 for trunk/examples

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

Location:

trunk/examples/objects

Files:

• Makefile.in (modified) (1 diff)
• axis/Makefile.in (modified) (1 diff)
• axis/axis.cc (modified) (3 diffs)
• contour (added)
• contour/Makefile.in (added)
• curve/curve.cc (modified) (3 diffs)
• histogram (added)
• histogram/Makefile.in (added)
• histogram/histogram.cc (added)
• number/number.cc (modified) (1 diff)
• path (added)
• path/Makefile.in (added)
• path/path.cc (added)
• plot/plot.cc (modified) (3 diffs)
• scatter (added)
• scatter/Makefile.in (added)
• scatter/scatter.cc (added)
• tree (added)
• tree/Makefile.in (added)
• tree/tree.c (added)
• xmlparser (added)
• xmlparser/Makefile.in (added)
• xmlparser/tool.xml (added)
• xmlparser/xmlparser.cc (added)

trunk/examples/objects/Makefile.in

@@ -15 +15 @@
 RM              = rm -f
 
-examples   = \
+examples = \
                 axis \
                 curve \
                 dxWriter \
                 floatBuffer \
+                histogram \
                 number \
+                path \
                 plot \
-                string
+                string \
+                tree \
+                xmlparser
 
 destdir    = $(prefix)/examples/objects

trunk/examples/objects/axis/Makefile.in

@@ -18 +18 @@
 CXXFLAGS        = @CFLAGS@
 DEFINES         = -g -Wall
-INCLUDES        = -I$(srcdir)/../../../src/core \
+INCLUDES        = -I../../../src/core \
+                  -I../../../src/objects \
+                  -I$(srcdir)/../../../src/core \
                   -I$(srcdir)/../../../src/objects \
                   -I$(includedir)

trunk/examples/objects/axis/axis.cc

@@ -1 +1 @@
 #include <iostream>
 #include "RpArray1D.h"
+
+
+int test(
+    const char *testname,
+    const char *desc,
+    const char *expected,
+    const char *received)
+{
+/*
+    if (strcmp(expected,received) != 0) {
+        printf("Error: %s\n", testname);
+        printf("\t%s\n", desc);
+        printf("\texpected \"%s\"\n",expected);
+        printf("\treceived \"%s\"\n",received);
+        return 1;
+    }
+*/
+    return 0;
+}
 
 int
 printAxis(Rappture::Array1D *n)
 {
-    std::cout << "path: " << n->path() << std::endl;
+    std::cout << "name: " << n->name() << std::endl;
     std::cout << "label: " << n->label() << std::endl;
     std::cout << "desc: " << n->desc() << std::endl;
@@ -22 +41 @@
 }
 
+int axis_0_0 ()
+{
+    const char *desc = "";
+    const char *testname = "axis_0_0";
+
+
+    const char *expected = NULL;
+    const char *received = NULL;
+
+    return test(testname,desc,expected,received);
+}
+
 int main()
 {
@@ -27 +58 @@
     double d[] = {70,400,199,502,832924};
 
-    n = new Rappture::Array1D("output.axis(temperature)",d,5,"mylabel",
-                            "mydesc","K","linear");
+    n = new Rappture::Array1D(d,5);
+    n->name("output.axis(temperature)");
+    n->label("mylabel");
+    n->desc("mydesc");
+    n->units("K");
+    n->scale("linear");
 
     printAxis(n);
 
-    Rappture::Array1D n1("output.axis(t)",d,5);
+    Rappture::Array1D n1(d,5);
+    n1.name("output.axis(t)");
     printAxis(&n1);
 
     delete n;
 
+    axis_0_0();
+
     return 0;
 }

trunk/examples/objects/curve/curve.cc

@@ -1 +1 @@
 #include <iostream>
 #include "RpCurve.h"
+
+int test(
+    const char *testname,
+    const char *desc,
+    const char *expected,
+    const char *received)
+{
+    if (strcmp(expected,received) != 0) {
+        printf("Error: %s\n", testname);
+        printf("\t%s\n", desc);
+        printf("\texpected \"%s\"\n",expected);
+        printf("\treceived \"%s\"\n",received);
+        return 1;
+    }
+    return 0;
+}
 
 int
@@ -18 +34 @@
     }
 
+    std::cout << "xml: " << n->xml() << std::endl;
     return 0;
+}
+
+int curve_0_0 ()
+{
+    const char *desc = "test basic constructor";
+    const char *testname = "curve_0_0";
+
+    const char *expected = "output.curve(myid)";
+    const char *received = NULL;
+
+    Rappture::Curve c(expected);
+    received = c.path();
+
+    return test(testname,desc,expected,received);
 }
 
@@ -31 +62 @@
                             "mydesc","mygroup");
 
-    n->axis("xlabel","xdesc","xunits","xscale",x,10);
-    n->axis("ylabel","ydesc","yunits","yscale",y,10);
-    n->axis("zlabel","zdesc","zunits","zscale",z,10);
+    n->axis("xaxis","xlabel","xdesc","xunits","xscale",x,10);
+    n->axis("yaxis","ylabel","ydesc","yunits","yscale",y,10);
+    n->axis("zaxis","zlabel","zdesc","zunits","zscale",z,10);
     printCurve(n);
     n->delAxis("zlabel");

trunk/examples/objects/number/number.cc

@@ -13 +13 @@
     std::cout << "max: " << n->max() << std::endl;
     std::cout << "units: " << n->units() << std::endl;
+    std::cout << "xml: " << n->xml() << std::endl;
     return 0;
 }

trunk/examples/objects/plot/plot.cc

@@ -41 +41 @@
     std::printf("curveCnt = %zu\n",curveCnt);
 
+    std::printf("xml: %s\n",p1->xml());
+
+/*
     // retrieve curve from curve name
     // may want to add curve to another plot
@@ -51 +54 @@
     size_t ylen = 0;
 
-    xlen = c->data(Rappture::Plot::xaxis,&ax);
-    ylen = c->data(Rappture::Plot::yaxis,&ay);
+    xlen = c->data(Rappture::Curve::xaxis,&ax);
+    ylen = c->data(Rappture::Curve::yaxis,&ay);
 
     std::printf("xlen = %zu\nylen = %zu\n",xlen,ylen);
-    std::printf("fmt = %s\n",c->propstr(Rappture::Plot::format,NULL));
+    std::printf("fmt = %s\n",c->propstr(Rappture::Curve::format,NULL));
 
     if (   (ax != NULL)
@@ -63 +66 @@
         }
     }
+*/
 
     delete p1;