Changeset 595

Timestamp:

Feb 27, 2007, 8:07:51 AM (17 years ago)

Author:

mmc

Message:

Added Derrick's libraries for base64 decoding and unzipping in place,
without having to shell out.

Location:

trunk/gui/vizservers/nanovis

Files:

• Makefile (modified) (2 diffs)
• nanovis.cpp (modified) (10 diffs)

trunk/gui/vizservers/nanovis/Makefile

@@ -23 +23 @@
 R2INC = ./R2/include
 
-LIB_NANOVIS = -ltcl8.4 -L/opt/render/lib -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lstdc++ 
+LIB_NANOVIS = -Wl,-rpath,/apps/rappture/lib -ltcl8.4 ../../../src2/core/libviz.a -L/apps/rappture/lib -lb64 -lz -L/opt/render/lib -lGL -lglut -lglui -lGLEW -lCg -lCgGL -pthread -lstdc++ 
 LIB_CLIENT = -L/opt/render/lib -lGL -lglut -pthread -lstdc++ 
-INCLUDES = -I../../../src2/core -I/opt/render/include -I/usr/include/GL -I/usr/include/GL -I/usr/include/tcl8.4 -I/usr/include/GL -I$(R2INC)
+INCLUDES = -I../../../src2/core -I/apps/rappture/include -I/opt/render/include -I/usr/include/GL -I/usr/include/GL -I/usr/include/tcl8.4 -I/usr/include/GL -I$(R2INC)
 CFLAG = -g -c $(INCLUDES)
 
@@ -37 +37 @@
 
 nanovis: $(OBJ_NANOVIS)
-        gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) ../../../src2/core/*.o
-#   (cd ../../../src2/core; make libviz.a)
-#       gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) ../../../src2/core/libviz.a
+        (cd ../../../src2/core; make libviz.a)
+        gcc -g -o nanovis $(OBJ_NANOVIS) $(LIB_NANOVIS) ../../../src2/core/libviz.a
 
 ColorGradient.o: Color.o $(TFSRC)/ColorGradient.cpp

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -32 +32 @@
 #include "RpFieldRect3D.h"
 #include "RpFieldPrism3D.h"
+#include "RpBuffer.h"
 
 //transfer function headers
@@ -108 +109 @@
 //void init_particles();
 void get_slice_vectors();
-Rappture::Outcome load_volume_file(int index, char *fname);
+Rappture::Outcome load_volume_stream(int index, std::iostream& fin);
 void load_volume(int index, int width, int height, int depth, int n_component, float* data, double vmin, double vmax);
 TransferFunction* get_transfunc(char *name);
@@ -830 +831 @@
             }
 
-            char fname[64];
-            sprintf(fname,"/tmp/nv%d.dat",getpid());
-            std::ofstream dfile(fname);
+            Rappture::Outcome err;
+            Rappture::Buffer buf;
 
             char buffer[8096];
@@ -839 +839 @@
                 int status = fread(buffer, 1, chunk, stdin);
                 if (status > 0) {
-                    dfile.write(buffer,status);
+                    buf.append(buffer,status);
                     nbytes -= status;
                 } else {
-                    Tcl_AppendResult(interp, "data unpacking failed in file ",
-                        fname, (char*)NULL);
+                    Tcl_AppendResult(interp, "data unpacking failed: unexpected EOF",
+                        (char*)NULL);
                     return TCL_ERROR;
                 }
             }
-            dfile.close();
-
-            char cmdstr[512];
-            sprintf(cmdstr, "mimedecode %s | gunzip -c > /tmp/nv%d.dx", fname, getpid());
-            if (system(cmdstr) != 0) {
-                Tcl_AppendResult(interp, "data unpacking failed in file ",
-                    fname, (char*)NULL);
+
+            err = buf.decode();
+            if (err) {
+                Tcl_AppendResult(interp, err.remark().c_str(), (char*)NULL);
                 return TCL_ERROR;
             }
-
-            sprintf(fname,"/tmp/nv%d.dx",getpid());
+            std::stringstream fdata;
+            fdata.write(buf.bytes(),buf.size());
 
             int n = n_volumes;
-            Rappture::Outcome err = load_volume_file(n, fname);
-
-            sprintf(cmdstr, "rm -f /tmp/nv%d.dat /tmp/nv%d.dx", getpid(), getpid());
-            system(cmdstr);
+            err = load_volume_stream(n, fdata);
 
             if (err) {
@@ -1395 +1389 @@
  */
 void
-load_vector_file(int index, char *fname) {
+load_vector_stream(int index, std::iostream& fin) {
     int dummy, nx, ny, nz, nxy, npts;
     double x0, y0, z0, dx, dy, dz, ddx, ddy, ddz;
     char line[128], type[128], *start;
-    std::ifstream fin(fname);
 
     do {
@@ -1530 +1523 @@
         delete [] data;
     } else {
-        std::cerr << "WARNING: data not found in file " << fname << std::endl;
+        std::cerr << "WARNING: data not found in stream" << std::endl;
     }
 }
@@ -1538 +1531 @@
  */
 Rappture::Outcome
-load_volume_file(int index, char *fname) {
+load_volume_stream(int index, std::iostream& fin) {
     Rappture::Outcome result;
 
@@ -1545 +1538 @@
     double x0, y0, z0, dx, dy, dz, ddx, ddy, ddz;
     char line[128], type[128], *start;
-    std::ifstream fin(fname);
 
     int isrect = 1;
@@ -1888 +1880 @@
         }
     } else {
-        char mesg[256];
-        sprintf(mesg,"data not found in file %s", fname);
-        return result.error(mesg);
+        return result.error("data not found in stream");
     }
 
@@ -2218 +2208 @@
      perf = new PerfQuery(); 
    }
-
-   //load_volume_file(0, "./data/A-apbs-2-out-potential-PE0.dx");
-   //load_volume_file(0, "./data/nw-AB-Vg=0.000-Vd=1.000-potential.dx");
-   //load_volume_file(0, "./data/test2.dx");
-   //load_volume_file(0, "./data/mu-wire-3d.dx"); //I added this line to debug: Wei
-   //load_volume_file(0, "./data/input_nd_dx_4"); //take a VERY long time?
-   //load_vector_file(1, "./data/J-wire-vec.dx");
-   //load_volume_file(1, "./data/mu-wire-3d.dx");  //I added this line to debug: Wei
-   //load_volume_file(3, "./data/mu-wire-3d.dx");
-   //load_volume_file(4, "./data/mu-wire-3d.dx");
 
    init_offscreen_buffer();    //frame buffer object for offscreen rendering