Changeset 1374 for trunk/packages

Timestamp:

Apr 2, 2009, 3:52:16 PM (16 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (15 diffs)
• FlowCmds.cpp (modified) (3 diffs)
• LoadVector.cpp (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)
• VolumeRenderer.cpp (modified) (5 diffs)
• VolumeRenderer.h (modified) (1 diff)
• dxReader.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -68 +68 @@
 #include "Grid.h"
 #include "NvCamera.h"
-#include <RenderContext.h>
-#include <NvLIC.h>
+#include "RenderContext.h"
+#include "NvLIC.h"
+#include "Unirect.h"
 
 #define ISO_TEST                1
@@ -103 +104 @@
         std::istream& fin);
 extern bool load_vector_stream2(Rappture::Outcome &result, int index, 
-        std::istream& fin);
+        size_t length, char *bytes);
+extern bool MakeVectorFieldFromUnirect3d(Rappture::Outcome &result, 
+        Rappture::Unirect3d &data);
 
 // Tcl interpreter for incoming messages
@@ -147 +150 @@
 static Tcl_ObjCmdProc SnapshotCmd;
 static Tcl_ObjCmdProc TransfuncCmd;
-static Tcl_ObjCmdProc UniRect2dCmd;
+static Tcl_ObjCmdProc Unirect2dCmd;
 static Tcl_ObjCmdProc UpCmd;
 static Tcl_ObjCmdProc VolumeCmd;
 
-static bool
+bool
 GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, bool *boolPtr)
 {
@@ -163 +166 @@
 }
 
