Changeset 3567 for trunk/packages

Timestamp:

Mar 24, 2013 10:23:25 PM (11 years ago)

Author:

ldelgass

Message:

Refactor and cleanups in nanovis, mainly to switch to using STL hash tables
(TR1 required) instead of Tcl hash tables, split out Flow particles and boxes
to separate implementation files. The goal is to achieve better separation of
Tcl command parsing and the core graphics rendering objects and code.

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (52 diffs)
• Doxyfile.in (modified) (1 diff)
• FlowBox.cpp (added)
• FlowBox.h (added)
• FlowCmd.cpp (modified) (48 diffs)
• FlowCmd.h (modified) (18 diffs)
• FlowParticles.cpp (added)
• FlowParticles.h (added)
• FlowTypes.h (added)
• Makefile.in (modified) (2 diffs)
• Volume.cpp (modified) (1 diff)
• Volume.h (modified) (2 diffs)
• VolumeRenderer.cpp (modified) (3 diffs)
• nanovis.cpp (modified) (20 diffs)
• nanovis.h (modified) (8 diffs)
• protocol-nanovis.txt (modified) (4 diffs)
• vrmath/Color4f.cpp (deleted)
• vrmath/Makefile.in (modified) (2 diffs)
• vrmath/include/vrmath/Color4f.h (modified) (1 diff)
• vrmath/include/vrmath/Vector3f.h (modified) (1 diff)
• vrmath/include/vrmath/Vector4f.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -266 +266 @@
         }
     }
-    HeightMap* hmPtr;
-    hmPtr = new HeightMap();
-    hmPtr->setHeight(xMin, yMin, xMax, yMax, xNum, yNum, heights);
-    hmPtr->transferFunction(NanoVis::getTransfunc("default"));
-    hmPtr->setVisible(true);
-    hmPtr->setLineContourVisible(true);
+    HeightMap *heightMap = new HeightMap();
+    heightMap->setHeight(xMin, yMin, xMax, yMax, xNum, yNum, heights);
+    heightMap->transferFunction(NanoVis::getTransferFunction("default"));
+    heightMap->setVisible(true);
+    heightMap->setLineContourVisible(true);
     delete [] heights;
-    return hmPtr;
+    return heightMap;
 }
 
