Changeset 1899 for trunk/packages/vizservers

Timestamp:

Aug 31, 2010, 8:29:13 PM (14 years ago)

Author:

gah

Message:

re-merge with latest branches/blt4 changes

Location:

trunk/packages/vizservers

Files:

• configure.in (modified) (2 diffs)
• nanovis/FlowCmd.cpp (modified) (125 diffs)
• nanovis/Makefile.in (modified) (1 diff)
• nanovis/RpAVTranslate.h (modified) (2 diffs)
• nanovis/nanovis.cpp (modified) (1 diff)
• nanovis/nvconf.h.in (modified) (1 diff)

trunk/packages/vizservers/configure.in

@@ -45 +45 @@
 
 AC_C_BIGENDIAN
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(long long, 8)
+AC_CHECK_SIZEOF(void *, 4)
+AC_CHECK_SIZEOF(float, 4)
+
+# Save the values as shell variables so that we can substitute them
+# into bltHash.h for situtations where there's no bltInt.h.
+
+AC_SUBST(SIZEOF_INT, ${ac_cv_sizeof_int})
+AC_SUBST(SIZEOF_LONG, ${ac_cv_sizeof_long})
+AC_SUBST(SIZEOF_LONG_LONG, ${ac_cv_sizeof_long_long})
+AC_SUBST(SIZEOF_VOID_P, ${ac_cv_sizeof_void_p})
+AC_SUBST(SIZEOF_FLOAT, ${ac_cv_sizeof_float})
 
 LD_RPATH="";
@@ -209 +223 @@
 AC_MSG_RESULT([${DX_LIB_DIR}])
 
-AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h])
+AC_CHECK_HEADERS([ffmpeg/avcodec.h libavcodec/avcodec.h ffmpeg/avformat.h libavformat/avformat.h ffmpeg/avutil.h libavutil/avutil.h],,,[
+#define SIZEOF_LONG ${ac_cv_sizeof_long}
+#if SIZEOF_LONG == 8
+#  define INT64_C(c)  c ## L
+#  define UINT64_C(c) c ## UL
+#else
+#  define INT64_C(c)  c ## LL
+#  define UINT64_C(c) c ## ULL
+#endif
+])
 
 oldLIBS=$LIBS

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -4 +4 @@
 #include <stddef.h>
 #include <limits.h>
+#include <stdint.h>
 #include <poll.h>
 #include <tcl.h>
@@ -55 +56 @@
 Rappture::SwitchSpec FlowCmd::_switches[] = {
     {Rappture::SWITCH_BOOLEAN, "-arrows", "boolean",
-        offsetof(FlowValues, showArrows), 0},
+        offsetof(FlowValues, showArrows), 0},
     {Rappture::SWITCH_CUSTOM, "-axis", "axis",
-        offsetof(FlowValues, slicePos.axis), 0, 0, &axisSwitch},
+        offsetof(FlowValues, slicePos.axis), 0, 0, &axisSwitch},
     {Rappture::SWITCH_FLOAT, "-diffuse", "value",
-        offsetof(FlowValues, diffuse), 0},
+        offsetof(FlowValues, diffuse), 0},
     {Rappture::SWITCH_BOOLEAN, "-hide", "boolean",
-        offsetof(FlowValues, isHidden), 0},
+        offsetof(FlowValues, isHidden), 0},
     {Rappture::SWITCH_FLOAT, "-opacity", "value",
-        offsetof(FlowValues, opacity), 0},
+        offsetof(FlowValues, opacity), 0},
     {Rappture::SWITCH_BOOLEAN, "-outline", "boolean",
-        offsetof(FlowValues, showOutline), 0},
+        offsetof(FlowValues, showOutline), 0},
     {Rappture::SWITCH_CUSTOM, "-position", "number",
-        offsetof(FlowValues, slicePos), 0, 0, &positionSwitch},
+        offsetof(FlowValues, slicePos), 0, 0, &positionSwitch},
     {Rappture::SWITCH_BOOLEAN, "-slice", "boolean",
-        offsetof(FlowValues, sliceVisible), 0},
+        offsetof(FlowValues, sliceVisible), 0},
     {Rappture::SWITCH_FLOAT, "-specular", "value",
-        offsetof(FlowValues, specular), 0},
+        offsetof(FlowValues, specular), 0},
     {Rappture::SWITCH_CUSTOM, "-transferfunction", "name",
         offsetof(FlowValues, tfPtr), 0, 0, &transferFunctionSwitch},
     {Rappture::SWITCH_BOOLEAN, "-volume", "boolean",
-        offsetof(FlowValues, showVolume), 0},
+        offsetof(FlowValues, showVolume), 0},
     {Rappture::SWITCH_END}
 };
@@ -87 +88 @@
         offsetof(FlowParticlesValues, isHidden), 0},
     {Rappture::SWITCH_CUSTOM, "-position", "number",
-        offsetof(FlowParticlesValues, position), 0, 0, &positionSwitch},
+        offsetof(FlowParticlesValues, position), 0, 0, &positionSwitch},
     {Rappture::SWITCH_FLOAT, "-size", "float",
         offsetof(FlowParticlesValues, particleSize), 0},
@@ -118 +119 @@
     _hashPtr = hPtr;
     _sv.isHidden = false;
-    _sv.position.axis = 0;                /* X_AXIS */
-    _sv.position.value = 0.0f;        
+    _sv.position.axis = 0;              /* X_AXIS */
+    _sv.position.value = 0.0f;  
     _sv.position.flags = RELPOS;
     _sv.color.r = _sv.color.b = _sv.color.g = _sv.color.a = 1.0f;
     _rendererPtr = new NvParticleRenderer(NMESH, NMESH, 
-                /* Global nVidia Cg context */g_context);
+                /* Global nVidia Cg context */g_context);
 }
 
@@ -129 +130 @@
 {
     if (_rendererPtr != NULL) {
-        delete _rendererPtr;
+        delete _rendererPtr;
     }
     if (_hashPtr != NULL) {
-        Tcl_DeleteHashEntry(_hashPtr);
+        Tcl_DeleteHashEntry(_hashPtr);
     }
     Rappture::FreeSwitches(_switches, &_sv, 0);
@@ -144 +145 @@
     Trace("rendering particles %s position=%g\n", _name, _sv.position.value);
     Trace("rendering particles %s position=%g\n", _name, 
-          FlowCmd::GetRelativePosition(&_sv.position));
+          FlowCmd::GetRelativePosition(&_sv.position));
 
     _rendererPtr->setPos(FlowCmd::GetRelativePosition(&_sv.position));
@@ -157 +158 @@
     _rendererPtr->setPos(FlowCmd::GetRelativePosition(&_sv.position));
     _rendererPtr->setColor(Vector4(_sv.color.r, _sv.color.g, _sv.color.b, 
-                _sv.color.a));
+                _sv.color.a));
     _rendererPtr->particleSize(_sv.particleSize);
     _rendererPtr->setAxis(_sv.position.axis);
@@ -168 +169 @@
     _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.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;
@@ -199 +200 @@
     sy = volPtr->height / (double)volPtr->width;
     if (volPtr->depth > 0.0) {
-        sz = volPtr->depth  / (double)volPtr->width;
+        sz = volPtr->depth  / (double)volPtr->width;
     }
     glScaled(sx, sy, sz);
@@ -209 +210 @@
 
     Trace("box is %g,%g %g,%g %g,%g\n", 
-          _sv.corner1.x, _sv.corner2.x,
-          _sv.corner1.y, _sv.corner2.y,
-          _sv.corner1.z, _sv.corner2.z);
+          _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\n", 
-          min.x, max.x, min.y, max.y, min.z, max.z);
+          min.x, max.x, min.y, max.y, min.z, max.z);
 
     float x0, y0, z0, x1, y1, z1;
@@ -219 +220 @@
     x1 = y1 = z1 = 0.0f;
     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);
+        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);
+        z0 = (_sv.corner1.z - min.z) / (max.z - min.z);
+        z1 = (_sv.corner2.z - min.z) / (max.z - min.z);
     }
     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);
+        x0 = (_sv.corner1.x - min.x) / (max.x - min.x);
+        x1 = (_sv.corner2.x - min.x) / (max.x - min.x);
     }
     Trace("rendering box %g,%g %g,%g %g,%g\n", x0, x1, y0, y1, z0, z1);
@@ -235 +236 @@
     glBegin(GL_LINE_LOOP); 
     {
-        glVertex3d(x0, y0, z0);
-        glVertex3d(x1, y0, z0);
-        glVertex3d(x1, y1, z0);
-        glVertex3d(x0, y1, z0);
+        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);
+        glVertex3d(x0, y0, z1);
+        glVertex3d(x1, y0, z1);
+        glVertex3d(x1, y1, z1);
+        glVertex3d(x0, y1, z1);
     }
     glEnd();
@@ -252 +253 @@
     glBegin(GL_LINE_LOOP);
     {
-        glVertex3d(x0, y0, z0);
-        glVertex3d(x0, y0, z1);
-        glVertex3d(x0, y1, z1);
-        glVertex3d(x0, y1, z0);
+        glVertex3d(x0, y0, z0);
+        glVertex3d(x0, y0, z1);
+        glVertex3d(x0, y1, z1);
+        glVertex3d(x0, y1, z0);
     }
     glEnd();
@@ -261 +262 @@
     glBegin(GL_LINE_LOOP);
     {
-        glVertex3d(x1, y0, z0);
-        glVertex3d(x1, y0, z1);
-        glVertex3d(x1, y1, z1);
-        glVertex3d(x1, y1, z0);
+        glVertex3d(x1, y0, z0);
+        glVertex3d(x1, y0, z1);
+        glVertex3d(x1, y1, z1);
+        glVertex3d(x1, y1, z0);
     }
     glEnd();