-static int
+int
 GetFloatFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, float *valuePtr)
 {
@@ -578 +581 @@
  * ----------------------------------------------------------------------
  */
-static int
+int
 GetAxisFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *indexPtr)
 {
@@ -650 +653 @@
  * -----------------------------------------------------------------------
  */
-static int
+int
 GetDataStream(Tcl_Interp *interp, Rappture::Buffer &buf, int nBytes)
 {
@@ -686 +689 @@
     {
         Rappture::Outcome err;
-
-        err = Rappture::encoding::decode(buf, RPENC_Z|RPENC_B64|RPENC_HDR);
-        if (err) {
+        unsigned int flags;
+
+        flags = RPENC_Z|RPENC_B64|RPENC_HDR;
+        if (!Rappture::encoding::decode(err, buf, flags)) {
             printf("ERROR -- DECODING\n");
             fflush(stdout);
@@ -1734 +1738 @@
         return TCL_ERROR;
     }
+    int extents;
+    if (Tcl_GetIntFromObj(interp, objv[4], &extents) != TCL_OK) {
+        return TCL_ERROR;
+    }
 
     Rappture::Buffer buf;
@@ -1740 +1748 @@
     }
     int n = NanoVis::n_volumes;
-    std::stringstream fdata;
-    fdata.write(buf.bytes(),buf.size());
-    // load_vector_stream(result, n, fdata);
-
-    if (!load_vector_stream2(result, n, fdata)) {
-        Tcl_AppendResult(interp, result.remark(), (char *)NULL);
-        return TCL_ERROR;
-    }
-    Volume *volPtr = NanoVis::volume[n];
-
+    if (strncmp(buf.bytes(), "<DX>", 4) == 0) {
+        if (!load_vector_stream2(result, n, buf.size(), (char *)buf.bytes())) {
+            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
+            return TCL_ERROR;
+        }
+    } else if (strncmp(buf.bytes(), "<unirect3d>", 4) == 0) {
+        Rappture::Unirect3d data;
+        Tcl_CmdInfo cmdInfo;
+
+        /* Set the clientdata field of the unirect3d command to contain
+         * the local data structure. */
+        if (!Tcl_GetCommandInfo(interp, "unirect3d", &cmdInfo)) {
+            return TCL_ERROR;
+        }
+        data.extents(extents);
+        cmdInfo.objClientData = (ClientData)&data;      
+        Tcl_SetCommandInfo(interp, "unirect3d", &cmdInfo);
+        if (Tcl_Eval(interp, (const char *)buf.bytes()) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        if (!data.isInitialized()) {
+            return TCL_ERROR;
+        }
+        if (!MakeVectorFieldFromUnirect3d(result, data)) {
+            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
+            return TCL_ERROR;
+        }
+    }
+
+    Volume *volPtr = NanoVis::volume[NanoVis::n_volumes];
     //
     // BE CAREFUL:  Set the number of slices to something
@@ -1758 +1786 @@
     //   appear at all.
     //
-    if (volPtr != NULL) {
-        volPtr->set_n_slice(256-n);
-        // volPtr->set_n_slice(512-n);
-        volPtr->disable_cutplane(0);
-        volPtr->disable_cutplane(1);
-        volPtr->disable_cutplane(2);
-
-        NanoVis::vol_renderer->add_volume(volPtr,
-                NanoVis::get_transfunc("default"));
-
-        float dx0 = -0.5;
-        float dy0 = -0.5*volPtr->height/volPtr->width;
-        float dz0 = -0.5*volPtr->depth/volPtr->width;
-        volPtr->move(Vector3(dx0, dy0, dz0));
-
-    }
-
+    volPtr->set_n_slice(256-n);
+    // volPtr->set_n_slice(512-n);
+    volPtr->disable_cutplane(0);
+    volPtr->disable_cutplane(1);
+    volPtr->disable_cutplane(2);
+    
+    NanoVis::vol_renderer->add_volume(volPtr, 
+        NanoVis::get_transfunc("default"));
+    
+    float dx0 = -0.5;
+    float dy0 = -0.5*volPtr->height/volPtr->width;
+    float dz0 = -0.5*volPtr->depth/volPtr->width;
+    volPtr->move(Vector3(dx0, dy0, dz0));
     return TCL_OK;
 }
@@ -1901 +1925 @@
     // FIXME: find a way to get the data from the movie object as a void*
     Rappture::Buffer data;
-    data.load(fileName);
+    if (!data.load(result, fileName)) {
+        Tcl_AppendResult(interp, "can't load data from temporary movie file \"",
+                fileName, "\": ", result.remark(), (char *)NULL);
+        return TCL_ERROR;
+    }
 
     // Build the command string for the client.
@@ -2002 +2030 @@
              Tcl_Obj *const *objv)
 {
-    Tcl_ObjCmdProc *proc;
+                                                                                                                                                                                        Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nFlowSliceOps, flowSliceOps,
@@ -2182 +2210 @@
     }
     buf.append("\0", 1);
-    int result;
-    result = Tcl_Eval(interp, buf.bytes());
-    if (result != TCL_OK) {
+
+    Rappture::Unirect2d grid;
+    Tcl_CmdInfo cmdInfo;
+
+    /* Set the clientdata field of the unirect2d command to contain the local
+     * grid structure. This is how we communicate through the Tcl command
+     * interface. */
+    if (!Tcl_GetCommandInfo(interp, "unirect2d", &cmdInfo)) {
+        return TCL_ERROR;
+    }
+    cmdInfo.objClientData = (ClientData)&grid;  
+    Tcl_SetCommandInfo(interp, "unirect2d", &cmdInfo);
+    if (Tcl_Eval(interp, (const char *)buf.bytes()) != TCL_OK) {
         fprintf(NanoVis::logfile, "error in command: %s\n",
                 Tcl_GetStringResult(interp));
         fflush(NanoVis::logfile);
-    }
-    return result;
+        return TCL_ERROR;
+    }
+    if (!grid.isInitialized()) {
+        return TCL_ERROR;
+    }
+
+    HeightMap* hmPtr;
+    hmPtr = new HeightMap();
+
+    // Must set units before the heights.
+    hmPtr->xAxis.units(grid.xUnits());
+    hmPtr->yAxis.units(grid.yUnits());
+    hmPtr->zAxis.units(grid.vUnits());
+    hmPtr->wAxis.units(grid.yUnits());
+    hmPtr->setHeight(grid.xMin(), grid.yMin(), grid.xMax(), grid.yMax(), 
+                     grid.xNum(), grid.yNum(), grid.acceptValues());
+    hmPtr->setColorMap(NanoVis::get_transfunc("default"));
+    hmPtr->setVisible(true);
+    hmPtr->setLineContourVisible(true);
+    NanoVis::heightMap.push_back(hmPtr);
+    return TCL_OK;
 }
 
@@ -2729 +2786 @@
  */
 static int
-UniRect2dCmd(ClientData clientData, Tcl_Interp *interp, int objc,
+Unirect2dCmd(ClientData clientData, Tcl_Interp *interp, int objc,
              Tcl_Obj *const *objv)
 {
-    int xNum, yNum, zNum;
-    float xMin, yMin, xMax, yMax;
-    float *zValues;
-    const char *xUnits, *yUnits, *zUnits;
-
-    if ((objc & 0x01) == 0) {
-        Tcl_AppendResult(interp, Tcl_GetString(objv[0]), ": ",
-                "wrong number of arguments: should be key-value pairs",
-                (char *)NULL);
-        return TCL_ERROR;
-    }
-    zValues = NULL;
-    xNum = yNum = zNum = 0;
-    xMin = yMin = xMax = yMax = 0.0f;
-    xUnits = yUnits = zUnits = NULL;
-    int i;
-    for (i = 1; i < objc; i += 2) {
-        const char *string;
-        char c;
-
-        string = Tcl_GetString(objv[i]);
-        c = string[0];
-        if ((c == 'x') && (strcmp(string, "xmin") == 0)) {
-            if (GetFloatFromObj(interp, objv[i+1], &xMin) != TCL_OK) {
-                return TCL_ERROR;
-            }
-        } else if ((c == 'x') && (strcmp(string, "xmax") == 0)) {
-            if (GetFloatFromObj(interp, objv[i+1], &xMax) != TCL_OK) {
-                return TCL_ERROR;
-            }
-        } else if ((c == 'x') && (strcmp(string, "xnum") == 0)) {
-            if (Tcl_GetIntFromObj(interp, objv[i+1], &xNum) != TCL_OK) {
-                return TCL_ERROR;
-            }
-            if (xNum <= 0) {
-                Tcl_AppendResult(interp, "bad xnum value: must be > 0",
-                     (char *)NULL);
-                return TCL_ERROR;
-            }
-        } else if ((c == 'x') && (strcmp(string, "xunits") == 0)) {
-            xUnits = Tcl_GetString(objv[i+1]);
-        } else if ((c == 'y') && (strcmp(string, "ymin") == 0)) {
-            if (GetFloatFromObj(interp, objv[i+1], &yMin) != TCL_OK) {
-                return TCL_ERROR;
-            }
-        } else if ((c == 'y') && (strcmp(string, "ymax") == 0)) {
-            if (GetFloatFromObj(interp, objv[i+1], &yMax) != TCL_OK) {
-                return TCL_ERROR;
-            }
-        } else if ((c == 'y') && (strcmp(string, "ynum") == 0)) {
-            if (Tcl_GetIntFromObj(interp, objv[i+1], &yNum) != TCL_OK) {
-                return TCL_ERROR;
-            }
-            if (yNum <= 0) {
-                Tcl_AppendResult(interp, "bad ynum value: must be > 0",
-                                 (char *)NULL);
-                return TCL_ERROR;
-            }
-        } else if ((c == 'y') && (strcmp(string, "yunits") == 0)) {
-            yUnits = Tcl_GetString(objv[i+1]);
-        } else if ((c == 'z') && (strcmp(string, "zvalues") == 0)) {
-            Tcl_Obj **zObj;
-
-            if (Tcl_ListObjGetElements(interp, objv[i+1], &zNum, &zObj)!= TCL_OK) {
-                return TCL_ERROR;
-            }
-            int j;
-            zValues = new float[zNum];
-            for (j = 0; j < zNum; j++) {
-                if (GetFloatFromObj(interp, zObj[j], zValues + j) != TCL_OK) {
-                    return TCL_ERROR;
-                }
-            }
-        } else if ((c == 'z') && (strcmp(string, "zunits") == 0)) {
-            zUnits = Tcl_GetString(objv[i+1]);
-        } else {
-            Tcl_AppendResult(interp, "unknown key \"", string,
-                "\": should be xmin, xmax, xnum, xunits, ymin, ymax, ynum, yunits, zvalues, or zunits",
-                (char *)NULL);
-            return TCL_ERROR;
-        }
-    }
-    if (zValues == NULL) {
-        Tcl_AppendResult(interp, "missing \"zvalues\" key", (char *)NULL);
-        return TCL_ERROR;
-    }
-    if (zNum != (xNum * yNum)) {
-        Tcl_AppendResult(interp, "wrong number of z values must be xnum*ynum",
-                (char *)NULL);
-        return TCL_ERROR;
-    }
-    HeightMap* hmPtr;
-    hmPtr = new HeightMap();
-
-    // Must set units before the heights.
-    hmPtr->xAxis.units(xUnits);
-    hmPtr->yAxis.units(yUnits);
-    hmPtr->zAxis.units(zUnits);
-    hmPtr->wAxis.units(yUnits);
-    hmPtr->setHeight(xMin, yMin, xMax, yMax, xNum, yNum, zValues);
-    hmPtr->setColorMap(NanoVis::get_transfunc("default"));
-    hmPtr->setVisible(true);
-    hmPtr->setLineContourVisible(true);
-    NanoVis::heightMap.push_back(hmPtr);
-    return TCL_OK;
-}
-
+    Rappture::Unirect2d *dataPtr = (Rappture::Unirect2d *)clientData;
+
+    return dataPtr->LoadData(interp, objc, objv);
+}
+
+/*
+ * This command should be Tcl procedure instead of a C command.  The reason
+ * for this that 1) we are using a safe interpreter so we would need a master
+ * interpreter to load the Tcl environment properly (including our "unirect2d"
+ * procedure). And 2) the way nanovis is currently deployed doesn't make it
+ * easy to add new directories for procedures, since it's loaded into /tmp.
+ *
+ * Ideally, the "unirect2d" proc would do a rundimentary parsing of the data
+ * to verify the structure and then pass it to the appropiate Tcl command
+ * (heightmap, volume, etc). Our C command always creates a heightmap.
+ */
+
+static int
+Unirect3dCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+             Tcl_Obj *const *objv)
+{
+    Rappture::Unirect3d *dataPtr = (Rappture::Unirect3d *)clientData;
+
+    return dataPtr->LoadData(interp, objc, objv);
+}
 
 Tcl_Interp *
