Changeset 3605

Timestamp:

Apr 2, 2013, 1:31:30 PM (12 years ago)

Author:

ldelgass

Message:

Add writer thread to nanovis (set USE_THREADS in Makefile), more refactoring.

Location:

trunk/packages/vizservers/nanovis

Files:

• BMPWriter.cpp (added)
• BMPWriter.h (added)
• Command.cpp (modified) (31 diffs)
• Command.h (modified) (3 diffs)
• FlowCmd.cpp (modified) (9 diffs)
• FlowCmd.h (modified) (1 diff)
• Grid.cpp (modified) (1 diff)
• HeightMap.cpp (modified) (1 diff)
• Makefile.in (modified) (10 diffs)
• OrientationIndicator.cpp (added)
• OrientationIndicator.h (added)
• PPMWriter.cpp (added)
• PPMWriter.h (added)
• ReadBuffer.cpp (added)
• ReadBuffer.h (added)
• ResponseQueue.cpp (added)
• ResponseQueue.h (added)
• Trace.cpp (modified) (4 diffs)
• Trace.h (modified) (1 diff)
• Unirect.cpp (modified) (2 diffs)
• Unirect.h (modified) (1 diff)
• dxReader.cpp (modified) (2 diffs)
• nanovis.cpp (modified) (27 diffs)
• nanovis.h (modified) (10 diffs)
• nanovisServer.cpp (added)
• nanovisServer.h (added)
• protocol-nanovis.txt (modified) (8 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -45 +45 @@
 #include <vrmath/Vector3f.h>
 
+#include "nanovisServer.h"
 #include "nanovis.h"
+#include "ReadBuffer.h"
+#ifdef USE_THREADS
+#include "ResponseQueue.h"
+#endif
+#include "Command.h"
 #include "CmdProc.h"
 #include "FlowCmd.h"
-#include "Trace.h"
-#ifdef USE_POINTSET_RENDERER
-#include "PointSet.h"
-#endif
 #include "dxReader.h"
 #include "VtkReader.h"
+#include "BMPWriter.h"
+#include "PPMWriter.h"
 #include "Grid.h"
 #include "HeightMap.h"
 #include "NvCamera.h"
 #include "NvZincBlendeReconstructor.h"
+#include "OrientationIndicator.h"
 #include "Unirect.h"
 #include "Volume.h"
 #include "VolumeRenderer.h"
-
+#include "Trace.h"
+
+using namespace nv;
 using namespace nv::graphics;
 using namespace vrmath;
@@ -102 +109 @@
 }";
 
+static int lastCmdStatus;
+
+#ifdef USE_THREADS
+void
+nv::queueResponse(const void *bytes, size_t len, 
+                  Response::AllocationType allocType,
+                  Response::ResponseType type)
+{
+    Response *response = new Response(type);
+    response->setMessage((unsigned char *)bytes, len, allocType);
+    g_queue->enqueue(response);
+}
+#else
+
+ssize_t
+nv::SocketWrite(const void *bytes, size_t len)
+{
+    size_t ofs = 0;
+    ssize_t bytesWritten;
+    while ((bytesWritten = write(g_fdOut, (const char *)bytes + ofs, len - ofs)) > 0) {
+        ofs += bytesWritten;
+        if (ofs == len)
+            break;
+    }
+    if (bytesWritten < 0) {
+        ERROR("write: %s", strerror(errno));
+    }
+    return bytesWritten;
+}
+
+#endif  /*USE_THREADS*/
+
+bool
+nv::SocketRead(char *bytes, size_t len)
+{
+    ReadBuffer::BufferStatus status;
+    status = g_inBufPtr->followingData((unsigned char *)bytes, len);
+    TRACE("followingData status: %d", status);
+    return (status == ReadBuffer::OK);
+}
+
+bool
+nv::SocketRead(Rappture::Buffer &buf, size_t len)
+{
+    ReadBuffer::BufferStatus status;
+    status = g_inBufPtr->followingData(buf, len);
+    TRACE("followingData status: %d", status);
+    return (status == ReadBuffer::OK);
+}
+
+static int
+ExecuteCommand(Tcl_Interp *interp, Tcl_DString *dsPtr) 
+{
+    int result;
+#ifdef WANT_TRACE
+    char *str = Tcl_DStringValue(dsPtr);
+    std::string cmd(str);
+    cmd.erase(cmd.find_last_not_of(" \n\r\t")+1);
+    TRACE("command %lu: '%s'", g_stats.nCommands+1, cmd.c_str());
+#endif
+    lastCmdStatus = TCL_OK;
+    result = Tcl_EvalEx(interp, Tcl_DStringValue(dsPtr), 
+                        Tcl_DStringLength(dsPtr), 
+                        TCL_EVAL_DIRECT | TCL_EVAL_GLOBAL);
+    Tcl_DStringSetLength(dsPtr, 0);
+    if (lastCmdStatus == TCL_BREAK) {
+        return TCL_BREAK;
+    }
+    lastCmdStatus = result;
+    if (result != TCL_OK) {
+        TRACE("Error: %d", result);
+    }
+    return result;
+}
+
 bool
 GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, bool *boolPtr)
@@ -276 +358 @@
  * TCL_ERROR to indicate an error.
  */
-static int
+int
 GetVolumeFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, Volume **volPtrPtr)
 {
@@ -454 +536 @@
 GetDataStream(Tcl_Interp *interp, Rappture::Buffer &buf, int nBytes)
 {
-    char buffer[8096];
-
-    clearerr(NanoVis::stdin);
-    while (nBytes > 0) {
-        unsigned int chunk;
-        int nRead;
-
-        chunk = (sizeof(buffer) < (unsigned int) nBytes) ?
-            sizeof(buffer) : nBytes;
-        nRead = fread(buffer, sizeof(char), chunk, NanoVis::stdin);
-        if (ferror(NanoVis::stdin)) {
-            Tcl_AppendResult(interp, "while reading data stream: ",
-                             Tcl_PosixError(interp), (char*)NULL);
-            return TCL_ERROR;
-        }
-        if (feof(NanoVis::stdin)) {
-            Tcl_AppendResult(interp, "premature EOF while reading data stream",
-                             (char*)NULL);
-            return TCL_ERROR;
-        }
-        buf.append(buffer, nRead);
-        nBytes -= nRead;
-    }
-    if (NanoVis::recfile != NULL) {
-        ssize_t nWritten;
-
-        nWritten = fwrite(buf.bytes(), sizeof(char), buf.size(), 
-                          NanoVis::recfile);
-        assert(nWritten == (ssize_t)buf.size());
-        fflush(NanoVis::recfile);
+    if (!SocketRead(buf, nBytes)) {
+        return TCL_ERROR;
     }
     Rappture::Outcome err;
@@ -621 +675 @@
             Tcl_Obj *const *objv)
 {
-    int w, h;
-
-    w = NanoVis::winWidth, h = NanoVis::winHeight;
-
-    NanoVis::resizeOffscreenBuffer(2048, 2048);
-#ifdef notdef
-    NanoVis::cam->setScreenSize(0, 0, NanoVis::winWidth, NanoVis::winHeight);
-    NanoVis::cam->setScreenSize(30, 90, 2048 - 60, 2048 - 120);
-#endif
-    NanoVis::bindOffscreenBuffer();  //enable offscreen render
+    int origWidth, origHeight, width, height;
+
+    origWidth = NanoVis::winWidth;
+    origHeight = NanoVis::winHeight;
+    width = 2048;
+    height = 2048;
+
+    NanoVis::resizeOffscreenBuffer(width, height);
+    NanoVis::bindOffscreenBuffer();
     NanoVis::render();
     NanoVis::readScreen();
-
-    NanoVis::ppmWrite("nv>image -type print -bytes %d");
-    NanoVis::resizeOffscreenBuffer(w, h);
+#ifdef USE_THREADS
+    queuePPM(g_queue, "nv>image -type print -bytes",
+             NanoVis::screenBuffer, width, height);
+#else
+    writePPM(g_fdOut, "nv>image -type print -bytes",
+             NanoVis::screenBuffer, width, height);
+#endif
+    NanoVis::resizeOffscreenBuffer(origWidth, origHeight);
 
     return TCL_OK;
@@ -753 +811 @@
 static int
 ClientInfoCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-        Tcl_Obj *const *objv)
+              Tcl_Obj *const *objv)
 {
     Tcl_DString ds;
@@ -769 +827 @@
     }
 #ifdef KEEPSTATS
-    int f;
-
     /* Use the initial client key value pairs as the parts for a generating
      * a unique file name. */
-    f = NanoVis::getStatsFile(objv[1]);
+    int f = nv::getStatsFile(interp, objv[1]);
     if (f < 0) {
         Tcl_AppendResult(interp, "can't open stats file: ", 
@@ -809 +865 @@
     /* date */
     Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4));
-    strcpy(buf, ctime(&NanoVis::startTime.tv_sec));
+    strcpy(buf, ctime(&nv::g_stats.start.tv_sec));
     buf[strlen(buf) - 1] = '\0';
     Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1));
@@ -816 +872 @@
                 Tcl_NewStringObj("date_secs", 9));
     Tcl_ListObjAppendElement(interp, listObjPtr, 
-                Tcl_NewLongObj(NanoVis::startTime.tv_sec));
+                Tcl_NewLongObj(nv::g_stats.start.tv_sec));
     /* Client arguments. */
     if (Tcl_ListObjGetElements(interp, objv[1], &numItems, &items) != TCL_OK) {
@@ -829 +885 @@
     Tcl_DStringAppend(&ds, "\n", 1);
 #ifdef KEEPSTATS
-    result = NanoVis::writeToStatsFile(f, Tcl_DStringValue(&ds), 
-                                       Tcl_DStringLength(&ds));
+    result = nv::writeToStatsFile(f, Tcl_DStringValue(&ds), 
+                                  Tcl_DStringLength(&ds));
 #else
     TRACE("clientinfo: %s", Tcl_DStringValue(&ds));
@@ -860 +916 @@
     }
 
-    const char *name;
-    name = Tcl_GetString(objv[1]);
-    TransferFunction *tf = NanoVis::getTransferFunction(name);
+    const char *tfName = Tcl_GetString(objv[1]);
+    TransferFunction *tf = NanoVis::getTransferFunction(tfName);
     if (tf == NULL) {
-        Tcl_AppendResult(interp, "unknown transfer function \"", name, "\"",
+        Tcl_AppendResult(interp, "unknown transfer function \"", tfName, "\"",
                              (char*)NULL);
         return TCL_ERROR;
@@ -876 +931 @@
         NanoVis::setVolumeRanges();
     }
-    NanoVis::renderLegend(tf, Volume::valueMin, Volume::valueMax, w, h, name);
+    NanoVis::renderLegend(tf, Volume::valueMin, Volume::valueMax, w, h, tfName);
     return TCL_OK;
 }
@@ -1080 +1135 @@
         return TCL_ERROR;
     }
-    VolumeInterpolator* interpolator;
-    interpolator = NanoVis::volRenderer->getVolumeInterpolator();
+    VolumeInterpolator *interpolator =
+        NanoVis::volRenderer->getVolumeInterpolator();
     interpolator->start();
     if (interpolator->isStarted()) {
-        const char *fileName = (objc < 5) ? NULL : Tcl_GetString(objv[4]);
-        for (int frame_num = 0; frame_num < total; ++frame_num) {
+        const char *dirName = (objc < 5) ? NULL : Tcl_GetString(objv[4]);
+        for (int frameNum = 0; frameNum < total; ++frameNum) {
             float fraction;
 
-            fraction = ((float)frame_num) / (total - 1);
+            fraction = ((float)frameNum) / (total - 1);
             TRACE("fraction : %f", fraction);
-            //interpolator->update(((float)frame_num) / (total - 1));
             interpolator->update(fraction);
 
@@ -1103 +1157 @@
             glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboOrig);
 
-            NanoVis::bmpWriteToFile(frame_num, fileName);
+            /* FIXME: this function requires 4-byte aligned RGB rows,
+             * but screen buffer is now 1 byte aligned for PPM images.
+             */
+            nv::writeBMPFile(frameNum, dirName,
+                             NanoVis::screenBuffer,
+                             NanoVis::winWidth, NanoVis::winHeight);
         }
     }
@@ -1185 +1244 @@
     }
     const char *tag = Tcl_GetString(objv[4]);
-    Rappture::Buffer buf;
+
+    Rappture::Buffer buf(nbytes);
     if (GetDataStream(interp, buf, nbytes) != TCL_OK) {
         return TCL_ERROR;
     }