@@ -290 +291 @@
     _volPtr = NULL;
     _cmdToken = Tcl_CreateObjCommand(interp, (char *)_name, 
-        (Tcl_ObjCmdProc *)FlowInstObjCmd, this, FlowInstDeleteProc);
+        (Tcl_ObjCmdProc *)FlowInstObjCmd, this, FlowInstDeleteProc);
     Tcl_InitHashTable(&_particlesTable, TCL_STRING_KEYS);
     Tcl_InitHashTable(&_boxTable, TCL_STRING_KEYS);
@@ -299 +300 @@
     Rappture::FreeSwitches(_switches, &_sv, 0);
     if (_hashPtr != NULL) {
-        Tcl_DeleteHashEntry(_hashPtr);
+        Tcl_DeleteHashEntry(_hashPtr);
     }
     if (_fieldPtr != NULL) {
-        delete _fieldPtr;
+        delete _fieldPtr;
     }
     if (_dataPtr != NULL) {
-        delete _dataPtr;
+        delete _dataPtr;
     }
      if (_volPtr != NULL) {
-         NanoVis::remove_volume(_volPtr);
-         _volPtr = NULL;
+         NanoVis::remove_volume(_volPtr);
+         _volPtr = NULL;
     }
 
@@ -315 +316 @@
     FlowBoxIterator boxIter;
     for (boxPtr = FirstBox(&boxIter); boxPtr != NULL; 
-         boxPtr = NextBox(&boxIter)) {
-        boxPtr->disconnect();
-        delete boxPtr;
-    }        
+         boxPtr = NextBox(&boxIter)) {
+        boxPtr->disconnect();
+        delete boxPtr;
+    }   
     FlowParticles *particlesPtr;
     FlowParticlesIterator partIter;
     for (particlesPtr = FirstParticles(&partIter); particlesPtr != NULL;
-         particlesPtr = NextParticles(&partIter)) {
-        particlesPtr->disconnect();
-        delete particlesPtr;
-    }        
+         particlesPtr = NextParticles(&partIter)) {
+        particlesPtr->disconnect();
+        delete particlesPtr;
+    }   
     Tcl_DeleteHashTable(&_particlesTable);
     Tcl_DeleteHashTable(&_boxTable);
@@ -336 +337 @@
     FlowParticles *particlesPtr;
     for (particlesPtr = FirstParticles(&iter); particlesPtr != NULL;
-         particlesPtr = NextParticles(&iter)) {
-        particlesPtr->Reset();
+         particlesPtr = NextParticles(&iter)) {
+        particlesPtr->Reset();
     }
 }
@@ -350 +351 @@
     FlowParticles *particlesPtr;
     for (particlesPtr = FirstParticles(&iter); particlesPtr != NULL;
-         particlesPtr = NextParticles(&iter)) {
-        if (particlesPtr->visible()) {
-            particlesPtr->Advect();
-        }
+         particlesPtr = NextParticles(&iter)) {
+        if (particlesPtr->visible()) {
+            particlesPtr->Advect();
+        }
     }
 }
@@ -365 +366 @@
     FlowParticles *particlesPtr;
     for (particlesPtr = FirstParticles(&iter); particlesPtr != NULL; 
-         particlesPtr = NextParticles(&iter)) {
-        if (particlesPtr->visible()) {
-            particlesPtr->Render();
-        }
+         particlesPtr = NextParticles(&iter)) {
+        if (particlesPtr->visible()) {
+            particlesPtr->Render();
+        }
     }
     Trace("in Render before boxes %s\n", _name);
@@ -382 +383 @@
     hPtr = Tcl_CreateHashEntry(&_particlesTable, particlesName, &isNew);
     if (!isNew) {
-        Tcl_AppendResult(interp, "particle injection plane \"",
-                         particlesName, "\" already exists.", (char *)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "particle injection plane \"",
+                         particlesName, "\" already exists.", (char *)NULL);
+        return TCL_ERROR;
     }
     particlesName = Tcl_GetHashKey(&_particlesTable, hPtr);
@@ -390 +391 @@
     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_AppendResult(interp, "can't allocate particle injection plane",
+                (char *)NULL);
+        Tcl_DeleteHashEntry(hPtr);
+        return TCL_ERROR;
     }
     Tcl_SetHashValue(hPtr, particlesPtr);
@@ -401 +402 @@
 int
 FlowCmd::GetParticles(Tcl_Interp *interp, Tcl_Obj *objPtr, 
-                      FlowParticles **particlesPtrPtr)
+                      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;
+        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);
@@ -420 +421 @@
 {
     iterPtr->hashPtr = Tcl_FirstHashEntry(&_particlesTable, 
-        &iterPtr->hashSearch);
+        &iterPtr->hashSearch);
     if (iterPtr->hashPtr == NULL) {
-        return NULL;
+        return NULL;
     }
     return (FlowParticles *)Tcl_GetHashValue(iterPtr->hashPtr);
@@ -431 +432 @@
 {
     if (iterPtr->hashPtr == NULL) {
-        return NULL;
+        return NULL;
     }
     iterPtr->hashPtr = Tcl_NextHashEntry(&iterPtr->hashSearch);
     if (iterPtr->hashPtr == NULL) {
-        return NULL;
+        return NULL;
     }
     return (FlowParticles *)Tcl_GetHashValue(iterPtr->hashPtr);
@@ -447 +448 @@
     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;
+        Tcl_AppendResult(interp, "box \"", Tcl_GetString(objPtr),
+                "\" already exists in flow \"", name(), "\"", (char *)NULL);
+        return TCL_ERROR;
     }
     const char *boxName;
@@ -456 +457 @@
     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_AppendResult(interp, "can't allocate box \"", boxName, "\"",
+                         (char *)NULL);
+        Tcl_DeleteHashEntry(hPtr);
+        return TCL_ERROR;
     }
     Tcl_SetHashValue(hPtr, boxPtr);
@@ -471 +472 @@
     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;
+        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);
@@ -487 +488 @@
     iterPtr->hashPtr = Tcl_FirstHashEntry(&_boxTable, &iterPtr->hashSearch);
     if (iterPtr->hashPtr == NULL) {
-        return NULL;
+        return NULL;
     }
     return (FlowBox *)Tcl_GetHashValue(iterPtr->hashPtr);
@@ -496 +497 @@
 {
     if (iterPtr->hashPtr == NULL) {
-        return NULL;
+        return NULL;
     }
     iterPtr->hashPtr = Tcl_NextHashEntry(&iterPtr->hashSearch);
     if (iterPtr->hashPtr == NULL) {
-        return NULL;
+        return NULL;
     }
     return (FlowBox *)Tcl_GetHashValue(iterPtr->hashPtr);
@@ -512 +513 @@
     FlowParticlesIterator iter;
     for (particlesPtr = FirstParticles(&iter); particlesPtr != NULL;
-         particlesPtr = NextParticles(&iter)) {
-        particlesPtr->Initialize();
-    }        
+         particlesPtr = NextParticles(&iter)) {
+        particlesPtr->Initialize();
+    }   
 }
 
@@ -521 +522 @@
 {
     if (_volPtr != NULL) {
-        fprintf(stderr, "from ScaleVectorField volId=%s\n", _volPtr->name());
-        NanoVis::remove_volume(_volPtr);
-        _volPtr = NULL;
+        fprintf(stderr, "from ScaleVectorField volId=%s\n", _volPtr->name());
+        NanoVis::remove_volume(_volPtr);
+        _volPtr = NULL;
     }
     float *vdata;
     vdata = GetScaledVector();
     if (vdata == NULL) {
-        return false;
+        return false;
     }
     Volume *volPtr;
@@ -534 +535 @@
     delete [] vdata;
     if (volPtr == NULL) {
-        return false;
+        return false;
     }
     _volPtr = volPtr;
@@ -540 +541 @@
     // Remove the associated vector field.
     if (_fieldPtr != NULL) {
-        delete _fieldPtr;
+        delete _fieldPtr;
     }
     _fieldPtr = new NvVectorField();
     if (_fieldPtr == NULL) {
-        return false;
+        return false;
     }
 
@@ -559 +560 @@
 
     _fieldPtr->setVectorField(_volPtr, loc, 
-        1.0f, height / width, depth  / width, NanoVis::magMax);
+        1.0f, height / width, depth  / width, NanoVis::magMax);
 
     if (NanoVis::licRenderer != NULL) {
         NanoVis::licRenderer->setVectorField(_volPtr->id, loc,
-                1.0f / _volPtr->aspect_ratio_width,
-                1.0f / _volPtr->aspect_ratio_height,
-                1.0f / _volPtr->aspect_ratio_depth,
-                _volPtr->wAxis.max());
-        SetCurrentPosition();
-        SetAxis();
-        SetActive();
+                1.0f / _volPtr->aspect_ratio_width,
+                1.0f / _volPtr->aspect_ratio_height,
+                1.0f / _volPtr->aspect_ratio_depth,
+                _volPtr->wAxis.max());
+        SetCurrentPosition();
+        SetAxis();
+        SetActive();
     }
 
@@ -576 +577 @@
             //*(volPtr->get_location()),
             1.0f,
-            _volPtr->aspect_ratio_height / _volPtr->aspect_ratio_width,
-            _volPtr->aspect_ratio_depth / _volPtr->aspect_ratio_width
+            _volPtr->aspect_ratio_height / _volPtr->aspect_ratio_width,
+            _volPtr->aspect_ratio_depth / _volPtr->aspect_ratio_width
             //,volPtr->wAxis.max()
             );