@@ -2865 +2840 @@
     Tcl_CreateObjCommand(interp, "snapshot",    SnapshotCmd,    NULL, NULL);
     Tcl_CreateObjCommand(interp, "transfunc",   TransfuncCmd,   NULL, NULL);
-    Tcl_CreateObjCommand(interp, "unirect2d",   UniRect2dCmd,   NULL, NULL);
+    Tcl_CreateObjCommand(interp, "unirect2d",   Unirect2dCmd,   NULL, NULL);
+    Tcl_CreateObjCommand(interp, "unirect3d",   Unirect3dCmd,   NULL, NULL);
     Tcl_CreateObjCommand(interp, "up",          UpCmd,          NULL, NULL);
     Tcl_CreateObjCommand(interp, "volume",      VolumeCmd,      NULL, NULL);

trunk/packages/vizservers/nanovis/FlowCmds.cpp

@@ -98 +98 @@
 extern int GetDataStream(Tcl_Interp *interp, Rappture::Buffer &buf, int nBytes);
 extern bool load_vector_stream2(Rappture::Outcome &result, int index, 
-        int nBytes, char *bytes);
+        size_t nBytes, char *bytes);
 
 extern bool MakeVectorFieldFromUnirect3d(Rappture::Outcome &result, 
@@ -145 +145 @@
     }
     Rappture::Buffer buf;