@@ -279 +278 @@
 GetHeightMapFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, HeightMap **hmPtrPtr)
 {
-    const char *string;
-    string = Tcl_GetString(objPtr);
-
-    Tcl_HashEntry *hPtr;
-    hPtr = Tcl_FindHashEntry(&NanoVis::heightmapTable, string);
-    if (hPtr == NULL) {
-        if (interp != NULL) {
-            Tcl_AppendResult(interp, "can't find a heightmap named \"",
+    const char *string = Tcl_GetString(objPtr);
+
+    NanoVis::HeightMapHashmap::iterator itr = NanoVis::heightMapTable.find(string);
+    if (itr == NanoVis::heightMapTable.end()) {
+        if (interp != NULL) {
+            Tcl_AppendResult(interp, "can't find a heightmap named \"",
                          string, "\"", (char*)NULL);
-        }
-        return TCL_ERROR;
-    }
-    *hmPtrPtr = (HeightMap *)Tcl_GetHashValue(hPtr);
+        }
+        return TCL_ERROR;
+    }
+    *hmPtrPtr = itr->second;
     return TCL_OK;
 }
@@ -308 +305 @@
 GetVolumeFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, Volume **volPtrPtr)
 {
-    const char *string;
-    string = Tcl_GetString(objPtr);
-
-    Tcl_HashEntry *hPtr;
-    hPtr = Tcl_FindHashEntry(&NanoVis::volumeTable, string);
-    if (hPtr == NULL) {
-        if (interp != NULL) {
-            Tcl_AppendResult(interp, "can't find a volume named \"",
+    const char *string = Tcl_GetString(objPtr);
+
+    NanoVis::VolumeHashmap::iterator itr = NanoVis::volumeTable.find(string);
+    if (itr == NanoVis::volumeTable.end()) {
+        if (interp != NULL) {
+            Tcl_AppendResult(interp, "can't find a volume named \"",
                          string, "\"", (char*)NULL);
-        }
-        return TCL_ERROR;
-    }
-    *volPtrPtr = (Volume *)Tcl_GetHashValue(hPtr);
+        }
+        return TCL_ERROR;
+    }
+    *volPtrPtr = itr->second;
     return TCL_OK;
 }
@@ -338 +333 @@
 {
     if (objc == 0) {
-        // No arguments. Get all volumes. 
-        Tcl_HashSearch iter;
-        Tcl_HashEntry *hPtr;
-        for (hPtr = Tcl_FirstHashEntry(&NanoVis::volumeTable, &iter); 
-             hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
-            Volume *volPtr;
-            volPtr = (Volume *)Tcl_GetHashValue(hPtr);
-            vectorPtr->push_back(volPtr);
-        }
+        // No arguments. Get all volumes.
+        NanoVis::VolumeHashmap::iterator itr;
+        for (itr = NanoVis::volumeTable.begin();
+             itr != NanoVis::volumeTable.end(); ++itr) {
+            vectorPtr->push_back(itr->second);
+        }
     } else {
-        // Get the volumes associated with the given index arguments.
+        // Get the volumes associated with the given index arguments.
         for (int n = 0; n < objc; n++) {
-            Volume *volPtr;
-
-            if (GetVolumeFromObj(interp, objv[n], &volPtr) != TCL_OK) {
+            Volume *volume;
+            if (GetVolumeFromObj(interp, objv[n], &volume) != TCL_OK) {
                 return TCL_ERROR;
             }
-            vectorPtr->push_back(volPtr);
+            vectorPtr->push_back(volume);
         }
     }
@@ -375 +366 @@
 {
     if (objc == 0) {
-        // No arguments. Get all heightmaps. 
-        Tcl_HashSearch iter;
-        Tcl_HashEntry *hPtr;
-        for (hPtr = Tcl_FirstHashEntry(&NanoVis::heightmapTable, &iter); 
-             hPtr != NULL; hPtr = Tcl_NextHashEntry(&iter)) {
-            HeightMap *hmPtr;
-            hmPtr = (HeightMap *)Tcl_GetHashValue(hPtr);
-            vectorPtr->push_back(hmPtr);
-        }
+        // No arguments. Get all heightmaps.
+        NanoVis::HeightMapHashmap::iterator itr;
+        for (itr = NanoVis::heightMapTable.begin();
+             itr != NanoVis::heightMapTable.end(); ++itr) {
+            vectorPtr->push_back(itr->second);
+        }
     } else {
         for (int n = 0; n < objc; n++) {
-            HeightMap *hmPtr;
-
-            if (GetHeightMapFromObj(interp, objv[n], &hmPtr) != TCL_OK) {
+            HeightMap *heightMap;
+            if (GetHeightMapFromObj(interp, objv[n], &heightMap) != TCL_OK) {
                 return TCL_ERROR;
             }
-            vectorPtr->push_back(hmPtr);
+            vectorPtr->push_back(heightMap);
         }
     }
@@ -517 +504 @@
     }
     if (NanoVis::recfile != NULL) {
-        ssize_t nWritten;
+        ssize_t nWritten;
 
         nWritten = fwrite(buf.bytes(), sizeof(char), buf.size(), 
-                          NanoVis::recfile);
-        assert(nWritten == (ssize_t)buf.size());
+                          NanoVis::recfile);
+        assert(nWritten == (ssize_t)buf.size());
         fflush(NanoVis::recfile);
     }
@@ -527 +514 @@
     TRACE("Checking header[%.13s]", buf.bytes());
     if (strncmp (buf.bytes(), "@@RP-ENC:", 9) == 0) {
-        /* There's a header on the buffer, use it to decode the data. */
-        if (!Rappture::encoding::decode(err, buf, RPENC_HDR)) {
-            Tcl_AppendResult(interp, err.remark(), (char*)NULL);
-            return TCL_ERROR;
-        }
+        /* There's a header on the buffer, use it to decode the data. */
+        if (!Rappture::encoding::decode(err, buf, RPENC_HDR)) {
+            Tcl_AppendResult(interp, err.remark(), (char*)NULL);
+            return TCL_ERROR;
+        }
     } else if (Rappture::encoding::isBase64(buf.bytes(), buf.size())) {
-        /* No header, but it's base64 encoded.  It's likely that it's both
-         * base64 encoded and compressed. */
-        if (!Rappture::encoding::decode(err, buf, RPENC_B64 | RPENC_Z)) {
-            Tcl_AppendResult(interp, err.remark(), (char*)NULL);
-            return TCL_ERROR;
-        }
+        /* No header, but it's base64 encoded.  It's likely that it's both
+         * base64 encoded and compressed. */
+        if (!Rappture::encoding::decode(err, buf, RPENC_B64 | RPENC_Z)) {
+            Tcl_AppendResult(interp, err.remark(), (char*)NULL);
+            return TCL_ERROR;
+        }
     }
     return TCL_OK;
@@ -644 +631 @@
 static int
 CameraCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-          Tcl_Obj *const *objv)
+          Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
@@ -658 +645 @@
 static int
 SnapshotCmd(ClientData clientData, Tcl_Interp *interp, int objc,
-            Tcl_Obj *const *objv)
+            Tcl_Obj *const *objv)
 {
     int w, h;
@@ -787 +774 @@
  *      "render_start" is written into the stats file.  Afterwards, it 
  *      is "render_info". 
- *      
+ *        
  *         clientinfo list
  */
@@ -803 +790 @@
 
     if (objc != 2) {
-        Tcl_AppendResult(interp, "wrong # of arguments: should be \"", 
+        Tcl_AppendResult(interp, "wrong # of arguments: should be \"", 
                 Tcl_GetString(objv[0]), " list\"", (char *)NULL);
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
 #ifdef KEEPSTATS
@@ -814 +801 @@
     f = NanoVis::getStatsFile(objv[1]);
     if (f < 0) {
-        Tcl_AppendResult(interp, "can't open stats file: ", 
+        Tcl_AppendResult(interp, "can't open stats file: ", 
                          Tcl_PosixError(interp), (char *)NULL);
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
 #endif
@@ -858 +845 @@
     /* Client arguments. */
     if (Tcl_ListObjGetElements(interp, objv[1], &numItems, &items) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     for (i = 0; i < numItems; i++) {
@@ -891 +878 @@
 static int
 LegendCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-          Tcl_Obj *const *objv)
+          Tcl_Obj *const *objv)
 {
     if (objc != 4) {
@@ -901 +888 @@
     const char *name;
     name = Tcl_GetString(objv[1]);
-    TransferFunction *tf;
-    tf = NanoVis::getTransfunc(name);
+    TransferFunction *tf = NanoVis::getTransferFunction(name);
     if (tf == NULL) {
         Tcl_AppendResult(interp, "unknown transfer function \"", name, "\"",
@@ -1182 +1168 @@
     }
     TRACE("parsing volume data identifier");
-    Tcl_HashSearch iter;
-    Tcl_HashEntry *hPtr;
-    for (hPtr = Tcl_FirstHashEntry(&NanoVis::volumeTable, &iter); hPtr != NULL;
-         hPtr = Tcl_NextHashEntry(&iter)) {
-        Volume *volPtr;
-        volPtr = (Volume *)Tcl_GetHashValue(hPtr);
-        NanoVis::volRenderer->addAnimatedVolume(volPtr);
+    NanoVis::VolumeHashmap::iterator itr;
+    for (itr = NanoVis::volumeTable.begin();
+         itr != NanoVis::volumeTable.end(); ++itr) {
+        NanoVis::volRenderer->addAnimatedVolume(itr->second);
     }
     return TCL_OK;
@@ -1210 +1193 @@
 
     proc = Rappture::GetOpFromObj(interp, nVolumeAnimationOps, 
-                volumeAnimationOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);
+                volumeAnimationOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1227 +1210 @@
         return TCL_ERROR;
     }
-    const char *tag;
-    tag = Tcl_GetString(objv[4]);
+    const char *tag = Tcl_GetString(objv[4]);
     Rappture::Buffer buf;
     if (GetDataStream(interp, buf, nbytes) != TCL_OK) {
@@ -1241 +1223 @@
     TRACE("Checking header[%.20s]", bytes);
 
-    Volume *volPtr = NULL;
+    Volume *volume = NULL;
 
     if ((nBytes > 5) && (strncmp(bytes, "<HDR>", 5) == 0)) {
@@ -1249 +1231 @@
         //vol = NvZincBlendeReconstructor::getInstance()->loadFromStream(fdata);
 
-        volPtr = NvZincBlendeReconstructor::getInstance()->loadFromMemory((void*) buf.bytes());
-        if (volPtr == NULL) {
+        volume = NvZincBlendeReconstructor::getInstance()->loadFromMemory((void*) buf.bytes());
+        if (volume == NULL) {
             Tcl_AppendResult(interp, "can't get volume instance", (char *)NULL);
             return TCL_ERROR;
@@ -1256 +1238 @@
         TRACE("finish loading");
 
-        Vector3f scale = volPtr->getPhysicalScaling();
+        Vector3f scale = volume->getPhysicalScaling();
         Vector3f loc(scale);
         loc *= -0.5;
-        volPtr->location(loc);
-
-        int isNew;
-        Tcl_HashEntry *hPtr;
-        hPtr = Tcl_CreateHashEntry(&NanoVis::volumeTable, tag, &isNew);
-        if (!isNew) {
+        volume->location(loc);
+
+        NanoVis::VolumeHashmap::iterator itr = NanoVis::volumeTable.find(tag);
+        if (itr != NanoVis::volumeTable.end()) {
             Tcl_AppendResult(interp, "volume \"", tag, "\" already exists.",
-                             (char *)NULL);
+                             (char *)NULL);
             return TCL_ERROR;
-        }
-        Tcl_SetHashValue(hPtr, volPtr);
-        volPtr->name(Tcl_GetHashKey(&NanoVis::volumeTable, hPtr));
+        }
+        NanoVis::volumeTable[tag] = volume;
+        volume->name(tag);
     } else if ((nBytes > 14) && (strncmp(bytes, "# vtk DataFile", 14) == 0)) {
         TRACE("VTK loading...");
@@ -1276 +1256 @@
         fdata.write(bytes, nBytes);
         if (nBytes <= 0) {
-            ERROR("data buffer is empty");
-            abort();
+            ERROR("data buffer is empty");
+            abort();
         }
         Rappture::Outcome context;
-        volPtr = load_vtk_volume_stream(context, tag, fdata);
-        if (volPtr == NULL) {
+        volume = load_vtk_volume_stream(context, tag, fdata);
+        if (volume == NULL) {
             Tcl_AppendResult(interp, context.remark(), (char*)NULL);
             return TCL_ERROR;
@@ -1299 +1279 @@
         }
         Rappture::Outcome context;
-        volPtr = load_dx_volume_stream(context, tag, fdata);
-        if (volPtr == NULL) {
+        volume = load_dx_volume_stream(context, tag, fdata);
+        if (volume == NULL) {
             Tcl_AppendResult(interp, context.remark(), (char*)NULL);
             return TCL_ERROR;
@@ -1306 +1286 @@
     }
 
-    if (volPtr != NULL) {
-        volPtr->disableCutplane(0);
-        volPtr->disableCutplane(1);
-        volPtr->disableCutplane(2);
-        volPtr->transferFunction(NanoVis::getTransfunc("default"));
-        volPtr->visible(true);
+    if (volume != NULL) {
+        volume->disableCutplane(0);
+        volume->disableCutplane(1);
+        volume->disableCutplane(2);
+        volume->transferFunction(NanoVis::getTransferFunction("default"));
+        volume->visible(true);
 
         char info[1024];
-        ssize_t nWritten;
+        ssize_t nWritten;
 
         if (Volume::updatePending) {
@@ -1322 +1302 @@
         // 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, 
-                volPtr->wAxis.min(), volPtr->wAxis.max(),
+                volume->wAxis.min(), volume->wAxis.max(),
                 Volume::valueMin, Volume::valueMax);
         nWritten  = write(1, info, strlen(info));
-        assert(nWritten == (ssize_t)strlen(info));
+        assert(nWritten == (ssize_t)strlen(info));
     }
     return TCL_OK;
@@ -1344 +1324 @@
     std::vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        (*iter)->dataEnabled(state);
+        (*iter)->dataEnabled(state);
     }
     return TCL_OK;
@@ -1371 +1351 @@
 static int
 VolumeDeleteOp(ClientData clientData, Tcl_Interp *interp, int objc,
-               Tcl_Obj *const *objv)
-{
-    int i;
-
-    for (i = 2; i < objc; i++) {
-        Volume *volPtr;
-
-        if (GetVolumeFromObj(interp, objv[i], &volPtr) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        NanoVis::removeVolume(volPtr);
+               Tcl_Obj *const *objv)
+{
+    for (int i = 2; i < objc; i++) {
+        Volume *volume;
+        if (GetVolumeFromObj(interp, objv[i], &volume) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        NanoVis::removeVolume(volume);
     }
     NanoVis::eventuallyRedraw();
@@ -1389 +1366 @@
 static int
 VolumeExistsOp(ClientData clientData, Tcl_Interp *interp, int objc,
-               Tcl_Obj *const *objv)
+               Tcl_Obj *const *objv)
 {
     bool value;
-    Volume *volPtr;
+    Volume *volume;
 
     value = false;
-    if (GetVolumeFromObj(NULL, objv[2], &volPtr) == TCL_OK) {
-        value = true;
+    if (GetVolumeFromObj(NULL, objv[2], &volume) == TCL_OK) {
+        value = true;
     }
     Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (int)value);
@@ -1404 +1381 @@
 static int
 VolumeNamesOp(ClientData clientData, Tcl_Interp *interp, int objc,
-              Tcl_Obj *const *objv)
+              Tcl_Obj *const *objv)
 {
     Tcl_Obj *listObjPtr;
     listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    Tcl_HashEntry *hPtr; 
-    Tcl_HashSearch iter;
-    for (hPtr = Tcl_FirstHashEntry(&NanoVis::volumeTable, &iter); hPtr != NULL; 
-         hPtr = Tcl_NextHashEntry(&iter)) {
-        Volume *volPtr;
-        volPtr = (Volume *)Tcl_GetHashValue(hPtr);
-        Tcl_Obj *objPtr;
-        objPtr = Tcl_NewStringObj(volPtr->name(), -1);
-        Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
+    NanoVis::VolumeHashmap::iterator itr;
+    for (itr = NanoVis::volumeTable.begin();
+         itr != NanoVis::volumeTable.end(); ++itr) {
+        Tcl_Obj *objPtr = Tcl_NewStringObj(itr->second->name(), -1);
+        Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
     Tcl_SetObjResult(interp, listObjPtr);
@@ -1455 +1428 @@
     std::vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        (*iter)->outline(state);
+        (*iter)->outline(state);
     }
     return TCL_OK;
@@ -1633 +1606 @@
                          Tcl_Obj *const *objv)
 {
-    TransferFunction *tfPtr;
     const char *name = Tcl_GetString(objv[3]);
-    tfPtr = NanoVis::getTransfunc(name);
-    if (tfPtr == NULL) {
+    TransferFunction *tf = NanoVis::getTransferFunction(name);
+    if (tf == NULL) {
         Tcl_AppendResult(interp, "transfer function \"", name,
                          "\" is not defined", (char*)NULL);
@@ -1647 +1619 @@
     std::vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        TRACE("setting %s with transfer function %s", (*iter)->name(),
-               tfPtr->name());
-        (*iter)->transferFunction(tfPtr);
+        TRACE("setting %s with transfer function %s", (*iter)->name(),
+               tf->name());
+        (*iter)->transferFunction(tf);
 #ifdef USE_POINTSET_RENDERER
         // TBD..
         if ((*iter)->pointsetIndex != -1) {
-            NanoVis::pointSet[(*iter)->pointsetIndex]->updateColor(tfPtr->getData(), 256);
+            NanoVis::pointSet[(*iter)->pointsetIndex]->updateColor(tf->getData(), 256);
         }
 #endif
@@ -1700 +1672 @@
     std::vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        (*iter)->visible(state);
-    }
-    return TCL_OK;
-}
-
-static int
-VolumeTestOp(ClientData clientData, Tcl_Interp *interp, int objc,
-             Tcl_Obj *const *objv)
-{
-    // Find the first volume in the vector.
-    Tcl_HashEntry *hPtr;
-    Tcl_HashSearch iter;
-    hPtr = Tcl_FirstHashEntry(&NanoVis::volumeTable, &iter); 
-    if (hPtr != NULL) {
-        Volume *volPtr;
-        volPtr = (Volume *)Tcl_GetHashValue(hPtr);
-        volPtr->dataEnabled(false);
-        volPtr->visible(false);
+        (*iter)->visible(state);
     }
     return TCL_OK;
@@ -1731 +1686 @@
     {"shading",   2, VolumeShadingOp,     3, 0, "oper ?args?",},
     {"state",     2, VolumeStateOp,       3, 0, "bool ?indices?",},
-    {"test2",     1, VolumeTestOp,        2, 2, "",},
 };
 static int nVolumeOps = NumCmdSpecs(volumeOps);
@@ -1752 +1706 @@
 static int
 VolumeCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-          Tcl_Obj *const *objv)
+          Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
@@ -1772 +1726 @@
         return TCL_ERROR;
     }
-    const char *tag;
-    tag = Tcl_GetString(objv[4]);
-    int isNew;
-    Tcl_HashEntry *hPtr;
+    const char *tag = Tcl_GetString(objv[4]);
 
     Rappture::Buffer buf;
@@ -1783 +1734 @@
     Rappture::Unirect2d data(1);
     if (data.parseBuffer(interp, buf) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (data.nValues() == 0) {
-        Tcl_AppendResult(interp, "no data found in stream", (char *)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "no data found in stream", (char *)NULL);
+        return TCL_ERROR;
     }
     if (!data.isInitialized()) {
-        return TCL_ERROR;
-    }
-    HeightMap* hmPtr;
-    hPtr = Tcl_CreateHashEntry(&NanoVis::heightmapTable, tag, &isNew);
-    if (isNew) {
-        hmPtr = new HeightMap();
-        Tcl_SetHashValue(hPtr, hmPtr);
+        return TCL_ERROR;
+    }
+    HeightMap *heightMap;
+    NanoVis::HeightMapHashmap::iterator itr = NanoVis::heightMapTable.find(tag);
+    if (itr != NanoVis::heightMapTable.end()) {
+        heightMap = itr->second;
     } else {
-        hmPtr = (HeightMap *)Tcl_GetHashValue(hPtr);
-    }
-    TRACE("Number of heightmaps=%d", NanoVis::heightmapTable.numEntries);
+        heightMap = new HeightMap();
+        NanoVis::heightMapTable[tag] = heightMap;
+    }
+    TRACE("Number of heightmaps=%d", NanoVis::heightMapTable.size());
     // Must set units before the heights.
-    hmPtr->xAxis.units(data.xUnits());
-    hmPtr->yAxis.units(data.yUnits());
-    hmPtr->zAxis.units(data.vUnits());
-    hmPtr->wAxis.units(data.yUnits());
-    hmPtr->setHeight(data.xMin(), data.yMin(), data.xMax(), data.yMax(), 
-                     data.xNum(), data.yNum(), data.transferValues());
-    hmPtr->transferFunction(NanoVis::getTransfunc("default"));
-    hmPtr->setVisible(true);
-    hmPtr->setLineContourVisible(true);
+    heightMap->xAxis.units(data.xUnits());
+    heightMap->yAxis.units(data.yUnits());
+    heightMap->zAxis.units(data.vUnits());
+    heightMap->wAxis.units(data.yUnits());
+    heightMap->setHeight(data.xMin(), data.yMin(), data.xMax(), data.yMax(), 
+                         data.xNum(), data.yNum(), data.transferValues());
+    heightMap->transferFunction(NanoVis::getTransferFunction("default"));
+    heightMap->setVisible(true);
+    heightMap->setLineContourVisible(true);
     NanoVis::eventuallyRedraw();
     return TCL_OK;
@@ -1878 +1829 @@
 static int
 HeightMapLineContourVisibleOp(ClientData clientData, Tcl_Interp *interp, 
-                              int objc, Tcl_Obj *const *objv)
+                              int objc, Tcl_Obj *const *objv)
 {
     bool visible;
@@ -1933 +1884 @@
                   Tcl_Obj *const *objv)
 {
-    const char *tag;
-    tag = Tcl_GetString(objv[2]);
-    Tcl_HashEntry *hPtr;
-    int isNew;
-    hPtr = Tcl_CreateHashEntry(&NanoVis::heightmapTable, tag, &isNew);
-    if (!isNew) {
-        Tcl_AppendResult(interp, "heightmap \"", tag, "\" already exists.",
-                         (char *)NULL);
-        return TCL_ERROR;
-    }
-    HeightMap *hmPtr;
+    const char *tag = Tcl_GetString(objv[2]);
+    NanoVis::HeightMapHashmap::iterator itr = NanoVis::heightMapTable.find(tag);
+    if (itr != NanoVis::heightMapTable.end()) {
+        Tcl_AppendResult(interp, "heightmap \"", tag, "\" already exists.",
+                         (char *)NULL);
+        return TCL_ERROR;
+    }
     /* heightmap create xmin ymin xmax ymax xnum ynum values */
-    hmPtr = CreateHeightMap(clientData, interp, objc - 3, objv + 3);
-    if (hmPtr == NULL) {
-        return TCL_ERROR;
-    }
-    Tcl_SetHashValue(hPtr, hmPtr);
-    Tcl_SetStringObj(Tcl_GetObjResult(interp), tag, -1);;
+    HeightMap *heightMap = CreateHeightMap(clientData, interp, objc - 3, objv + 3);
+    if (heightMap == NULL) {
+        return TCL_ERROR;
+    }
+    NanoVis::heightMapTable[tag] = heightMap;
     NanoVis::eventuallyRedraw();
-    TRACE("Number of heightmaps=%d", NanoVis::heightmapTable.numEntries);
+    TRACE("Number of heightmaps=%d", NanoVis::heightMapTable.size());
     return TCL_OK;
 }
@@ -1970 +1916 @@
     if (tfPtr == NULL) {
         Tcl_AppendResult(interp, "no transfer function defined for heightmap"
-                         " \"", tag, "\"", (char*)NULL);
+                         " \"", tag, "\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -2018 +1964 @@
     const char *name;
     name = Tcl_GetString(objv[2]);
-    TransferFunction *tfPtr;
-    tfPtr = NanoVis::getTransfunc(name);
-    if (tfPtr == NULL) {
+    TransferFunction *tf = NanoVis::getTransferFunction(name);
+    if (tf == NULL) {
         Tcl_AppendResult(interp, "transfer function \"", name,
                          "\" is not defined", (char*)NULL);
@@ -2031 +1976 @@
     std::vector<HeightMap *>::iterator iter;
     for (iter = imap.begin(); iter != imap.end(); iter++) {
-        (*iter)->transferFunction(tfPtr);
+        (*iter)->transferFunction(tf);
     }
     NanoVis::eventuallyRedraw();
@@ -2044 +1989 @@
     float opacity;
     if (GetFloatFromObj(interp, objv[2], &opacity) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     std::vector<HeightMap *> heightmaps;
@@ -2073 +2018 @@
 static int
 HeightMapCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *const *objv)
+             Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
@@ -2150 +2095 @@
 static int
 GridVisibleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-              Tcl_Obj *const *objv)
+              Tcl_Obj *const *objv)
 {
     bool visible;
@@ -2170 +2115 @@
 static int
 GridCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-        Tcl_Obj *const *objv)
+        Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
@@ -2184 +2129 @@
 static int
 AxisCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-        Tcl_Obj *const *objv)
+        Tcl_Obj *const *objv)
 {
     if (objc < 2) {
@@ -2211 +2156 @@
 static int 
 PlaneAddOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-           Tcl_Obj *const *objv)
+           Tcl_Obj *const *objv)
 {
     TRACE("load plane for 2D visualization command");
@@ -2316 +2261 @@
 static int
 PlaneCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-         Tcl_Obj *const *objv)
+         Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
@@ -2364 +2309 @@
 static int
 Unirect3dCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *const *objv)
+             Tcl_Obj *const *objv)
 {
     Rappture::Unirect3d *dataPtr = (Rappture::Unirect3d *)clientData;
@@ -2391 +2336 @@
     Tcl_CreateObjCommand(interp, "cutplane",    CutplaneCmd,    NULL, NULL);
     if (FlowCmdInitProc(interp) != TCL_OK) {
-        return NULL;
+        return NULL;
     }
     Tcl_CreateObjCommand(interp, "grid",        GridCmd,        NULL, NULL);
@@ -2407 +2352 @@
     Tcl_CreateObjCommand(interp, "volume",      VolumeCmd,      NULL, NULL);
 
-    Tcl_InitHashTable(&NanoVis::volumeTable, TCL_STRING_KEYS);
-    Tcl_InitHashTable(&NanoVis::heightmapTable, TCL_STRING_KEYS);
     // create a default transfer function
     if (Tcl_Eval(interp, def_transfunc) != TCL_OK) {
         WARN("bad default transfer function:\n%s", 
-             Tcl_GetStringResult(interp));
+             Tcl_GetStringResult(interp));
     }
     return interp;

trunk/packages/vizservers/nanovis/Doxyfile.in

@@ -215 +215 @@
 # Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
 # .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set 
+# FILE_PATTERNS otherwise the files are not read by doxygen.
 
 EXTENSION_MAPPING      =

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -24 +24 @@
 
 #include <vrmath/Vector3f.h>
-#include <vrmath/Vector4f.h>
-#include <vrmath/Matrix4x4d.h>
 
 #include "nvconf.h"
 
 #include "nanovis.h"
+#include "CmdProc.h"
 #include "FlowCmd.h"
-#include "CmdProc.h"
+#include "FlowTypes.h"
+#include "FlowBox.h"
+#include "FlowParticles.h"
 #include "Switch.h"
 #include "TransferFunction.h"
@@ -39 +40 @@
 #include "VelocityArrowsSlice.h"
 #include "Volume.h"
-
-#define RELPOS 0
-#define ABSPOS 1
 
 using namespace vrmath;
@@ -96 +94 @@
      offsetof(FlowValues, specular), 0},
     {Rappture::SWITCH_CUSTOM, "-transferfunction", "name",
-     offsetof(FlowValues, tfPtr), 0, 0, &transferFunctionSwitch},
+     offsetof(FlowValues, transferFunction), 0, 0, &transferFunctionSwitch},
     {Rappture::SWITCH_BOOLEAN, "-volume", "boolean",
      offsetof(FlowValues, showVolume), 0},
@@ -133 +131 @@
 static Tcl_CmdDeleteProc FlowInstDeleteProc;
 
-FlowParticles::FlowParticles(const char *name, Tcl_HashEntry *hPtr) :
+FlowCmd::FlowCmd(Tcl_Interp *interp, const char *name) :
+    _interp(interp),
     _name(name),
-    _hashPtr(hPtr),
-    _rendererPtr(new NvParticleRenderer(NMESH, NMESH))
-{
-    _sv.position.value = 0.0f;
-    _sv.position.flags = RELPOS;
-    _sv.position.axis = 0; // X_AXIS
-    _sv.color.r = _sv.color.g = _sv.color.b = _sv.color.a = 1.0f;
-    _sv.isHidden = false;
-    _sv.particleSize = 1.2;
-}
-
-FlowParticles::~FlowParticles() 
-{
-    if (_rendererPtr != NULL) {
-        delete _rendererPtr;
-    }
-    if (_hashPtr != NULL) {
-        Tcl_DeleteHashEntry(_hashPtr);
-    }
-    Rappture::FreeSwitches(_switches, &_sv, 0);
-}
-
-void
-FlowParticles::render() 
-{
-    TRACE("Particles '%s' axis: %d pos: %g rel pos: %g",
-          _name, _sv.position.axis, _sv.position.value,
-          FlowCmd::getRelativePosition(&_sv.position));
-    _rendererPtr->setPos(FlowCmd::getRelativePosition(&_sv.position));
-    _rendererPtr->setAxis(_sv.position.axis);
-    assert(_rendererPtr->active());
-    _rendererPtr->render();
-}
-
-void 
-FlowParticles::configure() 
-{
-    _rendererPtr->setPos(FlowCmd::getRelativePosition(&_sv.position));
-    _rendererPtr->setColor(Vector4f(_sv.color.r, _sv.color.g, _sv.color.b, 
-                                    _sv.color.a));
-    _rendererPtr->particleSize(_sv.particleSize);
-    _rendererPtr->setAxis(_sv.position.axis);
-    _rendererPtr->active(!_sv.isHidden);
-}
-
-FlowBox::FlowBox(const char *name, Tcl_HashEntry *hPtr) 
-{
-    _name = name;
-    _hashPtr = hPtr;
-    _sv.isHidden = false;
-    _sv.corner1.x = 0.0f;
-    _sv.corner1.y = 0.0f;
-    _sv.corner1.z = 0.0f;
-    _sv.corner2.x = 1.0f;
-    _sv.corner2.y = 1.0f;
-    _sv.corner2.z = 1.0f;
-    _sv.lineWidth = 1.2f;
-    _sv.color.r = _sv.color.b = _sv.color.g = _sv.color.a = 1.0f;
-}
-
-void
-FlowBox::getWorldSpaceBounds(Vector3f& bboxMin,
-                             Vector3f& bboxMax,
-                             const Volume *vol) const
-{
-    bboxMin.set(FLT_MAX, FLT_MAX, FLT_MAX);
-    bboxMax.set(-FLT_MAX, -FLT_MAX, -FLT_MAX);
-
-    Vector3f origin = vol->location();
-    Vector3f scale = vol->getPhysicalScaling();
-
-    Matrix4x4d mat;
-    mat.makeTranslation(origin);
-    Matrix4x4d mat2;
-    mat2.makeScale(scale);
-
-    mat.multiply(mat2);
-
-    Vector3f min, max;
-    min.x = vol->xAxis.min();
-    min.y = vol->yAxis.min();
-    min.z = vol->zAxis.min();
-    max.x = vol->xAxis.max();
-    max.y = vol->yAxis.max();
-    max.z = vol->zAxis.max();
-
-    float x0, y0, z0, x1, y1, z1;
-    x0 = y0 = z0 = 0.0f;
-    x1 = y1 = z1 = 0.0f;
-    if (max.x > min.x) {
-        x0 = (_sv.corner1.x - min.x) / (max.x - min.x);
-        x1 = (_sv.corner2.x - min.x) / (max.x - min.x);
-    }
-    if (max.y > min.y) {
-        y0 = (_sv.corner1.y - min.y) / (max.y - min.y);
-        y1 = (_sv.corner2.y - min.y) / (max.y - min.y);
-    }
-    if (max.z > min.z) {
-        z0 = (_sv.corner1.z - min.z) / (max.z - min.z);
-        z1 = (_sv.corner2.z - min.z) / (max.z - min.z);
-    }
-
-    TRACE("Box model bounds: (%g,%g,%g) - (%g,%g,%g)",
-          x0, y0, z0, x1, y1, z1);
-
-    Vector3f modelMin(x0, y0, z0);
-    Vector3f modelMax(x1, y1, z1);
-
-    Vector4f bvert[8];
-    bvert[0] = Vector4f(modelMin.x, modelMin.y, modelMin.z, 1);
-    bvert[1] = Vector4f(modelMax.x, modelMin.y, modelMin.z, 1);
-    bvert[2] = Vector4f(modelMin.x, modelMax.y, modelMin.z, 1);
-    bvert[3] = Vector4f(modelMin.x, modelMin.y, modelMax.z, 1);
-    bvert[4] = Vector4f(modelMax.x, modelMax.y, modelMin.z, 1);
-    bvert[5] = Vector4f(modelMax.x, modelMin.y, modelMax.z, 1);
-    bvert[6] = Vector4f(modelMin.x, modelMax.y, modelMax.z, 1);
-    bvert[7] = Vector4f(modelMax.x, modelMax.y, modelMax.z, 1);
-
-    for (int i = 0; i < 8; i++) {
-        Vector4f worldVert = mat.transform(bvert[i]);
-        if (worldVert.x < bboxMin.x) bboxMin.x = worldVert.x;
-        if (worldVert.x > bboxMax.x) bboxMax.x = worldVert.x;
-        if (worldVert.y < bboxMin.y) bboxMin.y = worldVert.y;
-        if (worldVert.y > bboxMax.y) bboxMax.y = worldVert.y;
-        if (worldVert.z < bboxMin.z) bboxMin.z = worldVert.z;
-        if (worldVert.z > bboxMax.z) bboxMax.z = worldVert.z;
-    }
-
-    TRACE("Box world bounds: (%g,%g,%g) - (%g,%g,%g)",
-          bboxMin.x, bboxMin.y, bboxMin.z,
-          bboxMax.x, bboxMax.y, bboxMax.z);
-}
-
-void 
-FlowBox::render(Volume *vol)
-{
-    TRACE("Box: '%s'", _name);
-
-    glPushAttrib(GL_ENABLE_BIT);
-
-    glEnable(GL_DEPTH_TEST);
-    glDisable(GL_TEXTURE_2D);
-    glDisable(GL_BLEND);
-
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-
-    Vector3f origin = vol->location();
-    glTranslatef(origin.x, origin.y, origin.z);
-
-    Vector3f scale = vol->getPhysicalScaling();
-    glScalef(scale.x, scale.y, scale.z);
-
-    Vector3f min, max;
-    min.x = vol->xAxis.min();
-    min.y = vol->yAxis.min();
-    min.z = vol->zAxis.min();
-    max.x = vol->xAxis.max();
-    max.y = vol->yAxis.max();
-    max.z = vol->zAxis.max();
-
-    TRACE("box is %g,%g %g,%g %g,%g",
-          _sv.corner1.x, _sv.corner2.x,
-          _sv.corner1.y, _sv.corner2.y,
-          _sv.corner1.z, _sv.corner2.z);
-    TRACE("world is %g,%g %g,%g %g,%g",
-          min.x, max.x, min.y, max.y, min.z, max.z);
-
-    float x0, y0, z0, x1, y1, z1;
-    x0 = y0 = z0 = 0.0f;
-    x1 = y1 = z1 = 0.0f;
-    if (max.x > min.x) {
-        x0 = (_sv.corner1.x - min.x) / (max.x - min.x);
-        x1 = (_sv.corner2.x - min.x) / (max.x - min.x);
-    }
-    if (max.y > min.y) {
-        y0 = (_sv.corner1.y - min.y) / (max.y - min.y);
-        y1 = (_sv.corner2.y - min.y) / (max.y - min.y);
-    }
-    if (max.z > min.z) {
-        z0 = (_sv.corner1.z - min.z) / (max.z - min.z);
-        z1 = (_sv.corner2.z - min.z) / (max.z - min.z);
-    }
-    TRACE("box bounds: %g,%g %g,%g %g,%g",
-          x0, x1, y0, y1, z0, z1);
-
-    glColor4d(_sv.color.r, _sv.color.g, _sv.color.b, _sv.color.a);
-    glLineWidth(_sv.lineWidth);
-    glBegin(GL_LINE_LOOP); 
-    {
-        glVertex3d(x0, y0, z0);
-        glVertex3d(x1, y0, z0);
-        glVertex3d(x1, y1, z0);
-        glVertex3d(x0, y1, z0);
-    }
-    glEnd();
-    glBegin(GL_LINE_LOOP);
-    {
-        glVertex3d(x0, y0, z1);
-        glVertex3d(x1, y0, z1);
-        glVertex3d(x1, y1, z1);
-        glVertex3d(x0, y1, z1);
-    }
-    glEnd();
-    
-    glBegin(GL_LINE_LOOP);
-    {
-        glVertex3d(x0, y0, z0);
-        glVertex3d(x0, y0, z1);
-        glVertex3d(x0, y1, z1);
-        glVertex3d(x0, y1, z0);
-    }
-    glEnd();
-    
-    glBegin(GL_LINE_LOOP);
-    {
-        glVertex3d(x1, y0, z0);
-        glVertex3d(x1, y0, z1);
-        glVertex3d(x1, y1, z1);
-        glVertex3d(x1, y1, z0);
-    }
-    glEnd();
-
-    glPopMatrix();
-    glPopAttrib();
-
-    assert(CheckGL(AT));
-}
-
-FlowCmd::FlowCmd(Tcl_Interp *interp, const char *name, Tcl_HashEntry *hPtr) :
-    _interp(interp),
-    _hashPtr(hPtr),
-    _name(name),
-    _dataPtr(NULL),
-    _volPtr(NULL),
-    _fieldPtr(NULL)
+    _data(NULL),
+    _volume(NULL),
+    _field(NULL)
 {
     memset(&_sv, 0, sizeof(FlowValues));
     _sv.sliceVisible = 1;
-    _sv.tfPtr = NanoVis::getTransfunc("default");
-
-    Tcl_InitHashTable(&_particlesTable, TCL_STRING_KEYS);
-    Tcl_InitHashTable(&_boxTable, TCL_STRING_KEYS);
-
-    _cmdToken = Tcl_CreateObjCommand(_interp, (char *)_name, 
+    _sv.transferFunction = NanoVis::getTransferFunction("default");
+
+    _cmdToken = Tcl_CreateObjCommand(_interp, (char *)name, 
                                      (Tcl_ObjCmdProc *)FlowInstObjCmd,
                                      this, FlowInstDeleteProc);
@@ -386 +149 @@
 FlowCmd::~FlowCmd()
 {
+    TRACE("Enter");
+
     Rappture::FreeSwitches(_switches, &_sv, 0);
-    if (_hashPtr != NULL) {
-        Tcl_DeleteHashEntry(_hashPtr);
-    }
-    if (_fieldPtr != NULL) {
-        delete _fieldPtr;
-    }
-    if (_dataPtr != NULL) {
-        delete _dataPtr;
-    }
-    if (_volPtr != NULL) {
-        NanoVis::removeVolume(_volPtr);
-        _volPtr = NULL;
-    }
-
-    FlowBox *boxPtr;
-    FlowBoxIterator boxIter;
-    for (boxPtr = firstBox(&boxIter); boxPtr != NULL; 
-         boxPtr = nextBox(&boxIter)) {
-        boxPtr->disconnect();
-        delete boxPtr;
-    }
-    FlowParticles *particlesPtr;
-    FlowParticlesIterator partIter;
-    for (particlesPtr = firstParticles(&partIter); particlesPtr != NULL;
-         particlesPtr = nextParticles(&partIter)) {
-        particlesPtr->disconnect();
-        delete particlesPtr;
-    }
-    Tcl_DeleteHashTable(&_particlesTable);
-    Tcl_DeleteHashTable(&_boxTable);
+    if (_field != NULL) {
+        delete _field;
+    }
+    if (_data != NULL) {
+        delete _data;
+    }
+    if (_volume != NULL) {
+        NanoVis::removeVolume(_volume);
+        _volume = NULL;
+    }
+    for (BoxHashmap::iterator itr = _boxTable.begin();
+         itr != _boxTable.end(); ++itr) {
+        delete itr->second;
+    }
+    _boxTable.clear();
+    for (ParticlesHashmap::iterator itr = _particlesTable.begin();
+         itr != _particlesTable.end(); ++itr) {
+        delete itr->second;
+    }
+    _particlesTable.clear();
+}
+
+void
+FlowCmd::getBounds(Vector3f& min,
+                   Vector3f& max,
+                   bool onlyVisible)
+{
+    TRACE("Enter");
+
+    if (onlyVisible && !visible())
+        return;
+
+#if 0  // Using volume bounds instead of these
+    if (isDataLoaded()) {
+        Vector3f umin, umax;
+        Rappture::Unirect3d *unirect = data();
+        unirect->getWorldSpaceBounds(umin, umax);
+        if (min.x > umin.x) {
+            min.x = umin.x;
+        }
+        if (max.x < umax.x) {
+            max.x = umax.x;
+        }
+        if (min.y > umin.y) {
+            min.y = umin.y;
+        }
+        if (max.y < umax.y) {
+            max.y = umax.y;
+        }
+        if (min.z > umin.z) {
+            min.z = umin.z;
+        }
+        if (max.z < umax.z) {
+            max.z = umax.z;
+        }
+    }
+#endif
+    for (BoxHashmap::iterator itr = _boxTable.begin();
+         itr != _boxTable.end(); ++itr) {
+        FlowBox *box = itr->second;
+        if (!onlyVisible || box->visible()) {
+            Vector3f fbmin, fbmax;
+            box->getWorldSpaceBounds(fbmin, fbmax,
+                                     getVolume());
+            if (min.x > fbmin.x) {
+                min.x = fbmin.x;
+            }
+            if (max.x < fbmax.x) {
+                max.x = fbmax.x;
+            }
+            if (min.y > fbmin.y) {
+                min.y = fbmin.y;
+            }
+            if (max.y < fbmax.y) {
+                max.y = fbmax.y;
+            }
+            if (min.z > fbmin.z) {
+                min.z = fbmin.z;
+            }
+            if (max.z < fbmax.z) {
+                max.z = fbmax.z;
+            }
+        }
+    }
 }
 
@@ -422 +241 @@
 FlowCmd::resetParticles()
 {
-    FlowParticlesIterator iter;
-    for (FlowParticles *particlesPtr = firstParticles(&iter);
-         particlesPtr != NULL;
-         particlesPtr = nextParticles(&iter)) {
-        particlesPtr->reset();
+    for (ParticlesHashmap::iterator itr = _particlesTable.begin();
+         itr != _particlesTable.end(); ++itr) {
+        itr->second->reset();
     }
 }
@@ -435 +252 @@
     NvVectorField *fieldPtr = getVectorField();
     fieldPtr->active(true);
-    FlowParticlesIterator iter;
-    for (FlowParticles *particlesPtr = firstParticles(&iter);
-         particlesPtr != NULL;
-         particlesPtr = nextParticles(&iter)) {
-        if (particlesPtr->visible()) {
-            particlesPtr->advect();
+    for (ParticlesHashmap::iterator itr = _particlesTable.begin();
+         itr != _particlesTable.end(); ++itr) {
+        if (itr->second->visible()) {
+            itr->second->advect();
         }
     }
@@ -448 +263 @@
 FlowCmd::render()
 {
-    _fieldPtr->active(true);
-    _fieldPtr->render();
-    FlowParticlesIterator iter;
-    for (FlowParticles *particlesPtr = firstParticles(&iter);
-         particlesPtr != NULL; 
-         particlesPtr = nextParticles(&iter)) {
-        if (particlesPtr->visible()) {
-            particlesPtr->render();
+    _field->active(true);
+    _field->render();
+    for (ParticlesHashmap::iterator itr = _particlesTable.begin();
+         itr != _particlesTable.end(); ++itr) {
+        if (itr->second->visible()) {
+            itr->second->render();
         }
     }
@@ -461 +274 @@
 }
 
-int
-FlowCmd::createParticles(Tcl_Interp *interp, Tcl_Obj *objPtr)
-{
-    Tcl_HashEntry *hPtr;
-    int isNew;
-    const char *particlesName = Tcl_GetString(objPtr);
-    hPtr = Tcl_CreateHashEntry(&_particlesTable, particlesName, &isNew);
-    if (!isNew) {
-        Tcl_AppendResult(interp, "particle injection plane \"",
-                         particlesName, "\" already exists.", (char *)NULL);
-        return TCL_ERROR;
-    }
-    particlesName = Tcl_GetHashKey(&_particlesTable, hPtr);
-    FlowParticles *particlesPtr;
-    particlesPtr = new FlowParticles(particlesName, hPtr);
-    if (particlesPtr == NULL) {
-        Tcl_AppendResult(interp, "can't allocate particle injection plane",
-                         (char *)NULL);
-        Tcl_DeleteHashEntry(hPtr);
-        return TCL_ERROR;
-    }
-    Tcl_SetHashValue(hPtr, particlesPtr);
-    return TCL_OK;
-}
-
-int
-FlowCmd::getParticles(Tcl_Interp *interp, Tcl_Obj *objPtr, 
-                      FlowParticles **particlesPtrPtr)
-{
-    Tcl_HashEntry *hPtr;
-    hPtr = Tcl_FindHashEntry(&_particlesTable, Tcl_GetString(objPtr));
-    if (hPtr == NULL) {
-        if (interp != NULL) {
-            Tcl_AppendResult(interp, "can't find a particle injection plane \"",
-                             Tcl_GetString(objPtr), "\"", (char *)NULL);
-        }
-        return TCL_ERROR;
-    }
-    *particlesPtrPtr = (FlowParticles *)Tcl_GetHashValue(hPtr);
-    return TCL_OK;
-}
-
 FlowParticles *
-FlowCmd::firstParticles(FlowParticlesIterator *iterPtr) 
-{
-    iterPtr->hashPtr = Tcl_FirstHashEntry(&_particlesTable, 
-                                          &iterPtr->hashSearch);
-    if (iterPtr->hashPtr == NULL) {
+FlowCmd::createParticles(const char *particlesName)
+{
+    ParticlesHashmap::iterator itr = _particlesTable.find(particlesName);
+    if (itr != _particlesTable.end()) {
+        TRACE("Deleting existing particle injection plane '%s'", particlesName);
+        delete itr->second;
+        _particlesTable.erase(itr);
+    }
+    FlowParticles *particles = new FlowParticles(particlesName);
+    _particlesTable[particlesName] = particles;
+    return particles;
+}
+
+FlowParticles *
+FlowCmd::getParticles(const char *particlesName)
+{
+    ParticlesHashmap::iterator itr;
+    itr = _particlesTable.find(particlesName);
+    if (itr == _particlesTable.end()) {
+        TRACE("Can't find particle injection plane '%s' in '%s'", particlesName, name());
         return NULL;
     }
-    return (FlowParticles *)Tcl_GetHashValue(iterPtr->hashPtr);
-}
-
-FlowParticles *
-FlowCmd::nextParticles(FlowParticlesIterator *iterPtr) 
-{
-    if (iterPtr->hashPtr == NULL) {
+    return itr->second;
+}
+
+void
+FlowCmd::deleteParticles(const char *particlesName)
+{
+    ParticlesHashmap::iterator itr = _particlesTable.find(particlesName);
+    if (itr == _particlesTable.end()) {
+        TRACE("Can't find particle injection plane '%s' in '%s'", particlesName, name());
+        return;
+    }
+    delete itr->second;
+    _particlesTable.erase(itr);
+}
+
+void
+FlowCmd::getParticlesNames(std::vector<std::string>& names)
+{
+    for (ParticlesHashmap::iterator itr = _particlesTable.begin();
+         itr != _particlesTable.end(); ++itr) {
+        names.push_back(std::string(itr->second->name()));
+    }
+}
+
+FlowBox *
+FlowCmd::createBox(const char *boxName)
+{
+    BoxHashmap::iterator itr = _boxTable.find(boxName);
+    if (itr != _boxTable.end()) {
+        TRACE("Deleting existing box '%s'", boxName);
+        delete itr->second;
+        _boxTable.erase(itr);
+    }
+    FlowBox *box = new FlowBox(boxName);
+    _boxTable[boxName] = box;
+    return box;
+}
+
+FlowBox *
+FlowCmd::getBox(const char *boxName)
+{
+    BoxHashmap::iterator itr = _boxTable.find(boxName);
+    if (itr == _boxTable.end()) {
+        TRACE("Can't find box '%s' in '%s'", boxName, name());
         return NULL;
     }
-    iterPtr->hashPtr = Tcl_NextHashEntry(&iterPtr->hashSearch);
-    if (iterPtr->hashPtr == NULL) {
-        return NULL;
-    }
-    return (FlowParticles *)Tcl_GetHashValue(iterPtr->hashPtr);
-}
-
-int
-FlowCmd::createBox(Tcl_Interp *interp, Tcl_Obj *objPtr)
-{
-    Tcl_HashEntry *hPtr;
-    int isNew;
-    hPtr = Tcl_CreateHashEntry(&_boxTable, Tcl_GetString(objPtr), &isNew);
-    if (!isNew) {
-        Tcl_AppendResult(interp, "box \"", Tcl_GetString(objPtr),
-                         "\" already exists in flow \"", name(), "\"", (char *)NULL);
-        return TCL_ERROR;
-    }
-    const char *boxName;
-    boxName = Tcl_GetHashKey(&_boxTable, hPtr);
-    FlowBox *boxPtr;
-    boxPtr = new FlowBox(boxName, hPtr);
-    if (boxPtr == NULL) {
-        Tcl_AppendResult(interp, "can't allocate box \"", boxName, "\"",
-                         (char *)NULL);
-        Tcl_DeleteHashEntry(hPtr);
-        return TCL_ERROR;
-    }
-    Tcl_SetHashValue(hPtr, boxPtr);
-    return TCL_OK;
-}
-
-int
-FlowCmd::getBox(Tcl_Interp *interp, Tcl_Obj *objPtr, FlowBox **boxPtrPtr)
-{
-    Tcl_HashEntry *hPtr;
-    hPtr = Tcl_FindHashEntry(&_boxTable, Tcl_GetString(objPtr));
-    if (hPtr == NULL) {
-        if (interp != NULL) {
-            Tcl_AppendResult(interp, "can't find a box \"", 
-                             Tcl_GetString(objPtr), "\" in flow \"", name(), "\"", 
-                             (char *)NULL);
-        }
-        return TCL_ERROR;
-    }
-    *boxPtrPtr = (FlowBox *)Tcl_GetHashValue(hPtr);
-    return TCL_OK;
-}
-
-FlowBox *
-FlowCmd::firstBox(FlowBoxIterator *iterPtr) 
-{
-    iterPtr->hashPtr = Tcl_FirstHashEntry(&_boxTable, &iterPtr->hashSearch);
-    if (iterPtr->hashPtr == NULL) {
-        return NULL;
-    }
-    return (FlowBox *)Tcl_GetHashValue(iterPtr->hashPtr);
-}
-
-FlowBox *
-FlowCmd::nextBox(FlowBoxIterator *iterPtr) 
-{
-    if (iterPtr->hashPtr == NULL) {
-        return NULL;
-    }
-    iterPtr->hashPtr = Tcl_NextHashEntry(&iterPtr->hashSearch);
-    if (iterPtr->hashPtr == NULL) {
-        return NULL;
-    }
-    return (FlowBox *)Tcl_GetHashValue(iterPtr->hashPtr);
+    return itr->second;
+}
+
+void
+FlowCmd::deleteBox(const char *boxName)
+{
+    BoxHashmap::iterator itr = _boxTable.find(boxName);
+    if (itr == _boxTable.end()) {
+        TRACE("Can't find box '%s' in '%s'", boxName, name());
+        return;
+    }
+    delete itr->second;
+    _boxTable.erase(itr);
+}
+
+void FlowCmd::getBoxNames(std::vector<std::string>& names)
+{
+    for (BoxHashmap::iterator itr = _boxTable.begin();
+         itr != _boxTable.end(); ++itr) {
+        names.push_back(std::string(itr->second->name()));
+    }
 }
 
@@ -595 +369 @@
 FlowCmd::initializeParticles()
 {
-    FlowParticlesIterator iter;
-    for (FlowParticles *particlesPtr = firstParticles(&iter);
-         particlesPtr != NULL;
-         particlesPtr = nextParticles(&iter)) {
-        particlesPtr->initialize();
+    for (ParticlesHashmap::iterator itr = _particlesTable.begin();
+         itr != _particlesTable.end(); ++itr) {
+        itr->second->initialize();
     }
 }
@@ -606 +378 @@
 FlowCmd::scaleVectorField()
 {
-    if (_volPtr != NULL) {
-        TRACE("Removing existing volume: %s", _volPtr->name());
-        NanoVis::removeVolume(_volPtr);
-        _volPtr = NULL;
-    }
-    float *vdata;
-    vdata = getScaledVector();
+    if (_volume != NULL) {
+        TRACE("Removing existing volume: %s", _volume->name());
+        NanoVis::removeVolume(_volume);
+        _volume = NULL;
+    }
+    float *vdata = getScaledVector();
     if (vdata == NULL) {
         return false;
     }
-    Volume *volPtr;
-    volPtr = makeVolume(vdata);
+    Volume *volume = makeVolume(vdata);
     delete [] vdata;
-    if (volPtr == NULL) {
+    if (volume == NULL) {
         return false;
     }
-    _volPtr = volPtr;
+    _volume = volume;
 
     // Remove the associated vector field.
-    if (_fieldPtr != NULL) {
-        delete _fieldPtr;
-    }
-    _fieldPtr = new NvVectorField();
-    if (_fieldPtr == NULL) {
+    if (_field != NULL) {
+        delete _field;
+    }
+    _field = new NvVectorField();
+    if (_field == NULL) {
         return false;
     }
 
-    Vector3f scale = volPtr->getPhysicalScaling();
-    Vector3f location = _volPtr->location();
-
-    _fieldPtr->setVectorField(_volPtr,
-                              location,
-                              scale.x,
-                              scale.y,
-                              scale.z,
-                              NanoVis::magMax);
-
-    if (NanoVis::licRenderer != NULL) {
-        NanoVis::licRenderer->
-            setVectorField(_volPtr->textureID(),
+    Vector3f scale = volume->getPhysicalScaling();
+    Vector3f location = _volume->location();
+
+    _field->setVectorField(_volume,
                            location,
                            scale.x,
                            scale.y,
                            scale.z,
-                           _volPtr->wAxis.max());
-        setCurrentPosition();
-        setAxis();
-        setActive();
-    }
-
-    if (NanoVis::velocityArrowsSlice != NULL) {
-        NanoVis::velocityArrowsSlice->
-            setVectorField(_volPtr->textureID(),
+                           NanoVis::magMax);
+
+    if (NanoVis::licRenderer != NULL) {
+        NanoVis::licRenderer->
+            setVectorField(_volume->textureID(),
                            location,
                            scale.x,
                            scale.y,
                            scale.z,
-                           _volPtr->wAxis.max());
+                           _volume->wAxis.max());
+        setCurrentPosition();
+        setAxis();
+        setActive();
+    }
+
+    if (NanoVis::velocityArrowsSlice != NULL) {
+        NanoVis::velocityArrowsSlice->
+            setVectorField(_volume->textureID(),
+                           location,
+                           scale.x,
+                           scale.y,
+                           scale.z,
+                           _volume->wAxis.max());
         NanoVis::velocityArrowsSlice->axis(_sv.slicePos.axis);
         NanoVis::velocityArrowsSlice->slicePos(_sv.slicePos.value);
@@ -669 +439 @@
     }
 
-    FlowParticlesIterator partIter;
-    for (FlowParticles *particlesPtr = firstParticles(&partIter);
-         particlesPtr != NULL;
-         particlesPtr = nextParticles(&partIter)) {
-        particlesPtr->setVectorField(_volPtr,
-                                     location,
-                                     scale.x,
-                                     scale.y,
-                                     scale.z,
-                                     _volPtr->wAxis.max());
+    for (ParticlesHashmap::iterator itr = _particlesTable.begin();
+         itr != _particlesTable.end(); ++itr) {
+        itr->second->setVectorField(_volume,
+                                    location,
+                                    scale.x,
+                                    scale.y,
+                                    scale.z,
+                                    _volume->wAxis.max());
     }
     return true;
@@ -686 +454 @@
 FlowCmd::renderBoxes()
 {
-    FlowBoxIterator iter;
-    FlowBox *boxPtr;
-    for (boxPtr = firstBox(&iter); boxPtr != NULL; boxPtr = nextBox(&iter)) {
-        if (boxPtr->visible()) {
-            boxPtr->render(_volPtr);
+    for (BoxHashmap::iterator itr = _boxTable.begin();
+         itr != _boxTable.end(); ++itr) {
+        if (itr->second->visible()) {
+            itr->second->render(_volume);
         }
     }
@@ -698 +465 @@
 FlowCmd::getScaledVector()
 {
-    assert(_dataPtr->nComponents() == 3);
-    size_t n = _dataPtr->nValues() / _dataPtr->nComponents() * 4;
+    assert(_data->nComponents() == 3);
+    size_t n = _data->nValues() / _data->nComponents() * 4;
     float *data = new float[n];
     if (data == NULL) {
@@ -706 +473 @@
     memset(data, 0, sizeof(float) * n);
     float *destPtr = data;
-    const float *values = _dataPtr->values();
-    for (size_t iz = 0; iz < _dataPtr->zNum(); iz++) {
-        for (size_t iy = 0; iy < _dataPtr->yNum(); iy++) {
-            for (size_t ix = 0; ix < _dataPtr->xNum(); ix++) {
+    const float *values = _data->values();
+    for (size_t iz = 0; iz < _data->zNum(); iz++) {
+        for (size_t iy = 0; iy < _data->yNum(); iy++) {
+            for (size_t ix = 0; ix < _data->xNum(); ix++) {
                 double vx, vy, vz, vm;
                 vx = values[0];
@@ -730 +497 @@
 FlowCmd::makeVolume(float *data)
 {
-    Volume *volPtr;
-
-    volPtr = NanoVis::loadVolume(_name,
-                                 _dataPtr->xNum(),
-                                 _dataPtr->yNum(), 
-                                 _dataPtr->zNum(),
-                                 4, data, 
-                                 NanoVis::magMin, NanoVis::magMax, 0);
-    volPtr->xAxis.setRange(_dataPtr->xMin(), _dataPtr->xMax());
-    volPtr->yAxis.setRange(_dataPtr->yMin(), _dataPtr->yMax());
-    volPtr->zAxis.setRange(_dataPtr->zMin(), _dataPtr->zMax());
+    Volume *volume =
+        NanoVis::loadVolume(_name.c_str(),
+                            _data->xNum(),
+                            _data->yNum(), 
+                            _data->zNum(),
+                            4, data, 
+                            NanoVis::magMin, NanoVis::magMax, 0);
+    volume->xAxis.setRange(_data->xMin(), _data->xMax());
+    volume->yAxis.setRange(_data->yMin(), _data->yMax());
+    volume->zAxis.setRange(_data->zMin(), _data->zMax());
 
     TRACE("min=%g %g %g max=%g %g %g mag=%g %g",
@@ -747 +513 @@
           NanoVis::magMin, NanoVis::magMax);
 
-    volPtr->disableCutplane(0);
-    volPtr->disableCutplane(1);
-    volPtr->disableCutplane(2);
+    volume->disableCutplane(0);
+    volume->disableCutplane(1);
+    volume->disableCutplane(2);
 
     /* Initialize the volume with the previously configured values. */
-    volPtr->transferFunction(_sv.tfPtr);
-    volPtr->dataEnabled(_sv.showVolume);
-    volPtr->twoSidedLighting(_sv.twoSidedLighting);
-    volPtr->outline(_sv.showOutline);
-    volPtr->opacityScale(_sv.opacity);
-    volPtr->ambient(_sv.ambient);
-    volPtr->diffuse(_sv.diffuse);
-    volPtr->specularLevel(_sv.specular);
-    volPtr->specularExponent(_sv.specularExp);
-    volPtr->visible(_sv.showVolume);
-
-    Vector3f volScaling = volPtr->getPhysicalScaling();
+    volume->transferFunction(_sv.transferFunction);
+    volume->dataEnabled(_sv.showVolume);
+    volume->twoSidedLighting(_sv.twoSidedLighting);
+    volume->outline(_sv.showOutline);
+    volume->opacityScale(_sv.opacity);
+    volume->ambient(_sv.ambient);
+    volume->diffuse(_sv.diffuse);
+    volume->specularLevel(_sv.specular);
+    volume->specularExponent(_sv.specularExp);
+    volume->visible(_sv.showVolume);
+
+    Vector3f volScaling = volume->getPhysicalScaling();
     Vector3f loc(volScaling);
     loc *= -0.5;
-    volPtr->location(loc);
+    volume->location(loc);
 
     Volume::updatePending = true;
-    return volPtr;
+    return volume;
 }
 
@@ -996 +762 @@
 /* Static NanoVis class commands. */
 
+FlowCmd *
+NanoVis::getFlow(const char *name)
+{
+    FlowHashmap::iterator itr = flowTable.find(name);
+    if (itr == flowTable.end()) {
+        TRACE("Can't find flow '%s'", name);
+        return NULL;
+    }
+    return itr->second;
+}
+
+FlowCmd *
+NanoVis::createFlow(Tcl_Interp *interp, const char *name)
+{
+    FlowHashmap::iterator itr = flowTable.find(name);
+    if (itr != flowTable.end()) {
+        ERROR("Flow '%s' already exists", name);
+        return NULL;
+    }
+    FlowCmd *flow = new FlowCmd(interp, name);
+    flowTable[name] = flow;
+    return flow;
+}
+
+/**
+ * \brief Delete flow object and hash table entry
+ *
+ * This is called by the flow command instance delete callback
+ */
 void
-NanoVis::initFlows() 
-{
-    Tcl_InitHashTable(&flowTable, TCL_STRING_KEYS);
-}
-
-FlowCmd *
-NanoVis::firstFlow(FlowIterator *iterPtr) 
-{
-    iterPtr->hashPtr = Tcl_FirstHashEntry(&flowTable, &iterPtr->hashSearch);
-    if (iterPtr->hashPtr == NULL) {
-        return NULL;
-    }
-    return (FlowCmd *)Tcl_GetHashValue(iterPtr->hashPtr);
-}
-
-FlowCmd *
-NanoVis::nextFlow(FlowIterator *iterPtr) 
-{
-    if (iterPtr->hashPtr == NULL) {
-        return NULL;
-    }
-    iterPtr->hashPtr = Tcl_NextHashEntry(&iterPtr->hashSearch);
-    if (iterPtr->hashPtr == NULL) {
-        return NULL;
-    }
-    return (FlowCmd *)Tcl_GetHashValue(iterPtr->hashPtr);
-}
-
-int
-NanoVis::getFlow(Tcl_Interp *interp, Tcl_Obj *objPtr, FlowCmd **flowPtrPtr)
-{
-    Tcl_HashEntry *hPtr;
-    hPtr = Tcl_FindHashEntry(&flowTable, Tcl_GetString(objPtr));
-    if (hPtr == NULL) {
-        if (interp != NULL) {
-            Tcl_AppendResult(interp, "can't find a flow \"", 
-                             Tcl_GetString(objPtr), "\"", (char *)NULL);
-        }
-        return TCL_ERROR;
-    }
-    *flowPtrPtr = (FlowCmd *)Tcl_GetHashValue(hPtr);
-    return TCL_OK;
-}
-
-int
-NanoVis::createFlow(Tcl_Interp *interp, Tcl_Obj *objPtr)
-{
-    Tcl_HashEntry *hPtr;
-    int isNew;
-    const char *name;
-    name = Tcl_GetString(objPtr);
-    hPtr = Tcl_CreateHashEntry(&flowTable, name, &isNew);
-    if (!isNew) {
-        Tcl_AppendResult(interp, "flow \"", name, "\" already exists.",
-                         (char *)NULL);
-        return TCL_ERROR;
-    }
-    Tcl_CmdInfo cmdInfo;
-    if (Tcl_GetCommandInfo(interp, name, &cmdInfo)) {
-        Tcl_AppendResult(interp, "an another command \"", name, 
-                         "\" already exists.", (char *)NULL);
-        return TCL_ERROR;
-    }
-    FlowCmd *flowPtr;
-    name = Tcl_GetHashKey(&flowTable, hPtr);
-    flowPtr = new FlowCmd(interp, name, hPtr);
-    if (flowPtr == NULL) {
-        Tcl_AppendResult(interp, "can't allocate a flow object \"", name, 
-                         "\"", (char *)NULL);
-        return TCL_ERROR;
-    }
-    Tcl_SetHashValue(hPtr, flowPtr);
-    return TCL_OK;
-}
-
+NanoVis::deleteFlow(const char *name)
+{
+    FlowHashmap::iterator itr = flowTable.find(name);
+    if (itr != flowTable.end()) {
+        delete itr->second;
+        flowTable.erase(itr);
+    }
+}
+
+/**
+ * \brief Delete all flow object commands
+ *
+ * This will also delete the flow objects and hash table entries
+ */
 void
 NanoVis::deleteFlows(Tcl_Interp *interp)
 {
-    FlowCmd *flowPtr;
-    FlowIterator iter;
-    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
-         flowPtr = nextFlow(&iter)) {
-        flowPtr->disconnect();                /* Don't disrupt the hash walk */
-        Tcl_DeleteCommand(interp, flowPtr->name());
-    }
-    Tcl_DeleteHashTable(&flowTable);
+    FlowHashmap::iterator itr;
+    for (itr = flowTable.begin();
+         itr != flowTable.end(); ++itr) {
+        Tcl_DeleteCommandFromToken(interp, itr->second->getCommandToken());
+    }
+    flowTable.clear();
 }
 
@@ -1098 +830 @@
     magMin = DBL_MAX, magMax = -DBL_MAX;
 
-    FlowCmd *flowPtr;
-    FlowIterator iter;
-    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
-         flowPtr = nextFlow(&iter)) {
+    for (FlowHashmap::iterator itr = flowTable.begin();
+         itr != flowTable.end(); ++itr) {
+        FlowCmd *flow = itr->second;
         double min, max;
-        if (!flowPtr->isDataLoaded()) {
+        if (!flow->isDataLoaded()) {
             continue;
         }
-        Rappture::Unirect3d *dataPtr = flowPtr->data();
-        min = dataPtr->magMin();
-        max = dataPtr->magMax();
+        Rappture::Unirect3d *data = flow->data();
+        min = data->magMin();
+        max = data->magMax();
         if (min < magMin) {
             magMin = min;
@@ -1115 +846 @@
             magMax = max;
         }
-        if (dataPtr->xMin() < xMin) {
-            xMin = dataPtr->xMin();
-        }
-        if (dataPtr->yMin() < yMin) {
-            yMin = dataPtr->yMin();
-        }
-        if (dataPtr->zMin() < zMin) {
-            zMin = dataPtr->zMin();
-        }
-        if (dataPtr->xMax() > xMax) {
-            xMax = dataPtr->xMax();
-        }
-        if (dataPtr->yMax() > yMax) {
-            yMax = dataPtr->yMax();
-        }
-        if (dataPtr->zMax() > zMax) {
-            zMax = dataPtr->zMax();
+        if (data->xMin() < xMin) {
+            xMin = data->xMin();
+        }
+        if (data->yMin() < yMin) {
+            yMin = data->yMin();
+        }
+        if (data->zMin() < zMin) {
+            zMin = data->zMin();
+        }
+        if (data->xMax() > xMax) {
+            xMax = data->xMax();
+        }
+        if (data->yMax() > yMax) {
+            yMax = data->yMax();
+        }
+        if (data->zMax() > zMax) {
+            zMax = data->zMax();
         }
     }
@@ -1140 +871 @@
      * Step 2. Generate the vector field from each data set. 
      */
-    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
-         flowPtr = nextFlow(&iter)) {
-        if (!flowPtr->isDataLoaded()) {
+    for (FlowHashmap::iterator itr = flowTable.begin();
+         itr != flowTable.end(); ++itr) {
+        FlowCmd *flow = itr->second;
+        if (!flow->isDataLoaded()) {
             continue; // Flow exists, but no data has been loaded yet.
         }
-        if (flowPtr->visible()) {
-            flowPtr->initializeParticles();
-        }
-        if (!flowPtr->scaleVectorField()) {
+        if (flow->visible()) {
+            flow->initializeParticles();
+        }
+        if (!flow->scaleVectorField()) {
             return false;
         }
         // FIXME: This doesn't work when there is more than one flow.
-        licRenderer->setOffset(flowPtr->getRelativePosition());
-        velocityArrowsSlice->slicePos(flowPtr->getRelativePosition());
+        licRenderer->setOffset(flow->getRelativePosition());
+        velocityArrowsSlice->slicePos(flow->getRelativePosition());
     }
     advectFlows();
@@ -1169 +901 @@
     max.set(-FLT_MAX, -FLT_MAX, -FLT_MAX);
 
-    FlowCmd *flow;
-    FlowIterator iter;
-    for (flow = firstFlow(&iter); flow != NULL; 
-         flow = nextFlow(&iter)) {
-        if (onlyVisible && !flow->visible())
-            continue;
- #if 0  // Using volume bounds instead of these
-        if (flow->isDataLoaded()) {
-            Vector3f umin, umax;
-            Rappture::Unirect3d *unirect = flow->data();
-            unirect->getWorldSpaceBounds(umin, umax);
-            if (min.x > umin.x) {
-                min.x = umin.x;
-            }
-            if (max.x < umax.x) {
-                max.x = umax.x;
-            }
-            if (min.y > umin.y) {
-                min.y = umin.y;
-            }
-            if (max.y < umax.y) {
-                max.y = umax.y;
-            }
-            if (min.z > umin.z) {
-                min.z = umin.z;
-            }
-            if (max.z < umax.z) {
-                max.z = umax.z;
-            }
-        }
-#endif
-        FlowBox *box;
-        FlowBoxIterator iter;
-        for (box = flow->firstBox(&iter); box != NULL;
-             box = flow->nextBox(&iter)) {
-            if (!onlyVisible || box->visible()) {
-                Vector3f fbmin, fbmax;
-                box->getWorldSpaceBounds(fbmin, fbmax,
-                                         flow->getVolume());
-                if (min.x > fbmin.x) {
-                    min.x = fbmin.x;
-                }
-                if (max.x < fbmax.x) {
-                    max.x = fbmax.x;
-                }
-                if (min.y > fbmin.y) {
-                    min.y = fbmin.y;
-                }
-                if (max.y < fbmax.y) {
-                    max.y = fbmax.y;
-                }
-                if (min.z > fbmin.z) {
-                    min.z = fbmin.z;
-                }
-                if (max.z < fbmax.z) {
-                    max.z = fbmax.z;
-                }
-            }
-        }
+    for (FlowHashmap::iterator itr = flowTable.begin();
+         itr != flowTable.end(); ++itr) {
+        itr->second->getBounds(min, max, onlyVisible);
     }
 }
@@ -1234 +910 @@
 NanoVis::renderFlows()
 {
-    FlowCmd *flowPtr;
-    FlowIterator iter;
-    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
-         flowPtr = nextFlow(&iter)) {
-        if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
-            flowPtr->render();
+    for (FlowHashmap::iterator itr = flowTable.begin();
+         itr != flowTable.end(); ++itr) {
+        FlowCmd *flow = itr->second;
+        if (flow->isDataLoaded() && flow->visible()) {
+            flow->render();
         }
     }
@@ -1248 +923 @@
 NanoVis::resetFlows()
 {
-    FlowCmd *flowPtr;
-    FlowIterator iter;
-
     if (licRenderer->active()) {
         NanoVis::licRenderer->reset();
     }
-    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
-         flowPtr = nextFlow(&iter)) {
-        if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
-            flowPtr->resetParticles();
+    for (FlowHashmap::iterator itr = flowTable.begin();
+         itr != flowTable.end(); ++itr) {
+        FlowCmd *flow = itr->second;
+        if (flow->isDataLoaded() && flow->visible()) {
+            flow->resetParticles();
         }
     }
@@ -1265 +938 @@
 NanoVis::advectFlows()
 {
-    FlowCmd *flowPtr;
-    FlowIterator iter;
-    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
-         flowPtr = nextFlow(&iter)) {
-        if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
-            flowPtr->advect();
+    for (FlowHashmap::iterator itr = flowTable.begin();
+         itr != flowTable.end(); ++itr) {
+        FlowCmd *flow = itr->second;
+        if (flow->isDataLoaded() && flow->visible()) {
+            flow->advect();
         }
     }
@@ -1339 +1011 @@
     Tcl_Obj **objv;
     int objc;
-    FlowColor *colorPtr = (FlowColor *)(record + offset);
+    FlowColor *color = (FlowColor *)(record + offset);
 
     if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
@@ -1366 +1038 @@
         values[i] = value;
     }
-    colorPtr->r = values[0];
-    colorPtr->g = values[1];
-    colorPtr->b = values[2];
-    colorPtr->a = values[3];
+    color->r = values[0];
+    color->g = values[1];
+    color->b = values[2];
+    color->a = values[3];
     return TCL_OK;
 }
@@ -1392 +1064 @@
                 char *record, int offset, int flags)
 {
-    FlowPoint *pointPtr = (FlowPoint *)(record + offset);
+    FlowPoint *point = (FlowPoint *)(record + offset);
     int objc;
     Tcl_Obj **objv;
@@ -1414 +1086 @@
         values[i] = value;
     }
-    pointPtr->x = values[0];
-    pointPtr->y = values[1];
-    pointPtr->z = values[2];
+    point->x = values[0];
+    point->y = values[1];
+    point->z = values[2];
     return TCL_OK;
 }
@@ -1489 +1161 @@
 {
     TransferFunction **funcPtrPtr = (TransferFunction **)(record + offset);
-    TransferFunction *funcPtr;
-    funcPtr = NanoVis::getTransfunc(Tcl_GetString(objPtr));
-    if (funcPtr == NULL) {
+    TransferFunction *tf = NanoVis::getTransferFunction(Tcl_GetString(objPtr));
+    if (tf == NULL) {
         Tcl_AppendResult(interp, "transfer function \"", Tcl_GetString(objPtr),
                          "\" is not defined", (char*)NULL);
         return TCL_ERROR;
     }
-    *funcPtrPtr = funcPtr;
+    *funcPtrPtr = tf;
     return TCL_OK;
 }
@@ -1517 +1188 @@
                    Tcl_Obj *const *objv)
 {
-    FlowCmd *flowPtr = (FlowCmd *)clientData;
-
-    if (flowPtr->createParticles(interp, objv[3]) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    FlowParticles *particlesPtr;
-    if (flowPtr->getParticles(interp, objv[3], &particlesPtr) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (particlesPtr->parseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
-        delete particlesPtr;
-        return TCL_ERROR;
-    }
-    particlesPtr->configure();
+    FlowCmd *flow = (FlowCmd *)clientData;
+    const char *particlesName = Tcl_GetString(objv[3]);
+    FlowParticles *particles = flow->createParticles(particlesName);
+    if (particles == NULL) {
+        Tcl_AppendResult(interp, "Flow particle injection plane \"",
+                         particlesName,
+                         "\" already exists or could not be created",
+                         (char*)NULL);
+        return TCL_ERROR;
+    }
+    if (particles->parseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
+        flow->deleteParticles(particlesName);
+        return TCL_ERROR;
+    }
+    particles->configure();
     NanoVis::eventuallyRedraw();
     Tcl_SetObjResult(interp, objv[3]);
@@ -1540 +1212 @@
                          Tcl_Obj *const *objv)
 {
-    FlowCmd *flowPtr = (FlowCmd *)clientData;
-
-    FlowParticles *particlesPtr;
-    if (flowPtr->getParticles(interp, objv[3], &particlesPtr) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (particlesPtr->parseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    particlesPtr->configure();
+    FlowCmd *flow = (FlowCmd *)clientData;
+    const char *particlesName = Tcl_GetString(objv[3]);
+    FlowParticles *particles = flow->getParticles(particlesName);
+    if (particles == NULL) {
+        Tcl_AppendResult(interp, "Flow particle injection plane \"",
+                         particlesName, "\" not found",
+                         (char*)NULL);
+        return TCL_ERROR;
+    }
+    if (particles->parseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    particles->configure();
     NanoVis::eventuallyRedraw(NanoVis::MAP_FLOWS);
     return TCL_OK;
@@ -1558 +1233 @@
                       Tcl_Obj *const *objv)
 {
-    FlowCmd *flowPtr = (FlowCmd *)clientData;
-    int i;
-    for (i = 3; i < objc; i++) {
-        FlowParticles *particlesPtr;
-
-        if (flowPtr->getParticles(NULL, objv[i], &particlesPtr) == TCL_OK) {
-            delete particlesPtr;
-        }
+    FlowCmd *flow = (FlowCmd *)clientData;
+    for (int i = 3; i < objc; i++) {
+        flow->deleteParticles(Tcl_GetString(objv[i]));
     }
     NanoVis::eventuallyRedraw();
@@ -1575 +1245 @@
                      Tcl_Obj *const *objv)
 {
-    FlowCmd *flowPtr = (FlowCmd *)clientData;
+    FlowCmd *flow = (FlowCmd *)clientData;
     Tcl_Obj *listObjPtr;
     listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    FlowParticlesIterator iter;
-    FlowParticles *particlesPtr;
-    for (particlesPtr = flowPtr->firstParticles(&iter); particlesPtr != NULL; 
-         particlesPtr = flowPtr->nextParticles(&iter)) {
-        Tcl_Obj *objPtr;
-
-        objPtr = Tcl_NewStringObj(particlesPtr->name(), -1);
+    std::vector<std::string> names;
+    flow->getParticlesNames(names);
+    for (std::vector<std::string>::iterator itr = names.begin();
+         itr != names.end(); ++itr) {
+        Tcl_Obj *objPtr = Tcl_NewStringObj(itr->c_str(), -1);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
@@ -1594 +1262 @@
     {"add",        1, FlowParticlesAddOp,        4, 0, "name ?switches?",},
     {"configure",  1, FlowParticlesConfigureOp,  4, 0, "name ?switches?",},
-    {"delete",     1, FlowParticlesDeleteOp,     4, 0, "?name...?"},
-    {"names",      1, FlowParticlesNamesOp,      3, 4, "?pattern?"},
+    {"delete",     1, FlowParticlesDeleteOp,     4, 0, "name ?name...?"},
+    {"names",      1, FlowParticlesNamesOp,      3, 3, ""},
 };
 
@@ -1632 +1300 @@
              Tcl_Obj *const *objv)
 {
-    FlowCmd *flowPtr = (FlowCmd *)clientData;
-
-    if (flowPtr->createBox(interp, objv[3]) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    FlowBox *boxPtr;
-    if (flowPtr->getBox(interp, objv[3], &boxPtr) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (boxPtr->parseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
-        delete boxPtr;
+    FlowCmd *flow = (FlowCmd *)clientData;
+    const char *boxName = Tcl_GetString(objv[3]);
+    FlowBox *box = flow->createBox(boxName);
+    if (box == NULL) {
+        Tcl_AppendResult(interp, "Flow box \"", boxName, 
+                         "\" already exists or could not be created",
+                         (char*)NULL);
+        return TCL_ERROR;
+    }
+    if (box->parseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
+        flow->deleteBox(boxName);
         return TCL_ERROR;
     }
@@ -1651 +1319 @@
 
 static int
+FlowBoxConfigureOp(ClientData clientData, Tcl_Interp *interp, int objc,
+                   Tcl_Obj *const *objv)
+{
+    FlowCmd *flow = (FlowCmd *)clientData;
+    const char *boxName = Tcl_GetString(objv[3]);
+    FlowBox *box = flow->getBox(boxName);
+    if (box == NULL) {
+        Tcl_AppendResult(interp, "Flow box \"", boxName, "\" not found",
+                         (char*)NULL);
+        return TCL_ERROR;
+    }
+    if (box->parseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    NanoVis::eventuallyRedraw();
+    return TCL_OK;
+}
+
+static int
 FlowBoxDeleteOp(ClientData clientData, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
 {
-    FlowCmd *flowPtr = (FlowCmd *)clientData;
-    int i;
-    for (i = 3; i < objc; i++) {
-        FlowBox *boxPtr;
-
-        if (flowPtr->getBox(NULL, objv[i], &boxPtr) == TCL_OK) {
-            delete boxPtr;
-        }
+    FlowCmd *flow = (FlowCmd *)clientData;
+    for (int i = 3; i < objc; i++) {
+        flow->deleteBox(Tcl_GetString(objv[i]));
     }
     NanoVis::eventuallyRedraw();
@@ -1671 +1353 @@
                Tcl_Obj *const *objv)
 {
-    FlowCmd *flowPtr = (FlowCmd *)clientData;
-    Tcl_Obj *listObjPtr;
-    listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    FlowBoxIterator iter;
-    FlowBox *boxPtr;
-    for (boxPtr = flowPtr->firstBox(&iter); boxPtr != NULL; 
-         boxPtr = flowPtr->nextBox(&iter)) {
-        Tcl_Obj *objPtr;
-
-        objPtr = Tcl_NewStringObj(boxPtr->name(), -1);
+    FlowCmd *flow = (FlowCmd *)clientData;
+    Tcl_Obj *listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
+    std::vector<std::string> names;
+    flow->getBoxNames(names);
+    for (std::vector<std::string>::iterator itr = names.begin();
+         itr != names.end(); ++itr) {
+        Tcl_Obj *objPtr = Tcl_NewStringObj(itr->c_str(), -1);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
     Tcl_SetObjResult(interp, listObjPtr);
-    return TCL_OK;
-}
-
-static int
-FlowBoxConfigureOp(ClientData clientData, Tcl_Interp *interp, int objc,
-                   Tcl_Obj *const *objv)
-{
-    FlowCmd *flowPtr = (FlowCmd *)clientData;
-
-    FlowBox *boxPtr;
-    if (flowPtr->getBox(interp, objv[3], &boxPtr) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (boxPtr->parseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    NanoVis::eventuallyRedraw();
     return TCL_OK;
 }
@@ -1707 +1369 @@
     {"add",        1, FlowBoxAddOp,        4, 0, "name ?switches?",},
     {"configure",  1, FlowBoxConfigureOp,  4, 0, "name ?switches?",},
-    {"delete",     1, FlowBoxDeleteOp,     3, 0, "?name...?"},
-    {"names",      1, FlowBoxNamesOp,      3, 0, "?pattern?"},
+    {"delete",     1, FlowBoxDeleteOp,     4, 0, "name ?name...?"},
+    {"names",      1, FlowBoxNamesOp,      3, 3, ""},
 };
 
@@ -1804 +1466 @@
     }
     assert(CheckGL(AT));
-    FlowCmd *flowPtr = (FlowCmd *)clientData;
-    Tcl_Preserve(flowPtr);
-    int result;
-    result = (*proc) (clientData, interp, objc, objv);
-    Tcl_Release(flowPtr);
+    FlowCmd *flow = (FlowCmd *)clientData;
+    Tcl_Preserve(flow);
+    int result = (*proc) (clientData, interp, objc, objv);
+    Tcl_Release(flow);
     return result;
 }
 
 /**
- * \brief Deletes the command associated with the tree.
- *
- * This is called only when the command associated with the tree is destroyed.
+ * \brief Deletes the command associated with the flow
+ *
+ * This is called only when the command associated with the flow is destroyed.
  */
 static void
 FlowInstDeleteProc(ClientData clientData)
 {
-    FlowCmd *flowPtr = (FlowCmd *)clientData;
-    delete flowPtr;
+    FlowCmd *flow = (FlowCmd *)clientData;
+    NanoVis::deleteFlow(flow->name());
 }
 
@@ -1828 +1489 @@
           Tcl_Obj *const *objv)
 {
-    if (NanoVis::createFlow(interp, objv[2]) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    FlowCmd *flowPtr;
-    if (NanoVis::getFlow(interp, objv[2], &flowPtr) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (flowPtr->parseSwitches(interp, objc - 3, objv + 3) != TCL_OK) {
-        Tcl_DeleteCommand(interp, flowPtr->name());
+    const char *name = Tcl_GetString(objv[2]);
+    Tcl_CmdInfo cmdInfo;
+    if (Tcl_GetCommandInfo(interp, name, &cmdInfo)) {
+        Tcl_AppendResult(interp, "an another command \"", name, 
+                         "\" already exists.", (char *)NULL);
+        return NULL;
+    }
+    FlowCmd *flow = NanoVis::createFlow(interp, name);
+    if (flow == NULL) {
+        Tcl_AppendResult(interp, "Flow \"", name, "\" already exists",
+                         (char*)NULL);
+        return TCL_ERROR;
+    }
+    if (flow->parseSwitches(interp, objc - 3, objv + 3) != TCL_OK) {
+        Tcl_DeleteCommand(interp, flow->name());
         return TCL_ERROR;
     }
@@ -1848 +1515 @@
              Tcl_Obj *const *objv)
 {
-    int i;
-
-    for (i = 2; i < objc; i++) {
-        FlowCmd *flowPtr;
-
-        if (NanoVis::getFlow(interp, objv[i], &flowPtr) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        Tcl_DeleteCommand(interp, flowPtr->name());
+    for (int i = 2; i < objc; i++) {
+        FlowCmd *flow = NanoVis::getFlow(Tcl_GetString(objv[i]));
+        if (flow != NULL) {
+            Tcl_DeleteCommandFromToken(interp, flow->getCommandToken());
+        }
     }
     NanoVis::eventuallyRedraw(NanoVis::MAP_FLOWS);
@@ -1866 +1529 @@
              Tcl_Obj *const *objv)
 {
-    bool value;
-    FlowCmd *flowPtr;
-
-    value = false;
-    if (NanoVis::getFlow(NULL, objv[2], &flowPtr) == TCL_OK) {
+    bool value = false;
+    FlowCmd *flow = NanoVis::getFlow(Tcl_GetString(objv[2]));
+    if (flow != NULL) {
         value = true;
     }
@@ -1897 +1558 @@
         NanoVis::mapFlows();
     }
-    int i;
     NanoVis::advectFlows();
-    for (i = 0; i < nSteps; i++) {
+    for (int i = 0; i < nSteps; i++) {
         if (NanoVis::licRenderer->active()) {
             NanoVis::licRenderer->convolve();
@@ -1915 +1575 @@
     Tcl_Obj *listObjPtr;
     listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **) NULL);
-    FlowCmd *flowPtr;
-    FlowIterator iter;
-    for (flowPtr = NanoVis::firstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NanoVis::nextFlow(&iter)) {
-        Tcl_Obj *objPtr;
-
-        objPtr = Tcl_NewStringObj(flowPtr->name(), -1);
+    for (NanoVis::FlowHashmap::iterator itr = NanoVis::flowTable.begin();
+         itr != NanoVis::flowTable.end(); ++itr) {
+        FlowCmd *flow = itr->second;
+        Tcl_Obj *objPtr = Tcl_NewStringObj(flow->name(), -1);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
@@ -2274 +1931 @@
 static Rappture::CmdSpec flowCmdOps[] = {
     {"add",      1, FlowAddOp,     3, 0, "name ?option value...?",},
-    {"delete",   1, FlowDeleteOp,  2, 0, "name...",},
+    {"delete",   1, FlowDeleteOp,  3, 0, "name ?name...?",},
     {"exists",   1, FlowExistsOp,  3, 3, "name",},
     {"goto",     1, FlowGotoOp,    3, 3, "nSteps",},
-    {"names",    1, FlowNamesOp,   2, 3, "?pattern?",},
+    {"names",    1, FlowNamesOp,   2, 2, "",},
     {"next",     2, FlowNextOp,    2, 2, "",},
     {"reset",    1, FlowResetOp,   2, 2, "",},
@@ -2299 +1956 @@
 
 /**
- *\brief This procedure is invoked to initialize the "tree" command.
+ *\brief This procedure is invoked to initialize the "flow" command.
  *
  * Side effects:
@@ -2309 +1966 @@
 {
     Tcl_CreateObjCommand(interp, "flow", FlowCmdProc, NULL, NULL);
-    NanoVis::initFlows();
-    return TCL_OK;
-}
-
-#ifdef notdef
-
-// Read the header of a vtk data file. Returns 0 if error.
-bool 
-VtkReadHeader()
-{
-    char *p, *endPtr;
-
-    line = getline(&p, endPtr);
-    if (line == endPtr) {
-        vtkErrorMacro(<<"Premature EOF reading first line! " << " for file: " 
-                      << (this->FileName?this->FileName:"(Null FileName)"));
-        return false;
-    }
-    if (sscanf(line, "# vtk DataFile Version %s", version) != 1) {
-        vtkErrorMacro(<< "Unrecognized file type: "<< line << " for file: " 
-                      << (this->FileName?this->FileName:"(Null FileName)"));
-        return false;
-    }
-
-    // Read title
-    line = getline(&p, endPtr);
-    if (line == endPtr) {
-        vtkErrorMacro(<<"Premature EOF reading title! " << " for file: " 
-                      << (this->FileName?this->FileName:"(Null FileName)"));
-        return false;
-    }
-    if (_title != NULL) {
-        delete [] _title;
-    }
-    _title = new char[strlen(line) + 1];
-    strcpy(_title, line);
-
-    // Read type
-    line = getline(&p, endPtr);
-    if (line == endPtr) {
-        vtkErrorMacro(<<"Premature EOF reading file type!" << " for file: " 
-                      << (this->FileName?this->FileName:"(Null FileName)"));
-        return false;
-    }
-    word = GetWord(line, &endPtr);
-    if (strncasecmp(word, "ascii", 5) == 0) {
-        _fileType = VTK_ASCII;
-    } else if (strcasecmp(word, "binary", 6) == 0) {
-        _fileType = VTK_BINARY;
-    } else {
-        vtkErrorMacro(<< "Unrecognized file type: "<< line << " for file: " 
-                      << (this->FileName?this->FileName:"(Null FileName)"));
-        _fileType = 0;
-        return false;
-    }
-
-    // Read dataset type
-    line = getline(&p, endPtr);
-    if (line == endPtr) {
-        vtkErrorMacro(<<"Premature EOF reading file type!" << " for file: " 
-                      << (this->FileName?this->FileName:"(Null FileName)"));
-        return false;
-    }
-    word = GetWord(line, &endPtr);
-    if (strncasecmp(word, "dataset", 7) == 0) {
-        // Read dataset type
-        line = getline(&p, endPtr);
-        if (line == endPtr) {
-            // EOF
-        }
-        type = GetWord(line, &endPtr);
-        if (strncasecmp(word, "structured_grid", 15) == 0) {
-            vtkErrorMacro(<< "Cannot read dataset type: " << line);
-            return 1;
-        }
-        // Read keyword and dimensions
-        //
-        while (!done) {
-            if (!this->ReadString(line)) {
-                break;
-            }
-
-            // Have to read field data because it may be binary.
-            if (! strncmp(this->LowerCase(line), "field", 5)) {
-                vtkFieldData* fd = this->ReadFieldData();
-                fd->Delete(); 
-            }
-
-            if ( ! strncmp(this->LowerCase(line),"dimensions",10) ) {
-                int ext[6];
-                if (!(this->Read(ext+1) && 
-                      this->Read(ext+3) && 
-                      this->Read(ext+5))) {
-                    vtkErrorMacro(<<"Error reading dimensions!");
-                    this->CloseVTKFile ();
-                    return 1;
-                }
-                // read dimensions, change to extent;
-                ext[0] = ext[2] = ext[4] = 0;
-                --ext[1];
-                --ext[3];
-                --ext[5];
-                outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),
-                             ext, 6);
-                // That is all we wanted !!!!!!!!!!!!!!!
-                this->CloseVTKFile();
-                return 1;
-            }
-        }
-    }
-
-    float progress = this->GetProgress();
-    this->UpdateProgress(progress + 0.5*(1.0 - progress));
-
-    return 1;
-}
-#endif
+    return TCL_OK;
+}

trunk/packages/vizservers/nanovis/FlowCmd.h

@@ -25 +25 @@
 #define FLOWCMD_H
 
+#include <tr1/unordered_map>
+#include <vector>
+#include <string>
+
 #include <tcl.h>
 
@@ -30 +34 @@
 
 #include "Switch.h"
+#include "FlowTypes.h"
+#include "FlowParticles.h"
+#include "FlowBox.h"
 #include "NvLIC.h"
 #include "NvParticleRenderer.h"
@@ -35 +42 @@
 #include "Unirect.h"
 #include "Volume.h"
-
-struct FlowColor {
-    float r, g, b, a;
-};
-
-struct FlowPosition {
-    float value;
-    unsigned int flags;
-    int axis;
-};
-
-struct FlowPoint {
-    float x, y, z;
-};
-
-struct FlowParticlesValues {
-    FlowPosition position;        ///< Position on axis of particle plane
-    FlowColor color;              ///< Color of particles
-    /// Indicates if particle injection plane is active or not
-    int isHidden;
-    float particleSize;           ///< Size of the particles
-};
-
-struct FlowParticlesIterator {
-    Tcl_HashEntry *hashPtr;
-    Tcl_HashSearch hashSearch;
-};
-
-class FlowParticles
-{
-public:
-    FlowParticles(const char *name, Tcl_HashEntry *hPtr);
-
-    ~FlowParticles();
-
-    const char *name()
-    {
-        return _name;
-    }
-
-    void disconnect()
-    {
-        _hashPtr = NULL;
-    }
-
-    bool visible()
-    {
-        return !_sv.isHidden;
-    }
-
-    int parseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
-    {
-        if (Rappture::ParseSwitches(interp, _switches, objc, objv, &_sv, 
-                                    SWITCH_DEFAULTS) < 0) {
-            return TCL_ERROR;
-        }
-        return TCL_OK;
-    }
-
-    void advect()
-    {
-        assert(_rendererPtr->active());
-        _rendererPtr->advect();
-    }
-
-    void render();
-
-    void reset()
-    {
-        _rendererPtr->reset();
-    }
-
-    void initialize()
-    {
-        _rendererPtr->initialize();
-    }
-
-    void setVectorField(Volume *volPtr, const vrmath::Vector3f& location,
-                        float scaleX, float scaleY, float scaleZ,
-                        float max)
-    {
-        _rendererPtr->
-            setVectorField(volPtr->textureID(),
-                           location,
-                           scaleX,
-                           scaleY,
-                           scaleZ,
-                           max);
-    }
-
-    void configure();
-
-private:
-    /**
-     * Name of particle injection plane. Actual character string is
-     * stored in hash table.
-     */
-    const char *_name;
-    Tcl_HashEntry *_hashPtr;
-    NvParticleRenderer *_rendererPtr;        ///< Particle renderer
-    FlowParticlesValues _sv;
-
-    static Rappture::SwitchSpec _switches[];
-};
-
-struct FlowBoxIterator {
-    Tcl_HashEntry *hashPtr;
-    Tcl_HashSearch hashSearch;
-};
-
-struct FlowBoxValues {
-    FlowPoint corner1, corner2;    ///< Coordinates of the box.
-    FlowColor color;               ///< Color of box
-    float lineWidth;
-    int isHidden;
-};
-
-class FlowBox
-{
-public:
-    FlowBox(const char *name, Tcl_HashEntry *hPtr);
-
-    ~FlowBox()
-    {
-        Rappture::FreeSwitches(_switches, &_sv, 0);
-        if (_hashPtr != NULL) {
-            Tcl_DeleteHashEntry(_hashPtr);
-        }
-    }
-
-    const char *name()
-    {
-        return _name;
-    }
-
-    bool visible()
-    {
-        return !_sv.isHidden;
-    }
-
-    void disconnect()
-    {
-        _hashPtr = NULL;
-    }
-
-    int parseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
-    {
-        if (Rappture::ParseSwitches(interp, _switches, objc, objv, &_sv, 
-                                    SWITCH_DEFAULTS) < 0) {
-            return TCL_ERROR;
-        }
-        return TCL_OK;
-    }
-
-    void render(Volume *volPtr);
-
-    const FlowBoxValues *getValues() const
-    {
-        return &_sv;
-    }
-
-    void getWorldSpaceBounds(vrmath::Vector3f& min,
-                             vrmath::Vector3f& max,
-                             const Volume *vol) const;
-
-private:
-    const char *_name;          ///< Name of this box in the hash table.
-    Tcl_HashEntry *_hashPtr;    ///< Pointer to this entry in the hash table of boxes.
-    FlowBoxValues _sv;
-    static Rappture::SwitchSpec _switches[];
-
-};
+#include "TransferFunction.h"
 
 struct FlowValues {
-    TransferFunction *tfPtr;
+    TransferFunction *transferFunction;
     FlowPosition slicePos;
     int showArrows;
@@ -224 +60 @@
 };
 
-struct FlowIterator {
-    Tcl_HashEntry *hashPtr;
-    Tcl_HashSearch hashSearch;
-};
-
 class FlowCmd
 {
@@ -234 +65 @@
     enum SliceAxis { AXIS_X, AXIS_Y, AXIS_Z };
 
-    FlowCmd(Tcl_Interp *interp, const char *name, Tcl_HashEntry *hPtr);
+    FlowCmd(Tcl_Interp *interp, const char *name);
 
     ~FlowCmd();
 
-    int createParticles(Tcl_Interp *interp, Tcl_Obj *objPtr);
-
-    int getParticles(Tcl_Interp *interp, Tcl_Obj *objPtr,
-                     FlowParticles **particlePtrPtr);
+    void getBounds(vrmath::Vector3f& min,
+                   vrmath::Vector3f& max,
+                   bool onlyVisible);
+
+    FlowParticles *createParticles(const char *particlesName);
+
+    FlowParticles *getParticles(const char *particlesName);
+
+    void deleteParticles(const char *particlesName);
+
+    void getParticlesNames(std::vector<std::string>& names);
 
     void render();
@@ -251 +89 @@
     void initializeParticles();
 
-    FlowParticles *firstParticles(FlowParticlesIterator *iterPtr);
-
-    FlowParticles *nextParticles(FlowParticlesIterator *iterPtr);
-
-    int createBox(Tcl_Interp *interp, Tcl_Obj *objPtr);
-
-    int getBox(Tcl_Interp *interp, Tcl_Obj *objPtr, FlowBox **boxPtrPtr);
-
-    FlowBox *firstBox(FlowBoxIterator *iterPtr);
-
-    FlowBox *nextBox(FlowBoxIterator *iterPtr);
+    FlowBox *createBox(const char *boxName);
+
+    FlowBox *getBox(const char *boxName);
+
+    void deleteBox(const char *boxName);
+
+    void getBoxNames(std::vector<std::string>& names);
 
     float *getScaledVector();
@@ -271 +105 @@
     NvVectorField *getVectorField()
     {
-        return _fieldPtr;
+        return _field;
     }
 
@@ -281 +115 @@
     }
 
-    const char *name()
-    {
-        return _name;
-    }
-
-    void disconnect()
-    {
-        _hashPtr = NULL;
+    const char *name() const
+    {
+        return _name.c_str();
     }
 
     bool isDataLoaded()
     {
-        return (_dataPtr != NULL);
+        return (_data != NULL);
     }
 
     Rappture::Unirect3d *data()
     {
-        return _dataPtr;
-    }
-
-    void data(Rappture::Unirect3d *dataPtr)
-    {
-        if (_dataPtr != NULL) {
-            delete _dataPtr;
+        return _data;
+    }
+
+    void data(Rappture::Unirect3d *data)
+    {
+        if (_data != NULL) {
+            delete _data;
         }
-        _dataPtr = dataPtr;
+        _data = data;
     }
 
@@ -329 +158 @@
     TransferFunction *getTransferFunction()
     {
-        return _sv.tfPtr;
+        return _sv.transferFunction;
     }
 
@@ -367 +196 @@
     }
 
-    void setVectorField(NvVectorField *fieldPtr)
+    void setVectorField(NvVectorField *field)
     {
         deleteVectorField();
-        _fieldPtr = fieldPtr;
+        _field = field;
     }
 
     void deleteVectorField()
     {
-        if (_fieldPtr != NULL) {
-            delete _fieldPtr;
-            _fieldPtr = NULL;
+        if (_field != NULL) {
+            delete _field;
+            _field = NULL;
         }
+    }
+
+    const Volume *getVolume() const
+    {
+        return _volume;
     }
 
@@ -390 +224 @@
     }
 
-    const Volume *getVolume() const
-    {
-        return _volPtr;
-    }
-
-    static float getRelativePosition(FlowPosition *posPtr);
+    Tcl_Command getCommandToken()
+    {
+        return _cmdToken;
+    }
+
+    static float getRelativePosition(FlowPosition *pos);
 
     static Rappture::SwitchSpec videoSwitches[];
 
 private:
+    typedef std::string ParticlesId;
+    typedef std::string BoxId;
+    typedef std::tr1::unordered_map<ParticlesId, FlowParticles *> ParticlesHashmap;
+    typedef std::tr1::unordered_map<BoxId, FlowBox *> BoxHashmap;
+
     void configure();
 
@@ -405 +244 @@
 
     Tcl_Interp *_interp;
-    Tcl_HashEntry *_hashPtr;
     /**
      * Name of the flow.  This may differ
@@ -411 +249 @@
      * associated with the flow, if the
      * command was renamed. */
-    const char *_name;
+    std::string _name;
 
     /**
@@ -425 +263 @@
      * kept to regenerate the volume
      * associated with the flow. */
-    Rappture::Unirect3d *_dataPtr;
+    Rappture::Unirect3d *_data;
 
     /**
@@ -431 +269 @@
      * flow.  This isn't the same thing as
      * a normal volume displayed. */
-    Volume *_volPtr;
+    Volume *_volume;
 
     /**
      * Vector field generated from the 
      * above volume */
-    NvVectorField *_fieldPtr;
+    NvVectorField *_field;
 
     /**
@@ -443 +281 @@
      * where the particles are injected
      * into the flow. */
-    Tcl_HashTable _particlesTable;
+    ParticlesHashmap _particlesTable;
 
     /**
@@ -449 +287 @@
      * zero or more boxes associated
      * with each field. */
-    Tcl_HashTable _boxTable;
+    BoxHashmap _boxTable;
 
     FlowValues _sv;
@@ -459 +297 @@
 
 extern int GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-                             bool *boolPtr);
+                             bool *boolVal);
 
 extern int GetFloatFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-                           float *floatPtr);
+                           float *floatVal);
 
 extern int GetAxisFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-                          int *axisPtr);
+                          int *axisVal);
 
 extern int GetVolumeFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr,
-                            Volume **volumePtrPtr);
+                            Volume **volume);
 
 #endif

trunk/packages/vizservers/nanovis/Makefile.in

@@ -111 +111 @@
                 ContourLineFilter.o \
                 ConvexPolygon.o \
+                FlowBox.o \
                 FlowCmd.o \
+                FlowParticles.o \
                 GradientFilter.o \
                 Grid.o \
@@ -276 +278 @@
 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
-FlowCmd.o: FlowCmd.cpp FlowCmd.h Switch.h Trace.h TransferFunction.h nanovis.h CmdProc.h NvLIC.h Unirect.h Volume.h VelocityArrowsSlice.h 
+FlowBox.o: 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 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.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
 Grid.o: Grid.cpp Grid.h Axis.h Chain.h

trunk/packages/vizservers/nanovis/Volume.cpp

@@ -45 +45 @@
     _lightTwoSide(false),
     _opacityScale(0.5f),
-    _name(NULL),
     _data(NULL),
     _numComponents(n),

trunk/packages/vizservers/nanovis/Volume.h

@@ -320 +320 @@
     const char *name() const
     {
-        return _name;
+        return _name.c_str();
     }
 
@@ -381 +381 @@
     float _opacityScale;
 
-    const char *_name;
+    std::string _name;
+
     float *_data;
 

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -21 +21 @@
 #include <GL/glew.h>
 
-#include <tcl.h>
-
 #include <vrmath/Vector3f.h>
 #include <vrmath/Matrix4x4d.h>
@@ -109 +107 @@
     // Determine the volumes that are to be rendered.
     std::vector<Volume *> volumes;
-    Tcl_HashEntry *hPtr;
-    Tcl_HashSearch iter;
-    for (hPtr = Tcl_FirstHashEntry(&NanoVis::volumeTable, &iter); hPtr != NULL;
-         hPtr = Tcl_NextHashEntry(&iter)) {
-        Volume *volPtr;
-        volPtr = (Volume *)Tcl_GetHashValue(hPtr);
-        if (!volPtr->visible()) {
+    for (NanoVis::VolumeHashmap::iterator itr = NanoVis::volumeTable.begin();
+         itr != NanoVis::volumeTable.end(); ++itr) {
+        Volume *volume = itr->second;
+        if (!volume->visible()) {
             continue; // Skip this volume
         }
@@ -123 +118 @@
         // second volume will overwrite the first, so the first won't appear
         // at all.
-        volumes.push_back(volPtr);
-        volPtr->numSlices(256 - volumes.size());
+        volumes.push_back(volume);
+        volume->numSlices(256 - volumes.size());
     }
 

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -68 +68 @@
 #include "NvLIC.h"
 #include "NvZincBlendeReconstructor.h"
-#include "PerfQuery.h"
 #include "PlaneRenderer.h"
 #ifdef USE_POINTSET_RENDERER
@@ -105 +104 @@
 
 // STATIC MEMBER DATA
-struct timeval NanoVis::startTime;      /* Start of elapsed time. */
-Grid *NanoVis::grid = NULL;
-int NanoVis::updir = Y_POS;
-NvCamera *NanoVis::cam = NULL;
-Tcl_HashTable NanoVis::volumeTable;
-Tcl_HashTable NanoVis::heightmapTable;
-VolumeRenderer *NanoVis::volRenderer = NULL;
-#ifdef USE_POINTSET_RENDERER
-PointSetRenderer *NanoVis::pointSetRenderer = NULL;
-std::vector<PointSet *> NanoVis::pointSet;
-#endif
-
-PlaneRenderer *NanoVis::planeRenderer = NULL;
-#ifdef PLANE_CMD
-// pointers to 2D planes, currently handle up 10
-int NanoVis::numPlanes = 10;
-Texture2D *NanoVis::plane[10];
-#endif
-Texture2D *NanoVis::legendTexture = NULL;
-NvColorTableRenderer *NanoVis::colorTableRenderer = NULL;
-#ifdef notdef
-NvFlowVisRenderer *NanoVis::flowVisRenderer = NULL;
-#endif
-VelocityArrowsSlice *NanoVis::velocityArrowsSlice = NULL;
-
-RenderContext *NanoVis::renderContext = NULL;
-NvLIC *NanoVis::licRenderer = NULL;
-Fonts *NanoVis::fonts;
 
 FILE *NanoVis::stdin = NULL;
@@ -140 +111 @@
 int NanoVis::statsFile = -1;
 
+unsigned int NanoVis::flags = 0;
+bool NanoVis::debugFlag = false;
 bool NanoVis::axisOn = true;
-bool NanoVis::debugFlag = false;
-
-Tcl_Interp *NanoVis::interp;
-
-//frame buffer for final rendering
-GLuint NanoVis::_finalColorTex = 0;
-GLuint NanoVis::_finalDepthRb = 0;
-GLuint NanoVis::_finalFbo = 0;
-int NanoVis::renderWindow = 0;       /* GLUT handle for the render window */
-int NanoVis::winWidth = NPIX;        /* Width of the render window */
-int NanoVis::winHeight = NPIX;       /* Height of the render window */
-
-unsigned char* NanoVis::screenBuffer = NULL;
-
-unsigned int NanoVis::flags = 0;
-Tcl_HashTable NanoVis::flowTable;
+struct timeval NanoVis::startTime;
+
+int NanoVis::winWidth = NPIX;
+int NanoVis::winHeight = NPIX;
+int NanoVis::renderWindow = 0;
+unsigned char *NanoVis::screenBuffer = NULL;
+Texture2D *NanoVis::legendTexture = NULL;
+Grid *NanoVis::grid = NULL;
+Fonts *NanoVis::fonts;
+int NanoVis::updir = Y_POS;
+NvCamera *NanoVis::cam = NULL;
+RenderContext *NanoVis::renderContext = NULL;
+
+NanoVis::TransferFunctionHashmap NanoVis::tfTable;
+NanoVis::VolumeHashmap NanoVis::volumeTable;
+NanoVis::FlowHashmap NanoVis::flowTable;
+NanoVis::HeightMapHashmap NanoVis::heightMapTable;
+
 double NanoVis::magMin = DBL_MAX;
 double NanoVis::magMax = -DBL_MAX;
@@ -169 +144 @@
 vrmath::Vector3f NanoVis::sceneMin, NanoVis::sceneMax;
 
-/* FIXME: This variable is always true. */
-static bool volumeMode = true; 
+NvColorTableRenderer *NanoVis::colorTableRenderer = NULL;
+VolumeRenderer *NanoVis::volRenderer = NULL;
+#ifdef notdef
+NvFlowVisRenderer *NanoVis::flowVisRenderer = NULL;
+#endif
+VelocityArrowsSlice *NanoVis::velocityArrowsSlice = NULL;
+NvLIC *NanoVis::licRenderer = NULL;
+PlaneRenderer *NanoVis::planeRenderer = NULL;
+#ifdef PLANE_CMD
+// pointers to 2D planes, currently handle up 10
+int NanoVis::numPlanes = 10;
+Texture2D *NanoVis::plane[10];
+#endif
+#ifdef USE_POINTSET_RENDERER
+PointSetRenderer *NanoVis::pointSetRenderer = NULL;
+std::vector<PointSet *> NanoVis::pointSet;
+#endif
+
+Tcl_Interp *NanoVis::interp;
+
+// Image based flow visualization slice location
+// FLOW
+float NanoVis::_licSlice = 0.5f;
+int NanoVis::_licAxis = 2; // z axis
+
+//frame buffer for final rendering
+GLuint NanoVis::_finalFbo = 0;
+GLuint NanoVis::_finalColorTex = 0;
+GLuint NanoVis::_finalDepthRb = 0;
 
 // in Command.cpp
 extern Tcl_Interp *initTcl();
-
-// maps transfunc name to TransferFunction object
-Tcl_HashTable NanoVis::tfTable;
-
-PerfQuery *perf = NULL;                        //performance counter
 
 // Default camera location.
@@ -184 +181 @@
 float def_eye_y = 0.0f;
 float def_eye_z = 2.5f;
-
-// Image based flow visualization slice location
-// FLOW
-float NanoVis::_licSlice = 0.5f;
-int NanoVis::_licAxis = 2; // z axis
 
 void
@@ -248 +240 @@
         delete [] screenBuffer;
         screenBuffer = NULL;
-    }
-    if (perf != NULL) {
-        TRACE("Deleting perf");
-        delete perf;
     }
 #ifdef USE_POINTSET_RENDERER
@@ -307 +295 @@
     }
     if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
-        return -1;
+        return -1;
     }
     Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("pid", 3));
@@ -328 +316 @@
     Tcl_DStringFree(&ds);
     if (statsFile < 0) {
-        ERROR("can't open \"%s\": %s", fileName, strerror(errno));
-        return -1;
+        ERROR("can't open \"%s\": %s", fileName, strerror(errno));
+        return -1;
     }
     return statsFile;
@@ -358 +346 @@
 
     {
-        struct timeval tv;
-
-        /* Get ending time.  */
-        gettimeofday(&tv, NULL);
-        finish = CVT2SECS(tv);
-        tv = stats.start;
-        start = CVT2SECS(tv);
+        struct timeval tv;
+
+        /* Get ending time.  */
+        gettimeofday(&tv, NULL);
+        finish = CVT2SECS(tv);
+        tv = stats.start;
+        start = CVT2SECS(tv);
     }
     /* 
@@ -434 +422 @@
     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);
+        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);
@@ -513 +501 @@
     if (NanoVis::logfile != NULL) {
         fclose(NanoVis::logfile);
-        NanoVis::logfile = NULL;
+        NanoVis::logfile = NULL;
     }
 
@@ -609 +597 @@
                     double nzero_min)
 {
-    Tcl_HashEntry *hPtr;
-    hPtr = Tcl_FindHashEntry(&volumeTable, name);
-    if (hPtr != NULL) {
-        Volume *volPtr; 
+    VolumeHashmap::iterator itr = volumeTable.find(name);
+    if (itr != volumeTable.end()) {
         WARN("volume \"%s\" already exists", name);
-        volPtr = (Volume *)Tcl_GetHashValue(hPtr);
-        removeVolume(volPtr);
-    }
-    int isNew;
-    hPtr = Tcl_CreateHashEntry(&volumeTable, name, &isNew);
-    Volume* volPtr;
-    volPtr = new Volume(0.f, 0.f, 0.f, width, height, depth, n_component,
-                        data, vmin, vmax, nzero_min);
+        removeVolume(itr->second);
+    }
+
+    Volume *volume = new Volume(0.f, 0.f, 0.f,
+                                width, height, depth,
+                                n_component,
+                                data, vmin, vmax, nzero_min);
     Volume::updatePending = true;
-    Tcl_SetHashValue(hPtr, volPtr);
-    volPtr->name(Tcl_GetHashKey(&volumeTable, hPtr));
-    return volPtr;
+    volume->name(name);
+    volumeTable[name] = volume;
+
+    return volume;
 }
 
 // Gets a colormap 1D texture by name.
 TransferFunction *
-NanoVis::getTransfunc(const char *name) 
-{
-    Tcl_HashEntry *hPtr;
-
-    hPtr = Tcl_FindHashEntry(&tfTable, name);
-    if (hPtr == NULL) {
-        ERROR("No transfer function named \"%s\" found", name);
+NanoVis::getTransferFunction(const TransferFunctionId& id) 
+{
+    TransferFunctionHashmap::iterator itr = tfTable.find(id);
+    if (itr == tfTable.end()) {
+        ERROR("No transfer function named \"%s\" found", id.c_str());
         return NULL;
-    }
-    return (TransferFunction *)Tcl_GetHashValue(hPtr);
+    } else {
+        return itr->second;
+    }
 }
 
 // Creates of updates a colormap 1D texture by name.
 TransferFunction *
-NanoVis::defineTransferFunction(const char *name, size_t n, float *data)
-{
-    int isNew;
-    Tcl_HashEntry *hPtr;
-    TransferFunction *tfPtr;
-
-    hPtr = Tcl_CreateHashEntry(&tfTable, name, &isNew);
-    if (isNew) {
-        TRACE("Creating new transfer function \"%s\"", name);
-
-        tfPtr = new TransferFunction(n, data);
-        tfPtr->name(Tcl_GetHashKey(&tfTable, hPtr));
-        Tcl_SetHashValue(hPtr, tfPtr);
+NanoVis::defineTransferFunction(const TransferFunctionId& id,
+                                size_t n, float *data)
+{
+    TransferFunction *tf = getTransferFunction(id);
+    if (tf == NULL) {
+        TRACE("Creating new transfer function \"%s\"", id.c_str());
+        tf = new TransferFunction(n, data);
+        tfTable[id] = tf;
     } else {
-        TRACE("Updating existing transfer function \"%s\"", name);
-
-        /* 
-         * You can't delete the transfer function because many 
-         * objects may be holding its pointer.  We must update it.
-         */
-        tfPtr = (TransferFunction *)Tcl_GetHashValue(hPtr);
-        tfPtr->update(n, data);
-    }
-    return tfPtr;
+        TRACE("Updating existing transfer function \"%s\"", id.c_str());
+        tf->update(n, data);
+    }
+    return tf;
 }
 
@@ -978 +952 @@
     glLightfv(GL_LIGHT1, GL_DIFFUSE, green_light);
     glLightfv(GL_LIGHT1, GL_SPECULAR, white_light);
-
-    // init table of transfer functions
-    Tcl_InitHashTable(&tfTable, TCL_STRING_KEYS);
-
-    //check if performance query is supported
-    if (PerfQuery::checkQuerySupport()) {
-        //create queries to count number of rendered pixels
-        perf = new PerfQuery();
-    }
 
     initOffscreenBuffer();    //frame buffer object for offscreen rendering
@@ -1455 +1420 @@
     xMin = yMin = zMin = wMin = DBL_MAX;
     xMax = yMax = zMax = wMax = -DBL_MAX;
-    Tcl_HashEntry *hPtr;
-    Tcl_HashSearch iter;
-    for (hPtr = Tcl_FirstHashEntry(&volumeTable, &iter); hPtr != NULL;
-         hPtr = Tcl_NextHashEntry(&iter)) {
-        Volume *volPtr = (Volume *)Tcl_GetHashValue(hPtr);
-        if (xMin > volPtr->xAxis.min()) {
-            xMin = volPtr->xAxis.min();
-        }
-        if (xMax < volPtr->xAxis.max()) {
-            xMax = volPtr->xAxis.max();
-        }
-        if (yMin > volPtr->yAxis.min()) {
-            yMin = volPtr->yAxis.min();
-        }
-        if (yMax < volPtr->yAxis.max()) {
-            yMax = volPtr->yAxis.max();
-        }
-        if (zMin > volPtr->zAxis.min()) {
-            zMin = volPtr->zAxis.min();
-        }
-        if (zMax < volPtr->zAxis.max()) {
-            zMax = volPtr->zAxis.max();
-        }
-        if (wMin > volPtr->wAxis.min()) {
-            wMin = volPtr->wAxis.min();
-        }
-        if (wMax < volPtr->wAxis.max()) {
-            wMax = volPtr->wAxis.max();
+    VolumeHashmap::iterator itr;
+    for (itr = volumeTable.begin();
+         itr != volumeTable.end(); ++itr) {
+        Volume *volume = itr->second;
+        if (xMin > volume->xAxis.min()) {
+            xMin = volume->xAxis.min();
+        }
+        if (xMax < volume->xAxis.max()) {
+            xMax = volume->xAxis.max();
+        }
+        if (yMin > volume->yAxis.min()) {
+            yMin = volume->yAxis.min();
+        }
+        if (yMax < volume->yAxis.max()) {
+            yMax = volume->yAxis.max();
+        }
+        if (zMin > volume->zAxis.min()) {
+            zMin = volume->zAxis.min();
+        }
+        if (zMax < volume->zAxis.max()) {
+            zMax = volume->zAxis.max();
+        }
+        if (wMin > volume->wAxis.min()) {
+            wMin = volume->wAxis.min();
+        }
+        if (wMax < volume->wAxis.max()) {
+            wMax = volume->wAxis.max();
         }
     }
@@ -1510 +1474 @@
     xMin = yMin = zMin = wMin = DBL_MAX;
     xMax = yMax = zMax = wMax = -DBL_MAX;
-    Tcl_HashEntry *hPtr;
-    Tcl_HashSearch iter;
-    for (hPtr = Tcl_FirstHashEntry(&heightmapTable, &iter); hPtr != NULL;
-         hPtr = Tcl_NextHashEntry(&iter)) {
-        HeightMap *hmPtr = (HeightMap *)Tcl_GetHashValue(hPtr);
-        if (xMin > hmPtr->xAxis.min()) {
-            xMin = hmPtr->xAxis.min();
-        }
-        if (xMax < hmPtr->xAxis.max()) {
-            xMax = hmPtr->xAxis.max();
-        }
-        if (yMin > hmPtr->yAxis.min()) {
-            yMin = hmPtr->yAxis.min();
-        }
-        if (yMax < hmPtr->yAxis.max()) {
-            yMax = hmPtr->yAxis.max();
-        }
-        if (zMin > hmPtr->zAxis.min()) {
-            zMin = hmPtr->zAxis.min();
-        }
-        if (zMax < hmPtr->zAxis.max()) {
-            zMax = hmPtr->zAxis.max();
-        }
-        if (wMin > hmPtr->wAxis.min()) {
-            wMin = hmPtr->wAxis.min();
-        }
-        if (wMax < hmPtr->wAxis.max()) {
-            wMax = hmPtr->wAxis.max();
+    HeightMapHashmap::iterator itr;
+    for (itr = heightMapTable.begin();
+         itr != heightMapTable.end(); ++itr) {
+        HeightMap *heightMap = itr->second;
+        if (xMin > heightMap->xAxis.min()) {
+            xMin = heightMap->xAxis.min();
+        }
+        if (xMax < heightMap->xAxis.max()) {
+            xMax = heightMap->xAxis.max();
+        }
+        if (yMin > heightMap->yAxis.min()) {
+            yMin = heightMap->yAxis.min();
+        }
+        if (yMax < heightMap->yAxis.max()) {
+            yMax = heightMap->yAxis.max();
+        }
+        if (zMin > heightMap->zAxis.min()) {
+            zMin = heightMap->zAxis.min();
+        }
+        if (zMax < heightMap->zAxis.max()) {
+            zMax = heightMap->zAxis.max();
+        }
+        if (wMin > heightMap->wAxis.min()) {
+            wMin = heightMap->wAxis.min();
+        }
+        if (wMax < heightMap->wAxis.max()) {
+            wMax = heightMap->wAxis.max();
         }
     }
@@ -1553 +1516 @@
         HeightMap::valueMax = grid->yAxis.max();
     }
-    for (hPtr = Tcl_FirstHashEntry(&heightmapTable, &iter); hPtr != NULL;
-         hPtr = Tcl_NextHashEntry(&iter)) {
-        HeightMap *hmPtr;
-        hmPtr = (HeightMap *)Tcl_GetHashValue(hPtr);
-        hmPtr->mapToGrid(grid);
+    for (HeightMapHashmap::iterator itr = heightMapTable.begin();
+         itr != heightMapTable.end(); ++itr) {
+        itr->second->mapToGrid(grid);
     }
     HeightMap::updatePending = false;
@@ -1576 +1537 @@
     sceneMax.set(-FLT_MAX, -FLT_MAX, -FLT_MAX);
 
-    Tcl_HashEntry *hPtr;
-    Tcl_HashSearch iter;
-    for (hPtr = Tcl_FirstHashEntry(&volumeTable, &iter); hPtr != NULL;
-         hPtr = Tcl_NextHashEntry(&iter)) {
-        Volume *vol = (Volume *)Tcl_GetHashValue(hPtr);
-
-        if (onlyVisible && !vol->visible())
+    for (VolumeHashmap::iterator itr = volumeTable.begin();
+         itr != volumeTable.end(); ++itr) {
+        Volume *volume = itr->second;
+
+        if (onlyVisible && !volume->visible())
             continue;
 
         vrmath::Vector3f bmin, bmax;
-        vol->getWorldSpaceBounds(bmin, bmax);
+        volume->getWorldSpaceBounds(bmin, bmax);
         if (bmin.x > bmax.x)
             continue;
@@ -1610 +1569 @@
     }
 
-    for (hPtr = Tcl_FirstHashEntry(&heightmapTable, &iter); hPtr != NULL;
-         hPtr = Tcl_NextHashEntry(&iter)) {
-        HeightMap *heightMap = (HeightMap *)Tcl_GetHashValue(hPtr);
+    for (HeightMapHashmap::iterator itr = heightMapTable.begin();
+         itr != heightMapTable.end(); ++itr) {
+        HeightMap *heightMap = itr->second;
 
         if (onlyVisible && !heightMap->isVisible())
@@ -1712 +1671 @@
     bindOffscreenBuffer();
 
-    TRACE("glClear");
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //clear screen
 
-    if (volumeMode) {
-        TRACE("volumeMode");
-        //3D rendering mode
-        glEnable(GL_DEPTH_TEST);
-        glEnable(GL_COLOR_MATERIAL);
-
-        //camera setting activated
-        cam->initialize();
-
-        //set up the orientation of items in the scene.
-        glPushMatrix();
-
-        switch (updir) {
-        case X_POS:
-            glRotatef(90, 0, 0, 1);
-            glRotatef(90, 1, 0, 0);
-            break;
-        case Y_POS:
-            // this is the default
-            break;
-        case Z_POS:
-            glRotatef(-90, 1, 0, 0);
-            glRotatef(-90, 0, 0, 1);
-            break;
-        case X_NEG:
-            glRotatef(-90, 0, 0, 1);
-            break;
-        case Y_NEG:
-            glRotatef(180, 0, 0, 1);
-            glRotatef(-90, 0, 1, 0);
-            break;
-        case Z_NEG:
-            glRotatef(90, 1, 0, 0);
-            break;
-        }
-
-        //now render things in the scene
-        if (axisOn) {
-            draw3dAxis();
-        }
-        if (grid->isVisible()) {
-            grid->render();
-        }
-        if ((licRenderer != NULL) && (licRenderer->active())) {
-            licRenderer->render();
-        }
-
-        if ((velocityArrowsSlice != NULL) && (velocityArrowsSlice->enabled())) {
-            velocityArrowsSlice->render();
-        }
+    //3D rendering mode
+    glEnable(GL_DEPTH_TEST);
+    glEnable(GL_COLOR_MATERIAL);
+
+    //camera setting activated
+    cam->initialize();
+
+    //set up the orientation of items in the scene.
+    glPushMatrix();
+
+    switch (updir) {
+    case X_POS:
+        glRotatef(90, 0, 0, 1);
+        glRotatef(90, 1, 0, 0);
+        break;
+    case Y_POS:
+        // this is the default
+        break;
+    case Z_POS:
+        glRotatef(-90, 1, 0, 0);
+        glRotatef(-90, 0, 0, 1);
+        break;
+    case X_NEG:
+        glRotatef(-90, 0, 0, 1);
+        break;
+    case Y_NEG:
+        glRotatef(180, 0, 0, 1);
+        glRotatef(-90, 0, 1, 0);
+        break;
+    case Z_NEG:
+        glRotatef(90, 1, 0, 0);
+        break;
+    }
+
+    //now render things in the scene
+    if (axisOn) {
+        draw3dAxis();
+    }
+    if (grid->isVisible()) {
+        grid->render();
+    }
+    if ((licRenderer != NULL) && (licRenderer->active())) {
+        licRenderer->render();
+    }
+    if ((velocityArrowsSlice != NULL) && (velocityArrowsSlice->enabled())) {
+        velocityArrowsSlice->render();
+    }
 #ifdef notdef
-        if ((flowVisRenderer != NULL) && (flowVisRenderer->active())) {
-            flowVisRenderer->render();
-        }
+    if ((flowVisRenderer != NULL) && (flowVisRenderer->active())) {
+        flowVisRenderer->render();
+    }
 #endif
-        if (flowTable.numEntries > 0) {
-            renderFlows();
-        }
-
-        volRenderer->renderAll();
-
-        if (heightmapTable.numEntries > 0) {
-            TRACE("render heightmap");
-            Tcl_HashEntry *hPtr;
-            Tcl_HashSearch iter;
-            for (hPtr = Tcl_FirstHashEntry(&heightmapTable, &iter); hPtr != NULL;
-                 hPtr = Tcl_NextHashEntry(&iter)) {
-                HeightMap *hmPtr;
-                hmPtr = (HeightMap *)Tcl_GetHashValue(hPtr);
-                if (hmPtr->isVisible()) {
-                    hmPtr->render(renderContext);
-                }
-            }
-        }
-        glPopMatrix();
-    } else {
-        //2D rendering mode
-        perf->enable();
-        planeRenderer->render();
-        perf->disable();
-    }
-
-    perf->reset();
+    if (!flowTable.empty()) {
+        renderFlows();
+    }
+
+    volRenderer->renderAll();
+
+    TRACE("Render heightmaps");
+    HeightMapHashmap::iterator itr;
+    for (itr = heightMapTable.begin();
+         itr != heightMapTable.end(); ++itr) {
+        HeightMap *heightMap = itr->second;
+        if (heightMap->isVisible()) {
+            heightMap->render(renderContext);
+        }
+    }
+    glPopMatrix();
+
     CHECK_FRAMEBUFFER_STATUS();
     TRACE("Leave");
@@ -2050 +1994 @@
 
 void 
-NanoVis::removeVolume(Volume *volPtr)
-{
-    Tcl_HashEntry *hPtr;
-    hPtr = Tcl_FindHashEntry(&volumeTable, volPtr->name());
-    if (hPtr != NULL) {
-        Tcl_DeleteHashEntry(hPtr);
-    }
-    delete volPtr;
-}
+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

@@ -27 +27 @@
 #include <vector>
 #include <iostream>
+#include <tr1/unordered_map>
 
 #include <vrmath/Vector3f.h>
@@ -64 +65 @@
 class Volume;
 class FlowCmd;
-class FlowIterator;
 
 class NanoVis
@@ -83 +83 @@
     };
 
+    typedef std::string TransferFunctionId;
+    typedef std::string VolumeId;
+    typedef std::string FlowId;
+    typedef std::string HeightMapId;
+    typedef std::tr1::unordered_map<TransferFunctionId, TransferFunction *> TransferFunctionHashmap;
+    typedef std::tr1::unordered_map<VolumeId, Volume *> VolumeHashmap;
+    typedef std::tr1::unordered_map<FlowId, FlowCmd *> FlowHashmap;
+    typedef std::tr1::unordered_map<HeightMapId, HeightMap *> HeightMapHashmap;
+
     static void processCommands();
     static void init(const char *path);
@@ -118 +127 @@
     static void bmpWriteToFile(int frame_number, const char* directory_name);
  
-    static TransferFunction *getTransfunc(const char *name);
-    static TransferFunction *defineTransferFunction(const char *name, 
+    static TransferFunction *getTransferFunction(const TransferFunctionId& id);
+    static TransferFunction *defineTransferFunction(const TransferFunctionId& id, 
                                                     size_t n, float *data);
 
@@ -141 +150 @@
     }
 
-    static FlowCmd *firstFlow(FlowIterator *iterPtr);
-    static FlowCmd *nextFlow(FlowIterator *iterPtr);
-    static void initFlows();
-    static int getFlow(Tcl_Interp *interp, Tcl_Obj *objPtr,
-                       FlowCmd **flowPtrPtr);
-    static int createFlow(Tcl_Interp *interp, Tcl_Obj *objPtr);
+    static FlowCmd *getFlow(const char *name);
+    static FlowCmd *createFlow(Tcl_Interp *interp, const char *name);
+    static void deleteFlow(const char *name);
     static void deleteFlows(Tcl_Interp *interp);
     static bool mapFlows();
@@ -162 +168 @@
     static bool debugFlag;
     static bool axisOn;
-    static int winWidth;        //size of the render window
-    static int winHeight;       //size of the render window
-    static int renderWindow;
+    static struct timeval startTime;       ///< Start of elapsed time.
+
+    static int winWidth;        ///< Width of the render window
+    static int winHeight;       ///< Height of the render window
+    static int renderWindow;    //< GLUT handle for the render window
     static unsigned char *screenBuffer;
     static Texture2D *legendTexture;
@@ -173 +181 @@
     static nv::graphics::RenderContext *renderContext;
 
-    static Tcl_HashTable tfTable;
-    static Tcl_HashTable volumeTable;
-    static Tcl_HashTable flowTable;
-    static Tcl_HashTable heightmapTable;
+    static TransferFunctionHashmap tfTable; ///< maps transfunc name to TransferFunction object
+    static VolumeHashmap volumeTable;
+    static FlowHashmap flowTable;
+    static HeightMapHashmap heightMapTable;
 
     static double magMin, magMax;
@@ -200 +208 @@
 
     static Tcl_Interp *interp;
-    static struct timeval startTime;           /* Start of elapsed time. */
+
 private:
     static void collectBounds(bool onlyVisible = false);

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

@@ -85 +85 @@
 flow exists <name>
 flow goto <nSteps>
-flow names <?pattern?>
+flow names
 flow next
 flow reset
@@ -104 +104 @@
          -hide <bool>
          -linewidth <val>
-<flowObj> box delete <?names?>
-<flowObj> box names <?pattern?>
+<flowObj> box delete <names>
+<flowObj> box names
 
 <flowObj> configure <?option value...?>
@@ -127 +127 @@
           Send flow data.  Data bytes follow the newline after the command
 <flowObj> legend <w> <h>
+
 <flowObj> particles add <name> <?switches?>
           see '<flowObj> particles configure' for switches
@@ -136 +137 @@
            val = [0,100], or %val = [0,1]
           -size <val>
+<flowObj> particles delete <names>
+<flowObj> particles names
 
 volume data state <on|off> <?names?>

trunk/packages/vizservers/nanovis/vrmath/Makefile.in

@@ -42 +42 @@
 #               BBox.o \
 #               BPlane.o \
-#               Color4f.o \
 #               Projection.o \
 
 OBJS            = \
-                BBox.o \
-                BPlane.o \
-                Color4f.o \
                 LineSegment.o \
                 Matrix4x4f.o \
@@ -81 +77 @@
 BBox.o: $(srcdir)/include/vrmath/BBox.h $(srcdir)/include/vrmath/Vector3f.h
 BPlane.o: $(srcdir)/include/vrmath/BPlane.h $(srcdir)/include/vrmath/Vector3f.h $(srcdir)/include/vrmath/LineSegment.h
-Color4f.o: $(srcdir)/include/vrmath/Color4f.h
 LineSegment.o: $(srcdir)/include/vrmath/LineSegment.h
 Matrix4x4d.o: $(srcdir)/include/vrmath/Matrix4x4d.h $(srcdir)/include/vrmath/Vector3f.h $(srcdir)/include/vrmath/Vector4f.h $(srcdir)/include/vrmath/Rotation.h

trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Color4f.h

@@ -8 +8 @@
 #define VRCOLOR4F_H
 
+#include <vrmath/Vector4f.h>
+
 namespace vrmath {
 
-class Color4f
-{
-public:
-    float r, g, b, a;
-
-    Color4f();
-
-    Color4f(float r1, float g1, float b1, float a1 = 0);
-
-    Color4f(const Color4f& col) :
-        r(col.r), g(col.g), b(col.b), a(col.a)
-    {}
-
-    friend bool operator==(const Color4f col1, const Color4f& col2);
-    friend bool operator!=(const Color4f col1, const Color4f& col2);
-};
-
-inline bool operator==(const Color4f col1, const Color4f& col2)
-{
-    return ((col1.r == col2.r) && (col1.g == col2.g) && (col1.b == col2.b));
-}
-
-inline bool operator!=(const Color4f col1, const Color4f& col2)
-{
-    return ((col1.r != col2.r) || (col1.g != col2.g) || (col1.b != col2.b));
-}
+typedef Vector4f Color4f;
 
 }

trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector3f.h

@@ -80 +80 @@
     //friend Vector3f operator*(float scale, const Vector3f& value);
 
-    float x, y, z;
+    union {
+        struct {
+            float x, y, z;
+        };
+        struct {
+            float r, g, b;
+        };
+    };
 };
 

trunk/packages/vizservers/nanovis/vrmath/include/vrmath/Vector4f.h

@@ -20 +20 @@
     {}
 
-    Vector4f(const Vector4f& v4) :
-        x(v4.x), y(v4.y), z(v4.z), w(v4.w)
+    Vector4f(const Vector4f& other) :
+        x(other.x), y(other.y), z(other.z), w(other.w)
     {}
 
@@ -72 +72 @@
     float dot(const Vector4f& vec) const;
 
-    float x, y, z, w;
+    union {
+        struct {
+            float x, y, z, w;
+        };
+        struct {
+            float r, g, b, a;
+        };
+    };
 };