-        Trace("Arrows enabled set to %d\n", _sv.showArrows);
-        NanoVis::velocityArrowsSlice->axis(_sv.slicePos.axis);
-        NanoVis::velocityArrowsSlice->slicePos(_sv.slicePos.value);
-        NanoVis::velocityArrowsSlice->enabled(_sv.showArrows);
+        Trace("Arrows enabled set to %d\n", _sv.showArrows);
+        NanoVis::velocityArrowsSlice->axis(_sv.slicePos.axis);
+        NanoVis::velocityArrowsSlice->slicePos(_sv.slicePos.value);
+        NanoVis::velocityArrowsSlice->enabled(_sv.showArrows);
     }
     FlowParticles *particlesPtr;
     FlowParticlesIterator partIter;
     for (particlesPtr = FirstParticles(&partIter); particlesPtr != NULL;
-         particlesPtr = NextParticles(&partIter)) {
-        particlesPtr->SetVectorField(_volPtr);
-    }        
+         particlesPtr = NextParticles(&partIter)) {
+        particlesPtr->SetVectorField(_volPtr);
+    }   
     return true;
 }
@@ -600 +601 @@
     FlowBox *boxPtr;
     for (boxPtr = FirstBox(&iter); boxPtr != NULL; boxPtr = NextBox(&iter)) {
-        Trace("found box %s\n", boxPtr->name());
-        if (boxPtr->visible()) {
-            boxPtr->Render(_volPtr);
-        }
+        Trace("found box %s\n", boxPtr->name());
+        if (boxPtr->visible()) {
+            boxPtr->Render(_volPtr);
+        }
     }
 }
@@ -614 +615 @@
     float *data = new float[n];
     if (data == NULL) {
-        return NULL;
+        return NULL;
     }
     memset(data, 0, sizeof(float) * n);
@@ -620 +621 @@
     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++) {
-                double vx, vy, vz, vm;
-                vx = values[0];
-                vy = values[1];
-                vz = values[2];
-                vm = sqrt(vx*vx + vy*vy + vz*vz);
-                destPtr[0] = vm / NanoVis::magMax; 
-                destPtr[1] = vx /(2.0*NanoVis::magMax) + 0.5; 
-                destPtr[2] = vy /(2.0*NanoVis::magMax) + 0.5; 
-                destPtr[3] = vz /(2.0*NanoVis::magMax) + 0.5; 
-                values += 3;
-                destPtr += 4;
-            }
-        }
+        for (size_t iy=0; iy < _dataPtr->yNum(); iy++) {
+            for (size_t ix=0; ix < _dataPtr->xNum(); ix++) {
+                double vx, vy, vz, vm;
+                vx = values[0];
+                vy = values[1];
+                vz = values[2];
+                vm = sqrt(vx*vx + vy*vy + vz*vz);
+                destPtr[0] = vm / NanoVis::magMax; 
+                destPtr[1] = vx /(2.0*NanoVis::magMax) + 0.5; 
+                destPtr[2] = vy /(2.0*NanoVis::magMax) + 0.5; 
+                destPtr[3] = vz /(2.0*NanoVis::magMax) + 0.5; 
+                values += 3;
+                destPtr += 4;
+            }
+        }
     }
     return data;
@@ -645 +646 @@
 
     volPtr = NanoVis::load_volume(_name, _dataPtr->xNum(), _dataPtr->yNum(), 
-                                  _dataPtr->zNum(), 4, data, 
-                                  NanoVis::magMin, NanoVis::magMax, 0);
+                                  _dataPtr->zNum(), 4, data, 
+                                  NanoVis::magMin, NanoVis::magMax, 0);
     volPtr->xAxis.SetRange(_dataPtr->xMin(), _dataPtr->xMax());
     volPtr->yAxis.SetRange(_dataPtr->yMin(), _dataPtr->yMax());
@@ -655 +656 @@
     Vector3 physicalMax(NanoVis::xMax, NanoVis::yMax, NanoVis::zMax);
     Trace("min=%g %g %g max=%g %g %g mag=%g %g\n", 
-            NanoVis::xMin, NanoVis::yMin, NanoVis::zMin,
-            NanoVis::xMax, NanoVis::yMax, NanoVis::zMax,
-            NanoVis::magMin, NanoVis::magMax);
+            NanoVis::xMin, NanoVis::yMin, NanoVis::zMin,
+            NanoVis::xMax, NanoVis::yMax, NanoVis::zMax,
+            NanoVis::magMin, NanoVis::magMax);
     volPtr->setPhysicalBBox(physicalMin, physicalMax);
     //volPtr->set_n_slice(256 - _volIndex);
@@ -689 +690 @@
 static int
 FlowDataFileOp(ClientData clientData, Tcl_Interp *interp, int objc,
-               Tcl_Obj *const *objv)
+               Tcl_Obj *const *objv)
 {
     Rappture::Outcome result;
@@ -702 +703 @@
     }
     if ((nComponents < 1) || (nComponents > 4)) {
-        Tcl_AppendResult(interp, "bad # of components \"", 
-                         Tcl_GetString(objv[4]), "\"", (char *)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "bad # of components \"", 
+                         Tcl_GetString(objv[4]), "\"", (char *)NULL);
+        return TCL_ERROR;
     }
     Rappture::Buffer buf;
     if (!buf.load(result, fileName)) {
-        Tcl_AppendResult(interp, "can't load data from \"", fileName, "\": ",
-                         result.remark(), (char *)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "can't load data from \"", fileName, "\": ",
+                         result.remark(), (char *)NULL);
+        return TCL_ERROR;
     }
 
@@ -719 +720 @@
     char *bytes = (char *)buf.bytes();
     if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
-        if (!dataPtr->ImportDx(result, nComponents, length-4, bytes+4)) {
-            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
-            delete dataPtr;
-            return TCL_ERROR;
-        }
+        if (!dataPtr->ImportDx(result, nComponents, length-4, bytes+4)) {
+            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
+            delete dataPtr;
+            return TCL_ERROR;
+        }
     } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
-        if (dataPtr->ParseBuffer(interp, buf) != TCL_OK) {
-            delete dataPtr;
-            return TCL_ERROR;
-        }
+        if (dataPtr->ParseBuffer(interp, buf) != TCL_OK) {
+            delete dataPtr;
+            return TCL_ERROR;
+        }
     } else if ((length > 10) && (strncmp(bytes, "unirect2d ", 10) == 0)) {
-        Rappture::Unirect2d *u2dPtr;
-        u2dPtr = new Rappture::Unirect2d(nComponents);
-        if (u2dPtr->ParseBuffer(interp, buf) != TCL_OK) {
-            delete u2dPtr;
-            return TCL_ERROR;
-        }
-        dataPtr->Convert(u2dPtr);
-        delete u2dPtr;
+        Rappture::Unirect2d *u2dPtr;
+        u2dPtr = new Rappture::Unirect2d(nComponents);
+        if (u2dPtr->ParseBuffer(interp, buf) != TCL_OK) {
+            delete u2dPtr;
+            return TCL_ERROR;
+        }
+        dataPtr->Convert(u2dPtr);
+        delete u2dPtr;
     } else {
-        fprintf(stderr, "header is %.14s\n", buf.bytes());
-        if (!dataPtr->ImportDx(result, nComponents, length, bytes)) {
-            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
-            delete dataPtr;
-            return TCL_ERROR;
-        }
+        fprintf(stderr, "header is %.14s\n", buf.bytes());
+        if (!dataPtr->ImportDx(result, nComponents, length, bytes)) {
+            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
+            delete dataPtr;
+            return TCL_ERROR;
+        }
     }
     if (dataPtr->nValues() == 0) {
-        delete dataPtr;
-        Tcl_AppendResult(interp, "no data found in \"", fileName, "\"",
-                         (char *)NULL);
-        return TCL_ERROR;
+        delete dataPtr;
+        Tcl_AppendResult(interp, "no data found in \"", fileName, "\"",
+                         (char *)NULL);
+        return TCL_ERROR;
     }
     flowPtr->data(dataPtr);
@@ -770 +771 @@
     int nBytes;
     if (Tcl_GetIntFromObj(interp, objv[3], &nBytes) != TCL_OK) {
-        Trace("Bad nBytes \"%s\"\n", Tcl_GetString(objv[3]));
+        Trace("Bad nBytes \"%s\"\n", Tcl_GetString(objv[3]));
         return TCL_ERROR;
     }
     if (nBytes <= 0) {
-        Tcl_AppendResult(interp, "bad # bytes request \"", 
-                Tcl_GetString(objv[3]), "\" for \"data follows\"", (char *)NULL);
-        Trace("Bad nbytes %d\n", nBytes);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "bad # bytes request \"", 
+                Tcl_GetString(objv[3]), "\" for \"data follows\"", (char *)NULL);
+        Trace("Bad nbytes %d\n", nBytes);
+        return TCL_ERROR;
     }
     int nComponents;
     if (Tcl_GetIntFromObj(interp, objv[4], &nComponents) != TCL_OK) {
-        Trace("Bad # of components \"%s\"\n", Tcl_GetString(objv[4]));
+        Trace("Bad # of components \"%s\"\n", Tcl_GetString(objv[4]));
         return TCL_ERROR;
     }
     if (nComponents <= 0) {
-        Tcl_AppendResult(interp, "bad # of components request \"", 
-                Tcl_GetString(objv[4]), "\" for \"data follows\"", (char *)NULL);
-        Trace("Bad # of components %d\n", nComponents);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "bad # of components request \"", 
+                Tcl_GetString(objv[4]), "\" for \"data follows\"", (char *)NULL);
+        Trace("Bad # of components %d\n", nComponents);
+        return TCL_ERROR;
     }
     Rappture::Buffer buf;
@@ -802 +803 @@
     char *bytes = (char *)buf.bytes();
     if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
-        if (!dataPtr->ImportDx(result, nComponents, length - 4, bytes + 4)) {
-            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
-            delete dataPtr;
-            return TCL_ERROR;
-        }
+        if (!dataPtr->ImportDx(result, nComponents, length - 4, bytes + 4)) {
+            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
+            delete dataPtr;
+            return TCL_ERROR;
+        }
     } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