-    buf.load(fileName);
+    if (!buf.load(result, fileName)) {
+        Tcl_AppendResult(interp, "can't load data from \"", fileName, "\": ",
+                         result.remark(), (char *)NULL);
+        return TCL_ERROR;
+    }
 
     int n = NanoVis::n_volumes;
@@ -901 +905 @@
     // FIXME: find a way to get the data from the movie object as a void*
     Rappture::Buffer data;
-    data.load(fileName);
-
+    if (!data.load(result, fileName)) {
+        Tcl_AppendResult(interp, "can't load data from temporary movie file \"",
+                fileName, "\": ", result.remark(), (char *)NULL);
+        return TCL_ERROR;
+    }
     // Build the command string for the client.
     char command[200];

trunk/packages/vizservers/nanovis/LoadVector.cpp

@@ -240 +240 @@
 
 
+#ifdef notdef
 /*
  * Load a 3D vector field from a dx-format file
@@ -363 +364 @@
 }
 
+#endif

trunk/packages/vizservers/nanovis/Makefile.in

@@ -72 +72 @@
                 $(CG_LIB_SPEC) \
                 $(GL_LIB_SPEC) \
-                $(GLUI_LIB_SPEC) \
                 $(FF_LIB_SPEC) \
                 $(EXTRA_LIBS) \
@@ -83 +82 @@
                 $(IMG_INC_SPEC) \
                 $(MAT_INC_SPEC) \
-                $(GLUI_INC_SPEC) \
                 $(TCL_INC_SPEC) \
                 $(CG_INC_SPEC) \
@@ -105 +103 @@
                 ConvexPolygon.o \
                 Event.o \
+                Switch.o \
+                FlowCmds.o \
                 GradientFilter.o \
                 Grid.o \
                 HeightMap.o \
+                LoadVector.o \
+                Unirect.o \
                 Mat4x4.o \
                 Nv.o \
@@ -178 +180 @@
                 $(srcdir)/shaders/zincblende_volume.cg
 
-.PHONY: glui newmat11 R2 imgloaders transfer-function nanovis
-
-all: glui newmat11 R2 imgloaders transfer-function nanovis
+.PHONY: newmat11 R2 imgloaders transfer-function nanovis
+
+all: newmat11 R2 imgloaders transfer-function nanovis
 
 install: install-nanovis install-resources install-shaders
@@ -238 +240 @@
 
 clean:
-        $(MAKE) -C $(GLUI_DIR) clean
         $(MAKE) -C $(MAT_DIR) clean
         $(MAKE) -C $(R2_DIR)/src clean

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -890 +890 @@
 
 
-void VolumeRenderer::init_font(const char* filename) {
-
-    FILE *file;
+bool 
+VolumeRenderer::init_font(const char* filename) 
+{
+    FILE *f;
     unsigned short int bfType;
     int bfOffBits;
@@ -901 +902 @@
     int i;
     unsigned char temp;
-
-
+    unsigned char* data;
     /* make sure the file is there and open it read-only (binary) */