-    const char *bytes;
-    size_t nBytes;
-
-    bytes = buf.bytes();
-    nBytes = buf.size();
+    const char *bytes = buf.bytes();
+    size_t nBytes = buf.size();
 
     TRACE("Checking header[%.20s]", bytes);
@@ -1201 +1258 @@
     if ((nBytes > 5) && (strncmp(bytes, "<HDR>", 5) == 0)) {
         TRACE("ZincBlende Stream loading...");
-         //std::stringstream fdata(std::ios_base::out|std::ios_base::in|std::ios_base::binary);
-        //fdata.write(buf.bytes(),buf.size());
-        //vol = NvZincBlendeReconstructor::getInstance()->loadFromStream(fdata);
-
-        volume = NvZincBlendeReconstructor::getInstance()->loadFromMemory((void*) buf.bytes());
+        volume = NvZincBlendeReconstructor::getInstance()->loadFromMemory(const_cast<char *>(bytes));
         if (volume == NULL) {
             Tcl_AppendResult(interp, "can't get volume instance", (char *)NULL);
@@ -1267 +1320 @@
         volume->visible(true);
 
-        char info[1024];
-        ssize_t nWritten;
-
         if (Volume::updatePending) {
             NanoVis::setVolumeRanges();
         }
 
+        char info[1024];
         // FIXME: strlen(info) is the return value of sprintf
-        sprintf(info, "nv>data tag %s min %g max %g vmin %g vmax %g\n", tag, 
-                volume->wAxis.min(), volume->wAxis.max(),
-                Volume::valueMin, Volume::valueMax);
-        nWritten  = write(1, info, strlen(info));
-        assert(nWritten == (ssize_t)strlen(info));
-    }
+        int cmdLength = 
+            sprintf(info, "nv>data tag %s min %g max %g vmin %g vmax %g\n", tag, 
+                    volume->wAxis.min(), volume->wAxis.max(),
+                    Volume::valueMin, Volume::valueMax);
+#ifdef USE_THREADS
+        queueResponse(info, cmdLength, Response::VOLATILE);
+#else
+        ssize_t nWritten  = SocketWrite(info, (size_t)cmdLength);
+        if (nWritten != (ssize_t)cmdLength) {
+            ERROR("Short write");
+             return TCL_ERROR;
+        }
+#endif
+    }
+
     return TCL_OK;
 }
@@ -1304 +1364 @@
 
 static Rappture::CmdSpec volumeDataOps[] = {
-    {"follows",   1, VolumeDataFollowsOp, 5, 5, "size tag",},
+    {"follows",   1, VolumeDataFollowsOp, 5, 5, "nbytes tag",},
     {"state",     1, VolumeDataStateOp,   4, 0, "bool ?indices?",},
 };
@@ -1407 +1467 @@
 }
 
-
 static Rappture::CmdSpec volumeOutlineOps[] = {
     {"color",     1, VolumeOutlineColorOp,  6, 0, "r g b ?indices?",},
@@ -1596 +1655 @@
                tf->name());
         (*iter)->transferFunction(tf);
-#ifdef USE_POINTSET_RENDERER
-        // TBD..
-        if ((*iter)->pointsetIndex != -1) {
-            NanoVis::pointSet[(*iter)->pointsetIndex]->updateColor(tf->getData(), 256);
-        }
-#endif
     }
     return TCL_OK;
@@ -1656 +1709 @@
     {"delete",    2, VolumeDeleteOp,      3, 0, "?name...?",},
     {"exists",    1, VolumeExistsOp,      3, 3, "name",},
-    {"names",     1, VolumeNamesOp,       2, 3, "?pattern?",},
+    {"names",     1, VolumeNamesOp,       2, 2, "",},
     {"outline",   1, VolumeOutlineOp,     3, 0, "oper ?args?",},
     {"shading",   2, VolumeShadingOp,     3, 0, "oper ?args?",},
@@ -1663 +1716 @@
 static int nVolumeOps = NumCmdSpecs(volumeOps);
 
-/*
- * ----------------------------------------------------------------------
- * CLIENT COMMAND:
- *   volume data state on|off ?<volumeId> ...?
- *   volume outline state on|off ?<volumeId> ...?
- *   volume outline color on|off ?<volumeId> ...?
- *   volume shading transfunc <name> ?<volumeId> ...?
- *   volume shading diffuse <value> ?<volumeId> ...?
- *   volume shading specular <value> ?<volumeId> ...?
- *   volume shading opacity <value> ?<volumeId> ...?
- *   volume state on|off ?<volumeId> ...?
- *
- * Clients send these commands to manipulate the volumes.
- * ----------------------------------------------------------------------
- */
 static int
 VolumeCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
@@ -1702 +1740 @@
     const char *tag = Tcl_GetString(objv[4]);
 
-    Rappture::Buffer buf;
+    Rappture::Buffer buf(nBytes);
     if (GetDataStream(interp, buf, nBytes) != TCL_OK) {
         return TCL_ERROR;
@@ -1761 +1799 @@
 
 static Rappture::CmdSpec heightMapDataOps[] = {
-    {"follows",  1, HeightMapDataFollowsOp, 5, 5, "size tag",},
-    {"visible",  1, HeightMapDataVisibleOp, 4, 0, "bool ?indices?",},
+    {"follows",  1, HeightMapDataFollowsOp, 5, 5, "size heightmapName",},
+    {"visible",  1, HeightMapDataVisibleOp, 4, 0, "bool ?heightmapNames...?",},
 };
 static int nHeightMapDataOps = NumCmdSpecs(heightMapDataOps);
@@ -1822 +1860 @@
 
 static Rappture::CmdSpec heightMapLineContourOps[] = {
-    {"color",   1, HeightMapLineContourColorOp,   4, 4, "length",},
-    {"visible", 1, HeightMapLineContourVisibleOp, 4, 0, "bool ?indices?",},
+    {"color",   1, HeightMapLineContourColorOp,   6, 0, "r g b ?heightmapNames...?",},
+    {"visible", 1, HeightMapLineContourVisibleOp, 4, 0, "bool ?heightmapNames...?",},
 };
 static int nHeightMapLineContourOps = NumCmdSpecs(heightMapLineContourOps);
@@ -1956 +1994 @@
 }
 
-
 static int
 HeightMapOpacityOp(ClientData clientData, Tcl_Interp *interp, int objc,
@@ -1978 +2015 @@
 
 static Rappture::CmdSpec heightMapOps[] = {
-    {"create",       2, HeightMapCreateOp,      10, 10, "tag xmin ymin xmax ymax xnum ynum values",},
+    {"create",       2, HeightMapCreateOp,      10, 10, "heightmapName xmin ymin xmax ymax xnum ynum values",},
     {"cull",         2, HeightMapCullOp,        3, 3, "mode",},
     {"data",         1, HeightMapDataOp,        3, 0, "oper ?args?",},
-    {"legend",       2, HeightMapLegendOp,      5, 5, "index width height",},
+    {"legend",       2, HeightMapLegendOp,      5, 5, "heightmapName width height",},
     {"linecontour",  2, HeightMapLineContourOp, 2, 0, "oper ?args?",},
-    {"opacity",      1, HeightMapOpacityOp,     3, 0, "value ?heightmap...? ",},
+    {"opacity",      1, HeightMapOpacityOp,     3, 0, "value ?heightmapNames...? ",},
     {"polygon",      1, HeightMapPolygonOp,     3, 3, "mode",},
     {"shading",      1, HeightMapShadingOp,     3, 3, "model",},
-    {"transfunc",    2, HeightMapTransFuncOp,   3, 0, "name ?heightmap...?",},
+    {"transfunc",    2, HeightMapTransFuncOp,   3, 0, "name ?heightmapNames...?",},
 };
 static int nHeightMapOps = NumCmdSpecs(heightMapOps);
@@ -2118 +2155 @@
             return TCL_ERROR;
         }
-        NanoVis::axisOn = visible;
+        NanoVis::orientationIndicator->setVisible(visible);
     } else {
         Tcl_AppendResult(interp, "bad axis option \"", string,
@@ -2127 +2164 @@
 }
 
-/*
- * 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
+ImageFlushCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+              Tcl_Obj *const *objv)
+{
+    lastCmdStatus = TCL_BREAK;
+    return TCL_OK;
+}
+
+/**
+ * \brief Execute commands from client in Tcl interpreter
+ * 
+ * In this threaded model, the select call is for event compression.  We
+ * want to execute render server commands as long as they keep coming.  
+ * This lets us execute a stream of many commands but render once.  This 
+ * benefits camera movements, screen resizing, and opacity changes 
+ * (using a slider on the client).  The down side is you don't render
+ * until there's a lull in the command stream.  If the client needs an
+ * image, it can issue an "imgflush" command.  That breaks us out of the
+ * read loop.
  */
-static int
-Unirect2dCmd(ClientData clientData, Tcl_Interp *interp, int objc,
-             Tcl_Obj *const *objv)
-{
-    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.
+int
+nv::processCommands(Tcl_Interp *interp,
+                    ReadBuffer *inBufPtr, int fdOut)
+{
+    int ret = 1;
+    int status = TCL_OK;
+
+    Tcl_DString command;
+    Tcl_DStringInit(&command);
+    fd_set readFds;
+    struct timeval tv, *tvPtr;
+
+    FD_ZERO(&readFds);
+    FD_SET(inBufPtr->file(), &readFds);
+    tvPtr = NULL;                       /* Wait for the first read. This is so
+                                         * that we don't spin when no data is
+                                         * available. */
+    while (inBufPtr->isLineAvailable() || 
+           (select(1, &readFds, NULL, NULL, tvPtr) > 0)) {
+        size_t numBytes;
+        unsigned char *buffer;
+
+        /* A short read is treated as an error here because we assume that we
+         * will always get commands line by line. */
+        if (inBufPtr->getLine(&numBytes, &buffer) != ReadBuffer::OK) {
+            /* Terminate the server if we can't communicate with the client
+             * anymore. */
+            if (inBufPtr->status() == ReadBuffer::ENDFILE) {
+                TRACE("Exiting server on EOF from client");
+                return -1;
+            } else {
+                ERROR("Exiting server, failed to read from client: %s",
+                      strerror(errno));
+                return -1;
+            }
+        }
+        Tcl_DStringAppend(&command, (char *)buffer, numBytes);
+        if (Tcl_CommandComplete(Tcl_DStringValue(&command))) {
+            struct timeval start, finish;
+            gettimeofday(&start, NULL);
+            status = ExecuteCommand(interp, &command);
+            gettimeofday(&finish, NULL);
+            g_stats.cmdTime += (MSECS_ELAPSED(start, finish) / 1.0e+3);
+            g_stats.nCommands++;
+            if (status == TCL_BREAK) {
+                return 1;               /* This was caused by a "imgflush"
+                                         * command. Break out of the read loop
+                                         * and allow a new image to be
+                                         * rendered. */
+            } else { //if (status != TCL_OK) {
+                ret = 0;
+                if (handleError(interp, status, fdOut) < 0) {
+                    return -1;
+                }
+            }
+        }
+
+        tv.tv_sec = tv.tv_usec = 0L;    /* On successive reads, we break out
+                                         * if no data is available. */
+        FD_SET(inBufPtr->file(), &readFds);
+        tvPtr = &tv;
+    }
+
+    return ret;
+}
+
+/**
+ * \brief Send error message to client socket
  */
-
-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 *
-initTcl()
+int
+nv::handleError(Tcl_Interp *interp, int status, int fdOut)
+{
+    const char *string;
+    int nBytes;
+
+    if (status != TCL_OK) {
+        string = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
+        nBytes = strlen(string);
+        if (nBytes > 0) {
+            TRACE("status=%d errorInfo=(%s)", status, string);
+
+            std::ostringstream oss;
+            oss << "nv>viserror -type internal_error -token " << g_stats.nCommands << " -bytes " << nBytes << "\n" << string;
+            nBytes = oss.str().length();
+
+#ifdef USE_THREADS
+            queueResponse(oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
+#else
+            if (write(fdOut, oss.str().c_str(), nBytes) < 0) {
+                ERROR("write failed: %s", strerror(errno));
+                return -1;
+            }
+#endif
+        }
+    }
+
+    string = getUserMessages();
+    nBytes = strlen(string);
+    if (nBytes > 0) {
+        TRACE("userError=(%s)", string);
+
+        std::ostringstream oss;
+        oss << "nv>viserror -type error -token " << g_stats.nCommands << " -bytes " << nBytes << "\n" << string;
+        nBytes = oss.str().length();
+
+#ifdef USE_THREADS
+        queueResponse(oss.str().c_str(), nBytes, Response::VOLATILE, Response::ERROR);
+#else
+        if (write(fdOut, oss.str().c_str(), nBytes) < 0) {
+            ERROR("write failed: %s", strerror(errno));
+            return -1;
+        }
+#endif
+        clearUserMessages();
+    }
+
+    return 0;
+}
+
+void
+nv::initTcl(Tcl_Interp *interp, ClientData clientData)
 {
     /*
@@ -2178 +2313 @@
      * a test harness through the interpreter for nanovis.
      */
-    Tcl_Interp *interp;
-    interp = Tcl_CreateInterp();
-    /*
+
     Tcl_MakeSafe(interp);
-    */
-    Tcl_CreateObjCommand(interp, "axis",        AxisCmd,        NULL, NULL);
-    Tcl_CreateObjCommand(interp, "camera",      CameraCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "clientinfo",  ClientInfoCmd,  NULL, NULL);
-    Tcl_CreateObjCommand(interp, "cutplane",    CutplaneCmd,    NULL, NULL);
-    if (FlowCmdInitProc(interp) != TCL_OK) {
-        return NULL;
-    }
-    Tcl_CreateObjCommand(interp, "grid",        GridCmd,        NULL, NULL);
-    Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   NULL, NULL);
-    Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "screen",      ScreenCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "snapshot",    SnapshotCmd,    NULL, NULL);
-    Tcl_CreateObjCommand(interp, "transfunc",   TransfuncCmd,   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);
+
+    Tcl_CreateObjCommand(interp, "axis",        AxisCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "camera",      CameraCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "clientinfo",  ClientInfoCmd,  clientData, NULL);
+    Tcl_CreateObjCommand(interp, "cutplane",    CutplaneCmd,    clientData, NULL);
+    FlowCmdInitProc(interp, clientData);
+    Tcl_CreateObjCommand(interp, "grid",        GridCmd,        clientData, NULL);
+    Tcl_CreateObjCommand(interp, "heightmap",   HeightMapCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "imgflush",    ImageFlushCmd,  clientData, NULL);
+    Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "screen",      ScreenCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "snapshot",    SnapshotCmd,    clientData, NULL);
+    Tcl_CreateObjCommand(interp, "transfunc",   TransfuncCmd,   clientData, NULL);
+    Tcl_CreateObjCommand(interp, "up",          UpCmd,          clientData, NULL);
+    Tcl_CreateObjCommand(interp, "volume",      VolumeCmd,      clientData, NULL);
 
     // create a default transfer function
@@ -2206 +2336 @@
              Tcl_GetStringResult(interp));
     }