-        if (dataPtr->ParseBuffer(interp, buf) != TCL_OK) {
-            delete dataPtr;
-            return TCL_ERROR;
-        }
+        if (dataPtr->ParseBuffer(interp, buf) != TCL_OK) {
+            delete dataPtr;
+            return TCL_ERROR;
+        }
     } else if ((length > 10) && (strncmp(bytes, "unirect2d ", 10) == 0)) {
-        Rappture::Unirect2d *u2dPtr;
-        u2dPtr = new Rappture::Unirect2d(nComponents);
-        if (u2dPtr->ParseBuffer(interp, buf) != TCL_OK) {
-            delete u2dPtr;
-            return TCL_ERROR;
-        }
-        dataPtr->Convert(u2dPtr);
-        delete u2dPtr;
+        Rappture::Unirect2d *u2dPtr;
+        u2dPtr = new Rappture::Unirect2d(nComponents);
+        if (u2dPtr->ParseBuffer(interp, buf) != TCL_OK) {
+            delete u2dPtr;
+            return TCL_ERROR;
+        }
+        dataPtr->Convert(u2dPtr);
+        delete u2dPtr;
     } else {
-        fprintf(stderr, "header is %.14s\n", buf.bytes());
-        if (!dataPtr->ImportDx(result, nComponents, length, bytes)) {
-            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
-            delete dataPtr;
-            return TCL_ERROR;
-        }
+        fprintf(stderr, "header is %.14s\n", buf.bytes());
+        if (!dataPtr->ImportDx(result, nComponents, length, bytes)) {
+            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
+            delete dataPtr;
+            return TCL_ERROR;
+        }
     }
     if (dataPtr->nValues() == 0) {
-        delete dataPtr;
-        Tcl_AppendResult(interp, "no data found in stream", (char *)NULL);
-        return TCL_ERROR;
+        delete dataPtr;
+        Tcl_AppendResult(interp, "no data found in stream", (char *)NULL);
+        return TCL_ERROR;
     }
     flowPtr->data(dataPtr);
     {
         char info[1024];
-        ssize_t nWritten;
-        size_t length;
+        ssize_t nWritten;
+        size_t length;
 
         length = sprintf(info, "nv>data tag %s min %g max %g\n",
-                flowPtr->name(), dataPtr->magMin(), dataPtr->magMax());
+                flowPtr->name(), dataPtr->magMin(), dataPtr->magMax());
         nWritten  = write(0, info, length);
-        assert(nWritten == (ssize_t)strlen(info));
+        assert(nWritten == (ssize_t)strlen(info));
     }
     NanoVis::EventuallyRedraw(NanoVis::MAP_FLOWS);
@@ -857 +858 @@
 static int
 FlowDataOp(ClientData clientData, Tcl_Interp *interp, int objc,
-           Tcl_Obj *const *objv)
+           Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
@@ -873 +874 @@
 {
     if (posPtr->flags == RELPOS) {
-        return posPtr->value;
+        return posPtr->value;
     }
     switch (posPtr->axis) {
     case AXIS_X:  
-        return (posPtr->value - NanoVis::xMin) / 
-            (NanoVis::xMax - NanoVis::xMin); 
+        return (posPtr->value - NanoVis::xMin) / 
+            (NanoVis::xMax - NanoVis::xMin); 
     case AXIS_Y:  
-        return (posPtr->value - NanoVis::yMin) / 
-            (NanoVis::yMax - NanoVis::yMin); 
+        return (posPtr->value - NanoVis::yMin) / 
+            (NanoVis::yMax - NanoVis::yMin); 
     case AXIS_Z:  
-        return (posPtr->value - NanoVis::zMin) / 
-            (NanoVis::zMax - NanoVis::zMin); 
+        return (posPtr->value - NanoVis::zMin) / 
+            (NanoVis::zMax - NanoVis::zMin); 
     }
     return 0.0;
@@ -908 +909 @@
     iterPtr->hashPtr = Tcl_FirstHashEntry(&flowTable, &iterPtr->hashSearch);
     if (iterPtr->hashPtr == NULL) {
-        return NULL;
+        return NULL;
     }
     return (FlowCmd *)Tcl_GetHashValue(iterPtr->hashPtr);
@@ -917 +918 @@
 {
     if (iterPtr->hashPtr == NULL) {
-        return NULL;
+        return NULL;
     }
     iterPtr->hashPtr = Tcl_NextHashEntry(&iterPtr->hashSearch);
     if (iterPtr->hashPtr == NULL) {
-        return NULL;
+        return NULL;
     }
     return (FlowCmd *)Tcl_GetHashValue(iterPtr->hashPtr);
@@ -932 +933 @@
     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;
+        if (interp != NULL) {
+            Tcl_AppendResult(interp, "can't find a flow \"", 
+                             Tcl_GetString(objPtr), "\"", (char *)NULL);
+        }
+        return TCL_ERROR;
     }
     *flowPtrPtr = (FlowCmd *)Tcl_GetHashValue(hPtr);
@@ -951 +952 @@
     hPtr = Tcl_CreateHashEntry(&flowTable, name, &isNew);
     if (!isNew) {
-        Tcl_AppendResult(interp, "flow \"", name, "\" already exists.",
-                         (char *)NULL);
-        return TCL_ERROR;
+        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;
-    }        
+        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_AppendResult(interp, "can't allocate a flow object \"", name, 
+                         "\"", (char *)NULL);
+        return TCL_ERROR;
     }
     Tcl_SetHashValue(hPtr, flowPtr);
@@ -979 +980 @@
     FlowIterator iter;
     for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
-        flowPtr->disconnect();                /* Don't disrupt the hash walk */
-        Tcl_DeleteCommand(interp, flowPtr->name());
+         flowPtr = NextFlow(&iter)) {
+        flowPtr->disconnect();          /* Don't disrupt the hash walk */
+        Tcl_DeleteCommand(interp, flowPtr->name());
     }
     Tcl_DeleteHashTable(&flowTable);
@@ -994 +995 @@
     /* 
      * Step 1.  Get the overall min and max magnitudes of all the 
-     *                flow vectors.
+     *          flow vectors.
      */
     magMin = DBL_MAX, magMax = -DBL_MAX;
@@ -1001 +1002 @@
     FlowIterator iter;
     for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
-        double min, max;
-        if (!flowPtr->isDataLoaded()) {
-            continue;
-        }
-        Rappture::Unirect3d *dataPtr;
-        dataPtr = flowPtr->data();
-        min = dataPtr->magMin();
-        max = dataPtr->magMax();
-        if (min < magMin) {
-            magMin = min;
-        } 
-        if (max > magMax) {
-            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();
-        }
+         flowPtr = NextFlow(&iter)) {
+        double min, max;
+        if (!flowPtr->isDataLoaded()) {
+            continue;
+        }
+        Rappture::Unirect3d *dataPtr;
+        dataPtr = flowPtr->data();
+        min = dataPtr->magMin();
+        max = dataPtr->magMax();
+        if (min < magMin) {
+            magMin = min;
+        } 
+        if (max > magMax) {
+            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();
+        }
     }
     Trace("MapFlows magMin=%g magMax=%g\n", NanoVis::magMin, NanoVis::magMax);
@@ -1041 +1042 @@
      */
     for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
-        if (!flowPtr->isDataLoaded()) {
-            continue;                        // Flow exists, but no data has
-                                        // been loaded yet.
-        }
-        if (flowPtr->visible()) {
-            flowPtr->InitializeParticles();
-        }
-        if (!flowPtr->ScaleVectorField()) {
-            return false;
-        }
-        // FIXME: This doesn't work when there is more than one flow.
-        licRenderer->set_offset(flowPtr->GetRelativePosition());
+         flowPtr = NextFlow(&iter)) {
+        if (!flowPtr->isDataLoaded()) {
+            continue;                   // Flow exists, but no data has
+                                        // been loaded yet.
+        }
+        if (flowPtr->visible()) {
+            flowPtr->InitializeParticles();
+        }
+        if (!flowPtr->ScaleVectorField()) {
+            return false;
+        }
+        // FIXME: This doesn't work when there is more than one flow.
+        licRenderer->set_offset(flowPtr->GetRelativePosition());
         NanoVis::velocityArrowsSlice->slicePos(flowPtr->GetRelativePosition());
         
@@ -1067 +1068 @@
     FlowIterator iter;
     for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
-        if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
-            flowPtr->Render();
-        }
+         flowPtr = NextFlow(&iter)) {
+        if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
+            flowPtr->Render();
+        }
     }
     flags &= ~REDRAW_PENDING;
@@ -1082 +1083 @@
 
     if (licRenderer->active()) {
-        NanoVis::licRenderer->reset();
+        NanoVis::licRenderer->reset();
     }
     for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
-        if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
-            flowPtr->ResetParticles();
-        }
+         flowPtr = NextFlow(&iter)) {
+        if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
+            flowPtr->ResetParticles();
+        }
     }
 }    
@@ -1098 +1099 @@
     FlowIterator iter;
     for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
-        if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
-            flowPtr->Advect();
-        }
+         flowPtr = NextFlow(&iter)) {
+        if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
+            flowPtr->Advect();
+        }
     }
 }    
@@ -1110 +1111 @@
  * AxisSwitchProc --
  *
- *        Convert a Tcl_Obj representing the label of a child node into its
- *        integer node id.
+ *      Convert a Tcl_Obj representing the label of a child node into its
+ *      integer node id.
  *
  * Results:
- *        The return value is a standard Tcl result.
+ *      The return value is a standard Tcl result.
  *
  *---------------------------------------------------------------------------