-    if ((file = fopen(filename, "rb")) == NULL) {
+    f = fopen(filename, "rb");
+    if (f == NULL) {
         fprintf(stderr, "can't open font file \"%s\"\n", filename);
-        abort();
-    }
-    
-    if(!fread(&bfType, sizeof(short int), 1, file)) {
-        fprintf(stderr, "can't read 2 bytes from font file \"%s\"\n", filename);
-        abort();
+        return false;
+    }
+    
+    if (fread(&bfType, sizeof(short int), 1, f) != 1) {
+        fprintf(stderr, "can't read %d bytes from font file \"%s\"\n", 
+                sizeof(short int), filename);
+        goto error;
     }
     
     /* check if file is a bitmap */
     if (bfType != 19778) {
-        assert(false);
-        //printf("Not a Bitmap-File!\n");
+        fprintf(stderr, "not a bmp file.\n");
+        goto error;
     }
     
     /* get the file size */
     /* skip file size and reserved fields of bitmap file header */
-    fseek(file, 8, SEEK_CUR);
+    fseek(f, 8, SEEK_CUR);
     
     /* get the position of the actual bitmap data */
-    if (!fread(&bfOffBits, sizeof(int), 1, file)) {
-        assert(false);
-        //printf("Error reading file!\n");
+    if (fread(&bfOffBits, sizeof(int), 1, f) != 1) {
+        fprintf(stderr, "error reading file.\n");
+        goto error;
     }
     //printf("Data at Offset: %ld\n", bfOffBits);
     
     /* skip size of bitmap info header */
-    fseek(file, 4, SEEK_CUR);
+    fseek(f, 4, SEEK_CUR);
     
     /* get the width of the bitmap */
-    fread(&width, sizeof(int), 1, file);
+    if (fread(&width, sizeof(int), 1, f) != 1) {
+        fprintf(stderr, "error reading file.\n");
+        goto error;
+    }
     //printf("Width of Bitmap: %d\n", texture->width);
     
     /* get the height of the bitmap */
-    fread(&height, sizeof(int), 1, file);
+    if (fread(&height, sizeof(int), 1, f) != 1) {
+        fprintf(stderr, "error reading file.\n");
+        goto error;
+    }
     //printf("Height of Bitmap: %d\n", texture->height);
     
     /* get the number of planes (must be set to 1) */
-    fread(&biPlanes, sizeof(short int), 1, file);
-    if (biPlanes != 1)
-    {
-      assert(false);
-      //printf("Error: number of Planes not 1!\n");
+    if (fread(&biPlanes, sizeof(short int), 1, f) != 1) {
+        fprintf(stderr, "error reading file.\n");
+        goto error;
+    }
+    if (biPlanes != 1) {
+        fprintf(stderr, "Error: number of Planes not 1!\n");
+        goto error;
     }
     
     /* get the number of bits per pixel */
-    if (!fread(&biBitCount, sizeof(short int), 1, file)) {
-        assert(false);
-        //printf("Error reading file!\n");
-        //return 0;
+    if (fread(&biBitCount, sizeof(short int), 1, f) != 1) {
+        fprintf(stderr, "error reading file.\n");
+        goto error;
     }
     
     //printf("Bits per Pixel: %d\n", biBitCount);
     if (biBitCount != 24) {
-        assert(false);
-        //printf("Bits per Pixel not 24\n");
-        //return 0;
+        fprintf(stderr, "Bits per Pixel not 24\n");
+        goto error;
     }
 
@@ -967 +975 @@
     /* calculate the size of the image in bytes */
     biSizeImage = width * height * 3 * sizeof(unsigned char);
-    unsigned char* data = (unsigned char*) malloc(biSizeImage);
-
+    data = (unsigned char*) malloc(biSizeImage);
+    if (data == NULL) {
+        fprintf(stderr, "Can't allocate memory for image\n");
+        goto error;
+    }
 
     /* seek to the actual data */
-    fseek(file, bfOffBits, SEEK_SET);
-    if (!fread(data, biSizeImage, 1, file)) {
-        assert(false);
-        //printf("Error loading file!\n");
-    }
-    
+    fseek(f, bfOffBits, SEEK_SET);
+    if (fread(data, biSizeImage, 1, f) != 1) {
+        fprintf(stderr, "Error loading file!\n");
+        goto error;
+    }
+    fclose(f);
+
     /* swap red and blue (bgr -> rgb) */
     for (i = 0; i < biSizeImage; i += 3) {
@@ -985 +997 @@
 
     //insert alpha channel
-    unsigned char* data_with_alpha = (unsigned char*) malloc(width*height*4*sizeof(unsigned char));
+    unsigned char* data_with_alpha;
+    data_with_alpha = (unsigned char*)
+        malloc(width*height*4*sizeof(unsigned char));
     for(int i=0; i<height; i++){
-      for(int j=0; j<width; j++){
-        unsigned char r, g, b, a;
-        r = data[3*(i*width+j)];
-        g = data[3*(i*width+j)+1];
-        b = data[3*(i*width+j)+2];
-
-        if(r==0 && g==0 && b==0)
-          a = 0;
-        else
-          a = 255;
-
-        data_with_alpha[4*(i*width+j)] = r;
-        data_with_alpha[4*(i*width+j) + 1] = g;
-        data_with_alpha[4*(i*width+j) + 2] = b;
-        data_with_alpha[4*(i*width+j) + 3] = a;
-
-      }
+        for(int j=0; j<width; j++){
+            unsigned char r, g, b, a;
+            r = data[3*(i*width+j)];
+            g = data[3*(i*width+j)+1];
+            b = data[3*(i*width+j)+2];
+            
+            if(r==0 && g==0 && b==0)
+                a = 0;
+            else
+                a = 255;
+            
+            data_with_alpha[4*(i*width+j)] = r;
+            data_with_alpha[4*(i*width+j) + 1] = g;
+            data_with_alpha[4*(i*width+j) + 2] = b;
+            data_with_alpha[4*(i*width+j) + 3] = a;
+            
+        }
     }
     free(data);
-
+    
     //create opengl texture 
     glGenTextures(1, &font_texture);
@@ -1019 +1033 @@
 
     build_font();
-    assert(glGetError()==0);
-}
-
-
-
-void VolumeRenderer::draw_label(Volume* vol){
+    return (glGetError()==0);
+
+ error:
+    fclose(f);
+    return false;
+}
+
+
+
+void 
+VolumeRenderer::draw_label(Volume* vol)
+{
 
   //glEnable(GL_TEXTURE_2D);

trunk/packages/vizservers/nanovis/VolumeRenderer.h

@@ -94 +94 @@
 
     void get_near_far_z(Mat4x4 mv, double &zNear, double &zFar);
-    void init_font(const char* filename);
+    bool init_font(const char* filename);
     void glPrint(char* string, int set); //there are two sets of font in the
                                          //texture. 0, 1

trunk/packages/vizservers/nanovis/dxReader.cpp

@@ -44 +44 @@
 #define  _LOCAL_ZINC_TEST_ 0
 
+static INLINE char *
+skipspaces(char *string) 
+{
+    while (isspace(*string)) {
+        string++;
+    }
+    return string;
+}
+
+static INLINE char *
+getline(char **stringPtr, char *endPtr) 
+{
+    char *line, *p;
+
+    line = skipspaces(*stringPtr);
+    for (p = line; p < endPtr; p++) {
+        if (*p == '\n') {
+            *p++ = '\0';
+            *stringPtr = p;
+            return line;
+        }
+    }
+    *stringPtr = p;
+    return line;
+}
+
 /*
  * Load a 3D vector field from a dx-format file
  */
 bool
-load_vector_stream2(Rappture::Outcome &result, int volindex, std::istream& fin)
+load_vector_stream2(Rappture::Outcome &result, int ivol, size_t length,
+                    char *string)
 {
-    int dummy, nx, ny, nz, npts;
+    int nx, ny, nz, npts;
     double x0, y0, z0, dx, dy, dz, ddx, ddy, ddz;
-    char line[128], type[128], *start;
+    char *p, *endPtr;
 
     dx = dy = dz = 0.0;         // Suppress compiler warning.
     x0 = y0 = z0 = 0.0;         // May not have an origin line.
-
+    for (p = string, endPtr = p + length; p < endPtr; /*empty*/) {
+        char *line;
+
+        line = getline(&p, endPtr);
+        if (line == endPtr) {
+            break;
+        }
+        if ((line[0] == '#') || (line == '\0')) {
+            continue;           // Skip blank or comment lines.
+        }
+        if (sscanf(line, "object %*d class gridpositions counts %d %d %d", 
+                   &nx, &ny, &nz) == 4) {
+            printf("w:%d h:%d d:%d\n", nx, ny, nz);
+            // found grid size
+        } else if (sscanf(line, "origin %lg %lg %lg", &x0, &y0, &z0) == 3) {
+            // found origin
+        } else if (sscanf(line, "delta %lg %lg %lg", &ddx, &ddy, &ddz) == 3) {
+            // found one of the delta lines
+            if (ddx != 0.0) {
+                dx = ddx;
+            } else if (ddy != 0.0) {
+                dy = ddy;
+            } else if (ddz != 0.0) {
+                dz = ddz;
+            }
+        } else if (sscanf(line, "object %*d class array type %*s shape 3"
+                " rank 1 items %d data follows", &npts) == 3) {
+            printf("point %d\n", npts);
+            if (npts != nx*ny*nz) {
+                result.addError("inconsistent data: expected %d points"
+                                " but found %d points", nx*ny*nz, npts);
+                return false;
+            }
+            break;
+        } else if (sscanf(line, "object %*d class array type %*s rank 0"
+                " times %d data follows", &npts) == 3) {
+            if (npts != nx*ny*nz) {
+                result.addError("inconsistent data: expected %d points"
+                                " but found %d points", nx*ny*nz, npts);
+                return false;
+            }
+            break;
+        }
+    }
     Vector3 physicalMin;
     Vector3 physicalMax;
 
-    while (!fin.eof()) {
-        fin.getline(line, sizeof(line) - 1);
-        if (fin.fail()) {
-            result.addError("error in data stream");
-            return false;
-        }
-        for (start=&line[0]; *start == ' ' || *start == '\t'; start++)
-            ;  // skip leading blanks
-
-        if (*start != '#') {  // skip comment lines
-            if (sscanf(start, "object %d class gridpositions counts %d %d %d", &dummy, &nx, &ny, &nz) == 4) {
-                printf("w:%d h:%d d:%d\n", nx, ny, nz);
-                // found grid size
-            } else if (sscanf(start, "origin %lg %lg %lg", &x0, &y0, &z0) == 3) {
-                // found origin
-            } else if (sscanf(start, "delta %lg %lg %lg", &ddx, &ddy, &ddz) == 3) {
-                // found one of the delta lines
-                if (ddx != 0.0) {
-                    dx = ddx;
-                } else if (ddy != 0.0) {
-                    dy = ddy;
-                } else if (ddz != 0.0) {
-                    dz = ddz;
-                }
-            } else if (sscanf(start, "object %d class array type %s shape 3 rank 1 items %d data follows", &dummy, type, &npts) == 3) {
-                printf("point %d\n", npts);
-                if (npts != nx*ny*nz) {
-                    result.addError("inconsistent data: expected %d points"
-                                    " but found %d points", nx*ny*nz, npts);
-                    return false;
-                }
-                break;
-            } else if (sscanf(start, "object %d class array type %s rank 0 times %d data follows", &dummy, type, &npts) == 3) {
-                if (npts != nx*ny*nz) {
-                    result.addError("inconsistent data: expected %d points"
-                                    " but found %d points", nx*ny*nz, npts);
-                    return false;
-                }
-                break;
-            }
-        }
-    }
-
     physicalMin.set(x0, y0, z0);
     physicalMax.set(x0 + dx * nx, y0 + dy * ny, z0 + dz * nz);
@@ -108 +135 @@
     // read data points
     float* srcdata = new float[nx * ny * nz * 3];
-    if (!fin.eof()) {
-        double vx, vy, vz, vm;
+    if (p >= endPtr) {
+        std::cerr << "WARNING: data not found in stream" << std::endl;
+        return true;
+    }
 #ifdef notdef
-        double max_x = -1e21, min_x = 1e21;
-        double max_y = -1e21, min_y = 1e21;
-        double max_z = -1e21, min_z = 1e21;
+    double max_x = -1e21, min_x = 1e21;
+    double max_y = -1e21, min_y = 1e21;
+    double max_z = -1e21, min_z = 1e21;
 #endif
-        double max_mag = -1e21, min_mag = 1e21;
-        int nread = 0;
-        for (int ix=0; ix < nx; ix++) {
-            for (int iy=0; iy < ny; iy++) {
-                for (int iz=0; iz < nz; iz++) {
-                    if (fin.eof() || nread > npts) {
-                        break;
-                    }
-                    fin.getline(line,sizeof(line)-1);
-                    if (sscanf(line, "%lg %lg %lg", &vx, &vy, &vz) == 3) {
-                        int nindex = (iz*nx*ny + iy*nx + ix) * 3;
-                        srcdata[nindex] = vx;
-                        //if (srcdata[nindex] > max_x) max_x = srcdata[nindex];
-                        //if (srcdata[nindex] < min_x) min_x = srcdata[nindex];
-                        ++nindex;
-
-                        srcdata[nindex] = vy;
-                        //if (srcdata[nindex] > max_y) max_y = srcdata[nindex];
-                        //if (srcdata[nindex] < min_y) min_y = srcdata[nindex];
-                        ++nindex;
-
-                        srcdata[nindex] = vz;
-                        //if (srcdata[nindex] > max_z) max_z = srcdata[nindex];
-                        //if (srcdata[nindex] < min_z) min_z = srcdata[nindex];
-
-                        vm = sqrt(vx*vx + vy*vy + vz*vz);
-                        if (vm > max_mag) {
-                            max_mag = vm;
-                        }
-                        if (vm < min_mag) {
-                            min_mag = vm;
-                        }
-
-                        ++nread;
-                    }
-                }
-            }
-        }
-
-        // make sure that we read all of the expected points
-        if (nread != nx*ny*nz) {
-            result.addError("inconsistent data: expected %d points"
-                            " but found %d points", nx*ny*nz, npts);
-            return false;
-        }
-
-        float *data = new float[4*nx*ny*nz];
-        memset(data, 0, sizeof(float) * 4 * nx * ny * nz);
-
-        std::cout << "generating " << nx << "x" << ny << "x" << nz << " = " << nx*ny*nz << " points" << std::endl;
-
-        // generate the uniformly sampled data that we need for a volume
-#ifdef notdef
-        double nzero_min = 0.0;
-#endif
-        int ngen = 0;
-        int nindex = 0;
-        for (int iz=0; iz < nz; iz++) {
-            for (int iy=0; iy < ny; iy++) {
-                for (int ix=0; ix < nx; ix++) {
-
-                    vx = srcdata[nindex++];
-                    vy = srcdata[nindex++];
-                    vz = srcdata[nindex++];
-
-                    double vm;
-                    vm = sqrt(vx*vx + vy*vy + vz*vz);
-
-                    data[ngen] = vm / max_mag; ++ngen;
-                    data[ngen] = vx /(2.0*max_mag) + 0.5; ++ngen;
-                    data[ngen] = vy /(2.0*max_mag) + 0.5; ++ngen;
-                    data[ngen] = vz /(2.0*max_mag) + 0.5; ++ngen;
-                }
-            }
-        }
-
-        Volume *volPtr;
-        volPtr = NanoVis::load_volume(volindex, nx, ny, nz, 4, data, 
-                min_mag, max_mag, 0);
-
-        volPtr->xAxis.SetRange(x0, x0 + nx);
-        volPtr->yAxis.SetRange(y0, y0 + ny);
-        volPtr->zAxis.SetRange(z0, z0 + nz);
-        volPtr->wAxis.SetRange(min_mag, max_mag);
-        volPtr->update_pending = true;
-        volPtr->setPhysicalBBox(physicalMin, physicalMax);
-        delete [] data;
-    } else {
-        std::cerr << "WARNING: data not found in stream" << std::endl;
+    double max_mag = -1e21, min_mag = 1e21;
+    int nread = 0;
+    for (int ix=0; ix < nx; ix++) {
+        for (int iy=0; iy < ny; iy++) {
+            for (int iz=0; iz < nz; iz++) {
+                char *line;
+                double vx, vy, vz, vm;
+
+                if ((p == endPtr) || nread > npts) {
+                    break;
+                }
+                line = getline(&p, endPtr);
+                if ((line == '#') || (line == '\0')) {
+                    continue;   // Skip blank or comment lines.
+                }
+                if (sscanf(line, "%lg %lg %lg", &vx, &vy, &vz) == 3) {
+                    int nindex = (iz*nx*ny + iy*nx + ix) * 3;
+                    srcdata[nindex] = vx;
+                    //if (srcdata[nindex] > max_x) max_x = srcdata[nindex];
+                    //if (srcdata[nindex] < min_x) min_x = srcdata[nindex];
+                    ++nindex;
+                    
+                    srcdata[nindex] = vy;
+                    //if (srcdata[nindex] > max_y) max_y = srcdata[nindex];
+                    //if (srcdata[nindex] < min_y) min_y = srcdata[nindex];
+                    ++nindex;
+                    
+                    srcdata[nindex] = vz;
+                    //if (srcdata[nindex] > max_z) max_z = srcdata[nindex];
+                    //if (srcdata[nindex] < min_z) min_z = srcdata[nindex];
+                    
+                    vm = sqrt(vx*vx + vy*vy + vz*vz);
+                    if (vm > max_mag) {
+                        max_mag = vm;
+                    }
+                    if (vm < min_mag) {
+                        min_mag = vm;
+                    }
+                    ++nread;
+                }
+            }
+        }
     }
+    
+    // make sure that we read all of the expected points
+    if (nread != nx*ny*nz) {
+        result.addError("inconsistent data: expected %d points"
+                        " but found %d points", nx*ny*nz, npts);
+        return false;
+    }
+    
+    float *data = new float[4*nx*ny*nz];
+    memset(data, 0, sizeof(float) * 4 * nx * ny * nz);
+    fprintf(stderr, "generating %dx%dx%d = %d points\n", nx, ny, nz, nx*ny*nz);
+
+    // generate the uniformly sampled data that we need for a volume
+    float *destPtr = data;
+    float *srcPtr = srcdata;
+    for (int iz=0; iz < nz; iz++) {
+        for (int iy=0; iy < ny; iy++) {
+            for (int ix=0; ix < nx; ix++) {
+                double vx, vy, vz, vm;
+
+                vx = srcPtr[0];
+                vy = srcPtr[1];
+                vz = srcPtr[2];
+                
+                vm = sqrt(vx*vx + vy*vy + vz*vz);
+                
+                destPtr[0] = vm / max_mag; 
+                destPtr[1] = vx /(2.0*max_mag) + 0.5; 
+                destPtr[2] = vy /(2.0*max_mag) + 0.5; 
+                destPtr[3] = vz /(2.0*max_mag) + 0.5; 
+                srcPtr += 3;
+                destPtr += 4;
+            }
+        }
+    }
+    
+    Volume *volPtr;
+    volPtr = NanoVis::load_volume(ivol, nx, ny, nz, 4, data, min_mag, max_mag, 
+        0);
+    
+    volPtr->xAxis.SetRange(x0, x0 + nx);
+    volPtr->yAxis.SetRange(y0, y0 + ny);
+    volPtr->zAxis.SetRange(z0, z0 + nz);
+    volPtr->wAxis.SetRange(min_mag, max_mag);
+    volPtr->update_pending = true;
+    volPtr->setPhysicalBBox(physicalMin, physicalMax);
+    delete [] data;
     return true;
 }