-    return interp;
-}
+}

trunk/packages/vizservers/nanovis/Command.h

@@ -14 +14 @@
 #include <tcl.h>
 
+#include <RpBuffer.h>
+
+#include "ResponseQueue.h"
+
 namespace Rappture {
 class Buffer;
@@ -19 +23 @@
 class Volume;
 
+namespace nv {
+class ReadBuffer;
+
+#ifdef USE_THREADS
+extern void queueResponse(const void *bytes, size_t len, 
+                          Response::AllocationType allocType,
+                          Response::ResponseType type = Response::DATA);
+#else
+extern ssize_t SocketWrite(const void *bytes, size_t len);
+#endif
+
+extern bool SocketRead(char *bytes, size_t len);
+
+extern bool SocketRead(Rappture::Buffer &buf, size_t len);
+
+extern int processCommands(Tcl_Interp *interp,
+                           ReadBuffer *inBufPtr,
+                           int fdOut);
+
+extern int handleError(Tcl_Interp *interp,
+                       int status,
+                       int fdOut);
+
+extern void initTcl(Tcl_Interp *interp, ClientData clientData);
+}
+
 extern int GetAxisFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
                           int *axisVal);
 
-extern int GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
+extern bool GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
                              bool *boolVal);
 
@@ -33 +63 @@
                             Volume **volume);
 
-extern Tcl_Interp *initTcl();
-
 #endif

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -25 +25 @@
 #include "nvconf.h"
 
+#include "nanovisServer.h"
 #include "nanovis.h"
 #include "CmdProc.h"
 #include "Command.h"
+#include "PPMWriter.h"
 #include "FlowCmd.h"
 #include "FlowTypes.h"
@@ -41 +43 @@
 #include "Trace.h"
 
+using namespace nv;
 using namespace vrmath;
 
@@ -231 +234 @@
         return TCL_ERROR;
     }
-    Rappture::Buffer buf;
+    Rappture::Buffer buf(nBytes);
     TRACE("Flow data loading bytes: %d components: %d", nBytes, nComponents);
     if (GetDataStream(interp, buf, nBytes) != TCL_OK) {
         return TCL_ERROR;
     }
+    char *bytes = (char *)buf.bytes();
+    size_t length = buf.size();
+
     Rappture::Unirect3d *dataPtr;
     dataPtr = new Rappture::Unirect3d(nComponents);
 
     Flow *flow = (Flow *)clientData;
-    size_t length = buf.size();
-    char *bytes = (char *)buf.bytes();
     if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
         if (!dataPtr->importDx(result, nComponents, length - 4, bytes + 4)) {
@@ -292 +296 @@
     {
         char info[1024];
-        ssize_t nWritten;
-        size_t length;
-
-        length = sprintf(info, "nv>data tag %s min %g max %g\n",
-                         flow->name(), dataPtr->magMin(), dataPtr->magMax());
-        nWritten  = write(1, info, length);
-        assert(nWritten == (ssize_t)strlen(info));
+        int length = 
+            sprintf(info, "nv>data tag %s min %g max %g\n",
+                    flow->name(), dataPtr->magMin(), dataPtr->magMax());
+#ifdef USE_THREADS
+        queueResponse(info, (size_t)length, Response::VOLATILE);
+#else
+        if (SocketWrite(info, (size_t)length) < 0) {
+            return TCL_ERROR;
+        }
+#endif
     }
     NanoVis::eventuallyRedraw(NanoVis::MAP_FLOWS);
@@ -1064 +1071 @@
 
 static int
-ppmWriteToFile(Tcl_Interp *interp, const char *path, FlowVideoSwitches *switchesPtr)
-{
-    int f;
-    
-    /* Open the named file for writing. */
-    f = creat(path, 0600);
-    if (f < 0) {
-        Tcl_AppendResult(interp, "can't open temporary image file \"", path,
-                         "\": ", Tcl_PosixError(interp), (char *)NULL);
-        return TCL_ERROR;
-    }
-    // Generate the PPM binary file header
-    char header[200];
-#define PPM_MAXVAL 255
-    sprintf(header, "P6 %d %d %d\n", switchesPtr->width, switchesPtr->height, 
-        PPM_MAXVAL);
-
-    size_t header_length = strlen(header);
-    size_t wordsPerRow = (switchesPtr->width * 24 + 31) / 32;
-    size_t bytesPerRow = wordsPerRow * 4;
-    size_t rowLength = switchesPtr->width * 3;
-    size_t numRecords = switchesPtr->height + 1;
-
-    struct iovec *iov;
-    iov = (struct iovec *)malloc(sizeof(struct iovec) * numRecords);
-
-    // Add the PPM image header.
-    iov[0].iov_base = header;
-    iov[0].iov_len = header_length;
-
-    // Now add the image data, reversing the order of the rows.
-    int y;
-    unsigned char *srcRowPtr = NanoVis::screenBuffer;
-    /* Reversing the pointers for the image rows.  PPM is top-to-bottom. */
-    for (y = switchesPtr->height; y >= 1; y--) {
-        iov[y].iov_base = srcRowPtr;
-        iov[y].iov_len = rowLength;
-        srcRowPtr += bytesPerRow;
-    }
-    if (writev(f, iov, numRecords) < 0) {
-        Tcl_AppendResult(interp, "writing image to \"", path, "\" failed: ", 
-                         Tcl_PosixError(interp), (char *)NULL);
-        free(iov);
-        close(f);
-        return TCL_ERROR;
-    }
-    close(f);
-    free(iov);
-    return TCL_OK;
-}
-
-static int
 MakeImageFiles(Tcl_Interp *interp, char *tmpFileName, 
                FlowVideoSwitches *switchesPtr, bool *cancelPtr)
 {
     struct pollfd pollResults;
-    pollResults.fd = fileno(NanoVis::stdin);
+    pollResults.fd = fileno(nv::g_fIn);
     pollResults.events = POLLIN;
 #define PENDING_TIMEOUT          10  /* milliseconds. */
@@ -1160 +1115 @@
 
         sprintf(tmpFileName + length, "/image%d.ppm", i);
-        result = ppmWriteToFile(interp, tmpFileName, switchesPtr);
+        result = nv::writePPMFile(tmpFileName, NanoVis::screenBuffer,
+                                  switchesPtr->width, switchesPtr->height);
         if (result != TCL_OK) {
             break;
@@ -1230 +1186 @@
     sprintf(cmd,"nv>image -type movie -token \"%s\" -bytes %lu\n", 
             token, (unsigned long)data.size());
-    NanoVis::sendDataToClient(cmd, data.bytes(), data.size());
+    nv::sendDataToClient(cmd, data.bytes(), data.size());
     return TCL_OK;
 }
@@ -1292 +1248 @@
         sprintf(tmpFileName + length, "/image%d.ppm", i);
         unlink(tmpFileName);
-    }        
+    }
     tmpFileName[length] = '\0';
     rmdir(tmpFileName);
@@ -1343 +1299 @@
  *    associative array.
  */
-int
-FlowCmdInitProc(Tcl_Interp *interp)
-{
-    Tcl_CreateObjCommand(interp, "flow", FlowCmdProc, NULL, NULL);
-    return TCL_OK;
-}
+void
+FlowCmdInitProc(Tcl_Interp *interp, ClientData clientData)
+{
+    Tcl_CreateObjCommand(interp, "flow", FlowCmdProc, clientData, NULL);
+}

trunk/packages/vizservers/nanovis/FlowCmd.h

@@ -27 +27 @@
 #include <tcl.h>
 
-extern Tcl_AppInitProc FlowCmdInitProc;
+extern void FlowCmdInitProc(Tcl_Interp *interp, ClientData clientData);
+
 extern Tcl_ObjCmdProc FlowInstObjCmd;
 extern Tcl_CmdDeleteProc FlowInstDeleteProc;

trunk/packages/vizservers/nanovis/Grid.cpp

