Changeset 1615 for trunk/examples/objects/app-fermi/fermi4.cc

Timestamp:

Nov 16, 2009, 3:03:37 PM (15 years ago)

Author:

dkearney

Message:

clean up on example programs for new bindings

File:

• trunk/examples/objects/app-fermi/fermi4.cc (modified) (6 diffs)

trunk/examples/objects/app-fermi/fermi4.cc

@@ -14 +14 @@
 #include "rappture.h"
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <math.h>
 #include <unistd.h>
@@ -22 +22 @@
 
     // create a rappture library from the file filePath
-    Rappture::Library lib(argv[1]);
+    Rappture::Library lib;
     Rappture::Number *T;
 
@@ -36 +36 @@
     double fArr[nPts];
 
+    lib.loadFile(argv[1]);
     if (lib.error() != 0) {
         // cannot open file or out of memory
@@ -41 +42 @@
         fprintf(stderr, "%s",o.context());
         fprintf(stderr, "%s",o.remark());
-        exit(lib.error());
+        return (lib.error());
     }
 
-    Rappture::connect(&lib,"temperature",T);
+    Rappture::Connect(&lib,"temperature",T);
     lib.value("Ef", &Ef, 1, "units=eV");
 
@@ -53 +54 @@
         fprintf(stderr, "%s",o.context());
         fprintf(stderr, "%s",o.remark());
-        exit(lib.error());
+        return(lib.error());
     }
 
@@ -68 +69 @@
         fArr[idx] = f;
         EArr[idx] = E;
-        rpUtilsProgress((int)((E-Emin)/(Emax-Emin)*100),"Iterating");
+        Rappture::Utils::progress((int)((E-Emin)/(Emax-Emin)*100),"Iterating");
     }
-
-    const char *curveLabel = "Fermi-Dirac Curve"
-    const char *curveDesc = "Plot of Fermi-Dirac Calculation";
 
     // do it the easy way,
     // create a plot to add to the library
     // plot is registered with lib upon object creation
-    // p1.add(nPts,xArr,yArr,format,curveLabel,curveDesc);
+    // p1.add(nPts,xArr,yArr,format,name);
 
     Rappture::Plot p1(lib);
-    p1.add(nPts,fArr,EArr,"",curveLabel,curveDesc);
+    p1.add(nPts,fArr,EArr,"","fdfactor");
+    p1.propstr("label","Fermi-Dirac Curve");
+    p1.propstr("desc","Plot of Fermi-Dirac Calculation");
     p1.propstr("xlabel","Fermi-Dirac Factor");
     p1.propstr("ylabel","Energy");