@@ -1121 +1122 @@
 static int
 AxisSwitchProc(
-    ClientData clientData,        /* Flag indicating if the node is considered
-                                 * before or after the insertion position. */
-    Tcl_Interp *interp,                /* Interpreter to send results back to */
-    const char *switchName,        /* Not used. */
-    Tcl_Obj *objPtr,                /* String representation */
-    char *record,                /* Structure record */
-    int offset,                        /* Not used. */
-    int flags)                        /* Not used. */
+    ClientData clientData,      /* Flag indicating if the node is considered
+                                 * before or after the insertion position. */
+    Tcl_Interp *interp,         /* Interpreter to send results back to */
+    const char *switchName,     /* Not used. */
+    Tcl_Obj *objPtr,            /* String representation */
+    char *record,               /* Structure record */
+    int offset,                 /* Not used. */
+    int flags)                  /* Not used. */
 {
     const char *string = Tcl_GetString(objPtr);
     if (string[1] == '\0') {
-        FlowCmd::SliceAxis *axisPtr = (FlowCmd::SliceAxis *)(record + offset);
+        FlowCmd::SliceAxis *axisPtr = (FlowCmd::SliceAxis *)(record + offset);
         char c;
         c = tolower((unsigned char)string[0]);
@@ -1157 +1158 @@
  * ColorSwitchProc --
  *
- *        Convert a Tcl_Obj representing the label of a list of four color 
- *        components in to a RGBA color value.
+ *      Convert a Tcl_Obj representing the label of a list of four color 
+ *      components in to a RGBA color value.
  *
  * Results:
- *        The return value is a standard Tcl result.
+ *      The return value is a standard Tcl result.
  *
  *---------------------------------------------------------------------------
@@ -1168 +1169 @@
 static int
 ColorSwitchProc(
-    ClientData clientData,        /* Flag indicating if the node is considered
-                                 * before or after the insertion position. */
-    Tcl_Interp *interp,                /* Interpreter to send results back to */
-    const char *switchName,        /* Not used. */
-    Tcl_Obj *objPtr,                /* String representation */
-    char *record,                /* Structure record */
-    int offset,                        /* Not used. */
-    int flags)                        /* Not used. */
+    ClientData clientData,      /* Flag indicating if the node is considered
+                                 * before or after the insertion position. */
+    Tcl_Interp *interp,         /* Interpreter to send results back to */
+    const char *switchName,     /* Not used. */
+    Tcl_Obj *objPtr,            /* String representation */
+    char *record,               /* Structure record */
+    int offset,                 /* Not used. */
+    int flags)                  /* Not used. */
 {
     Tcl_Obj **objv;
@@ -1182 +1183 @@
 
     if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if ((objc < 3) || (objc > 4)) {
-        Tcl_AppendResult(interp, "wrong # of elements in color definition",
-                         (char *)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "wrong # of elements in color definition",
+                         (char *)NULL);
+        return TCL_ERROR;
     }
     float values[4];
@@ -1193 +1194 @@
     values[3] = 1.0f;
     for (i = 0; i < objc; i++) {
-        float value;
-
-        if (GetFloatFromObj(interp, objv[i], &value) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        if ((value < 0.0) || (value > 1.0)) {
-            Tcl_AppendResult(interp, "bad component value in \"",
-                Tcl_GetString(objPtr), "\": color values must be [0..1]",
-                (char *)NULL);
-            return TCL_ERROR;
-        }
-        values[i] = value;
-    }            
+        float value;
+
+        if (GetFloatFromObj(interp, objv[i], &value) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        if ((value < 0.0) || (value > 1.0)) {
+            Tcl_AppendResult(interp, "bad component value in \"",
+                Tcl_GetString(objPtr), "\": color values must be [0..1]",
+                (char *)NULL);
+            return TCL_ERROR;
+        }
+        values[i] = value;
+    }       
     colorPtr->r = values[0];
     colorPtr->g = values[1];
@@ -1218 +1219 @@
  * PointSwitchProc --
  *
- *        Convert a Tcl_Obj representing the a 3-D coordinate into
- *        a point.
+ *      Convert a Tcl_Obj representing the a 3-D coordinate into
+ *      a point.
  *
  * Results:
- *        The return value is a standard Tcl result.
+ *      The return value is a standard Tcl result.
  *
  *---------------------------------------------------------------------------
@@ -1229 +1230 @@
 static int
 PointSwitchProc(
-    ClientData clientData,        /* Flag indicating if the node is considered
-                                 * before or after the insertion position. */
-    Tcl_Interp *interp,                /* Interpreter to send results back to */
-    const char *switchName,        /* Not used. */
-    Tcl_Obj *objPtr,                /* String representation */
-    char *record,                /* Structure record */
-    int offset,                        /* Not used. */
-    int flags)                        /* Not used. */
+    ClientData clientData,      /* Flag indicating if the node is considered
+                                 * before or after the insertion position. */
+    Tcl_Interp *interp,         /* Interpreter to send results back to */
+    const char *switchName,     /* Not used. */
+    Tcl_Obj *objPtr,            /* String representation */
+    char *record,               /* Structure record */
+    int offset,                 /* Not used. */
+    int flags)                  /* Not used. */
 {
     FlowPoint *pointPtr = (FlowPoint *)(record + offset);
@@ -1243 +1244 @@
 
     if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (objc != 3) {
-        Tcl_AppendResult(interp, "wrong # of elements for box coordinates: "
-                         " should be \"x y z\"", (char *)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "wrong # of elements for box coordinates: "
+                         " should be \"x y z\"", (char *)NULL);
+        return TCL_ERROR;
     }
     float values[3];
     int i;
     for (i = 0; i < objc; i++) {
-        float value;
-
-        if (GetFloatFromObj(interp, objv[i], &value) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        values[i] = value;
-    }            
+        float value;
+
+        if (GetFloatFromObj(interp, objv[i], &value) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        values[i] = value;
+    }       
     pointPtr->x = values[0];
     pointPtr->y = values[1];
@@ -1271 +1272 @@
  * PositionSwitchProc --
  *
- *        Convert a Tcl_Obj representing the a 3-D coordinate into
- *        a point.
+ *      Convert a Tcl_Obj representing the a 3-D coordinate into
+ *      a point.
  *
  * Results:
- *        The return value is a standard Tcl result.
+ *      The return value is a standard Tcl result.
  *
  *---------------------------------------------------------------------------
@@ -1282 +1283 @@
 static int
 PositionSwitchProc(
-    ClientData clientData,        /* Flag indicating if the node is considered
-                                 * before or after the insertion position. */
-    Tcl_Interp *interp,                /* Interpreter to send results back to */
-    const char *switchName,        /* Not used. */
-    Tcl_Obj *objPtr,                /* String representation */
-    char *record,                /* Structure record */
-    int offset,                        /* Not used. */
-    int flags)                        /* Not used. */
+    ClientData clientData,      /* Flag indicating if the node is considered
+                                 * before or after the insertion position. */
+    Tcl_Interp *interp,         /* Interpreter to send results back to */
+    const char *switchName,     /* Not used. */
+    Tcl_Obj *objPtr,            /* String representation */
+    char *record,               /* Structure record */
+    int offset,                 /* Not used. */
+    int flags)                  /* Not used. */
 {
     FlowPosition *posPtr = (FlowPosition *)(record + offset);
@@ -1298 +1299 @@
     p = strrchr((char *)string, '%');
     if (p == NULL) {
-        float value;
-
-        if (GetFloatFromObj(interp, objPtr, &value) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        posPtr->value = value;
-        posPtr->flags = ABSPOS;
+        float value;
+
+        if (GetFloatFromObj(interp, objPtr, &value) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        posPtr->value = value;
+        posPtr->flags = ABSPOS;
     } else {
-        double value;
-
-        *p = '\0';
-        if (Tcl_GetDouble(interp, string, &value) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        posPtr->value = (float)value * 0.01;
-        posPtr->flags = RELPOS;
+        double value;
+
+        *p = '\0';
+        if (Tcl_GetDouble(interp, string, &value) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        posPtr->value = (float)value * 0.01;
+        posPtr->flags = RELPOS;
     }
     return TCL_OK;
@@ -1323 +1324 @@
  * TransferFunctionSwitchProc --
  *
- *        Convert a Tcl_Obj representing the transfer function into a
- *        TransferFunction pointer.  The transfer function must have been
- *        previously defined.
+ *      Convert a Tcl_Obj representing the transfer function into a
+ *      TransferFunction pointer.  The transfer function must have been
+ *      previously defined.
  *
  * Results:
- *        The return value is a standard Tcl result.
+ *      The return value is a standard Tcl result.
  *
  *---------------------------------------------------------------------------
@@ -1335 +1336 @@
 static int
 TransferFunctionSwitchProc(
-    ClientData clientData,        /* Flag indicating if the node is considered
-                                 * before or after the insertion position. */
-    Tcl_Interp *interp,                /* Interpreter to send results back to */
-    const char *switchName,        /* Not used. */
-    Tcl_Obj *objPtr,                /* String representation */
-    char *record,                /* Structure record */
-    int offset,                        /* Not used. */
-    int flags)                        /* Not used. */
+    ClientData clientData,      /* Flag indicating if the node is considered
+                                 * before or after the insertion position. */
+    Tcl_Interp *interp,         /* Interpreter to send results back to */
+    const char *switchName,     /* Not used. */
+    Tcl_Obj *objPtr,            /* String representation */
+    char *record,               /* Structure record */
+    int offset,                 /* Not used. */
+    int flags)                  /* Not used. */
 {
     TransferFunction **funcPtrPtr = (TransferFunction **)(record + offset);
@@ -1361 +1362 @@
  * VideoFormatSwitchProc --
  *
- *        Convert a Tcl_Obj representing the video format into its
- *        integer id.
+ *      Convert a Tcl_Obj representing the video format into its
+ *      integer id.
  *
  * Results:
- *        The return value is a standard Tcl result.
+ *      The return value is a standard Tcl result.
  *
  *---------------------------------------------------------------------------
@@ -1372 +1373 @@
 static int
 VideoFormatSwitchProc(
-    ClientData clientData,        /* Not used. */
-    Tcl_Interp *interp,                /* Interpreter to send results back to */
-    const char *switchName,        /* Not used. */
-    Tcl_Obj *objPtr,                /* String representation */
-    char *record,                /* Structure record */
-    int offset,                        /* Not used. */
-    int flags)                        /* Not used. */
+    ClientData clientData,      /* Not used. */
+    Tcl_Interp *interp,         /* Interpreter to send results back to */
+    const char *switchName,     /* Not used. */
+    Tcl_Obj *objPtr,            /* String representation */
+    char *record,               /* Structure record */
+    int offset,                 /* Not used. */
+    int flags)                  /* Not used. */
 {
     Rappture::AVTranslate::VideoFormats *formatPtr = 
-        (Rappture::AVTranslate::VideoFormats *)(record + offset);
+        (Rappture::AVTranslate::VideoFormats *)(record + offset);
     const char *string;
     char c; 
@@ -1388 +1389 @@
     c = string[0];
     if ((c == 'm') && (strcmp(string, "mpeg") == 0)) {
-        *formatPtr =  Rappture::AVTranslate::MPEG1;
+        *formatPtr =  Rappture::AVTranslate::MPEG1;
     } else if ((c == 't') && (strcmp(string, "theora") == 0)) {
-        *formatPtr = Rappture::AVTranslate::THEORA;
+        *formatPtr = Rappture::AVTranslate::THEORA;
     } else if ((c == 'm') && (strcmp(string, "mov") == 0)) {
-        *formatPtr = Rappture::AVTranslate::QUICKTIME;
+        *formatPtr = Rappture::AVTranslate::QUICKTIME;
     } else {
-        Tcl_AppendResult(interp, "bad video format \"", string,
+        Tcl_AppendResult(interp, "bad video format \"", string,
                      "\": should be mpeg, theora, or mov", (char*)NULL);
     }
@@ -1402 +1403 @@
 static int
 FlowConfigureOp(ClientData clientData, Tcl_Interp *interp, int objc,
-                Tcl_Obj *const *objv)
+                Tcl_Obj *const *objv)
 {
     FlowCmd *flowPtr = (FlowCmd *)clientData;
 
     if (flowPtr->ParseSwitches(interp, objc - 2, objv + 2) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     NanoVis::EventuallyRedraw(NanoVis::MAP_FLOWS);
@@ -1415 +1416 @@
 static int
 FlowParticlesAddOp(ClientData clientData, Tcl_Interp *interp, int objc,
-                   Tcl_Obj *const *objv)
+                   Tcl_Obj *const *objv)
 {
     FlowCmd *flowPtr = (FlowCmd *)clientData;
 
     if (flowPtr->CreateParticles(interp, objv[3]) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     FlowParticles *particlesPtr;
     if (flowPtr->GetParticles(interp, objv[3], &particlesPtr) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (particlesPtr->ParseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
-        delete particlesPtr;
-        return TCL_ERROR;
+        delete particlesPtr;
+        return TCL_ERROR;
     }
     particlesPtr->Configure();
@@ -1438 +1439 @@
 static int
 FlowParticlesConfigureOp(ClientData clientData, Tcl_Interp *interp, int objc,
-                         Tcl_Obj *const *objv)
+                         Tcl_Obj *const *objv)
 {
     FlowCmd *flowPtr = (FlowCmd *)clientData;
@@ -1444 +1445 @@
     FlowParticles *particlesPtr;
     if (flowPtr->GetParticles(interp, objv[3], &particlesPtr) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (particlesPtr->ParseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     particlesPtr->Configure();
@@ -1456 +1457 @@
 static int
 FlowParticlesDeleteOp(ClientData clientData, Tcl_Interp *interp, int objc,
-                      Tcl_Obj *const *objv)
+                      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;
-        }
+        FlowParticles *particlesPtr;
+
+        if (flowPtr->GetParticles(NULL, objv[i], &particlesPtr) == TCL_OK) {
+            delete particlesPtr;
+        }
     }
     NanoVis::EventuallyRedraw();
@@ -1473 +1474 @@
 static int
 FlowParticlesNamesOp(ClientData clientData, Tcl_Interp *interp, int objc,
-                     Tcl_Obj *const *objv)
+                     Tcl_Obj *const *objv)
 {
     FlowCmd *flowPtr = (FlowCmd *)clientData;
@@ -1481 +1482 @@
     FlowParticles *particlesPtr;
     for (particlesPtr = flowPtr->FirstParticles(&iter); particlesPtr != NULL; 
-         particlesPtr = flowPtr->NextParticles(&iter)) {
-        Tcl_Obj *objPtr;
-
-        objPtr = Tcl_NewStringObj(particlesPtr->name(), -1);
-        Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
+         particlesPtr = flowPtr->NextParticles(&iter)) {
+        Tcl_Obj *objPtr;
+
+        objPtr = Tcl_NewStringObj(particlesPtr->name(), -1);
+        Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
     Tcl_SetObjResult(interp, listObjPtr);
@@ -1496 +1497 @@
  * FlowParticlesObjCmd --
  *
- *         This procedure is invoked to process commands on behalf of the flow
- *         object.
+ *      This procedure is invoked to process commands on behalf of the flow
+ *      object.
  *
  * Results:
- *        A standard Tcl result.
+ *      A standard Tcl result.
  *
  * Side effects:
- *        See the user documentation.
+ *      See the user documentation.
  *
  * $flow particles oper $name 
@@ -1511 +1512 @@
     {"add",        1, FlowParticlesAddOp,        4, 0, "name ?switches?",},
     {"configure",  1, FlowParticlesConfigureOp,  4, 0, "name ?switches?",},
-    {"delete",           1, FlowParticlesDeleteOp,     4, 0, "?name...?"},
+    {"delete",     1, FlowParticlesDeleteOp,     4, 0, "?name...?"},
     {"names",      1, FlowParticlesNamesOp,      3, 4, "?pattern?"},
 };
@@ -1519 +1520 @@
 static int
 FlowParticlesOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-               Tcl_Obj *const *objv)
+               Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
     proc = Rappture::GetOpFromObj(interp, nFlowParticlesOps, flowParticlesOps, 
-        Rappture::CMDSPEC_ARG2, objc, objv, 0);
+        Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     FlowCmd *flowPtr = (FlowCmd *)clientData;
@@ -1537 +1538 @@
 static int
 FlowBoxAddOp(ClientData clientData, Tcl_Interp *interp, int objc,
-               Tcl_Obj *const *objv)
+               Tcl_Obj *const *objv)
 {
     FlowCmd *flowPtr = (FlowCmd *)clientData;
 
     if (flowPtr->CreateBox(interp, objv[3]) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     FlowBox *boxPtr;
     if (flowPtr->GetBox(interp, objv[3], &boxPtr) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (boxPtr->ParseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
-        delete boxPtr;
-        return TCL_ERROR;
+        delete boxPtr;
+        return TCL_ERROR;
     }
     NanoVis::EventuallyRedraw();
@@ -1559 +1560 @@
 static int
 FlowBoxDeleteOp(ClientData clientData, Tcl_Interp *interp, int objc,
-                   Tcl_Obj *const *objv)
+                   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;
-        }
+        FlowBox *boxPtr;
+
+        if (flowPtr->GetBox(NULL, objv[i], &boxPtr) == TCL_OK) {
+            delete boxPtr;
+        }
     }
     NanoVis::EventuallyRedraw();
@@ -1584 +1585 @@
     FlowBox *boxPtr;
     for (boxPtr = flowPtr->FirstBox(&iter); boxPtr != NULL; 
-         boxPtr = flowPtr->NextBox(&iter)) {
-        Tcl_Obj *objPtr;
-
-        objPtr = Tcl_NewStringObj(boxPtr->name(), -1);
-        Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
+         boxPtr = flowPtr->NextBox(&iter)) {
+        Tcl_Obj *objPtr;
+
+        objPtr = Tcl_NewStringObj(boxPtr->name(), -1);
+        Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
     Tcl_SetObjResult(interp, listObjPtr);
@@ -1596 +1597 @@
 static int
 FlowBoxConfigureOp(ClientData clientData, Tcl_Interp *interp, int objc,
-                        Tcl_Obj *const *objv)
+                        Tcl_Obj *const *objv)
 {
     FlowCmd *flowPtr = (FlowCmd *)clientData;
@@ -1602 +1603 @@
     FlowBox *boxPtr;
     if (flowPtr->GetBox(interp, objv[3], &boxPtr) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (boxPtr->ParseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     NanoVis::EventuallyRedraw();
@@ -1616 +1617 @@
  * FlowBoxOp--
  *
- *         This procedure is invoked to process commands on behalf of the flow
- *         object.
+ *      This procedure is invoked to process commands on behalf of the flow
+ *      object.
  *
  * Results:
- *        A standard Tcl result.
+ *      A standard Tcl result.
  *
  * Side effects:
- *        See the user documentation.
+ *      See the user documentation.
  *
  *---------------------------------------------------------------------------
@@ -1630 +1631 @@
     {"add",        1, FlowBoxAddOp,        4, 0, "name ?switches?",},
     {"configure",  1, FlowBoxConfigureOp,  4, 0, "name ?switches?",},
-    {"delete",           1, FlowBoxDeleteOp,     3, 0, "?name...?"},
+    {"delete",     1, FlowBoxDeleteOp,     3, 0, "?name...?"},
     {"names",      1, FlowBoxNamesOp,      3, 0, "?pattern?"},
 };
@@ -1638 +1639 @@
 static int
 FlowBoxOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-               Tcl_Obj *const *objv)
+               Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
     proc = Rappture::GetOpFromObj(interp, nFlowBoxOps, flowBoxOps, 
-        Rappture::CMDSPEC_ARG2, objc, objv, 0);
+        Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     FlowCmd *flowPtr = (FlowCmd *)clientData;
@@ -1667 +1668 @@
 static int
 FlowLegendOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-          Tcl_Obj *const *objv)
+          Tcl_Obj *const *objv)
 {
     FlowCmd *flowPtr = (FlowCmd *)clientData;
@@ -1698 +1699 @@
  * FlowInstObjCmd --
  *
- *         This procedure is invoked to process commands on behalf of the flow
- *         object.
+ *      This procedure is invoked to process commands on behalf of the flow
+ *      object.
  *
  * Results:
- *        A standard Tcl result.
+ *      A standard Tcl result.
  *
  * Side effects:
- *        See the user documentation.
+ *      See the user documentation.
  *
  *---------------------------------------------------------------------------
@@ -1712 +1713 @@
     {"box",         1, FlowBoxOp,        2, 0, "oper ?args?"},
     {"configure",   1, FlowConfigureOp,  2, 0, "?switches?"},
-    {"data",            1, FlowDataOp,       2, 0, "oper ?args?"},
+    {"data",        1, FlowDataOp,       2, 0, "oper ?args?"},
     {"legend",      1, FlowLegendOp,     4, 4, "w h"},
     {"particles",   1, FlowParticlesOp,  2, 0, "oper ?args?"}
@@ -1720 +1721 @@
 static int
 FlowInstObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
-               Tcl_Obj *const *objv)
+               Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
     proc = Rappture::GetOpFromObj(interp, nFlowInstOps, flowInstOps, 
-        Rappture::CMDSPEC_ARG1, objc, objv, 0);
+        Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     assert(CheckGL(AT));
@@ -1742 +1743 @@
  * FlowInstDeleteProc --
  *
- *        Deletes the command associated with the tree.  This is called only
- *        when the command associated with the tree is destroyed.
+ *      Deletes the command associated with the tree.  This is called only
+ *      when the command associated with the tree is destroyed.
  *
  * Results:
- *        None.
+ *      None.
  *
  *---------------------------------------------------------------------------
@@ -1767 +1768 @@
 static int
 FlowAddOp(ClientData clientData, Tcl_Interp *interp, int objc,
-          Tcl_Obj *const *objv)
+          Tcl_Obj *const *objv)
 {
     if (NanoVis::CreateFlow(interp, objv[2]) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     FlowCmd *flowPtr;
     if (NanoVis::GetFlow(interp, objv[2], &flowPtr) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (flowPtr->ParseSwitches(interp, objc - 3, objv + 3) != TCL_OK) {
-        Tcl_DeleteCommand(interp, flowPtr->name());
-        return TCL_ERROR;
+        Tcl_DeleteCommand(interp, flowPtr->name());
+        return TCL_ERROR;
     }
     Tcl_SetObjResult(interp, objv[2]);
@@ -1795 +1796 @@
 static int
 FlowDeleteOp(ClientData clientData, Tcl_Interp *interp, int objc,
-             Tcl_Obj *const *objv)
+             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());
+        FlowCmd *flowPtr;
+
+        if (NanoVis::GetFlow(interp, objv[i], &flowPtr) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        Tcl_DeleteCommand(interp, flowPtr->name());
     }
     NanoVis::EventuallyRedraw(NanoVis::MAP_FLOWS);
@@ -1821 +1822 @@
 static int
 FlowExistsOp(ClientData clientData, Tcl_Interp *interp, int objc,
-             Tcl_Obj *const *objv)
+             Tcl_Obj *const *objv)
 {
     bool value;
@@ -1828 +1829 @@
     value = false;
     if (NanoVis::GetFlow(NULL, objv[2], &flowPtr) == TCL_OK) {
-        value = true;
+        value = true;
     }
     Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (int)value);
@@ -1839 +1840 @@
  * FlowGotoOp --
  *
- *        flow goto number
+ *      flow goto number
  *
  *---------------------------------------------------------------------------
@@ -1852 +1853 @@
     }
     if ((nSteps < 0) || (nSteps > SHRT_MAX)) {
-        Tcl_AppendResult(interp, "flow goto: bad # of steps \"",
-                         Tcl_GetString(objv[2]), "\"", (char *)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "flow goto: bad # of steps \"",
+                         Tcl_GetString(objv[2]), "\"", (char *)NULL);
+        return TCL_ERROR;
     }
     NanoVis::ResetFlows();
     if (NanoVis::flags & NanoVis::MAP_FLOWS) {
-        NanoVis::MapFlows();
+        NanoVis::MapFlows();
     }
     int i;
     NanoVis::AdvectFlows();
     for (i = 0; i < nSteps; i++) {
-        if (NanoVis::licRenderer->active()) {
-            NanoVis::licRenderer->convolve();
-        }
-        NanoVis::AdvectFlows();
+        if (NanoVis::licRenderer->active()) {
+            NanoVis::licRenderer->convolve();
+        }
+        NanoVis::AdvectFlows();
     }
     NanoVis::EventuallyRedraw();
@@ -1882 +1883 @@
 static int
 FlowNamesOp(ClientData clientData, Tcl_Interp *interp, int objc,
-            Tcl_Obj *const *objv)
+            Tcl_Obj *const *objv)
 {
     Tcl_Obj *listObjPtr;
@@ -1889 +1890 @@
     FlowIterator iter;
     for (flowPtr = NanoVis::FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NanoVis::NextFlow(&iter)) {
-        Tcl_Obj *objPtr;
-
-        objPtr = Tcl_NewStringObj(flowPtr->name(), -1);
-        Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
+         flowPtr = NanoVis::NextFlow(&iter)) {
+        Tcl_Obj *objPtr;
+
+        objPtr = Tcl_NewStringObj(flowPtr->name(), -1);
+        Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     }
     Tcl_SetObjResult(interp, listObjPtr);
@@ -1905 +1906 @@
     assert(NanoVis::licRenderer != NULL);
     if (NanoVis::flags & NanoVis::MAP_FLOWS) {
-        NanoVis::MapFlows();
+        NanoVis::MapFlows();
     }
     NanoVis::EventuallyRedraw();
@@ -1922 +1923 @@
 
 struct FlowVideoValues {
-    float frameRate;                        /* Frame rate */
-    int bitRate;                        /* Video bitrate */
-    int width, height;                        /* Dimensions of video frame. */
+    float frameRate;                    /* Frame rate */
+    int bitRate;                        /* Video bitrate */
+    int width, height;                  /* Dimensions of video frame. */
     int nFrames;
     Rappture::AVTranslate::VideoFormats format;
@@ -1936 +1937 @@
 Rappture::SwitchSpec FlowCmd::videoSwitches[] = {
     {Rappture::SWITCH_FLOAT, "-bitrate", "value",
-        offsetof(FlowVideoValues, bitRate), 0},
+        offsetof(FlowVideoValues, bitRate), 0},
     {Rappture::SWITCH_CUSTOM, "-format", "string",
         offsetof(FlowVideoValues, format), 0, 0, &videoFormatSwitch},
     {Rappture::SWITCH_FLOAT, "-framerate", "value",
-        offsetof(FlowVideoValues, frameRate), 0},
+        offsetof(FlowVideoValues, frameRate), 0},
     {Rappture::SWITCH_INT, "-height", "integer",
-        offsetof(FlowVideoValues, height), 0},
+        offsetof(FlowVideoValues, height), 0},
     {Rappture::SWITCH_INT, "-numframes", "count",
-        offsetof(FlowVideoValues, nFrames), 0},
+        offsetof(FlowVideoValues, nFrames), 0},
     {Rappture::SWITCH_INT, "-width", "integer",
-        offsetof(FlowVideoValues, width), 0},
+        offsetof(FlowVideoValues, width), 0},
     {Rappture::SWITCH_END}
 };
@@ -1952 +1953 @@
 static int
 FlowVideoOp(ClientData clientData, Tcl_Interp *interp, int objc, 
-            Tcl_Obj *const *objv)
+            Tcl_Obj *const *objv)
 {
     struct pollfd pollResults;
@@ -1960 +1961 @@
     pollResults.events = POLLIN;
 
-#define PENDING_TIMEOUT                10  /* milliseconds. */
+#define PENDING_TIMEOUT         10  /* milliseconds. */
     timeout = PENDING_TIMEOUT;
 
@@ -1967 +1968 @@
 
     token = Tcl_GetString(objv[2]);
-    values.frameRate = 25.0f;                // Default frame rate 25 fps
-    values.bitRate = 6.0e+6f;                // Default video bit rate.
+    values.frameRate = 25.0f;           // Default frame rate 25 fps
+    values.bitRate = 6.0e+6f;           // Default video bit rate.
     values.width = NanoVis::win_width;
     values.height = NanoVis::win_height;
@@ -1974 +1975 @@
     values.format = Rappture::AVTranslate::MPEG1;
     if (Rappture::ParseSwitches(interp, FlowCmd::videoSwitches, 
-        objc - 3, objv + 3, &values, SWITCH_DEFAULTS) < 0) {
-        return TCL_ERROR;
+        objc - 3, objv + 3, &values, SWITCH_DEFAULTS) < 0) {
+        return TCL_ERROR;
     }
     if ((values.width < 0) || (values.width > SHRT_MAX) || 
-        (values.height < 0) || (values.height > SHRT_MAX)) {
-        Tcl_AppendResult(interp, "bad dimensions for video", (char *)NULL);
-        return TCL_ERROR;
+        (values.height < 0) || (values.height > SHRT_MAX)) {
+        Tcl_AppendResult(interp, "bad dimensions for video", (char *)NULL);
+        return TCL_ERROR;
     }
     if ((values.frameRate < 0.0f) || (values.frameRate > 30.0f)) {
-        Tcl_AppendResult(interp, "bad frame rate.", (char *)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "bad frame rate.", (char *)NULL);
+        return TCL_ERROR;
     }
     if (values.bitRate < 0.0f) {
-        Tcl_AppendResult(interp, "bad bit rate.", (char *)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "bad bit rate.", (char *)NULL);
+        return TCL_ERROR;
     }
     if (NanoVis::licRenderer == NULL) {
-        Tcl_AppendResult(interp, "no lic renderer.", (char *)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "no lic renderer.", (char *)NULL);
+        return TCL_ERROR;
     }
     // Save the old dimensions of the offscreen buffer.
@@ -2004 +2005 @@
 
     Rappture::AVTranslate movie(values.width, values.height, values.bitRate, 
-        values.frameRate);
+        values.frameRate);
     char tmpFileName[200];
     sprintf(tmpFileName,"/tmp/flow%d.mpeg", getpid());
     if (!movie.init(context, tmpFileName)) {
         Tcl_AppendResult(interp, "can't initialized movie \"", tmpFileName, 
-                "\": ", context.remark(), (char *)NULL);
-        return TCL_ERROR;
+                "\": ", context.remark(), (char *)NULL);
+        return TCL_ERROR;
     }
     if ((values.width != oldWidth) || (values.height != oldHeight)) {
-        // Resize to the requested size.
-        NanoVis::resize_offscreen_buffer(values.width, values.height);
+        // Resize to the requested size.
+        NanoVis::resize_offscreen_buffer(values.width, values.height);
     }
     // Now compute the line padding for the offscreen buffer.
@@ -2024 +2025 @@
     bool canceled = false;
     for (int i = 1; i <= values.nFrames; i++) {
-        if (((i & 0xF) == 0) && (poll(&pollResults, 1, 0) > 0)) {
-            /* If there's another command on stdin, that means the client is
-             * trying to cancel this operation. */
-            canceled = true;
-            break;
-        }
-        if (NanoVis::licRenderer->active()) {
-            NanoVis::licRenderer->convolve();
-        }
-        NanoVis::AdvectFlows();
-        NanoVis::offscreen_buffer_capture();
+        if (((i & 0xF) == 0) && (poll(&pollResults, 1, 0) > 0)) {
+            /* If there's another command on stdin, that means the client is
+             * trying to cancel this operation. */
+            canceled = true;
+            break;
+        }
+        if (NanoVis::licRenderer->active()) {
+            NanoVis::licRenderer->convolve();
+        }
+        NanoVis::AdvectFlows();
+        NanoVis::offscreen_buffer_capture();
         NanoVis::display();
         NanoVis::read_screen();
@@ -2043 +2044 @@
     Trace("FLOW end\n");
     if (!canceled) {
-        Rappture::Buffer data;
-
-        /* FIXME: find a way to get the data from the movie object as a
-         * void* */
-        if (!data.load(context, tmpFileName)) {
-            Tcl_AppendResult(interp, "can't load data from temporary file \"",
-                tmpFileName, "\": ", context.remark(), (char *)NULL);
-            return TCL_ERROR;
-        }
-
-        char command[200];
-        sprintf(command,"nv>image -bytes %lu -type movie -token \"%s\"\n", 
-                (unsigned long)data.size(), token);
-        NanoVis::sendDataToClient(command, data.bytes(), data.size());
+        Rappture::Buffer data;
+
+        /* FIXME: find a way to get the data from the movie object as a
+         * void* */
+        if (!data.load(context, tmpFileName)) {
+            Tcl_AppendResult(interp, "can't load data from temporary file \"",
+                tmpFileName, "\": ", context.remark(), (char *)NULL);
+            return TCL_ERROR;
+        }
+
+        char command[200];
+        sprintf(command,"nv>image -bytes %lu -type movie -token \"%s\"\n", 
+                (unsigned long)data.size(), token);
+        NanoVis::sendDataToClient(command, data.bytes(), data.size());
     }
     if ((values.width != oldWidth) || (values.height != oldHeight)) {
-        NanoVis::resize_offscreen_buffer(oldWidth, oldHeight);
+        NanoVis::resize_offscreen_buffer(oldWidth, oldHeight);
     }
     NanoVis::ResetFlows();
     if (unlink(tmpFileName) != 0) {
         Tcl_AppendResult(interp, "can't unlink temporary movie file \"",
-                tmpFileName, "\": ", Tcl_PosixError(interp), (char *)NULL);
-        return TCL_ERROR;
+                tmpFileName, "\": ", Tcl_PosixError(interp), (char *)NULL);
+        return TCL_ERROR;
     }
     return TCL_OK;
@@ -2093 +2094 @@
 static int
 FlowCmdProc(ClientData clientData, Tcl_Interp *interp, int objc,
-            Tcl_Obj *const *objv)
+            Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nFlowCmdOps, flowCmdOps, 
-        Rappture::CMDSPEC_ARG1, objc, objv, 0);
+        Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     return (*proc) (clientData, interp, objc, objv);
@@ -2110 +2111 @@
  * FlowCmdInitProc --
  *
- *        This procedure is invoked to initialize the "tree" command.
+ *      This procedure is invoked to initialize the "tree" command.
  *
  * Results:
- *        None.
+ *      None.
  *
  * Side effects:
- *        Creates the new command and adds a new entry into a global Tcl
- *        associative array.
+ *      Creates the new command and adds a new entry into a global Tcl
+ *      associative array.
  *
  *---------------------------------------------------------------------------
@@ -2141 +2142 @@
   if (line == endPtr) {
       vtkErrorMacro(<<"Premature EOF reading first line! " << " for file: " 
-                    << (this->FileName?this->FileName:"(Null FileName)"));
+                    << (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)"));
+                    << (this->FileName?this->FileName:"(Null FileName)"));
       return false;
   }    