@@ -36 +36 @@
 void Grid::render()
 {
+    if (!isVisible())
+        return;
+
     glPushAttrib(GL_ENABLE_BIT);
 

trunk/packages/vizservers/nanovis/HeightMap.cpp

@@ -57 +57 @@
 HeightMap::render(RenderContext *renderContext)
 {
+    if (!isVisible())
+        return;
+
     glPushAttrib(GL_ENABLE_BIT | GL_POLYGON_BIT | GL_LIGHTING_BIT);
 

trunk/packages/vizservers/nanovis/Makefile.in

@@ -1 @@
-TRACE           = #yes
+TRACE                   = #yes
+USE_THREADS             = yes
+USE_POINTSET_RENDERER   = #yes
 
 SHELL = /bin/sh
@@ -23 +25 @@
 INSTALL_SCRIPT  = ${INSTALL} -m 0444
 RM              = rm -f
-
-AUXSRC          = config.h define.h
 
 CG_INC_SPEC     = @CG_INC_SPEC@
@@ -89 +89 @@
                 $(RP_INC_SPEC)
 
-USE_POINTSET_RENDERER = #yes
-
 CC              = @CC@
 CXX             = @CXX@
@@ -99 +97 @@
 DEFINES         += -DWANT_TRACE
 endif
+ifdef USE_THREADS
+DEFINES         += -DUSE_THREADS
+endif
 ifdef USE_POINTSET_RENDERER
 DEFINES         += -DUSE_POINTSET_RENDERER
@@ -106 +107 @@
 OBJS            = \
                 Axis.o \
+                BMPWriter.o \
                 Chain.o \
                 CmdProc.o \
@@ -129 +131 @@
                 NvZincBlendeReconstructor.o \
                 NvZincBlendeVolumeShader.o \
+                OrientationIndicator.o \
                 PerfQuery.o \
                 Plane.o \
                 PlaneRenderer.o \
+                PPMWriter.o \
+                ReadBuffer.o \
                 ReaderCommon.o \
                 RenderVertexArray.o \
+                ResponseQueue.o \
                 Switch.o \
                 Texture1D.o \
@@ -148 +154 @@
                 ZincBlendeVolume.o \
                 dxReader.o \
+                md5.o \
                 nanovis.o \
-                md5.o
+                nanovisServer.o
 
 resources       = \
@@ -270 +277 @@
 
 Axis.o: Axis.cpp Axis.h Chain.h
+BMPWriter.o: BMPWriter.cpp nanovis.h
 BucketSort.o: BucketSort.cpp BucketSort.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h PCASplit.h
 Chain.o: Chain.cpp Chain.h
 CmdProc.o: CmdProc.cpp CmdProc.h
-Command.o: Command.cpp nanovis.h $(AUXSRC) FlowCmd.h CmdProc.h Trace.h PlaneRenderer.h PointSet.h dxReader.h Grid.h HeightMap.h NvCamera.h NvZincBlendeReconstructor.h Unirect.h Volume.h VolumeRenderer.h
+Command.o: Command.cpp nanovis.h config.h define.h FlowCmd.h CmdProc.h Trace.h PlaneRenderer.h PPMWriter.h BMPWriter.h dxReader.h Grid.h HeightMap.h NvCamera.h NvZincBlendeReconstructor.h OrientationIndicator.h Unirect.h Volume.h VolumeRenderer.h
 ContourLineFilter.o: ContourLineFilter.cpp ContourLineFilter.h
 ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h Plane.h
 Flow.o: Flow.cpp Flow.h FlowCmd.h FlowTypes.h FlowBox.h FlowParticles.h Switch.h Trace.h
 FlowBox.o: FlowBox.cpp FlowBox.h FlowTypes.h Switch.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h
-FlowCmd.o: FlowCmd.cpp FlowCmd.h FlowParticles.h FlowBox.h FlowTypes.h Command.h Switch.h Trace.h TransferFunction.h nanovis.h CmdProc.h NvLIC.h Unirect.h Volume.h VelocityArrowsSlice.h $(VRMATH_DIR)/include/vrmath/Vector3f.h
+FlowCmd.o: FlowCmd.cpp FlowCmd.h FlowParticles.h FlowBox.h FlowTypes.h Command.h PPMWriter.h Switch.h Trace.h TransferFunction.h nanovis.h CmdProc.h NvLIC.h Unirect.h Volume.h VelocityArrowsSlice.h $(VRMATH_DIR)/include/vrmath/Vector3f.h
 FlowParticles.o: FlowParticles.cpp FlowParticles.h FlowTypes.h FlowCmd.h Switch.h Trace.h NvParticleRenderer.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h
 GradientFilter.o: GradientFilter.cpp GradientFilter.h
@@ -294 +302 @@
 NvZincBlendeReconstructor.o: NvZincBlendeReconstructor.cpp NvZincBlendeReconstructor.h ZincBlendeVolume.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h
 NvZincBlendeVolumeShader.o: NvZincBlendeVolumeShader.cpp NvZincBlendeVolumeShader.h NvVolumeShader.h NvShader.h
+OrientationIndicator.o: OrientationIndicator.cpp OrientationIndicator.h
 ParticleEmitter.o: ParticleEmitter.cpp ParticleEmitter.h
 ParticleSystem.o: ParticleSystem.cpp ParticleSystem.h DataLoader.h
@@ -304 +313 @@
 PointSetRenderer.o: PointSetRenderer.cpp PointSetRenderer.h
 PointShader.o: PointShader.cpp PointShader.h
+PPMWriter.o: PPMWriter.cpp PPMWriter.h
 ReaderCommon.o: ReaderCommon.cpp ReaderCommon.h GradientFilter.h $(VRMATH_DIR)/include/vrmath/Vector3f.h
 RenderVertexArray.o: RenderVertexArray.cpp RenderVertexArray.h
 Switch.o: Switch.cpp Switch.h
 Texture1D.o: Texture1D.cpp Texture1D.h
-Texture2D.o: Texture2D.cpp Texture2D.h $(AUXSRC)
-Texture3D.o: Texture3D.cpp Texture3D.h $(AUXSRC)
+Texture2D.o: Texture2D.cpp Texture2D.h config.h define.h
+Texture3D.o: Texture3D.cpp Texture3D.h config.h define.h
 Trace.o: Trace.cpp Trace.h
 TransferFunction.o: TransferFunction.cpp
 Unirect.o: Unirect.cpp Unirect.h Command.h Trace.h
 VelocityArrowsSlice.o: VelocityArrowsSlice.cpp VelocityArrowsSlice.h
-Volume.o: Volume.cpp Volume.h $(AUXSRC)
+Volume.o: Volume.cpp Volume.h config.h define.h
 VolumeInterpolator.o: VolumeInterpolator.cpp VolumeInterpolator.h Volume.h
 VolumeRenderer.o: VolumeRenderer.cpp VolumeRenderer.h
 VtkReader.o: VtkReader.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h ReaderCommon.h nanovis.h
-ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h $(AUXSRC)
+ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h config.h define.h
 dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h Unirect.h ZincBlendeVolume.h NvZincBlendeReconstructor.h
-nanovis.o: nanovis.cpp nanovis.h $(AUXSRC) Command.h Flow.h Grid.h HeightMap.h NvCamera.h NvLIC.h NvZincBlendeReconstructor.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h
 md5.o: md5.h
+nanovis.o: nanovis.cpp nanovis.h config.h define.h Command.h Flow.h Grid.h HeightMap.h NvCamera.h NvLIC.h NvZincBlendeReconstructor.h OrientationIndicator.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h
+nanovisServer.o: nanovisServer.cpp nanovisServer.h config.h nanovis.h define.h Command.h PPMWriter.h ReadBuffer.h NvShader.h ResponseQueue.h Trace.h

trunk/packages/vizservers/nanovis/Trace.cpp

@@ -10 +10 @@
 #include <string.h>
 
+#include <string>
+#include <sstream>
+
 #include <GL/glew.h>
 
@@ -15 +18 @@
 #include "Trace.h"
 
+using namespace nv;
+
+static std::ostringstream g_UserErrorString;
+
 #define MSG_LEN 2047
 
+/**
+ * \brief Open syslog for writing
+ */
+void
+nv::initLog()
+{
+    openlog("nanovis", LOG_CONS | LOG_PERROR | LOG_PID,  LOG_USER);
+}
+
+/**
+ * \brief Close syslog
+ */
+void
+nv::closeLog()
+{
+    closelog();
+}
+
+/**
+ * \brief Write a message to syslog
+ */
 void 
-LogMessage(int priority, const char *funcname,
-           const char *path, int lineNum, const char* fmt, ...)
+nv::LogMessage(int priority, const char *funcname,
+               const char *path, int lineNum, const char* fmt, ...)
 {
     char message[MSG_LEN+1];
@@ -42 +70 @@
 
     syslog(priority, "%s", message);
+}
+
+/**
+ * \brief Write a user message to buffer
+ */
+void 
+nv::logUserMessage(const char* fmt, ...)
+{
+    char message[MSG_LEN + 1];
+    int length = 0;
+    va_list lst;
+
+    va_start(lst, fmt);
+
+    length += vsnprintf(message, MSG_LEN, fmt, lst);
+    message[MSG_LEN] = '\0';
+
+    g_UserErrorString << message << "\n";
+}
+
+const char *
+nv::getUserMessages()
+{
+    return g_UserErrorString.str().c_str();
+}
+
+void 
+nv::clearUserMessages()
+{
+    g_UserErrorString.str(std::string());
 }
 
@@ -116 +174 @@
     return false;
 }
-
-

trunk/packages/vizservers/nanovis/Trace.h

@@ -18 +18 @@
 #define AT __FILE__ ":" NEWSTRING(__LINE__)
 
+namespace nv {
+
+extern void logUserMessage(const char* format, ...);
+
+extern const char *getUserMessages();
+
+extern void clearUserMessages();
+
+extern void initLog();
+
+extern void closeLog();
+
 extern void LogMessage(int priority, const char *funcname, const char *fileName,
                        int lineNum, const char* format, ...);
 
-#define ERROR(...)      LogMessage(LOG_ERR, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define ERROR(...)      nv::LogMessage(LOG_ERR, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 #ifdef WANT_TRACE
-#define TRACE(...)      LogMessage(LOG_DEBUG, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define TRACE(...)      nv::LogMessage(LOG_DEBUG, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
 #else 
 #define TRACE(...) 
 #endif
-#define WARN(...)       LogMessage(LOG_WARNING, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
-#define INFO(...)       LogMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define WARN(...)       nv::LogMessage(LOG_WARNING, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+#define INFO(...)       nv::LogMessage(LOG_INFO, __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__)
+
+#define USER_ERROR(...) nv::logUserMessage(__VA_ARGS__)
+
+}
 
 extern bool CheckFBO(GLenum *status);
 extern void PrintFBOStatus(GLenum status, const char *prefix);
 extern bool CheckGL(const char *prefix);
+
 #endif

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -45 +45 @@
 Rappture::Unirect2d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
 {
-    Tcl_Obj *objPtr;
-    objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
+    Tcl_Obj *objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
     Tcl_Obj **objv;
     int objc;
@@ -52 +51 @@
         return TCL_ERROR;
     }
-    int result;
-    result = loadData(interp, objc, objv);
+    int result = loadData(interp, objc, objv);
     Tcl_DecrRefCount(objPtr);
     if ((result != TCL_OK) || (!isInitialized())) {

trunk/packages/vizservers/nanovis/Unirect.h

@@ -9 +9 @@
 
 #include <float.h>
+
+#include <tcl.h>
 
 #include <rappture.h>

trunk/packages/vizservers/nanovis/dxReader.cpp

@@ -43 +43 @@
 #include "ZincBlendeVolume.h"
 #include "NvZincBlendeReconstructor.h"
-#ifdef USE_POINTSET_RENDERER
-#include "PointSet.h"
-#endif
 
 /**
@@ -488 +485 @@
     volume->updatePending = true;
 
-    // TBD..
-#if 0 && defined(USE_POINTSET_RENDERER)
-    PointSet *pset = new PointSet();
-    pset->initialize(volume, (float*)data);
-    pset->setVisible(true);
-    NanoVis::pointSet.push_back(pset);
-    updateColor(pset);
-    volume->pointsetIndex = NanoVis::pointSet.size() - 1;
-#endif
     delete [] data;
 

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -16 +16 @@
  */
 
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <memory.h>
-#include <signal.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/times.h>
-#include <sys/types.h>
-#include <sys/uio.h> // for readv/writev
-#include <time.h>
-#include <unistd.h>
-
-#include <cstdlib>
+#include <cassert>
 #include <cstdio>
-#include <cstring>
-#include <cmath>
-
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <string>
 
 #include <GL/glew.h>
 #include <GL/glut.h>
 
-#include <RpEncode.h>
-
 #include <graphics/RenderContext.h>
 #include <vrmath/Vector3f.h>
@@ -57 +34 @@
 #include "config.h"
 #include "nanovis.h"
+#include "nanovisServer.h"
 #include "define.h"
 
-#include "Command.h"
 #include "Flow.h"
 #include "Grid.h"
 #include "HeightMap.h"
 #include "NvCamera.h"
+#include "NvLIC.h"
 #include "NvShader.h"
-#include "NvLIC.h"
-#include "NvZincBlendeReconstructor.h"
+#include "OrientationIndicator.h"
 #include "PlaneRenderer.h"
-#ifdef USE_POINTSET_RENDERER
-#include "PointSetRenderer.h"
-#include "PointSet.h"
-#endif
-#include "Switch.h"
+#include "PPMWriter.h"
+#include "Texture2D.h"
 #include "Trace.h"
+#include "TransferFunction.h"
 #include "Unirect.h"
 #include "VelocityArrowsSlice.h"
+#include "Volume.h"
 #include "VolumeInterpolator.h"
 #include "VolumeRenderer.h"
-#include "ZincBlendeVolume.h"
-
+
+using namespace nv;
 using namespace nv::graphics;
 using namespace nv::util;
 using namespace vrmath;
 
-#define SIZEOF_BMP_HEADER   54
-
-#define CVT2SECS(x)  ((double)(x).tv_sec) + ((double)(x).tv_usec * 1.0e-6)
-
-#define TRUE    1
-#define FALSE   0
-
-typedef struct {
-    pid_t pid;
-    size_t nFrames;            /**< # of frames sent to client. */
-    size_t nBytes;             /**< # of bytes for all frames. */
-    size_t nCommands;          /**< # of commands executed */
-    double cmdTime;            /**< Elasped time spend executing
-                                * commands. */
-    struct timeval start;      /**< Start of elapsed time. */
-} Stats;
-
-static Stats stats;
-
 // STATIC MEMBER DATA
 
-FILE *NanoVis::stdin = NULL;
-FILE *NanoVis::logfile = NULL;
-FILE *NanoVis::recfile = NULL;
-
-int NanoVis::statsFile = -1;
+Tcl_Interp *NanoVis::interp = NULL;
 
 unsigned int NanoVis::flags = 0;
 bool NanoVis::debugFlag = false;
-bool NanoVis::axisOn = true;
-struct timeval NanoVis::startTime;
 
 int NanoVis::winWidth = NPIX;
@@ -121 +72 @@
 unsigned char *NanoVis::screenBuffer = NULL;
 Texture2D *NanoVis::legendTexture = NULL;
-Grid *NanoVis::grid = NULL;
 Fonts *NanoVis::fonts;
 int NanoVis::updir = Y_POS;
@@ -148 +98 @@
 NvLIC *NanoVis::licRenderer = NULL;
 PlaneRenderer *NanoVis::planeRenderer = NULL;
-#ifdef USE_POINTSET_RENDERER
-PointSetRenderer *NanoVis::pointSetRenderer = NULL;
-std::vector<PointSet *> NanoVis::pointSet;
-#endif
-
-Tcl_Interp *NanoVis::interp;
+OrientationIndicator *NanoVis::orientationIndicator = NULL;
+Grid *NanoVis::grid = NULL;
 
 // Image based flow visualization slice location
@@ -213 +159 @@
         screenBuffer = NULL;
     }
-#ifdef USE_POINTSET_RENDERER
-    if (pointSetRenderer != NULL) {
-        TRACE("Deleting pointSetRenderer");
-        delete pointSetRenderer;
-    }
-    for (std::vector<PointSet *>::iterator itr = pointSet.begin();
-         itr != pointSet.end(); ++itr) {
-        TRACE("Deleting pointSet: %p", *itr);
-        delete (*itr);
-    }
-#endif
     if (fonts != NULL) {
         TRACE("Deleting fonts");
@@ -241 +176 @@
         flags |= REDRAW_PENDING;
     }
-}
-
-#ifdef KEEPSTATS
-
-#ifndef STATSDIR
-#define STATSDIR        "/var/tmp/visservers"
-#endif  /*STATSDIR*/
-
-int
-NanoVis::getStatsFile(Tcl_Obj *objPtr)
-{
-    Tcl_DString ds;
-    Tcl_Obj **objv;
-    int objc;
-    int i;
-    char fileName[33];
-    const char *path;
-    md5_state_t state;
-    md5_byte_t digest[16];
-    char *string;
-    int length;
-
-    if ((objPtr == NULL) || (statsFile >= 0)) {
-        return statsFile;
-    }
-    if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
-        return -1;
-    }
-    Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("pid", 3));
-    Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewIntObj(getpid()));
-    string = Tcl_GetStringFromObj(objPtr, &length);
-
-    md5_init(&state);
-    md5_append(&state, (const md5_byte_t *)string, length);
-    md5_finish(&state, digest);
-    for (i = 0; i < 16; i++) {
-        sprintf(fileName + i * 2, "%02x", digest[i]);
-    }
-    Tcl_DStringInit(&ds);
-    Tcl_DStringAppend(&ds, STATSDIR, -1);
-    Tcl_DStringAppend(&ds, "/", 1);
-    Tcl_DStringAppend(&ds, fileName, 32);
-    path = Tcl_DStringValue(&ds);
-
-    statsFile = open(path, O_EXCL | O_CREAT | O_WRONLY, 0600);
-    Tcl_DStringFree(&ds);
-    if (statsFile < 0) {
-        ERROR("can't open \"%s\": %s", fileName, strerror(errno));
-        return -1;
-    }
-    return statsFile;
-}
-
-int
-NanoVis::writeToStatsFile(int f, const char *s, size_t length)
-{
-    if (f >= 0) {
-        ssize_t numWritten;
-
-        numWritten = write(f, s, length);
-        if (numWritten == (ssize_t)length) {
-            close(dup(f));
-        }
-    }
-    return 0;
-}
-
-static int
-serverStats(int code) 
-{
-    double start, finish;
-    char buf[BUFSIZ];
-    Tcl_DString ds;
-    int result;
-    int f;
-
-    {
-        struct timeval tv;
-
-        /* Get ending time.  */
-        gettimeofday(&tv, NULL);
-        finish = CVT2SECS(tv);
-        tv = stats.start;
-        start = CVT2SECS(tv);
-    }
-    /* 
-     * Session information:
-     *   - Name of render server
-     *   - Process ID
-     *   - Hostname where server is running
-     *   - Start date of session
-     *   - Start date of session in seconds
-     *   - Number of frames returned
-     *   - Number of bytes total returned (in frames)
-     *   - Number of commands received
-     *   - Total elapsed time of all commands
-     *   - Total elapsed time of session
-     *   - Exit code of vizserver
-     *   - User time 
-     *   - System time
-     *   - User time of children 
-     *   - System time of children
-     */ 
-
-    Tcl_DStringInit(&ds);
-    
-    Tcl_DStringAppendElement(&ds, "render_stop");
-    /* renderer */
-    Tcl_DStringAppendElement(&ds, "renderer");
-    Tcl_DStringAppendElement(&ds, "nanovis");
-    /* pid */
-    Tcl_DStringAppendElement(&ds, "pid");
-    sprintf(buf, "%d", getpid());
-    Tcl_DStringAppendElement(&ds, buf);
-    /* host */
-    Tcl_DStringAppendElement(&ds, "host");
-    gethostname(buf, BUFSIZ-1);
-    buf[BUFSIZ-1] = '\0';
-    Tcl_DStringAppendElement(&ds, buf);
-    /* date */
-    Tcl_DStringAppendElement(&ds, "date");
-    strcpy(buf, ctime(&stats.start.tv_sec));
-    buf[strlen(buf) - 1] = '\0';
-    Tcl_DStringAppendElement(&ds, buf);
-    /* date_secs */
-    Tcl_DStringAppendElement(&ds, "date_secs");
-    sprintf(buf, "%ld", stats.start.tv_sec);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* num_frames */
-    Tcl_DStringAppendElement(&ds, "num_frames");
-    sprintf(buf, "%lu", (unsigned long int)stats.nFrames);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* frame_bytes */
-    Tcl_DStringAppendElement(&ds, "frame_bytes");
-    sprintf(buf, "%lu", (unsigned long int)stats.nBytes);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* num_commands */
-    Tcl_DStringAppendElement(&ds, "num_commands");
-    sprintf(buf, "%lu", (unsigned long int)stats.nCommands);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* cmd_time */
-    Tcl_DStringAppendElement(&ds, "cmd_time");
-    sprintf(buf, "%g", stats.cmdTime);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* session_time */
-    Tcl_DStringAppendElement(&ds, "session_time");
-    sprintf(buf, "%g", finish - start);
-    Tcl_DStringAppendElement(&ds, buf);
-    /* status */
-    Tcl_DStringAppendElement(&ds, "status");
-    sprintf(buf, "%d", code);
-    Tcl_DStringAppendElement(&ds, buf);
-    {
-        long clocksPerSec = sysconf(_SC_CLK_TCK);
-        double clockRes = 1.0 / clocksPerSec;
-        struct tms tms;
-
-        memset(&tms, 0, sizeof(tms));
-        times(&tms);
-        /* utime */
-        Tcl_DStringAppendElement(&ds, "utime");
-        sprintf(buf, "%g", tms.tms_utime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-        /* stime */
-        Tcl_DStringAppendElement(&ds, "stime");
-        sprintf(buf, "%g", tms.tms_stime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-        /* cutime */
-        Tcl_DStringAppendElement(&ds, "cutime");
-        sprintf(buf, "%g", tms.tms_cutime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-        /* cstime */
-        Tcl_DStringAppendElement(&ds, "cstime");
-        sprintf(buf, "%g", tms.tms_cstime * clockRes);
-        Tcl_DStringAppendElement(&ds, buf);
-    }
-    Tcl_DStringAppend(&ds, "\n", -1);
-    f = NanoVis::getStatsFile(NULL);
-    result = NanoVis::writeToStatsFile(f, Tcl_DStringValue(&ds), 
-                                       Tcl_DStringLength(&ds));
-    close(f);
-    Tcl_DStringFree(&ds);
-    return result;
-}
-
-#endif
-
-static void
-initService()
-{
-    TRACE("Enter");
-
-    const char* user = getenv("USER");
-    char* logName = NULL;
-    int logNameLen = 0;
-
-    if (user == NULL) {
-        logNameLen = 20+1;
-        logName = (char *)calloc(logNameLen, sizeof(char));
-        strncpy(logName, "/tmp/nanovis_log.txt", logNameLen);
-    } else {
-        logNameLen = 17+1+strlen(user);
-        logName = (char *)calloc(logNameLen, sizeof(char));
-        strncpy(logName, "/tmp/nanovis_log_", logNameLen);
-        strncat(logName, user, strlen(user));
-    }
-
-    //open log and map stderr to log file
-    NanoVis::logfile = fopen(logName, "w");
-    dup2(fileno(NanoVis::logfile), 2);
-    /* dup2(2,1); */
-
-    // clean up malloc'd memory
-    if (logName != NULL) {
-        free(logName);
-    }
-
-    TRACE("Leave");
-}
-
-static void
-exitService(int code)
-{
-    TRACE("Enter: %d", code);
-
-    NanoVis::removeAllData();
-
-    NvShader::exitCg();
-
-    //close log file
-    if (NanoVis::logfile != NULL) {
-        fclose(NanoVis::logfile);
-        NanoVis::logfile = NULL;
-    }
-
-#ifdef KEEPSTATS
-    serverStats(code);
-#endif
-    closelog();
-
-    exit(code);
-}
-
-static int
-executeCommand(Tcl_Interp *interp, Tcl_DString *dsPtr) 
-{
-    struct timeval tv;
-    double start, finish;
-    int result;
-
-#ifdef WANT_TRACE
-    char *str = Tcl_DStringValue(dsPtr);
-    std::string cmd(str);
-    cmd.erase(cmd.find_last_not_of(" \n\r\t")+1);
-    TRACE("command %lu: '%s'", stats.nCommands+1, cmd.c_str());
-#endif
-
-    gettimeofday(&tv, NULL);
-    start = CVT2SECS(tv);
-
-    if (NanoVis::recfile != NULL) {
-        fprintf(NanoVis::recfile, "%s", Tcl_DStringValue(dsPtr));
-        fflush(NanoVis::recfile);
-    }
-    result = Tcl_Eval(interp, Tcl_DStringValue(dsPtr));
-    Tcl_DStringSetLength(dsPtr, 0);
-
-    gettimeofday(&tv, NULL);
-    finish = CVT2SECS(tv);
-
-    stats.cmdTime += finish - start;
-    stats.nCommands++;
-    TRACE("Leave status=%d", result);
-    return result;
 }
 
@@ -649 +310 @@
     planeRenderer->render();
 
-    // INSOO
+    glPixelStorei(GL_PACK_ALIGNMENT, 1);
     glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, screenBuffer);
-    //glReadPixels(0, 0, width, height, GL_BGR, GL_UNSIGNED_BYTE, screenBuffer); // INSOO's
-
     {
         char prefix[200];
-        ssize_t nWritten;
 
         TRACE("Sending ppm legend image %s min:%g max:%g", volArg, min, max);
         sprintf(prefix, "nv>legend %s %g %g", volArg, min, max);
-        ppmWrite(prefix);
-        nWritten = write(1, "\n", 1);
-        assert(nWritten == 1);
+#ifdef USE_THREADS
+        queuePPM(nv::g_queue, prefix, screenBuffer, width, height);
+#else
+        writePPM(nv::g_fdOut, prefix, screenBuffer, width, height);
+#endif
     }
     planeRenderer->removePlane(index);
@@ -673 +333 @@
 
 //initialize frame buffer objects for offscreen rendering
-void
+bool
 NanoVis::initOffscreenBuffer()
 {
@@ -712 +372 @@
     if (!CheckFBO(&status)) {
         PrintFBOStatus(status, "finalFbo");
-        exitService(3);
+        return false;
     }
 
     TRACE("Leave");
+    return true;
 }
 
 //resize the offscreen buffer 
-void 
+bool
 NanoVis::resizeOffscreenBuffer(int w, int h)
 {
     TRACE("Enter (%d, %d)", w, h);
     if ((w == winWidth) && (h == winHeight)) {
-        return;
+        return true;
     }
     winWidth = w;
@@ -739 +400 @@
     }
 
-    screenBuffer = new unsigned char[4*winWidth*winHeight];
+    screenBuffer = new unsigned char[3*winWidth*winHeight];
     assert(screenBuffer != NULL);
-    
+
     //delete the current render buffer resources
     glDeleteTextures(1, &_finalColorTex);
@@ -785 +446 @@
     if (!CheckFBO(&status)) {
         PrintFBOStatus(status, "finalFbo");
-        exitService(3);
+        return false;
     }
 
@@ -794 +455 @@
 
     TRACE("Leave (%d, %d)", w, h);
+    return true;
 }
 
@@ -801 +463 @@
     if (!NvShader::printErrorInfo()) {
         TRACE("Cg error, exiting...");
-        exitService(-1);
-    }
-}
-
-void NanoVis::init(const char* path)
+        exit(1);
+    }
+}
+
+bool NanoVis::init(const char* path)
 {
     // print OpenGL driver information
@@ -816 +478 @@
     if (path == NULL) {
         ERROR("No path defined for shaders or resources");
-        exitService(1);
+        return false;
     }
     GLenum err = glewInit();
     if (GLEW_OK != err) {
         ERROR("Can't init GLEW: %s", glewGetErrorString(err));
-        exitService(1);
+        return false;
     }
     TRACE("Using GLEW %s", glewGetString(GLEW_VERSION));
@@ -829 +491 @@
     if (!GLEW_VERSION_2_1) {
         ERROR("OpenGL version 2.1 or greater is required");
-        exitService(1);
+        return false;
     }
 
@@ -836 +498 @@
     if (!GLEW_ARB_pixel_buffer_object) {
         ERROR("Pixel buffer objects are not supported by driver, please check that the user running nanovis has permissions to create a direct rendering context (e.g. user has read/write access to /dev/nvidia* device nodes in Linux).");
-        exitService(1);
+        return false;
     }
 
@@ -844 +506 @@
     if (!GLEW_EXT_framebuffer_object) {
         ERROR("EXT_framebuffer_oject extension is required");
-        exitService(1);
+        return false;
     }
     // Rectangle textures were promoted in 3.1
@@ -850 +512 @@
     if (!GLEW_ARB_texture_rectangle) {
         ERROR("ARB_texture_rectangle extension is required");
-        exitService(1);
+        return false;
     }
 #ifdef HAVE_FLOAT_TEXTURES
@@ -857 +519 @@
         !GLEW_ARB_color_buffer_float) {
         ERROR("ARB_texture_float and ARB_color_buffer_float extensions are required");
-        exitService(1);
+        return false;
     }
 #endif
