Changeset 1569 for trunk/examples/objects

Timestamp:

Sep 16, 2009 2:22:36 PM (11 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.

Location:

trunk/examples/objects

Files:

• curve/curve.cc (modified) (2 diffs)
• plot/plot.cc (modified) (2 diffs)

trunk/examples/objects/curve/curve.cc

@@ -41 +41 @@
 
     const char *expected = "<?xml version=\"1.0\"?>\n\
-<curve id=\"myid\">\n\
-    <about>\n\
-        <group>mygroup</group>\n\
-        <label>mylabel</label>\n\
-        <description>mydesc</description>\n\
-        <type>(null)</type>\n\
-    </about>\n\
-    <xaxis>\n\
-        <label>xlabel</label>\n\
-        <description>xdesc</description>\n\
-        <units>xunits</units>\n\
-        <scale>xscale</scale>\n\
-    </xaxis>\n\
-    <yaxis>\n\
-        <label>ylabel</label>\n\
-        <description>ydesc</description>\n\
-        <units>yunits</units>\n\
-        <scale>yscale</scale>\n\
-    </yaxis>\n\
-    <component>\n\
-        <xy>         1         1\n\
+<run>\n\
+    <curve id=\"myid\">\n\
+        <about>\n\
+            <group>mygroup</group>\n\
+            <label>mylabel</label>\n\
+            <description>mydesc</description>\n\
+            <type>(null)</type>\n\
+        </about>\n\
+        <xaxis>\n\
+            <label>xlabel</label>\n\
+            <description>xdesc</description>\n\
+            <units>xunits</units>\n\
+            <scale>xscale</scale>\n\
+        </xaxis>\n\
+        <yaxis>\n\
+            <label>ylabel</label>\n\
+            <description>ydesc</description>\n\
+            <units>yunits</units>\n\
+            <scale>yscale</scale>\n\
+        </yaxis>\n\
+        <component>\n\
+            <xy>         1         1\n\
          2         4\n\
          3         9\n\
@@ -72 +73 @@
         10       100\n\
 </xy>\n\
-    </component>\n\
-</curve>\n\
+        </component>\n\
+    </curve>\n\
+</run>\n\
 ";
     const char *received = NULL;

trunk/examples/objects/plot/plot.cc

@@ -2 +2 @@
 #include "RpPlot.h"
 
+size_t indent = 0;
+size_t tabstop = 4;
+
+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 plot_0_0 ()
+{
+    const char *desc = "test basic plot object constructor";
+    const char *testname = "plot_0_0";
+
+    const char *expected = "run";
+    const char *received = NULL;
+
+    Rappture::Plot p;
+    received = p.path();
+
+    return test(testname,desc,expected,received);
+}
+
+int plot_1_0 ()
+{
+    const char *desc = "test generating xml text for single curve";
+    const char *testname = "plot_1_0";
+
+    const char *expected = "<?xml version=\"1.0\"?>\n\
+<run>\n\
+    <curve id=\"myid\">\n\
+        <about>\n\
+            <group>plotlabel</group>\n\
+            <label>plotlabel</label>\n\
+            <description>describe plot here</description>\n\
+            <type>(null)</type>\n\
+        </about>\n\
+        <xaxis>\n\
+            <label>Voltage</label>\n\
+            <description>Voltage along the Gate</description>\n\
+            <units>Volt</units>\n\
+            <scale>linear</scale>\n\
+        </xaxis>\n\
+        <yaxis>\n\
+            <label>Current</label>\n\
+            <description>Current along the Drain</description>\n\
+            <units>Amp</units>\n\
+            <scale>log</scale>\n\
+        </yaxis>\n\
+        <component>\n\
+            <xy>         1         1\n\
+         2         4\n\
+         3         9\n\
+         4        16\n\
+         5        25\n\
+         6        36\n\
+         7        49\n\
+         8        64\n\
+         9        81\n\
+        10       100\n\
+</xy>\n\
+        </component>\n\
+    </curve>\n\
+</run>\n\
+";
+    const char *received = NULL;
+
+    Rappture::Plot p;
+    size_t npts = 10;
+    double x[] = {1,2,3,4,5,6,7,8,9,10};
+    double y[] = {1,4,9,16,25,36,49,64,81,100};
+
+    p.add(npts, x, y, NULL, "myid");
+
+    p.propstr("label","plotlabel");
+    p.propstr("desc","describe plot here");
+    p.propstr("xlabel","Voltage");
+    p.propstr("xdesc","Voltage along the Gate");
+    p.propstr("xunits","Volt");
+    p.propstr("xscale","linear");
+    p.propstr("ylabel","Current");
+    p.propstr("ydesc","Current along the Drain");
+    p.propstr("yunits","Amp");
+    p.propstr("yscale","log");
+
+    Rappture::ClientDataXml xmldata;
+    xmldata.indent = indent;
+    xmldata.tabstop = tabstop;
+    xmldata.retStr = NULL;
+    p.dump(Rappture::RPCONFIG_XML,&xmldata);
+    received = xmldata.retStr;
+
+    return test(testname,desc,expected,received);
+}
+
+int main()
+{
+    plot_0_0 ();
+    plot_1_0 ();
+    return 0;
+}
+
+/*
 int main()
 {
@@ -46 +159 @@
     std::printf("xml: %s\n",p1->xml(indent,tabstop));
 
-/*
-    // retrieve curve from curve name
-    // may want to add curve to another plot
-    // or just read through the values
-    Rappture::Curve *c = p1->curve("curve1");
-
-    const double *ax = NULL;
-    const double *ay = NULL;
-    size_t xlen = 0;
-    size_t ylen = 0;
-
-    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::Curve::format,NULL));
-
-    if (   (ax != NULL)
-        && (ay != NULL)) {
-        for (size_t i = 0; (i < xlen) && (i < ylen); i++) {
-            std::printf("x = %g  y = %g\n",ax[i],ay[i]);
-        }
-    }
-*/
-
     delete p1;
 
     return 0;
 }
+*/