@@ -2153 +2154 @@
   if (line == endPtr) {
       vtkErrorMacro(<<"Premature EOF reading title! " << " for file: " 
-                    << (this->FileName?this->FileName:"(Null FileName)"));
+                    << (this->FileName?this->FileName:"(Null FileName)"));
       return false;
   }
@@ -2166 +2167 @@
   if (line == endPtr) {
       vtkErrorMacro(<<"Premature EOF reading file type!" << " for file: " 
-                    << (this->FileName?this->FileName:"(Null FileName)"));
+                    << (this->FileName?this->FileName:"(Null FileName)"));
       return false;
   }
@@ -2176 +2177 @@
   } else {
       vtkErrorMacro(<< "Unrecognized file type: "<< line << " for file: " 
-                    << (this->FileName?this->FileName:"(Null FileName)"));
+                    << (this->FileName?this->FileName:"(Null FileName)"));
       _fileType = 0;
       return false;
@@ -2185 +2186 @@
   if (line == endPtr) {
       vtkErrorMacro(<<"Premature EOF reading file type!" << " for file: " 
-                    << (this->FileName?this->FileName:"(Null FileName)"));
+                    << (this->FileName?this->FileName:"(Null FileName)"));
       return false;
   }
@@ -2193 +2194 @@
       line = getline(&p, endPtr);
       if (line == endPtr) {
-          // EOF
+          // EOF
       }
       type = GetWord(line, &endPtr);
       if (strncasecmp(word, "structured_grid", 15) == 0) {
-          vtkErrorMacro(<< "Cannot read dataset type: " << line);
-          return 1;
+          vtkErrorMacro(<< "Cannot read dataset type: " << line);
+          return 1;
       }
     // Read keyword and dimensions