@@ -864 +526 @@
         !GLEW_NV_fragment_program2) {
         ERROR("NV_vertex_program3 and NV_fragment_program2 extensions are required");
-        exitService(1);
+        return false;
     }
 
     if (!FilePath::getInstance()->setPath(path)) {
         ERROR("can't set file path to %s", path);
-        exitService(1);
+        return false;
     }
 
@@ -886 +548 @@
     grid = new Grid();
     grid->setFont(fonts);
-
-#ifdef USE_POINTSET_RENDERER
-    pointSetRenderer = new PointSetRenderer();
-#endif
-}
-
-void
+    return true;
+}
+
+bool
 NanoVis::initGL()
 {
@@ -901 +560 @@
         screenBuffer = NULL;
     }
-    screenBuffer = new unsigned char[4*winWidth*winHeight];
+    screenBuffer = new unsigned char[3*winWidth*winHeight];
     assert(screenBuffer != NULL);
 
@@ -927 +586 @@
     glLightfv(GL_LIGHT1, GL_SPECULAR, white_light);
 
-    initOffscreenBuffer();    //frame buffer object for offscreen rendering
-
-    //create volume renderer
+    //frame buffer object for offscreen rendering
+    if (!initOffscreenBuffer()) {
+        return false;
+    }
+
     volRenderer = new VolumeRenderer();
 
-    // create
     renderContext = new RenderContext();
 
-    //create a 2D plane renderer
     planeRenderer = new PlaneRenderer(winWidth, winHeight);
 
+    orientationIndicator = new OrientationIndicator();
+
     //assert(glGetError()==0);
 
     TRACE("leaving initGL");
-}
-
-// used internally to build up the BMP file header
-// Writes an integer value into the header data structure at pos
-static inline void
-bmpHeaderAddInt(unsigned char* header, int& pos, int data)
-{
-#ifdef WORDS_BIGENDIAN
-    header[pos++] = (data >> 24) & 0xFF;
-    header[pos++] = (data >> 16) & 0xFF;
-    header[pos++] = (data >> 8)  & 0xFF;
-    header[pos++] = (data)       & 0xFF;
-#else
-    header[pos++] = data & 0xff;
-    header[pos++] = (data >> 8) & 0xff;
-    header[pos++] = (data >> 16) & 0xff;
-    header[pos++] = (data >> 24) & 0xff;
-#endif
-}
-
-// INSOO
-// FOR DEBUGGING
-void
-NanoVis::bmpWriteToFile(int frame_number, const char *directory_name)
-{
-    unsigned char header[SIZEOF_BMP_HEADER];
-    int pos = 0;
-    header[pos++] = 'B';
-    header[pos++] = 'M';
-
-    // BE CAREFUL:  BMP files must have an even multiple of 4 bytes
-    // on each scan line.  If need be, we add padding to each line.
-    int pad = 0;
-    if ((3*winWidth) % 4 > 0) {
-        pad = 4 - ((3*winWidth) % 4);
-    }
-
-    // file size in bytes
-    int fsize = (3*winWidth+pad)*winHeight + SIZEOF_BMP_HEADER;
-    bmpHeaderAddInt(header, pos, fsize);
-
-    // reserved value (must be 0)
-    bmpHeaderAddInt(header, pos, 0);
-
-    // offset in bytes to start of bitmap data
-    bmpHeaderAddInt(header, pos, SIZEOF_BMP_HEADER);
-
-    // size of the BITMAPINFOHEADER
-    bmpHeaderAddInt(header, pos, 40);
-
-    // width of the image in pixels
-    bmpHeaderAddInt(header, pos, winWidth);
-
-    // height of the image in pixels
-    bmpHeaderAddInt(header, pos, winHeight);
-
-    // 1 plane + (24 bits/pixel << 16)
-    bmpHeaderAddInt(header, pos, 1572865);
-
-    // no compression
-    // size of image for compression
-    bmpHeaderAddInt(header, pos, 0);
-    bmpHeaderAddInt(header, pos, 0);
-
-    // x pixels per meter
-    // y pixels per meter
-    bmpHeaderAddInt(header, pos, 0);
-    bmpHeaderAddInt(header, pos, 0);
-
-    // number of colors used (0 = compute from bits/pixel)
-    // number of important colors (0 = all colors important)
-    bmpHeaderAddInt(header, pos, 0);
-    bmpHeaderAddInt(header, pos, 0);
-
-    // BE CAREFUL: BMP format wants BGR ordering for screen data
-    unsigned char* scr = screenBuffer;
-    for (int row=0; row < winHeight; row++) {
-        for (int col=0; col < winWidth; col++) {
-            unsigned char tmp = scr[2];
-            scr[2] = scr[0];  // B
-            scr[0] = tmp;     // R
-            scr += 3;
-        }
-        scr += pad;  // skip over padding already in screen data
-    }
-
-    FILE* f;
-    char filename[100];
-    if (frame_number >= 0) {
-        if (directory_name)
-            sprintf(filename, "%s/image%03d.bmp", directory_name, frame_number);
-        else
-            sprintf(filename, "/tmp/flow_animation/image%03d.bmp", frame_number);
-
-        TRACE("Writing %s", filename);
-        f = fopen(filename, "wb");
-        if (f == 0) {
-            ERROR("cannot create file");
-        }
-    } else {
-        f = fopen("/tmp/image.bmp", "wb");
-        if (f == 0) {
-            ERROR("cannot create file");
-        }
-    }
-    if (fwrite(header, SIZEOF_BMP_HEADER, 1, f) != 1) {
-        ERROR("can't write header: short write");
-    }
-    if (fwrite(screenBuffer, (3*winWidth+pad)*winHeight, 1, f) != 1) {
-        ERROR("can't write data: short write");
-    }
-    fclose(f);
-}
-
-void
-NanoVis::bmpWrite(const char *prefix)
-{
-    unsigned char header[SIZEOF_BMP_HEADER];
-    ssize_t nWritten;
-    int pos = 0;
-
-    // BE CAREFUL:  BMP files must have an even multiple of 4 bytes
-    // on each scan line.  If need be, we add padding to each line.
-    int pad = 0;
-    if ((3*winWidth) % 4 > 0) {
-        pad = 4 - ((3*winWidth) % 4);
-    }
-    pad = 0;
-    int fsize = (3*winWidth+pad)*winHeight + sizeof(header);
-
-    char string[200];
-    sprintf(string, "%s %d\n", prefix, fsize);
-    nWritten = write(1, string, strlen(string));
-    assert(nWritten == (ssize_t)strlen(string));
-    header[pos++] = 'B';
-    header[pos++] = 'M';
-
-    // file size in bytes
-    bmpHeaderAddInt(header, pos, fsize);
-
-    // reserved value (must be 0)
-    bmpHeaderAddInt(header, pos, 0);
-
-    // offset in bytes to start of bitmap data
-    bmpHeaderAddInt(header, pos, SIZEOF_BMP_HEADER);
-
-    // size of the BITMAPINFOHEADER
-    bmpHeaderAddInt(header, pos, 40);
-
-    // width of the image in pixels
-    bmpHeaderAddInt(header, pos, winWidth);
-
-    // height of the image in pixels
-    bmpHeaderAddInt(header, pos, winHeight);
-
-    // 1 plane + (24 bits/pixel << 16)
-    bmpHeaderAddInt(header, pos, 1572865);
-
-    // no compression
-    // size of image for compression
-    bmpHeaderAddInt(header, pos, 0);
-    bmpHeaderAddInt(header, pos, 0);
-
-    // x pixels per meter
-    // y pixels per meter
-    bmpHeaderAddInt(header, pos, 0);
-    bmpHeaderAddInt(header, pos, 0);
-
-    // number of colors used (0 = compute from bits/pixel)
-    // number of important colors (0 = all colors important)
-    bmpHeaderAddInt(header, pos, 0);
-    bmpHeaderAddInt(header, pos, 0);
-
-    // BE CAREFUL: BMP format wants BGR ordering for screen data
-    unsigned char* scr = screenBuffer;
-    for (int row=0; row < winHeight; row++) {
-        for (int col=0; col < winWidth; col++) {
-            unsigned char tmp = scr[2];
-            scr[2] = scr[0];  // B
-            scr[0] = tmp;     // R
-            scr += 3;
-        }
-        scr += pad;  // skip over padding already in screen data
-    }
-
-    nWritten = write(1, header, SIZEOF_BMP_HEADER);
-    assert(nWritten == SIZEOF_BMP_HEADER);
-    nWritten = write(1, screenBuffer, (3*winWidth+pad)*winHeight);
-    assert(nWritten == (3*winWidth+pad)*winHeight);
-    stats.nFrames++;
-    stats.nBytes += (3*winWidth+pad)*winHeight;
-}
-
-/*
- * ppmWrite --
- *
- *  Writes the screen image as PPM binary data to the nanovisviewer
- *  client.  The PPM binary format is very simple.
- *
- *      P6 w h 255\n
- *      3-byte RGB pixel data.
- *
- *  The nanovisviewer client (using the TkImg library) will do less work
- *  to unpack this format, as opposed to BMP or PNG.  (This doesn't
- *  eliminate the need to look into DXT compression performed on the GPU).
- *
- *      Note that currently the image data from the screen is both row-padded
- *      and the scan lines are reversed.  This routine could be made even
- *      simpler (faster) if the screen buffer is an array of packed 3-bytes
- *      per pixels (no padding) and where the origin is the top-left corner.
- */
-void
-NanoVis::ppmWrite(const char *prefix)
-{
-#define PPM_MAXVAL 255
-    char header[200];
-
-    TRACE("Enter (%dx%d)", winWidth, winHeight);
-    // Generate the PPM binary file header
-    sprintf(header, "P6 %d %d %d\n", winWidth, winHeight, PPM_MAXVAL);
-
-    size_t header_length = strlen(header);
-    size_t data_length = winWidth * winHeight * 3;
-
-    char command[200];
-    sprintf(command, "%s %lu\n", prefix, 
-            (unsigned long)header_length + data_length);
-
-    size_t wordsPerRow = (winWidth * 24 + 31) / 32;
-    size_t bytesPerRow = wordsPerRow * 4;
-    size_t rowLength = winWidth * 3;
-    size_t nRecs = winHeight + 2;
-
-    struct iovec *iov;
-    iov = (struct iovec *)malloc(sizeof(struct iovec) * nRecs);
-
-    // Write the nanovisviewer command, then the image header and data.
-    // Command
-    iov[0].iov_base = command;
-    iov[0].iov_len = strlen(command);
-    // Header of image data
-    iov[1].iov_base = header;
-    iov[1].iov_len = header_length;
-    // Image data.
-    int y;
-    unsigned char *srcRowPtr = screenBuffer;
-    for (y = winHeight + 1; y >= 2; y--) {
-        iov[y].iov_base = srcRowPtr;
-        iov[y].iov_len = rowLength;
-        srcRowPtr += bytesPerRow;
-    }
-    if (writev(1, iov, nRecs) < 0) {
-        ERROR("write failed: %s", strerror(errno));
-    }
-    free(iov);
-    stats.nFrames++;
-    stats.nBytes += (bytesPerRow * winHeight);
-    TRACE("Leave (%dx%d)", winWidth, winHeight);
-}
-
-void
-NanoVis::sendDataToClient(const char *command, const char *data, size_t dlen)
-{
-    size_t numRecords = 2;
-
-    struct iovec *iov = new iovec[numRecords];
-
-    // Write the nanovisviewer command, then the image header and data.
-    // Command
-    // FIXME: shouldn't have to cast this
-    iov[0].iov_base = (char *)command;
-    iov[0].iov_len = strlen(command);
-    // Data
-    // FIXME: shouldn't have to cast this
-    iov[1].iov_base = (char *)data;
-    iov[1].iov_len = dlen;
-    if (writev(1, iov, numRecords) < 0) {
-        ERROR("write failed: %s", strerror(errno));
-    }
-    delete [] iov;
-}
-
-void
-NanoVis::idle()
-{
-    TRACE("Enter");
-
-    glutSetWindow(renderWindow);
-
-    processCommands();
-
-    TRACE("Leave");
-}
-
-void 
-NanoVis::draw3dAxis()
-{
-    glPushAttrib(GL_ENABLE_BIT);
-
-    glDisable(GL_TEXTURE_2D);
-    glEnable(GL_DEPTH_TEST);
-    glEnable(GL_COLOR_MATERIAL);
-    glDisable(GL_BLEND);
-
-    //draw axes
-    GLUquadric *obj;
-
-    obj = gluNewQuadric();
-
-    int segments = 50;
-
-    glColor3f(0.8, 0.8, 0.8);
-    glPushMatrix();
-    glTranslatef(0.4, 0., 0.);
-    glRotatef(90, 1, 0, 0);
-    glRotatef(180, 0, 1, 0);
-    glScalef(0.0005, 0.0005, 0.0005);
-    glutStrokeCharacter(GLUT_STROKE_ROMAN, 'x');
-    glPopMatrix();
-
-    glPushMatrix();
-    glTranslatef(0., 0.4, 0.);
-    glRotatef(90, 1, 0, 0);
-    glRotatef(180, 0, 1, 0);
-    glScalef(0.0005, 0.0005, 0.0005);
-    glutStrokeCharacter(GLUT_STROKE_ROMAN, 'y');
-    glPopMatrix();
-
-    glPushMatrix();
-    glTranslatef(0., 0., 0.4);
-    glRotatef(90, 1, 0, 0);
-    glRotatef(180, 0, 1, 0);
-    glScalef(0.0005, 0.0005, 0.0005);
-    glutStrokeCharacter(GLUT_STROKE_ROMAN, 'z');
-    glPopMatrix();
-
-    glEnable(GL_LIGHTING);
-    glEnable(GL_LIGHT0);
-
-    //glColor3f(0.2, 0.2, 0.8);
-    glPushMatrix();
-    glutSolidSphere(0.02, segments, segments );
-    glPopMatrix();
-
-    glPushMatrix();
-    glRotatef(-90, 1, 0, 0);
-    gluCylinder(obj, 0.01, 0.01, 0.3, segments, segments);
-    glPopMatrix();
-
-    glPushMatrix();
-    glTranslatef(0., 0.3, 0.);
-    glRotatef(-90, 1, 0, 0);
-    gluCylinder(obj, 0.02, 0.0, 0.06, segments, segments);
-    glPopMatrix();
-
-    glPushMatrix();
-    glRotatef(90, 0, 1, 0);
-    gluCylinder(obj, 0.01, 0.01, 0.3, segments, segments);
-    glPopMatrix();
-
-    glPushMatrix();
-    glTranslatef(0.3, 0., 0.);
-    glRotatef(90, 0, 1, 0);
-    gluCylinder(obj, 0.02, 0.0, 0.06, segments, segments);
-    glPopMatrix();
-
-    glPushMatrix();
-    gluCylinder(obj, 0.01, 0.01, 0.3, segments, segments);
-    glPopMatrix();
-
-    glPushMatrix();
-    glTranslatef(0., 0., 0.3);
-    gluCylinder(obj, 0.02, 0.0, 0.06, segments, segments);
-    glPopMatrix();
-
-    gluDeleteQuadric(obj);
-
-    glPopAttrib();
+    return true;
 }
 