trunk/packages/vizservers/nanovis/Makefile.in

@@ -107 +107 @@
 CFLAGS          = @CFLAGS@
 EXTRA_CFLAGS    = -Wall
-DEFINES         = @DEFINES@
-CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES)
+DEFINES         = 
+CC_SWITCHES     = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
 
 OBJS            = \

trunk/packages/vizservers/nanovis/RpAVTranslate.h

@@ -18 +18 @@
 
 extern "C" {
-#define __STDC_CONSTANT_MACROS 1
+#ifndef INT64_C
+#if SIZEOF_LONG == 8
+#  define INT64_C(c)  c ## L
+#  define UINT64_C(c) c ## UL
+#else
+#  define INT64_C(c)  c ## LL
+#  define UINT64_C(c) c ## ULL
+# endif
+#endif
 #ifdef HAVE_FFMPEG_AVFORMAT_H
 #include <ffmpeg/avformat.h>
@@ -53 +61 @@
     size_t _height;
     size_t _bitRate;
-    float _frameRate;                // frames/seconds
+    float _frameRate;           // frames/seconds
     size_t _videoOutbufSize;
     uint8_t *_videoOutbuf;
 
     size_t width(void) {
-        return _width;
+        return _width;
     }
     void width(size_t width) {
-        _width = width;
+        _width = width;
     }
     size_t height(void) {
-        return _width;
+        return _width;
     }
     void height(size_t width) {
-        _width = width;
+        _width = width;
     }
     size_t bitRate(void) {
-        return _bitRate;
+        return _bitRate;
     }
     void bitRate(size_t bitRate) {
-        _bitRate = bitRate;
+        _bitRate = bitRate;
     }
     float frameRate(void) {
-        return _frameRate;
+        return _frameRate;
     }
     void frameRate(size_t frameRate) {
-        _frameRate = frameRate;
+        _frameRate = frameRate;
     }
     AVOutputFormat *_fmtPtr;

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -30 +30 @@
 #include <string>
 #include <sys/resource.h>
+#include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/times.h>

trunk/packages/vizservers/nanovis/nvconf.h.in

@@ -88 +88 @@
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
+
+/* The size of `float', as computed by sizeof. */
+#undef SIZEOF_FLOAT
+
+/* The size of `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `long long', as computed by sizeof. */
+#undef SIZEOF_LONG_LONG
+
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
 
 /* Define to 1 if you have the ANSI C header files. */