@@ -1577 +861 @@
     TRACE("Setting bgcolor to %g %g %g", color[0], color[1], color[2]);
     glClearColor(color[0], color[1], color[2], 1);
+}
+
+void 
+NanoVis::removeVolume(Volume *volume)
+{
+    VolumeHashmap::iterator itr = volumeTable.find(volume->name());
+    if (itr != volumeTable.end()) {
+        volumeTable.erase(itr);
+    }
+    delete volume;
 }
 
@@ -1829 +1123 @@
 
     //now render things in the scene
-    if (axisOn) {
-        draw3dAxis();
-    }
-    if (grid->isVisible()) {
-        grid->render();
-    }
+
+    orientationIndicator->render();
+    grid->render();
     if ((licRenderer != NULL) && (licRenderer->active())) {
         licRenderer->render();
@@ -1841 +1132 @@
         velocityArrowsSlice->render();
     }
-    if (!flowTable.empty()) {
-        renderFlows();
-    }
-
+    renderFlows();
     volRenderer->renderAll();
 
-    TRACE("Render heightmaps");
     HeightMapHashmap::iterator itr;
     for (itr = heightMapTable.begin();
@@ -1861 +1148 @@
     TRACE("Leave");
 }
-
-void 
-NanoVis::processCommands()
-{
-    flags &= ~REDRAW_PENDING;
-
-    TRACE("Enter");
-
-    int flags = fcntl(0, F_GETFL, 0);
-    fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
-
-    int status = TCL_OK;
-
-    //  Read and execute as many commands as we can from stdin...
-    Tcl_DString cmdbuffer;
-    Tcl_DStringInit(&cmdbuffer);
-    int nCommands = 0;
-    bool isComplete = false;
-    while ((!feof(NanoVis::stdin)) && (status == TCL_OK)) {
-        //
-        //  Read the next command from the buffer.  First time through we
-        //  block here and wait if necessary until a command comes in.
-        //
-        //  BE CAREFUL: Read only one command, up to a newline.  The "volume
-        //  data follows" command needs to be able to read the data
-        //  immediately following the command, and we shouldn't consume it
-        //  here.
-        //
-        while (!feof(NanoVis::stdin)) {
-            int c = fgetc(NanoVis::stdin);
-            char ch;
-            if (c <= 0) {
-                if (errno == EWOULDBLOCK) {
-                    break;
-                }
-                exitService(100);
-            }
-            ch = (char)c;
-            Tcl_DStringAppend(&cmdbuffer, &ch, 1);
-            if (ch == '\n') {
-                isComplete = Tcl_CommandComplete(Tcl_DStringValue(&cmdbuffer));
-                if (isComplete) {
-                    break;
-                }
-            }
-        }
-        // no command? then we're done for now
-        if (Tcl_DStringLength(&cmdbuffer) == 0) {
-            break;
-        }
-        if (isComplete) {
-            // back to original flags during command evaluation...
-            fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
-            status = executeCommand(interp, &cmdbuffer);
-            // non-blocking for next read -- we might not get anything
-            fcntl(0, F_SETFL, flags | O_NONBLOCK);
-            isComplete = false;
-            nCommands++;
-            CHECK_FRAMEBUFFER_STATUS();
-        }
-    }
-    fcntl(0, F_SETFL, flags);
-
-    if (status != TCL_OK) {
-        char *msg;
-        char hdr[200];
-        int msgSize, hdrSize;
-        Tcl_Obj *objPtr;
-
-        objPtr = Tcl_GetObjResult(interp);
-        msg = Tcl_GetStringFromObj(objPtr, &msgSize);
-        hdrSize = sprintf(hdr, "nv>viserror -type internal_error -bytes %d\n", msgSize);
-        {
-            struct iovec iov[2];
-
-            iov[0].iov_base = hdr;
-            iov[0].iov_len = hdrSize;
-            iov[1].iov_base = msg;
-            iov[1].iov_len = msgSize;
-            if (writev(1, iov, 2) < 0) {
-                ERROR("write failed: %s", strerror(errno));
-            }
-        }
-        TRACE("Leaving on ERROR");
-        return;
-    }
-    if (feof(NanoVis::stdin)) {
-        TRACE("Exiting server on EOF from client");
-        exitService(90);
-    }
-
-    update();
-
-    bindOffscreenBuffer();  //enable offscreen render
-    render();
-    readScreen();
-
-    if (feof(NanoVis::stdin)) {
-        exitService(90);
-    }
-
-    ppmWrite("nv>image -type image -bytes");
-
-    TRACE("Leave");
-}
-
-int 
-main(int argc, char **argv)
-{
-    const char *path;
-    char *newPath;
-
-    newPath = NULL;
-    path = NULL;
-    NanoVis::stdin = stdin;
-
-    fprintf(stdout, "NanoVis %s (build %s)\n", NANOVIS_VERSION, SVN_VERSION);
-    fflush(stdout);
-
-    openlog("nanovis", LOG_CONS | LOG_PERROR | LOG_PID, LOG_USER);
-    gettimeofday(&NanoVis::startTime, NULL);
-    stats.start = NanoVis::startTime;
-
-    /* Initialize GLUT here so it can parse and remove GLUT-specific 
-     * command-line options before we parse the command-line below. */
-    glutInit(&argc, argv);
-    glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA);
-    glutInitWindowSize(NanoVis::winWidth, NanoVis::winHeight);
-    glutInitWindowPosition(10, 10);
-    NanoVis::renderWindow = glutCreateWindow("nanovis");
-    glutIdleFunc(NanoVis::idle);
-
-    glutDisplayFunc(NanoVis::render);
-    glutReshapeFunc(NanoVis::resizeOffscreenBuffer);
-
-    while (1) {
-        static struct option long_options[] = {
-            {"infile",  required_argument, NULL, 0},
-            {"path",    required_argument, NULL, 2},
-            {"debug",   no_argument,       NULL, 3},
-            {"record",  required_argument, NULL, 4},
-            {0, 0, 0, 0}
-        };
-        int option_index = 0;
-        int c;
-
-        c = getopt_long(argc, argv, ":dp:i:l:r:", long_options, &option_index);
-        if (c == -1) {
-            break;
-        }
-        switch (c) {
-        case '?':
-            fprintf(stderr, "unknown option -%c\n", optopt);
-            return 1;
-        case ':':
-            if (optopt < 4) {
-                fprintf(stderr, "argument missing for --%s option\n", 
-                        long_options[optopt].name);
-            } else {
-                fprintf(stderr, "argument missing for -%c option\n", optopt);
-            }
-            return 1;
-        case 2:
-        case 'p':
-            path = optarg;
-            break;
-        case 3:
-        case 'd':
-            NanoVis::debugFlag = true;
-            break;
-        case 0:
-        case 'i':
-            NanoVis::stdin = fopen(optarg, "r");
-            if (NanoVis::stdin == NULL) {
-                perror(optarg);
-                return 2;
-            }
-            break;
-        case 4:
-        case 'r':
-            Tcl_DString ds;
-            char buf[200];
-
-            Tcl_DStringInit(&ds);
-            Tcl_DStringAppend(&ds, optarg, -1);
-            sprintf(buf, ".%d", getpid());
-            Tcl_DStringAppend(&ds, buf, -1);
-            NanoVis::recfile = fopen(Tcl_DStringValue(&ds), "w");
-            if (NanoVis::recfile == NULL) {
-                perror(optarg);
-                return 2;
-            }
-            break;
-        default:
-            fprintf(stderr,"unknown option '%c'.\n", c);
-            return 1;
-        }
-    }     
-    if (path == NULL) {
-        char *p;
-
-        // See if we can derive the path from the location of the program.
-        // Assume program is in the form <path>/bin/nanovis.
-        path = argv[0];
-        p = strrchr((char *)path, '/');
-        if (p != NULL) {
-            *p = '\0';
-            p = strrchr((char *)path, '/');
-        }
-        if (p == NULL) {
-            TRACE("path not specified");
-            return 1;
-        }
-        *p = '\0';
-        newPath = new char[(strlen(path) + 15) * 2 + 1];
-        sprintf(newPath, "%s/lib/shaders:%s/lib/resources", path, path);
-        path = newPath;
-    }
-
-    FilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv);
-
-#ifdef notdef
-    signal(SIGPIPE, SIG_IGN);
-#endif
-    initService();
-
-    NanoVis::init(path);
-    if (newPath != NULL) {
-        delete [] newPath;
-    }
-    NanoVis::initGL();
-
-    NanoVis::interp = initTcl();
-
-    NanoVis::resizeOffscreenBuffer(NanoVis::winWidth, NanoVis::winHeight);
-
-    glutMainLoop();
-
-    exitService(80);
-}
-
-void 
-NanoVis::removeVolume(Volume *volume)
-{
-    VolumeHashmap::iterator itr = volumeTable.find(volume->name());
-    if (itr != volumeTable.end()) {
-        volumeTable.erase(itr);
-    }
-    delete volume;
-}

trunk/packages/vizservers/nanovis/nanovis.h

@@ -17 +17 @@
 #define NANOVIS_H
 
-#include <tcl.h>
-#include <md5.h>
-#include <GL/glew.h>
-
 #include <math.h>
 #include <stddef.h> // For size_t
 #include <stdio.h>
+#include <sys/time.h>
+#include <sys/types.h> // For pid_t
+
+#include <tcl.h>
+
+#include <GL/glew.h>
 
 #include <vector>
@@ -32 +34 @@
 
 #include "config.h"
+#include "md5.h"
 
-#define NANOVIS_VERSION         "1.1"
+#define NANOVIS_VERSION         "1.2"
 
 //defines for the image based flow visualization
@@ -46 +49 @@
     class Fonts;
 }
+class OrientationIndicator;
 }
 
 class VolumeRenderer;
-class PointSetRenderer;
 class NvParticleRenderer;
-class PlaneRenderer;
 class VelocityArrowsSlice;
 class NvLIC;
-class PointSet;
+class PlaneRenderer;
 class Texture2D;
 class HeightMap;
@@ -89 +91 @@
     typedef std::tr1::unordered_map<HeightMapId, HeightMap *> HeightMapHashmap;
 
-    static void processCommands();
-    static void init(const char *path);
-    static void initGL();
-    static void initOffscreenBuffer();
-    static void resizeOffscreenBuffer(int w, int h);
+    static bool init(const char *path);
+    static bool initGL();
+    static bool initOffscreenBuffer();
+    static bool resizeOffscreenBuffer(int w, int h);
     static void setBgColor(float color[3]);
     static void render();
     static void draw3dAxis();
-    static void idle();
     static void update();
     static void removeAllData();
@@ -113 +113 @@
     static void setVolumeRanges();
     static void setHeightmapRanges();
-
-#ifdef KEEPSTATS
-    static int getStatsFile(Tcl_Obj *objPtr);
-    static int writeToStatsFile(int f, const char *s, size_t length);
-#endif
-    static void ppmWrite(const char *prefix);
-    static void sendDataToClient(const char *command, const char *data,
-                                 size_t dlen);
-    static void bmpWrite(const char *prefix);
-    static void bmpWriteToFile(int frame_number, const char* directory_name);
  
     static TransferFunction *getTransferFunction(const TransferFunctionId& id);
@@ -139 +129 @@
     static void readScreen()
     {
+        glPixelStorei(GL_PACK_ALIGNMENT, 1);
         glReadPixels(0, 0, winWidth, winHeight, GL_RGB, GL_UNSIGNED_BYTE, 
                      screenBuffer);
@@ -149 +140 @@
     static Flow *getFlow(const char *name);
     static Flow *createFlow(Tcl_Interp *interp, const char *name);
+    static void deleteFlows(Tcl_Interp *interp);
     static void deleteFlow(const char *name);
-    static void deleteFlows(Tcl_Interp *interp);
     static bool mapFlows();
     static void getFlowBounds(vrmath::Vector3f& min,
@@ -160 +151 @@
     static void advectFlows();
 
-    static FILE *stdin, *logfile, *recfile;
-    static int statsFile;
+    static Tcl_Interp *interp;
+
     static unsigned int flags;
     static bool debugFlag;
-    static bool axisOn;
-    static struct timeval startTime;       ///< Start of elapsed time.
 
     static int winWidth;        ///< Width of the render window
@@ -172 +161 @@
     static unsigned char *screenBuffer;
     static Texture2D *legendTexture;
-    static Grid *grid;
     static nv::util::Fonts *fonts;
     static int updir;
@@ -191 +179 @@
     static NvLIC *licRenderer;
     static PlaneRenderer *planeRenderer;
-
-#ifdef USE_POINTSET_RENDERER
-    static PointSetRenderer *pointSetRenderer;
-    static std::vector<PointSet *> pointSet;
-#endif
-
-    static Tcl_Interp *interp;
+    static nv::OrientationIndicator *orientationIndicator;
+    static Grid *grid;
 
 private:

trunk/packages/vizservers/nanovis/protocol-nanovis.txt

@@ -38 +38 @@
 Requests:
 ================================================================================
-axis visible <false|true> 
-
-grid axiscolor <red> <green> <blue> <?alpha?>
-grid axisname <x|y|z> <name> 
-grid linecolor <red> <green> <blue> <?alpha?>
-grid visible <false|true>
+axis visible <bool> 
 
 camera angle <xAngle> <yAngle> <zAngle>
@@ -53 +48 @@
 camera zoom <factor>
 
-screen bgcolor <r> <g> <b>
-       Set screen background color
-screen size <width> <height>
-       Set size of rendered images
-
-snapshot
-         Render a 2k x 2k image (offscreen buffer)
-
-transfunc define <name> {colors} {alpha}
-          colors => 1 line each of "value r g b"
-          alpha => 1 line each of "value alpha"
-          value => [0,1]
-
-legend <transferfunc name> <width> <height>
-       Request render of transfer function
-
-heightmap data visible <true|false> <volume IDs>
-heightmap data follows <nbytes> <data>
-heightmap linecontour visible <true|false> <volume IDs>
-heightmap linecontour color <red> <green> <blue> <volume IDs>
-heightmap tranfunc <transfer function name> <volume IDs>
-heightmap cull <no/back/front>
-heightmap polygon <wireframe/fill> 
+clientinfo <list>
+
+cutplane position <relval> <x|y|z> <?names?>
+         Set the position of a volume cutplane.  Names is
+         an optional list of volume names.
+         relval = [0,1]
+cutplane state <bool> <x|y|z> <?names?>
+         Set the axis (normal) of a volume cutplane.  Names is
+         an optional list of volume names.
 
 flow add <name> <?option value...?>
@@ -84 +65 @@
 flow delete <names>
 flow exists <name>
+     This doesn't currently produce a response, it only returns a boolean
+     within the server's interpreter
 flow goto <nSteps>
 flow names
+     This doesn't currently produce a response, it only returns a Tcl list
+     within the server's interpreter
 flow next
 flow reset
@@ -106 +91 @@
 <flowObj> box delete <names>
 <flowObj> box names
+          This doesn't currently produce a response, it only returns a Tcl list
+          within the server's interpreter
 
 <flowObj> configure <?option value...?>
@@ -113 +100 @@
           -diffuse <val>
           -hide <bool>
+          -light2side <bool>
           -opacity <val>
           -outline <bool>
@@ -139 +127 @@
 <flowObj> particles delete <names>
 <flowObj> particles names
-
-volume data state <on|off> <?names?>
-volume data follows <size> <tag>
-volume delete <?names?>
+          This doesn't currently produce a response, it only returns a Tcl list
+          within the server's interpreter
+
+grid axiscolor <red> <green> <blue> <?alpha?>
+grid axisname <x|y|z> <name> <units>
+grid linecolor <red> <green> <blue> <?alpha?>
+grid visible <bool>
+
+heightmap create <heightmapName> <xMin> <yMin> <xMax> <yMax> <xNum> <yNum> <valueList>
+heightmap cull <none|back|front>
+heightmap data follows <nBytes> <heightmapName>
+          After newline following command, nBytes of data are sent
+heightmap data visible <bool> <?heightmapNames?>
+heightmap legend <heightmapName> <width> <height>
+heightmap linecontour color <red> <green> <blue> <?heightmapNames?>
+heightmap linecontour visible <bool> <?heightmapNames?>
+heightmap opacity <value> <?heightmapNames?>
+heightmap polygon <wireframe|fill> 
+          **Warning: This is a global setting**
+heightmap shading <flat|smooth>
+          **Warning: This is a global setting**
+heightmap transfunc <transferFunctionName> <?heightmapNames?>
+
+legend <transferfunc name> <width> <height>
+       Request render of transfer function
+
+screen bgcolor <r> <g> <b>
+       Set screen background color
+screen size <width> <height>
+       Set size of rendered images
+
+snapshot
+         Render a 2k x 2k image (offscreen buffer). Response image data is tagged
+         as '-type print'
+
+transfunc define <name> {colors} {alpha}
+          colors => 1 line each of "value r g b"
+          alpha => 1 line each of "value alpha"
+          value => [0,1]
+
+up <x|y|z|-x|-y|-z>
+   Set orientation of volumes
+
+volume animation capture <numframes> <?filename?>
+       This is not fully implemented.  Rendered frames are not returned
+       to the client.
+volume animation clear
+volume animation start
+volume animation stop
+volume animation volumes <?names?>
+
+volume data follows <nbytes> <name>
+volume data state <bool> <?names?>
+volume delete <names>
 volume exists <name>
-volume names <?pattern?>
+       This doesn't currently produce a response, it only returns a boolean
+       within the server's interpreter
+volume names
+       This doesn't currently produce a response, it only returns a Tcl list
+       within the server's interpreter
 volume outline color <r> <g> <b> <?names?>
-volume outline state|visible <bool> <?names?>
+volume outline state <bool> <?names?>
+volume outline visible <bool> <?names?>
 volume shading ambient <value> <?names?>
 volume shading diffuse <value> <?names?>
 volume shading isosurface <bool> <?names?>
+volume shading light2side <bool> <?names?>
 volume shading opacity <value> <?names?>
 volume shading specularExp <value> <?names?>
@@ -156 +200 @@
 volume state <bool> <?names?>
 
-volume animation volumes <volume IDs>
-volume animation start
-volume animation stop
-volume animation clear
-volume animation capture numframes <filename>
-
-cutplane position <relval> <x|y|z> <?names?>
-         Set the position of a volume cutplane.  Names is
-         an optional list of volume names.
-         relval = [0,1]
-cutplane state <bool> <x|y|z> <?names?>
-         Set the axis (normal) of a volume cutplane.  Names is
-         an optional list of volume names.
-
-up <x|y|z|-x|-y|-z>
-   Set orientation of volumes
-
 ================================================================================
 Replies:
 ================================================================================
 nv>legend <volume> <min> <max> <nbytes>
-  (followed by bytes and newline)
+  (followed by bytes)
 
 nv>image -type image -bytes <nbytes>
-  (followed by bytes -- command _preceded_ by newline)
+  (followed by bytes)
 
 nv>image -type print -bytes <nbytes>
-  (followed by bytes -- command _preceded_ by newline)
+  (followed by bytes)
 
 nv>image -type movie -token <token> -bytes <nbytes>
@@ -192 +219 @@
    min,max over all volumes
 
+nv>data tag <flow-tag> min <val> max <val>
+   Sent after a "<flowObj> data follows...".  Min,max values are for the 
+   magnitude of the vector field.
+
 ================================================================================
 Error Replies: