Changeset 1089 for trunk/packages/vizservers/nanovis

Timestamp:

Aug 3, 2008, 11:49:26 PM (16 years ago)

Author:

dkearney

Message:

saving the world from tabs...one source file at a time

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (113 diffs)
• nanovis.cpp (modified) (84 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -28 +28 @@
  *          lots of extra error checking code. (almost there)
  *        o Convert GetVolumeIndices to GetVolumes.  Goal is to remove
- *          all references of Nanovis::volume[] from this file.  Don't 
- *          want to know how volumes are stored. Same for heightmaps. 
- *        o Rationalize volume id scheme. Right now it's the index in 
+ *          all references of Nanovis::volume[] from this file.  Don't
+ *          want to know how volumes are stored. Same for heightmaps.
+ *        o Rationalize volume id scheme. Right now it's the index in
  *          the vector. 1) Use a list instead of a vector. 2) carry
  *          an id field that's a number that gets incremented each new volume.
@@ -108 +108 @@
 
 // default transfer function
-static const char def_transfunc[] = 
+static const char def_transfunc[] =
     "transfunc define default {\n\
   0.0  1 1 1\n\
@@ -152 +152 @@
 
 static bool
-GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, bool *boolPtr) 
+GetBooleanFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, bool *boolPtr)
 {
     int value;
@@ -176 +176 @@
 
 static int
-GetCullMode(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+GetCullMode(Tcl_Interp *interp, Tcl_Obj *objPtr,
             graphics::RenderContext::CullMode *modePtr)
 {
@@ -187 +187 @@
         *modePtr = graphics::RenderContext::BACK;
     } else {
-        Tcl_AppendResult(interp, "invalid cull mode \"", string, 
+        Tcl_AppendResult(interp, "invalid cull mode \"", string,
                          "\": should be front, back, or none\"", (char *)NULL);
         return TCL_ERROR;
@@ -195 +195 @@
 
 static int
-GetShadingModel(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+GetShadingModel(Tcl_Interp *interp, Tcl_Obj *objPtr,
                 graphics::RenderContext::ShadingModel *modelPtr)
 {
@@ -205 +205 @@
         *modelPtr = graphics::RenderContext::SMOOTH;
     } else {
-        Tcl_AppendResult(interp, "bad shading model \"", string, 
+        Tcl_AppendResult(interp, "bad shading model \"", string,
                          "\": should be flat or smooth", (char *)NULL);
         return TCL_ERROR;
@@ -213 +213 @@
 
 static int
-GetPolygonMode(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+GetPolygonMode(Tcl_Interp *interp, Tcl_Obj *objPtr,
                graphics::RenderContext::PolygonMode *modePtr)
 {
@@ -223 +223 @@
         *modePtr = graphics::RenderContext::FILL;
     } else {
-        Tcl_AppendResult(interp, "invalid polygon mode \"", string, 
+        Tcl_AppendResult(interp, "invalid polygon mode \"", string,
                          "\": should be wireframe or fill\"", (char *)NULL);
         return TCL_ERROR;
@@ -246 +246 @@
  */
 static HeightMap *
-CreateHeightMap(ClientData clientData, Tcl_Interp *interp, int objc, 
+CreateHeightMap(ClientData clientData, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
 {
@@ -253 +253 @@
 
     if (objc != 7) {
-        Tcl_AppendResult(interp, 
+        Tcl_AppendResult(interp,
         "wrong # of values: should be xMin yMin xMax yMax xNum yNum heights",
         (char *)NULL);
@@ -259 +259 @@
     }
     if ((GetFloatFromObj(interp, objv[0], &xMin) != TCL_OK) ||
-        (GetFloatFromObj(interp, objv[1], &yMin) != TCL_OK) || 
+        (GetFloatFromObj(interp, objv[1], &yMin) != TCL_OK) ||
         (GetFloatFromObj(interp, objv[2], &xMax) != TCL_OK) ||
         (GetFloatFromObj(interp, objv[3], &yMax) != TCL_OK) ||
@@ -283 +283 @@
     heights = new float[nValues];
     if (heights == NULL) {
-        Tcl_AppendResult(interp, "can't allocate array of heights", 
+        Tcl_AppendResult(interp, "can't allocate array of heights",
                          (char *)NULL);
         return NULL;
@@ -320 +320 @@
     }
     if (index < 0) {
-        Tcl_AppendResult(interp, "can't have negative index \"", 
+        Tcl_AppendResult(interp, "can't have negative index \"",
                          Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
@@ -350 +350 @@
     hmPtr = NanoVis::heightMap[index];
     if (hmPtr == NULL) {
-        Tcl_AppendResult(interp, "no heightmap defined for index \"", 
+        Tcl_AppendResult(interp, "no heightmap defined for index \"",
                          Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
@@ -379 +379 @@
     }
     if (index < 0) {
-        Tcl_AppendResult(interp, "can't have negative index \"", 
+        Tcl_AppendResult(interp, "can't have negative index \"",
                          Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
@@ -415 +415 @@
     vol = NanoVis::volume[index];
     if (vol == NULL) {
-        Tcl_AppendResult(interp, "no volume defined for index \"", 
+        Tcl_AppendResult(interp, "no volume defined for index \"",
                          Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
@@ -660 +660 @@
         int nRead;
 
-        chunk = (sizeof(buffer) < (unsigned int) nBytes) ? 
+        chunk = (sizeof(buffer) < (unsigned int) nBytes) ?
             sizeof(buffer) : nBytes;
         nRead = fread(buffer, sizeof(char), chunk, stdin);
@@ -707 +707 @@
 {
     double xangle, yangle, zangle;
-    if ((Tcl_GetDoubleFromObj(interp, objv[2], &xangle) != TCL_OK) || 
+    if ((Tcl_GetDoubleFromObj(interp, objv[2], &xangle) != TCL_OK) ||
         (Tcl_GetDoubleFromObj(interp, objv[3], &yangle) != TCL_OK) ||
         (Tcl_GetDoubleFromObj(interp, objv[4], &zangle) != TCL_OK)) {
@@ -752 +752 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nCameraOps, cameraOps, 
+    proc = Rappture::GetOpFromObj(interp, nCameraOps, cameraOps,
                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
@@ -762 +762 @@
 /*ARGSUSED*/
 static int
-SnapshotCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
+SnapshotCmd(ClientData cdata, Tcl_Interp *interp, int objc,
               Tcl_Obj *const *objv)
 {
@@ -785 +785 @@
 
 static int
-CutplanePositionOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+CutplanePositionOp(ClientData cdata, Tcl_Interp *interp, int objc,
                    Tcl_Obj *const *objv)
 {
@@ -792 +792 @@
         return TCL_ERROR;
     }
-    
+
     // keep this just inside the volume so it doesn't disappear
-    if (relval < 0.01f) { 
-        relval = 0.01f; 
-    } else if (relval > 0.99f) { 
-        relval = 0.99f; 
-    }
-    
+    if (relval < 0.01f) {
+        relval = 0.01f;
+    } else if (relval > 0.99f) {
+        relval = 0.99f;
+    }
+
     int axis;
     if (GetAxisFromObj(interp, objv[3], &axis) != TCL_OK) {
         return TCL_ERROR;
     }
-    
+
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
@@ -817 +817 @@
 
 static int
-CutplaneStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+CutplaneStateOp(ClientData cdata, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
 {
@@ -824 +824 @@
         return TCL_ERROR;
     }
-    
+
     int axis;
     if (GetAxisFromObj(interp, objv[3], &axis) != TCL_OK) {
         return TCL_ERROR;
     }
-    
+
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
@@ -838 +838 @@
         for (iter = ivol.begin(); iter != ivol.end(); iter++) {
             (*iter)->enable_cutplane(axis);
-        } 
+        }
     } else {
         vector<Volume *>::iterator iter;
         for (iter = ivol.begin(); iter != ivol.end(); iter++) {
             (*iter)->disable_cutplane(axis);
-        } 
+        }
     }
     return TCL_OK;
@@ -870 +870 @@
  */
 static int
-CutplaneCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
+CutplaneCmd(ClientData cdata, Tcl_Interp *interp, int objc,
             Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nCutplaneOps, cutplaneOps, 
+    proc = Rappture::GetOpFromObj(interp, nCutplaneOps, cutplaneOps,
                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
@@ -898 +898 @@
 {
     if (objc != 4) {
-        Tcl_AppendResult(interp, "wrong # args: should be \"", 
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
             Tcl_GetString(objv[0]), " volIndex width height\"", (char*)NULL);
         return TCL_ERROR;
@@ -910 +910 @@
     tf = NanoVis::vol_renderer->get_volume_shading(volPtr);
     if (tf == NULL) {
-        Tcl_AppendResult(interp, "no transfer function defined for volume \"", 
+        Tcl_AppendResult(interp, "no transfer function defined for volume \"",
                          Tcl_GetString(objv[1]), "\"", (char*)NULL);
         return TCL_ERROR;
@@ -942 +942 @@
 {
     if (objc != 3) {
-        Tcl_AppendResult(interp, "wrong # args: should be \"", 
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
                          Tcl_GetString(objv[0]), " width height\"", (char*)NULL);
         return TCL_ERROR;
@@ -967 +967 @@
  */
 static int
-TransfuncCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
+TransfuncCmd(ClientData cdata, Tcl_Interp *interp, int objc,
              Tcl_Obj *const *objv)
 {
     if (objc < 2) {
-        Tcl_AppendResult(interp, "wrong # args: should be \"", 
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
                 Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
         return TCL_ERROR;
@@ -980 +980 @@
     if ((c == 'd') && (strcmp(string, "define") == 0)) {
         if (objc != 5) {
-            Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                Tcl_GetString(objv[0]), " define name colorMap alphaMap\"", 
+            Tcl_AppendResult(interp, "wrong # args: should be \"",
+                Tcl_GetString(objv[0]), " define name colorMap alphaMap\"",
                 (char*)NULL);
             return TCL_ERROR;
@@ -1018 +1018 @@
                 }
                 if ((q[j] < 0.0) || (q[j] > 1.0)) {
-                    Tcl_AppendResult(interp, "bad colormap value \"", 
-                        Tcl_GetString(cmapv[i+j]), 
+                    Tcl_AppendResult(interp, "bad colormap value \"",
+                        Tcl_GetString(cmapv[i+j]),
                         "\": should be in the range 0-1", (char*)NULL);
                     return TCL_ERROR;
@@ -1037 +1037 @@
                 }
                 if ((q[j] < 0.0) || (q[j] > 1.0)) {
-                    Tcl_AppendResult(interp, "bad alphamap value \"", 
+                    Tcl_AppendResult(interp, "bad alphamap value \"",
                         Tcl_GetString(wmapv[i+j]),
                         "\": should be in the range 0-1", (char*)NULL);
@@ -1078 +1078 @@
 {
     if (objc != 2) {
-        Tcl_AppendResult(interp, "wrong # args: should be \"", 
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
                          Tcl_GetString(objv[0]), " x|y|z|-x|-y|-z\"", (char*)NULL);
         return TCL_ERROR;
@@ -1094 +1094 @@
 
 static int
-VolumeAnimationCaptureOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeAnimationCaptureOp(ClientData cdata, Tcl_Interp *interp, int objc,
                          Tcl_Obj *const *objv)
 {
@@ -1102 +1102 @@
     }
     VolumeInterpolator* interpolator;
-    interpolator = NanoVis::vol_renderer->getVolumeInterpolator(); 
+    interpolator = NanoVis::vol_renderer->getVolumeInterpolator();
     interpolator->start();
     if (interpolator->is_started()) {
@@ -1108 +1108 @@
         for (int frame_num = 0; frame_num < total; ++frame_num) {
             float fraction;
-            
+
             fraction = ((float)frame_num) / (total - 1);
             Trace("fraction : %f\n", fraction);
             //interpolator->update(((float)frame_num) / (total - 1));
             interpolator->update(fraction);
-            
+
             NanoVis::offscreen_buffer_capture();  //enable offscreen render
-            
+
             NanoVis::display();
             NanoVis::read_screen();
-            
+
             glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-            
+
             NanoVis::bmp_write_to_file(frame_num, fileName);
         }
@@ -1128 +1128 @@
 
 static int
-VolumeAnimationClearOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeAnimationClearOp(ClientData cdata, Tcl_Interp *interp, int objc,
                        Tcl_Obj *const *objv)
 {
@@ -1136 +1136 @@
 
 static int
-VolumeAnimationStartOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeAnimationStartOp(ClientData cdata, Tcl_Interp *interp, int objc,
                        Tcl_Obj *const *objv)
 {
@@ -1144 +1144 @@
 
 static int
-VolumeAnimationStopOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeAnimationStopOp(ClientData cdata, Tcl_Interp *interp, int objc,
                       Tcl_Obj *const *objv)
 {
@@ -1152 +1152 @@
 
 static int
-VolumeAnimationVolumesOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeAnimationVolumesOp(ClientData cdata, Tcl_Interp *interp, int objc,
                          Tcl_Obj *const *objv)
 {
@@ -1179 +1179 @@
 
 static int
-VolumeAnimationOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeAnimationOp(ClientData cdata, Tcl_Interp *interp, int objc,
                   Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nVolumeAnimationOps, volumeAnimationOps, 
+    proc = Rappture::GetOpFromObj(interp, nVolumeAnimationOps, volumeAnimationOps,
                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
@@ -1194 +1194 @@
 
 static int
-VolumeDataFollowsOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeDataFollowsOp(ClientData cdata, Tcl_Interp *interp, int objc,
                     Tcl_Obj *const *objv)
 {
     printf("Data Loading\n");
     fflush(stdout);
-    
+
     int nbytes;
     if (Tcl_GetIntFromObj(interp, objv[3], &nbytes) != TCL_OK) {
         return TCL_ERROR;
     }
-    
+
     Rappture::Buffer buf;
     if (GetDataStream(interp, buf, nbytes) != TCL_OK) {
@@ -1213 +1213 @@
     memcpy(header, buf.bytes(), sizeof(char) * 5);
     header[5] = '\0';
-    
+
 #if _LOCAL_ZINC_TEST_
     //FILE* fp = fopen("/home/nanohub/vrinside/nv/data/HOON/QDWL_100_100_50_strain_8000i.nd_zatom_12_1", "rb");
     FILE* fp;
-    
+
     fp = fopen("/home/nanohub/vrinside/nv/data/HOON/GaAs_AlGaAs_2QD_B4.nd_zc_1_wf", "rb");
     if (fp == NULL) {
@@ -1232 +1232 @@
     if (strcmp(header, "<HDR>") == 0) {
         Volume* vol = NULL;
-        
+
         printf("ZincBlende stream is in\n");
         fflush(stdout);
@@ -1238 +1238 @@
         //fdata.write(buf.bytes(),buf.size());
         //vol = NvZincBlendeReconstructor::getInstance()->loadFromStream(fdata);
-        
+
 #if _LOCAL_ZINC_TEST_
         vol = NvZincBlendeReconstructor::getInstance()->loadFromMemory(b);
@@ -1318 +1318 @@
         NanoVis::volume[n]->disable_cutplane(1);
         NanoVis::volume[n]->disable_cutplane(2);
-        
+
         NanoVis::vol_renderer->add_volume(NanoVis::volume[n],
                                           NanoVis::get_transfunc("default"));
     }
-    
+
     {
         Volume *volPtr;
         char info[1024];
-        
+
         if (Volume::update_pending) {
             NanoVis::SetVolumeRanges();
         }
         volPtr = NanoVis::volume[n];
-        sprintf(info, "nv>data id %d min %g max %g vmin %g vmax %g\n", 
+        sprintf(info, "nv>data id %d min %g max %g vmin %g vmax %g\n",
                 n, volPtr->wAxis.Min(), volPtr->wAxis.Max(),
                 Volume::valueMin, Volume::valueMax);
@@ -1340 +1340 @@
 
 static int
-VolumeDataStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeDataStateOp(ClientData cdata, Tcl_Interp *interp, int objc,
                   Tcl_Obj *const *objv)
 {
@@ -1372 +1372 @@
 
 static int
-VolumeDataOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeDataOp(ClientData cdata, Tcl_Interp *interp, int objc,
              Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nVolumeDataOps, volumeDataOps, 
+    proc = Rappture::GetOpFromObj(interp, nVolumeDataOps, volumeDataOps,
                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
@@ -1386 +1386 @@
 
 static int
-VolumeOutlineColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeOutlineColorOp(ClientData cdata, Tcl_Interp *interp, int objc,
                      Tcl_Obj *const *objv)
 {
@@ -1405 +1405 @@
 
 static int
-VolumeOutlineStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeOutlineStateOp(ClientData cdata, Tcl_Interp *interp, int objc,
                      Tcl_Obj *const *objv)
 {
@@ -1439 +1439 @@
 
 static int
-VolumeOutlineOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeOutlineOp(ClientData cdata, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nVolumeOutlineOps, volumeOutlineOps, 
-        Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    proc = Rappture::GetOpFromObj(interp, nVolumeOutlineOps, volumeOutlineOps,
+        Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1453 +1453 @@
 
 static int
-VolumeShadingDiffuseOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeShadingDiffuseOp(ClientData cdata, Tcl_Interp *interp, int objc,
                        Tcl_Obj *const *objv)
 {
@@ -1473 +1473 @@
 
 static int
-VolumeShadingIsosurfaceOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeShadingIsosurfaceOp(ClientData cdata, Tcl_Interp *interp, int objc,
                           Tcl_Obj *const *objv)
 {
@@ -1492 +1492 @@
 
 static int
-VolumeShadingOpacityOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeShadingOpacityOp(ClientData cdata, Tcl_Interp *interp, int objc,
                        Tcl_Obj *const *objv)
 {
@@ -1513 +1513 @@
 
 static int
-VolumeShadingSpecularOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeShadingSpecularOp(ClientData cdata, Tcl_Interp *interp, int objc,
                         Tcl_Obj *const *objv)
 {
@@ -1532 +1532 @@
 
 static int
-VolumeShadingTransFuncOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeShadingTransFuncOp(ClientData cdata, Tcl_Interp *interp, int objc,
                          Tcl_Obj *const *objv)
 {
@@ -1571 +1571 @@
 
 static int
-VolumeShadingOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeShadingOp(ClientData cdata, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps, 
+    proc = Rappture::GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps,
         Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
@@ -1585 +1585 @@
 
 static int
-VolumeAxisOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeAxisOp(ClientData cdata, Tcl_Interp *interp, int objc,
              Tcl_Obj *const *objv)
 {
@@ -1607 +1607 @@
         }
     } else {
-        Tcl_AppendResult(interp, "bad option \"", string, 
+        Tcl_AppendResult(interp, "bad option \"", string,
                          "\": should be label", (char*)NULL);
         return TCL_ERROR;
@@ -1615 +1615 @@
 
 static int
-VolumeStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeStateOp(ClientData cdata, Tcl_Interp *interp, int objc,
               Tcl_Obj *const *objv)
 {
@@ -1641 +1641 @@
 
 static int
-VolumeTestOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+VolumeTestOp(ClientData cdata, Tcl_Interp *interp, int objc,
              Tcl_Obj *const *objv)
 {
@@ -1681 +1681 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nVolumeOps, volumeOps, 
+    proc = Rappture::GetOpFromObj(interp, nVolumeOps, volumeOps,
         Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
@@ -1703 +1703 @@
     if ((c == 'v') && (strcmp(string, "vectorid") == 0)) {
         if (objc != 3) {
-            Tcl_AppendResult(interp, "wrong # args: should be \"", 
+            Tcl_AppendResult(interp, "wrong # args: should be \"",
                 Tcl_GetString(objv[0]), " vectorid volume", (char *)NULL);
             return TCL_ERROR;
         }
         Volume *volPtr;
-        if (GetVolumeFromObj(interp, objv[2], &volPtr) != TCL_OK) { 
+        if (GetVolumeFromObj(interp, objv[2], &volPtr) != TCL_OK) {
             return TCL_ERROR;
         }
         if (NanoVis::particleRenderer != NULL) {
-            NanoVis::particleRenderer->setVectorField(volPtr->id, 1.0f, 
+            NanoVis::particleRenderer->setVectorField(volPtr->id, 1.0f,
                 volPtr->height / (float)volPtr->width,
                 volPtr->depth  / (float)volPtr->width,
@@ -1739 +1739 @@
     } else if ((c == 'p') && (strcmp(string, "particle") == 0)) {
         if (objc < 3) {
-            Tcl_AppendResult(interp, "wrong # args: should be \"", 
+            Tcl_AppendResult(interp, "wrong # args: should be \"",
                 Tcl_GetString(objv[0]), " particle visible|slice|slicepos arg \"",
                 (char*)NULL);
@@ -1748 +1748 @@
         if ((c == 'v') && (strcmp(string, "visible") == 0)) {
             if (objc != 4) {
-                Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                                 Tcl_GetString(objv[0]), " particle visible on|off\"", 
+                Tcl_AppendResult(interp, "wrong # args: should be \"",
+                                 Tcl_GetString(objv[0]), " particle visible on|off\"",
                                  (char*)NULL);
                 return TCL_ERROR;
@@ -1760 +1760 @@
         } else if ((c == 's') && (strcmp(string, "slice") == 0)) {
             if (objc != 4) {
-                Tcl_AppendResult(interp, "wrong # args: should be \"", 
+                Tcl_AppendResult(interp, "wrong # args: should be \"",
                                  Tcl_GetString(objv[0]),
                                  " particle slice volume\"", (char*)NULL);
@@ -1772 +1772 @@
         } else if ((c == 's') && (strcmp(string, "slicepos") == 0)) {
             if (objc != 4) {
-                Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                                 Tcl_GetString(objv[0]), " particle slicepos value\"", 
+                Tcl_AppendResult(interp, "wrong # args: should be \"",
+                                 Tcl_GetString(objv[0]), " particle slicepos value\"",
                                  (char*)NULL);
                 return TCL_ERROR;
@@ -1799 +1799 @@
         } else {
             Tcl_AppendResult(interp, "unknown option \"", string,
-                "\": should be \"", Tcl_GetString(objv[0]), 
+                "\": should be \"", Tcl_GetString(objv[0]),
                 " visible, slice, or slicepos\"", (char *)NULL);
             return TCL_ERROR;
@@ -1807 +1807 @@
     } else if ((c == 'c') && (strcmp(string, "capture") == 0)) {
         if (objc > 4 || objc < 3) {
-            Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                             Tcl_GetString(objv[0]), " capture numframes [directory]\"", 
+            Tcl_AppendResult(interp, "wrong # args: should be \"",
+                             Tcl_GetString(objv[0]), " capture numframes [directory]\"",
                              (char*)NULL);
             return TCL_ERROR;
@@ -1828 +1828 @@
         const char *fileName;
         fileName = (objc < 4) ? NULL : Tcl_GetString(objv[3]);
-        for (int frame_count = 0; frame_count < total_frame_count; 
+        for (int frame_count = 0; frame_count < total_frame_count;
              frame_count++) {
-            
+
             // Generate the latest frame and send it back to the client
-            if (NanoVis::licRenderer && 
+            if (NanoVis::licRenderer &&
                 NanoVis::licRenderer->isActivated()) {
-                NanoVis::licRenderer->convolve();               
-            }
-            if (NanoVis::particleRenderer && 
+                NanoVis::licRenderer->convolve();
+            }
+            if (NanoVis::particleRenderer &&
                 NanoVis::particleRenderer->isActivated()) {
                 NanoVis::particleRenderer->advect();
@@ -1842 +1842 @@
             NanoVis::offscreen_buffer_capture();  //enable offscreen render
             NanoVis::display();
-            
+
             //          printf("Read Screen for Writing to file...\n");
-            
+
             NanoVis::read_screen();
             glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
@@ -1851 +1851 @@
         }
         Trace("FLOW end\n");
-        // put your code... 
+        // put your code...
         if (NanoVis::licRenderer) {
             NanoVis::licRenderer->deactivate();
@@ -1861 +1861 @@
     } else if ((c == 'd') && (strcmp(string, "data") == 0)) {
         if (objc < 3) {
-            Tcl_AppendResult(interp, "wrong # args: should be \"", 
+            Tcl_AppendResult(interp, "wrong # args: should be \"",
                 Tcl_GetString(objv[0]), " data follows ?args?", (char *)NULL);
             return TCL_ERROR;
@@ -1869 +1869 @@
         if ((c == 'f') && (strcmp(string,"follows") == 0)) {
             if (objc != 4) {
-                Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                    Tcl_GetString(objv[0]), " data follows length", 
+                Tcl_AppendResult(interp, "wrong # args: should be \"",
+                    Tcl_GetString(objv[0]), " data follows length",
                     (char *)NULL);
                 return TCL_ERROR;
@@ -1902 +1902 @@
                 volPtr->disable_cutplane(2);
 
-                NanoVis::vol_renderer->add_volume(volPtr, 
+                NanoVis::vol_renderer->add_volume(volPtr,
                         NanoVis::get_transfunc("default"));
             }
@@ -1914 +1914 @@
 
 static int
-HeightMapDataFollowsOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapDataFollowsOp(ClientData cdata, Tcl_Interp *interp, int objc,
                        Tcl_Obj *const *objv)
 {
     Rappture::Buffer buf;
     int nBytes;
-    
+
     if (Tcl_GetIntFromObj(interp, objv[3], &nBytes) != TCL_OK) {
         return TCL_ERROR;
@@ -1937 +1937 @@
 
 static int
-HeightMapDataVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapDataVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc,
                        Tcl_Obj *const *objv)
 {
@@ -1961 +1961 @@
 static int nHeightMapDataOps = NumCmdSpecs(heightMapDataOps);
 
-static int 
-HeightMapDataOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+static int
+HeightMapDataOp(ClientData cdata, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nHeightMapDataOps, heightMapDataOps, 
+    proc = Rappture::GetOpFromObj(interp, nHeightMapDataOps, heightMapDataOps,
                                   Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
@@ -1977 +1977 @@
 
 static int
-HeightMapLineContourColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapLineContourColorOp(ClientData cdata, Tcl_Interp *interp, int objc,
                             Tcl_Obj *const *objv)
 {
@@ -1983 +1983 @@
     if (GetColor(interp, objc - 3, objv + 3, rgb) != TCL_OK) {
         return TCL_ERROR;
-    }           
+    }
     vector<HeightMap *> imap;
     if (GetHeightMaps(interp, objc - 6, objv + 6, &imap) != TCL_OK) {
@@ -1996 +1996 @@
 
 static int
-HeightMapLineContourVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapLineContourVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc,
                               Tcl_Obj *const *objv)
 {
@@ -2021 +2021 @@
 
 static int 
-HeightMapLineContourOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapLineContourOp(ClientData cdata, Tcl_Interp *interp, int objc,
                        Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nHeightMapLineContourOps, 
+    proc = Rappture::GetOpFromObj(interp, nHeightMapLineContourOps,
         heightMapLineContourOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
@@ -2035 +2035 @@
 
 static int
-HeightMapCullOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapCullOp(ClientData cdata, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
 {
@@ -2047 +2047 @@
 
 static int
-HeightMapCreateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapCreateOp(ClientData cdata, Tcl_Interp *interp, int objc,
                   Tcl_Obj *const *objv)
 {
     HeightMap *hmPtr;
-    
+
     /* heightmap create xmin ymin xmax ymax xnum ynum values */
     hmPtr = CreateHeightMap(cdata, interp, objc - 2, objv + 2);
@@ -2063 +2063 @@
 
 static int
-HeightMapLegendOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapLegendOp(ClientData cdata, Tcl_Interp *interp, int objc,
                   Tcl_Obj *const *objv)
 {
@@ -2073 +2073 @@
     tf = hmPtr->getColorMap();
     if (tf == NULL) {
-        Tcl_AppendResult(interp, "no transfer function defined for heightmap \"", 
+        Tcl_AppendResult(interp, "no transfer function defined for heightmap \"",
                          Tcl_GetString(objv[2]), "\"", (char*)NULL);
         return TCL_ERROR;
     }
     int w, h;
-    if ((Tcl_GetIntFromObj(interp, objv[3], &w) != TCL_OK) || 
+    if ((Tcl_GetIntFromObj(interp, objv[3], &w) != TCL_OK) ||
         (Tcl_GetIntFromObj(interp, objv[4], &h) != TCL_OK)) {
         return TCL_ERROR;
@@ -2085 +2085 @@
         NanoVis::SetHeightmapRanges();
     }
-    NanoVis::render_legend(tf, HeightMap::valueMin, HeightMap::valueMax, w, h, 
+    NanoVis::render_legend(tf, HeightMap::valueMin, HeightMap::valueMax, w, h,
         "label");
     return TCL_OK;
@@ -2091 +2091 @@
 
 static int
-HeightMapPolygonOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapPolygonOp(ClientData cdata, Tcl_Interp *interp, int objc,
                    Tcl_Obj *const *objv)
 {
@@ -2103 +2103 @@
 
 static int
-HeightMapShadingOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapShadingOp(ClientData cdata, Tcl_Interp *interp, int objc,
                  Tcl_Obj *const *objv)
 {
@@ -2115 +2115 @@
 
 static int
-HeightMapTestOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapTestOp(ClientData cdata, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
 {
@@ -2124 +2124 @@
     double mean = exp(0.0) / (sigma * sqrt(2.0));
     float* data = (float*) malloc(sizeof(float) * size);
-    
+
     float x;
     for (int i = 0; i < size; ++i) {
         x = - 10 + i%20;
-        data[i] = exp(- (x * x)/(2 * sigma * sigma)) / 
+        data[i] = exp(- (x * x)/(2 * sigma * sigma)) /
             (sigma * sqrt(2.0)) / mean * 2 + 1000;
     }
-    
+
     HeightMap* hmPtr = new HeightMap();
     float minx = 0.0f;
@@ -2147 +2147 @@
 
 static int
-HeightMapTransFuncOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+HeightMapTransFuncOp(ClientData cdata, Tcl_Interp *interp, int objc,
                      Tcl_Obj *const *objv)
 {
@@ -2171 +2171 @@
 
 static Rappture::CmdSpec heightMapOps[] = {
-    {"create",       2, HeightMapCreateOp,      9, 9, 
+    {"create",       2, HeightMapCreateOp,      9, 9,
      "xmin ymin xmax ymax xnum ynum values",},
     {"cull",         2, HeightMapCullOp,        3, 3, "mode",},
@@ -2184 +2184 @@
 static int nHeightMapOps = NumCmdSpecs(heightMapOps);
 
-static int 
+static int
 HeightMapCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
-{ 
+{
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nHeightMapOps, heightMapOps, 
+    proc = Rappture::GetOpFromObj(interp, nHeightMapOps, heightMapOps,
                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
@@ -2198 +2198 @@
 
 static int
-GridAxisColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+GridAxisColorOp(ClientData cdata, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
 {
@@ -2210 +2210 @@
     if ((objc == 6) && (GetFloatFromObj(interp, objv[5], &a) != TCL_OK)) {
         return TCL_ERROR;
-    }           
+    }
     if (NanoVis::grid) {
         NanoVis::grid->setAxisColor(r, g, b, a);
@@ -2228 +2228 @@
         Axis *axisPtr;
 
-        axisPtr = NULL;         /* Suppress compiler warning. */
+        axisPtr = NULL;     /* Suppress compiler warning. */
         switch (axis) {
         case 0: axisPtr = &NanoVis::grid->xAxis; break;
@@ -2241 +2241 @@
 
 static int
-GridLineColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+GridLineColorOp(ClientData cdata, Tcl_Interp *interp, int objc,
                 Tcl_Obj *const *objv)
 {
@@ -2253 +2253 @@
     if ((objc == 6) && (GetFloatFromObj(interp, objv[5], &a) != TCL_OK)) {
         return TCL_ERROR;
-    }           
+    }
     if (NanoVis::grid) {
         NanoVis::grid->setLineColor(r, g, b, a);
@@ -2279 +2279 @@
 static int nGridOps = NumCmdSpecs(gridOps);
 
-static int 
+static int
 GridCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
-{ 
+{
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nGridOps, gridOps, 
-        Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    proc = Rappture::GetOpFromObj(interp, nGridOps, gridOps,
+        Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2292 +2292 @@
 }
 
-static int 
+static int
 AxisCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     if (objc < 2) {
-        Tcl_AppendResult(interp, "wrong # args: should be \"", 
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
                 Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
         return TCL_ERROR;
@@ -2325 +2325 @@
     if (objc != 4) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-            Tcl_GetString(objv[0]), " plane_index w h \"", (char*)NULL);
+            Tcl_GetString(objv[0]), " plane_index w h \"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -2337 +2337 @@
         return TCL_ERROR;
     }
-    
+
     //Now read w*h*4 bytes. The server expects the plane to be a stream of
     //floats
@@ -2357 +2357 @@
 
 
-static int 
-PlaneLinkOp(ClientData cdata, Tcl_Interp *interp, int objc, 
+static int
+PlaneLinkOp(ClientData cdata, Tcl_Interp *interp, int objc,
             Tcl_Obj *const *objv)
 {
     fprintf(stderr, "link the plane to the 2D renderer command\n");
-    
+
     int plane_index, tf_index;
-    
+
+    if (objc != 3) {
+        Tcl_AppendResult(interp, "wrong # args: should be \"",
+            Tcl_GetString(objv[0]), " plane_index tf_index \"", (char*)NULL);
+        return TCL_ERROR;
+    }
+    if (Tcl_GetIntFromObj(interp, objv[1], &plane_index) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (Tcl_GetIntFromObj(interp, objv[2], &tf_index) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    //plane_render->add_plane(plane[plane_index], tf[tf_index]);
+    return TCL_OK;
+}
+
+//Enable a 2D plane for render
+//The plane_index is the index mantained in the 2D plane renderer
+static int
+PlaneEnableOp(ClientData cdata, Tcl_Interp *interp, int objc,
+              Tcl_Obj *const *objv)
+{
+    fprintf(stderr,"enable a plane so the 2D renderer can render it command\n");
+
     if (objc != 3) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-            Tcl_GetString(objv[0]), " plane_index tf_index \"", (char*)NULL);
-        return TCL_ERROR;
-    }
-    if (Tcl_GetIntFromObj(interp, objv[1], &plane_index) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (Tcl_GetIntFromObj(interp, objv[2], &tf_index) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    //plane_render->add_plane(plane[plane_index], tf[tf_index]);
-    return TCL_OK;
-}
-
-//Enable a 2D plane for render
-//The plane_index is the index mantained in the 2D plane renderer
-static int 
-PlaneEnableOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-              Tcl_Obj *const *objv)
-{
-    fprintf(stderr,"enable a plane so the 2D renderer can render it command\n");
-    
-    if (objc != 3) {
-        Tcl_AppendResult(interp, "wrong # args: should be \"", 
-            Tcl_GetString(objv[0]), " plane_index mode \"", (char*)NULL);
+            Tcl_GetString(objv[0]), " plane_index mode \"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -2420 +2420 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nPlaneOps, planeOps, 
+    proc = Rappture::GetOpFromObj(interp, nPlaneOps, planeOps,
                                   Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
@@ -2439 +2439 @@
  * Ideally, the "unirect2d" proc would do a rundimentary parsing of the data
  * to verify the structure and then pass it to the appropiate Tcl command
- * (heightmap, volume, etc). Our C command always creates a heightmap.  
+ * (heightmap, volume, etc). Our C command always creates a heightmap.
  */
 static int
-UniRect2dCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+UniRect2dCmd(ClientData clientData, Tcl_Interp *interp, int objc,
              Tcl_Obj *const *objv)
-{    
+{
     int xNum, yNum, zNum;
     float xMin, yMin, xMax, yMax;
@@ -2450 +2450 @@
 
     if ((objc & 0x01) == 0) {
-        Tcl_AppendResult(interp, Tcl_GetString(objv[0]), ": ", 
-                "wrong number of arguments: should be key-value pairs", 
+        Tcl_AppendResult(interp, Tcl_GetString(objv[0]), ": ",
+                "wrong number of arguments: should be key-value pairs",
                 (char *)NULL);
         return TCL_ERROR;
@@ -2511 +2511 @@
             }
         } else {
-            Tcl_AppendResult(interp, "unknown key \"", string, 
+            Tcl_AppendResult(interp, "unknown key \"", string,
                 "\": should be xmin, xmax, xnum, ymin, ymax, ynum, or zvalues",
                 (char *)NULL);
@@ -2581 +2581 @@
 xinetd_listen()
 {
-    int flags = fcntl(0, F_GETFL, 0); 
+    int flags = fcntl(0, F_GETFL, 0);
     fcntl(0, F_SETFL, flags & ~O_NONBLOCK);
 
@@ -2633 +2633 @@
 
     if (status != TCL_OK) {
-        const char *string;
-        int nBytes;
-        string = Tcl_GetStringFromObj(Tcl_GetObjResult(_interp), &nBytes);
-
-        struct iovec iov[3];
-        iov[0].iov_base = "NanoVis Server Error: ";
-        iov[0].iov_len = strlen(iov[0].iov_base);
-        iov[1].iov_base = string;
-        iov[1].iov_len = nBytes;
-        iov[2].iov_base = '\n';
-        iov[2].iov_len = 1;
-        writev(0, iov, 3);
+        const char *string;
+        int nBytes;
+        string = Tcl_GetStringFromObj(Tcl_GetObjResult(_interp), &nBytes);
+
+        struct iovec iov[3];
+        iov[0].iov_base = "NanoVis Server Error: ";
+        iov[0].iov_len = strlen(iov[0].iov_base);
+        iov[1].iov_base = string;
+        iov[1].iov_len = nBytes;
+        iov[2].iov_base = '\n';
+        iov[2].iov_len = 1;
+        writev(0, iov, 3);
         return;
     }
@@ -2669 +2669 @@
 
     NanoVis::display();
-    
+
     // INSOO
 #ifdef XINETD
     NanoVis::read_screen();
-    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); 
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
 #else
     NanoVis::display_offscreen_buffer(); //display the final rendering on screen
     NanoVis::read_screen();
-    glutSwapBuffers(); 
-#endif   
+    glutSwapBuffers();
+#endif
 
 #if DO_RLE
     do_rle();
-    int sizes[2] = {  offsets_size*sizeof(offsets[0]), rle_size }; 
+    int sizes[2] = {  offsets_size*sizeof(offsets[0]), rle_size };
     fprintf(stderr, "Writing %d,%d\n", sizes[0], sizes[1]); fflush(stderr);
     write(0, &sizes, sizeof(sizes));

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -70 +70 @@
 #include <R2/R2Fonts.h>
 
-#define SIZEOF_BMP_HEADER       54
+#define SIZEOF_BMP_HEADER   54
 
 extern void NvInitCG(); // in Shader.cpp
@@ -120 +120 @@
 
 // color table for built-in transfer function editor
-float color_table[256][4];      
+float color_table[256][4];
 
 /*
@@ -139 +139 @@
 // in Command.cpp
 extern void xinetd_listen();
-extern void initTcl(); 
+extern void initTcl();
 
 //ParticleSystem* psys;
@@ -167 +167 @@
 
 // Object rotation angles
-static float live_rot_x = 90.;          
+static float live_rot_x = 90.;
 static float live_rot_y = 180.;
 static float live_rot_z = -135;
 
 // Object translation location from the origin
-static float live_obj_x = -0.0; 
+static float live_obj_x = -0.0;
 static float live_obj_y = -0.0;
 static float live_obj_z = -2.5;
@@ -183 +183 @@
 static int right_last_x;
 static int right_last_y;
-static bool left_down = false;                                          
+static bool left_down = false;
 static bool right_down = false;
 #endif /*XINETD*/
@@ -190 +190 @@
 // FLOW
 float NanoVis::lic_slice_x = 1.0f;
-float NanoVis::lic_slice_y = 0.0f; 
-float NanoVis::lic_slice_z = 0.5f; 
-int NanoVis::lic_axis = 2; 
+float NanoVis::lic_slice_y = 0.0f;
+float NanoVis::lic_slice_z = 0.5f;
+int NanoVis::lic_axis = 2;
 
 /*
@@ -258 +258 @@
 
 //report errors related to CG shaders
-void 
+void
 cgErrorCallback(void)
 {
@@ -277 +277 @@
 /* Load a 3D volume
  * index: the index into the volume array, which stores pointers to 3D volume instances
- * data: pointer to an array of floats.  
- * n_component: the number of scalars for each space point. 
- *              All component scalars for a point are placed consequtively in data array 
+ * data: pointer to an array of floats.
+ * n_component: the number of scalars for each space point.
+ *              All component scalars for a point are placed consequtively in data array
  * width, height and depth: number of points in each dimension
  */
 Volume *
-NanoVis::load_volume(int index, int width, int height, int depth, 
-                     int n_component, float* data, double vmin, 
+NanoVis::load_volume(int index, int width, int height, int depth,
+                     int n_component, float* data, double vmin,
                      double vmax, double nzero_min)
 {
@@ -297 +297 @@
 
         if (vol->pointsetIndex != -1) {
-            if (((unsigned  int) vol->pointsetIndex) < pointSet.size() && 
-                pointSet[vol->pointsetIndex] != NULL) {
+            if (((unsigned  int) vol->pointsetIndex) < pointSet.size() &&
+        pointSet[vol->pointsetIndex] != NULL) {
                 delete pointSet[vol->pointsetIndex];
                 pointSet[vol->pointsetIndex] = 0;
@@ -306 +306 @@
     }
     volume[index] = new Volume(0.f, 0.f, 0.f, width, height, depth, 1.,
-        n_component, data, vmin, vmax, nzero_min);
+        n_component, data, vmin, vmax, nzero_min);
     return volume[index];
 }
@@ -315 +315 @@
 {
     Tcl_HashEntry *hPtr;
-    
+
     hPtr = Tcl_FindHashEntry(&tftable, name);
     if (hPtr == NULL) {
@@ -325 +325 @@
 // Creates of updates a colormap 1D texture by name.
 TransferFunction*
-NanoVis::DefineTransferFunction(const char *name, size_t n, float *data) 
+NanoVis::DefineTransferFunction(const char *name, size_t n, float *data)
 {
     int isNew;
@@ -333 +333 @@
     hPtr = Tcl_CreateHashEntry(&tftable, name, &isNew);
     if (isNew) {
-        tf = new TransferFunction(n, data);
-        Tcl_SetHashValue(hPtr, (ClientData)tf);
+        tf = new TransferFunction(n, data);
+        Tcl_SetHashValue(hPtr, (ClientData)tf);
     } else {
-        /* 
-         * You can't delete the transfer function because many 
-         * objects may be holding its pointer.  We must update it.
-         */
-        tf = (TransferFunction *)Tcl_GetHashValue(hPtr);
-        tf->update(n, data);
+        /* 
+         * You can't delete the transfer function because many 
+         * objects may be holding its pointer.  We must update it.
+         */
+        tf = (TransferFunction *)Tcl_GetHashValue(hPtr);
+        tf->update(n, data);
     }
     return tf;
@@ -358 +358 @@
 {
     glutSetWindow(render_window);
-    
+
     //fprintf(stderr, "tf update\n");
     TransferFunction *tf = NanoVis::get_transfunc("default");
@@ -364 +364 @@
         return;
     }
-    
+
     float data[256*4];
     for(int i=0; i<256; i++) {
@@ -373 +373 @@
         //fprintf(stderr, "(%f,%f,%f,%f) ", data[4*i+0], data[4*i+1], data[4*i+2], data[4*i+3]);
     }
-    
+
     tf->update(data);
-    
+
 #ifdef EVENTLOG
     float param[3] = {0,0,0};
@@ -384 +384 @@
 }
 
-int 
+int
 NanoVis::render_legend(
-    TransferFunction *tf, 
-    double min, double max, 
-    int width, int height, 
+    TransferFunction *tf,
+    double min, double max,
+    int width, int height,
     const char* volArg)
 {
@@ -426 +426 @@
 
 //initialize frame buffer objects for offscreen rendering
-void 
+void
 NanoVis::init_offscreen_buffer()
 {
@@ -433 +433 @@
     glGenTextures(1, &final_color_tex);
     glGenRenderbuffersEXT(1, &final_depth_rb);
-    
+
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo);
-    
+
     //initialize final color texture
     glBindTexture(GL_TEXTURE_2D, final_color_tex);
@@ -450 +450 @@
                               GL_COLOR_ATTACHMENT0_EXT,
                               GL_TEXTURE_2D, final_color_tex, 0);
-    
+
     // initialize final depth renderbuffer
     glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, final_depth_rb);
@@ -458 +458 @@
                                  GL_DEPTH_ATTACHMENT_EXT,
                                  GL_RENDERBUFFER_EXT, final_depth_rb);
-    
+
     // Check framebuffer completeness at the end of initialization.
     CHECK_FRAMEBUFFER_STATUS();
@@ -472 +472 @@
     win_width = w;
     win_height = h;
-    
+
     if (fonts) {
         fonts->resize(w, h);
     }
-    
+
     //fprintf(stderr, "screen_buffer size: %d\n", sizeof(screen_buffer));
     printf("screen_buffer size: %d %d\n", w, h);
-    
+
     if (screen_buffer) {
         delete[] screen_buffer;
         screen_buffer = NULL;
     }
-    
+
     screen_buffer = new unsigned char[4*win_width*win_height];
     assert(screen_buffer != NULL);
-    
+
     //delete the current render buffer resources
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo);
     glDeleteTextures(1, &final_color_tex);
     glDeleteFramebuffersEXT(1, &final_fbo);
-    
+
     glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, final_depth_rb);
     glDeleteRenderbuffersEXT(1, &final_depth_rb);
-    
+
     //change the camera setting
     cam->set_screen_size(0, 0, win_width, win_height);
     plane_render->set_screen_size(win_width, win_height);
-    
+
     //Reinitialize final fbo for final display
     glGenFramebuffersEXT(1, &final_fbo);
@@ -506 +506 @@
 
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo);
-    
+
     //initialize final color texture
     glBindTexture(GL_TEXTURE_2D, final_color_tex);
@@ -521 +521 @@
                               GL_COLOR_ATTACHMENT0_EXT,
                               GL_TEXTURE_2D, final_color_tex, 0);
-        
+
     // initialize final depth renderbuffer
     glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, final_depth_rb);
@@ -536 +536 @@
 
 /*
- * FIXME: This routine is fairly expensive (60000 floating pt divides).  
- *        I've put an ifdef around the call to it so that the released
- *        builds don't include it.  Define PROTOTYPE to 1 in config.h 
- *        to turn it back on.
+ * FIXME: This routine is fairly expensive (60000 floating pt divides).
+ *      I've put an ifdef around the call to it so that the released
+ *      builds don't include it.  Define PROTOTYPE to 1 in config.h
+ *      to turn it back on.
  */
 void 
@@ -547 +547 @@
     int h = 200;
     float* data = new float[w*h];
-    
+
     //procedurally make a gradient plane
     for(int j=0; j<h; j++){
@@ -566 +566 @@
     int index;
     //bool particle;
-    for (int i=0; i<particleRenderer->psys_width; i++) { 
-        for (int j=0; j<particleRenderer->psys_height; j++) { 
+    for (int i=0; i<particleRenderer->psys_width; i++) {
+        for (int j=0; j<particleRenderer->psys_height; j++) {
             index = i + particleRenderer->psys_height*j;
             //particle = rand() % 256 > 150; 
@@ -577 +577 @@
                 data[4*index+1]= j/float(particleRenderer->psys_height);
                 data[4*index+2]= i/float(particleRenderer->psys_width);
-                data[4*index+3]= 30; //shorter life span, quicker iterations    
-                //data[4*index+3]= 1.0f; //shorter life span, quicker iterations        
+                data[4*index+3]= 30; //shorter life span, quicker iterations
+                //data[4*index+3]= 1.0f; //shorter life span, quicker iterations
             }
 /*
@@ -586 +586 @@
                 data[4*index+1]= 0;
                 data[4*index+2]= 0;
-                data[4*index+3]= 0;     
+                data[4*index+3]= 0;
             }
 */
@@ -646 +646 @@
     color_table_renderer = new NvColorTableRenderer();
     color_table_renderer->setFonts(fonts);
-    
+
     particleRenderer = new NvParticleRenderer(NMESH, NMESH, g_context);
 
@@ -661 +661 @@
 
 /*----------------------------------------------------*/
-void 
-NanoVis::initGL(void) 
-{ 
+void
+NanoVis::initGL(void)
+{
    //buffer to store data read from the screen
    if (screen_buffer) {
@@ -673 +673 @@
 
    //create the camera with default setting
-   cam = new NvCamera(0, 0, win_width, win_height, 
+   cam = new NvCamera(0, 0, win_width, win_height,
                    live_obj_x, live_obj_y, live_obj_z,
                    0., 0., 100.,
@@ -694 +694 @@
    glMaterialfv(GL_FRONT, GL_SHININESS, mat_shininess);
    glLightfv(GL_LIGHT0, GL_DIFFUSE, white_light);
-   glLightfv(GL_LIGHT0, GL_SPECULAR, white_light);      
+   glLightfv(GL_LIGHT0, GL_SPECULAR, white_light);
    glLightfv(GL_LIGHT1, GL_DIFFUSE, green_light);
-   glLightfv(GL_LIGHT1, GL_SPECULAR, white_light);      
+   glLightfv(GL_LIGHT1, GL_SPECULAR, white_light);
 
    // init table of transfer functions
@@ -704 +704 @@
    if(check_query_support()){
      //create queries to count number of rendered pixels
-     perf = new PerfQuery(); 
+     perf = new PerfQuery();
    }
 
@@ -734 +734 @@
 #if PROTOTYPE
    make_test_2D_data();
-#endif  /* PROTOTYPE */
+#endif  /* PROTOTYPE */
    plane_render->add_plane(plane[0], get_transfunc("default"));
 
@@ -741 +741 @@
 #ifdef notdef
    init_particle_system();
-   NanoVis::init_lic(); 
+   NanoVis::init_lic();
 #endif
 }
@@ -758 +758 @@
     rle_size = 0;
     offsets_size = 0;
-    
+
     int i=0;
     while(i<len){
@@ -769 +769 @@
             i = pos;
         }
-        
+
         else {
             int pos;
@@ -778 +778 @@
             i = pos;
         }
-        
+
     }
 }
@@ -870 +870 @@
     char filename[100];
     if (frame_number >= 0) {
-        if (directory_name)
-            sprintf(filename, "%s/image%03d.bmp", directory_name, frame_number);
-        else
-            sprintf(filename, "/tmp/flow_animation/image%03d.bmp", frame_number);
+        if (directory_name)
+            sprintf(filename, "%s/image%03d.bmp", directory_name, frame_number);
+        else
+            sprintf(filename, "/tmp/flow_animation/image%03d.bmp", frame_number);
 
         printf("Writing %s\n", filename);
         f = fopen(filename, "wb");
-        if (f == 0) {
-            Trace("cannot create file\n");
-        }
+        if (f == 0) {
+            Trace("cannot create file\n");
+        }
     } else {
         f = fopen("/tmp/image.bmp", "wb");
-        if (f == 0) {
-            Trace("cannot create file\n");
-        }
+        if (f == 0) {
+            Trace("cannot create file\n");
+        }
     }
     fwrite((void*) header, SIZEOF_BMP_HEADER, 1, f);
@@ -968 +968 @@
  * ppm_write --
  *
- *      Writes the screen image as PPM binary data to the nanovisviewer
- *      client.  The PPM binary format is very simple.  
+ *  Writes the screen image as PPM binary data to the nanovisviewer
+ *  client.  The PPM binary format is very simple.
  *
- *              P6 w h 255\n
- *              3-byte RGB pixel data.
+ *      P6 w h 255\n
+ *      3-byte RGB pixel data.
  *
- *      The nanovisviewer client (using the TkImg library) will do less work
- *      to unpack this format, as opposed to BMP or PNG.  (This doesn't
- *      eliminate the need to look into DXT compression performed on the GPU).
+ *  The nanovisviewer client (using the TkImg library) will do less work
+ *  to unpack this format, as opposed to BMP or PNG.  (This doesn't
+ *  eliminate the need to look into DXT compression performed on the GPU).
  *
  *      Note that currently the image data from the screen is both row-padded
@@ -1017 +1017 @@
     unsigned char *srcRowPtr = screen_buffer;
     for (y = win_height + 1; y >= 2; y--) {
-        iov[y].iov_base = srcRowPtr;
-        iov[y].iov_len = rowLength;
-        srcRowPtr += bytesPerRow;
+        iov[y].iov_base = srcRowPtr;
+        iov[y].iov_len = rowLength;
+        srcRowPtr += bytesPerRow;
     }
     writev(0, iov, nRecs);
@@ -1033 +1033 @@
         for(int j=0; j<NMESH; j++){
             Vector2 v = grid.get(i, j);
-            
+
             int x1 = i*DM;
             int y1 = j*DM;
-            
+
             int x2 = x1 + v.x;
             int y2 = y1 + v.y;
-            
+
             glBegin(GL_LINES);
             glVertex2d(x1, y1);
@@ -1051 +1051 @@
 
 /*----------------------------------------------------*/
-static void 
+static void
 idle()
 {
     glutSetWindow(render_window);
-  
+
 #ifdef notdef
       struct timespec ts;
@@ -1075 +1075 @@
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
     glBindTexture(GL_TEXTURE_2D, final_color_tex);
-    
+
     glViewport(0, 0, win_width, win_height);
     glMatrixMode(GL_PROJECTION);
@@ -1082 +1082 @@
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
-    
+
     glColor3f(1.,1.,1.);                //MUST HAVE THIS LINE!!!
     glBegin(GL_QUADS);
     {
-        glTexCoord2f(0, 0); glVertex2f(0, 0);
-        glTexCoord2f(1, 0); glVertex2f(win_width, 0);
-        glTexCoord2f(1, 1); glVertex2f(win_width, win_height);
-        glTexCoord2f(0, 1); glVertex2f(0, win_height);
+        glTexCoord2f(0, 0); glVertex2f(0, 0);
+        glTexCoord2f(1, 0); glVertex2f(win_width, 0);
+        glTexCoord2f(1, 1); glVertex2f(win_width, win_height);
+        glTexCoord2f(0, 1); glVertex2f(0, win_height);
     }
     glEnd();
@@ -1109 +1109 @@
 void soft_read_verts()
 {
-    glReadPixels(0, 0, psys->psys_width, psys->psys_height, GL_RGB, GL_FLOAT, 
-                 vert);
+    glReadPixels(0, 0, psys->psys_width, psys->psys_height, GL_RGB, GL_FLOAT,
+         vert);
     //fprintf(stderr, "soft_read_vert");
-    
-    //cpu sort the distance  
+
+    //cpu sort the distance
     Particle* p;
     p = (Particle*)malloc(sizeof(Particle)*psys->psys_width*psys->psys_height);
@@ -1120 +1120 @@
         float y = vert[3*i+1];
         float z = vert[3*i+2];
-        
-        float dis = (x-live_obj_x)*(x-live_obj_x) + (y-live_obj_y)*(y-live_obj_y) + (z-live_obj_z)*(z-live_obj_z); 
+
+        float dis = (x-live_obj_x)*(x-live_obj_x) + (y-live_obj_y)*(y-live_obj_y) + (z-live_obj_z)*(z-live_obj_z);
         p[i].x = x;
         p[i].y = y;
@@ -1127 +1127 @@
         p[i].aux = dis;
     }
-    
+
     qsort(p, psys->psys_width * psys->psys_height, sizeof(Particle), particle_distance_sort);
-    
+
     for(int i=0; i<psys->psys_width * psys->psys_height; i++){
         vert[3*i] = p[i].x;
@@ -1135 +1135 @@
         vert[3*i+2] = p[i].z;
     }
-    
+
     free(p);
 }
@@ -1146 +1146 @@
 {
     glPushMatrix();
-    
+
     glEnable(GL_TEXTURE_2D);
     glBindTexture(GL_TEXTURE_RECTANGLE_NV, tex);
-    
+
     glViewport(0, 0, width, height);
     glMatrixMode(GL_PROJECTION);
@@ -1156 +1156 @@
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
-    
+
     cgGLBindProgram(m_passthru_fprog);
     cgGLEnableProfile(CG_PROFILE_FP30);
-    
+
     cgGLSetParameter4f(m_passthru_scale_param, 1.0, 1.0, 1.0, 1.0);
     cgGLSetParameter4f(m_passthru_bias_param, 0.0, 0.0, 0.0, 0.0);
-    
+
     draw_quad(width, height, width, height);
     cgGLDisableProfile(CG_PROFILE_FP30);
-    
+
     glPopMatrix();
-    
+
     //assert(glGetError()==0);
 }
@@ -1175 +1175 @@
 //draw vertices in the main memory
 #ifdef notdef
-void 
+void
 soft_display_verts()
 {
     glDisable(GL_TEXTURE_2D);
     glEnable(GL_BLEND);
-    
+
     glPointSize(0.5);
     glColor4f(0,0.8,0.8,0.6);
     glBegin(GL_POINTS);
     {
-        for(int i=0; i < psys->psys_width * psys->psys_height; i++){
-            glVertex3f(vert[3*i], vert[3*i+1], vert[3*i+2]);
-        }
+        for(int i=0; i < psys->psys_width * psys->psys_height; i++){
+            glVertex3f(vert[3*i], vert[3*i+1], vert[3*i+2]);
+        }
     }
     glEnd();
@@ -1196 +1196 @@
 #if 0
 //oddeven sort on GPU
-void 
+void
 sortstep()
 {
     // perform one step of the current sorting algorithm
-    
+
 #ifdef notdef
     // swap buffers
     int sourceBuffer = targetBuffer;
-    targetBuffer = (targetBuffer+1)%2;   
+    targetBuffer = (targetBuffer+1)%2;
     int pstage = (1<<stage);
     int ppass  = (1<<pass);
     int activeBitonicShader = 0;
-    
+
 #ifdef _WIN32
     buffer->BindBuffer(wglTargets[sourceBuffer]);
@@ -1225 +1225 @@
     // switch on correct sorting shader
     oddevenMergeSort.bind();
-    glUniform3fARB(oddevenMergeSort.getUniformLocation("Param1"), float(pstage+pstage), 
+    glUniform3fARB(oddevenMergeSort.getUniformLocation("Param1"), float(pstage+pstage),
                    float(ppass%pstage), float((pstage+pstage)-(ppass%pstage)-1));
-    glUniform3fARB(oddevenMergeSort.getUniformLocation("Param2"), 
-                   float(psys_width), float(psys_height), float(ppass));
+    glUniform3fARB(oddevenMergeSort.getUniformLocation("Param2"),
+           float(psys_width), float(psys_height), float(ppass));
     glUniform1iARB(oddevenMergeSort.getUniformLocation("Data"), 0);
     staticdebugmsg("sort","stage "<<pstage<<" pass "<<ppass);
-    
+
     // This clear is not necessary for sort to function. But if we are in
     // interactive mode unused parts of the texture that are visible will look
@@ -1237 +1237 @@
 #ifdef notdef
     if (!perfTest) glClear(GL_COLOR_BUFFER_BIT);
-    
+
     buffer->Bind();
     buffer->EnableTextureTarget();
 #endif
-    
+
     // Initiate the sorting step on the GPU a full-screen quad
     glBegin(GL_QUADS);
     {
 #ifdef notdef
-        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,0.0f,0.0f,0.0f,1.0f); 
-        glVertex2f(-1.0f,-1.0f); 
-        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,float(psys_width),0.0f,1.0f,1.0f); 
-        glVertex2f(1.0f,-1.0f);
-        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,float(psys_width),float(psys_height),1.0f,0.0f); 
-        glVertex2f(1.0f,1.0f);        
-        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,0.0f,float(psys_height),0.0f,0.0f); 
-        glVertex2f(-1.0f,1.0f);    
-#endif
-        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,0.0f,0.0f,0.0f,1.0f); 
-        glVertex2f(0.,0.);       
-        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,float(psys_width),0.0f,1.0f,1.0f); 
-        glVertex2f(float(psys_width), 0.);
-        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,float(psys_width),float(psys_height),1.0f,0.0f); 
-        glVertex2f(float(psys_width), float(psys_height));    
-        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,0.0f,float(psys_height),0.0f,0.0f); 
-        glVertex2f(0., float(psys_height));        
+        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,0.0f,0.0f,0.0f,1.0f);
+        glVertex2f(-1.0f,-1.0f);
+        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,float(psys_width),0.0f,1.0f,1.0f);
+        glVertex2f(1.0f,-1.0f);
+        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,float(psys_width),float(psys_height),1.0f,0.0f);
+        glVertex2f(1.0f,1.0f);
+        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,0.0f,float(psys_height),0.0f,0.0f);
+        glVertex2f(-1.0f,1.0f);
+#endif
+        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,0.0f,0.0f,0.0f,1.0f);
+        glVertex2f(0.,0.);
+        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,float(psys_width),0.0f,1.0f,1.0f);
+        glVertex2f(float(psys_width), 0.);
+        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,float(psys_width),float(psys_height),1.0f,0.0f);
+        glVertex2f(float(psys_width), float(psys_height));
+        glMultiTexCoord4fARB(GL_TEXTURE0_ARB,0.0f,float(psys_height),0.0f,0.0f);
+        glVertex2f(0., float(psys_height));
     }
     glEnd();
@@ -1281 +1281 @@
     glDisable(GL_TEXTURE_2D);
     glEnable(GL_DEPTH_TEST);
-    
+
     //draw axes
     GLUquadric *obj;
 
     obj = gluNewQuadric();
-    
+
     glDepthFunc(GL_LESS);
     glEnable(GL_COLOR_MATERIAL);
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_BLEND);
-    
+
     int segments = 50;
-    
+
     glColor3f(0.8, 0.8, 0.8);
     glPushMatrix();
@@ -1301 +1301 @@
     glScalef(0.0005, 0.0005, 0.0005);
     glutStrokeCharacter(GLUT_STROKE_ROMAN, 'x');
-    glPopMatrix();      
-    
+    glPopMatrix();
+
     glPushMatrix();
     glTranslatef(0., 0.4, 0.);
@@ -1309 +1309 @@
     glScalef(0.0005, 0.0005, 0.0005);
     glutStrokeCharacter(GLUT_STROKE_ROMAN, 'y');
-    glPopMatrix();      
-    
+    glPopMatrix();
+
     glPushMatrix();
     glTranslatef(0., 0., 0.4);
@@ -1317 +1317 @@
     glScalef(0.0005, 0.0005, 0.0005);
     glutStrokeCharacter(GLUT_STROKE_ROMAN, 'z');
-    glPopMatrix();      
-    
+    glPopMatrix();
+
     glEnable(GL_LIGHTING);
     glEnable(GL_LIGHT0);
-    
+
     //glColor3f(0.2, 0.2, 0.8);
     glPushMatrix();
     glutSolidSphere(0.02, segments, segments );
     glPopMatrix();
-    
+
     glPushMatrix();
-    glRotatef(-90, 1, 0, 0);    
+    glRotatef(-90, 1, 0, 0);
     gluCylinder(obj, 0.01, 0.01, 0.3, segments, segments);
-    glPopMatrix();      
-    
+    glPopMatrix();
+
     glPushMatrix();
     glTranslatef(0., 0.3, 0.);
-    glRotatef(-90, 1, 0, 0);    
+    glRotatef(-90, 1, 0, 0);
     gluCylinder(obj, 0.02, 0.0, 0.06, segments, segments);
-    glPopMatrix();      
-    
+    glPopMatrix();
+
     glPushMatrix();
     glRotatef(90, 0, 1, 0);
     gluCylinder(obj, 0.01, 0.01, 0.3, segments, segments);
-    glPopMatrix();      
-    
+    glPopMatrix();
+
     glPushMatrix();
     glTranslatef(0.3, 0., 0.);
-    glRotatef(90, 0, 1, 0);     
+    glRotatef(90, 0, 1, 0);
     gluCylinder(obj, 0.02, 0.0, 0.06, segments, segments);
-    glPopMatrix();      
-    
+    glPopMatrix();
+
     glPushMatrix();
     gluCylinder(obj, 0.01, 0.01, 0.3, segments, segments);
-    glPopMatrix();      
-    
+    glPopMatrix();
+
     glPushMatrix();
     glTranslatef(0., 0., 0.3);
     gluCylinder(obj, 0.02, 0.0, 0.06, segments, segments);
-    glPopMatrix();      
-    
+    glPopMatrix();
+
     glDisable(GL_LIGHTING);
     glDisable(GL_DEPTH_TEST);
     gluDeleteQuadric(obj);
-    
+
     glEnable(GL_TEXTURE_2D);
     glDisable(GL_DEPTH_TEST);
@@ -1367 +1367 @@
 
 #ifdef notdef
-void 
+void
 draw_axis()
 {
     glDisable(GL_TEXTURE_2D);
     glEnable(GL_DEPTH_TEST);
-    
+
     //red x
     glColor3f(1,0,0);
@@ -1381 +1381 @@
     }
     glEnd();
-    
+
     //blue y
     glColor3f(0,0,1);
@@ -1390 +1390 @@
     }
     glEnd();
-    
+
     //green z
     glColor3f(0,1,0);
@@ -1399 +1399 @@
     }
     glEnd();
-    
+
     glEnable(GL_TEXTURE_2D);
     glDisable(GL_DEPTH_TEST);
@@ -1412 +1412 @@
         double elapsed_time;
 
-        elapsed_time = clock.tv_sec + clock.tv_usec/1000000.0 - 
-            vol_renderer->_volumeInterpolator->getStartTime();
-        
+        elapsed_time = clock.tv_sec + clock.tv_usec/1000000.0 -
+            vol_renderer->_volumeInterpolator->getStartTime();
+
         Trace("%lf %lf\n", elapsed_time, vol_renderer->_volumeInterpolator->getInterval());
         float fraction;
@@ -1431 +1431 @@
 
 void
-NanoVis::SetVolumeRanges() 
+NanoVis::SetVolumeRanges()
 {
     double xMin, xMax, yMin, yMax, zMin, zMax, wMin, wMax;
-    
+
     xMin = yMin = zMin = wMin = DBL_MAX;
     xMax = yMax = zMax = wMax = -DBL_MAX;
     for (unsigned int i = 0; i < volume.size(); i++) {
-        Volume *volPtr;
-        
-        volPtr = volume[i];
-        if (volPtr == NULL) {
-            continue;
-        }
-        if (!volPtr->enabled) {
-            continue;
-        }
-        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();
-        }
+        Volume *volPtr;
+
+        volPtr = volume[i];
+        if (volPtr == NULL) {
+            continue;
+        }
+        if (!volPtr->enabled) {
+            continue;
+        }
+        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();
+        }
     }
     if ((xMin < DBL_MAX) && (xMax > -DBL_MAX)) {
-        grid->xAxis.SetScale(xMin, xMax);
+        grid->xAxis.SetScale(xMin, xMax);
     }
     if ((yMin < DBL_MAX) && (yMax > -DBL_MAX)) {
-        grid->yAxis.SetScale(yMin, yMax);
+        grid->yAxis.SetScale(yMin, yMax);
     }
     if ((zMin < DBL_MAX) && (zMax > -DBL_MAX)) {
-        grid->zAxis.SetScale(zMin, zMax);
+        grid->zAxis.SetScale(zMin, zMax);
     }
     if ((wMin < DBL_MAX) && (wMax > -DBL_MAX)) {
-        Volume::valueMin = wMin;
-        Volume::valueMax = wMax;
+        Volume::valueMin = wMin;
+        Volume::valueMax = wMax;
     }
     Volume::update_pending = false;
@@ -1492 +1492 @@
 {
     double xMin, xMax, yMin, yMax, zMin, zMax, wMin, wMax;
-    
+
     xMin = yMin = zMin = wMin = DBL_MAX;
     xMax = yMax = zMax = wMax = -DBL_MAX;
     for (unsigned int i = 0; i < heightMap.size(); i++) {
-        HeightMap *hmPtr;
-        
-        hmPtr = heightMap[i];
-        if (hmPtr == NULL) {
-            continue;
-        }
-        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();
-        }
+        HeightMap *hmPtr;
+
+        hmPtr = heightMap[i];
+        if (hmPtr == NULL) {
+            continue;
+        }
+        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();
+        }
     }
     if ((xMin < DBL_MAX) && (xMax > -DBL_MAX)) {
-        grid->xAxis.SetScale(xMin, xMax);
+        grid->xAxis.SetScale(xMin, xMax);
     }
     if ((yMin < DBL_MAX) && (yMax > -DBL_MAX)) {
-        grid->yAxis.SetScale(yMin, yMax);
+        grid->yAxis.SetScale(yMin, yMax);
     }
     if ((zMin < DBL_MAX) && (zMax > -DBL_MAX)) {
-        grid->zAxis.SetScale(zMin, zMax);
+        grid->zAxis.SetScale(zMin, zMax);
     }
     if ((wMin < DBL_MAX) && (wMax > -DBL_MAX)) {
-        HeightMap::valueMin = wMin;
-        HeightMap::valueMax = wMax;
+        HeightMap::valueMin = wMin;
+        HeightMap::valueMax = wMax;
     }
     HeightMap::update_pending = false;
@@ -1544 +1544 @@
 
 /*----------------------------------------------------*/
-void 
+void
 NanoVis::display()
 {
     //assert(glGetError()==0);
     if (HeightMap::update_pending) {
-        SetHeightmapRanges();
+        SetHeightmapRanges();
     }
     if (Volume::update_pending) {
-        SetVolumeRanges();
+        SetVolumeRanges();
     }
     //start final rendering
@@ -1564 +1564 @@
         //camera setting activated
         cam->activate();
-        
+
         //set up the orientation of items in the scene.
         glPushMatrix();
@@ -1576 +1576 @@
             // this is the default
             break;
-            
+
         case 3:  // z
             glRotatef(-90, 1, 0, 0);
             glRotatef(-90, 0, 0, 1);
             break;
-            
+
         case -1:  // -x
             glRotatef(-90, 0, 0, 1);
             break;
-            
+
         case -2:  // -y
             glRotatef(180, 0, 0, 1);
             glRotatef(-90, 0, 1, 0);
             break;
-            
+
         case -3:  // -z
             glRotatef(90, 1, 0, 0);
             break;
         }
-        
+
         // TBD : This will be removed after being sure that all the functions work well.
         //glPushMatrix();
-        
+
         //now render things in the scene
         if (axis_on) {
@@ -1617 +1617 @@
         //fprintf(stderr, "particle pixels: %d\n", perf->get_pixel_count());
         //perf->reset();
-        
+
         //perf->enable();
         vol_renderer->render_all();
         //perf->disable();
-        
+
         for (unsigned int i = 0; i < heightMap.size(); ++i) {
             if (heightMap[i]->isVisible()) {
@@ -1674 +1674 @@
 }
 
-void 
+void
 NanoVis::update_rot(int delta_x, int delta_y)
 {
     live_rot_x += delta_x;
     live_rot_y += delta_y;
-    
+
     if (live_rot_x > 360.0) {
-        live_rot_x -= 360.0;    
+        live_rot_x -= 360.0;
     } else if(live_rot_x < -360.0) {
         live_rot_x += 360.0;
     }
     if (live_rot_y > 360.0) {
-        live_rot_y -= 360.0;    
+        live_rot_y -= 360.0;
     } else if(live_rot_y < -360.0) {
         live_rot_y += 360.0;
@@ -1772 +1772 @@
    default:
        break;
-   }    
+   }
 #ifdef EVENTLOG
    if(log){
@@ -1786 +1786 @@
 NanoVis::motion(int x, int y)
 {
-    int old_x, old_y;   
+    int old_x, old_y;
 
     if(left_down){
         old_x = left_last_x;
-        old_y = left_last_y;   
+        old_y = left_last_y;
     } else if(right_down){
         old_x = right_last_x;
-        old_y = right_last_y;   
-    }
-    
+        old_y = right_last_y;
+    }
+
     int delta_x = x - old_x;
     int delta_y = y - old_y;
-    
+
     //more coarse event handling
     //if(abs(delta_x)<10 && abs(delta_y)<10)
     //return;
-    
+
     if(left_down){
         left_last_x = x;
         left_last_y = y;
-        
+
         update_rot(-delta_y, -delta_x);
     } else if (right_down){
         //fprintf(stderr, "right mouse motion (%d,%d)\n", x, y);
-        
+
         right_last_x = x;
         right_last_y = y;
-        
+
         update_trans(0, 0, delta_x);
     }
-    
+
 #ifdef EVENTLOG
     float param[3] = {live_rot_x, live_rot_y, live_rot_z};
@@ -1831 +1831 @@
 
 #ifdef XINETD
-void 
+void
 init_service()
 {
@@ -1839 +1839 @@
     dup2(fileno(xinetd_log), 2);
     dup2(2,1);
-    
-    //flush junk 
+
+    //flush junk
     fflush(stdout);
     fflush(stderr);
 }
 
-void 
+void
 end_service()
 {
@@ -1853 +1853 @@
 #endif  /*XINETD*/
 
-void 
-init_event_log() 
+void
+init_event_log()
 {
     event_log = fopen("event.txt", "w");
     assert(event_log!=0);
-    
+
     struct timeval time;
     gettimeofday(&time, NULL);
@@ -1864 +1864 @@
 }
 
-void 
+void
 end_event_log()
 {
@@ -1870 +1870 @@
 }
 
-double 
+double
 get_time_interval()
 {
@@ -1876 +1876 @@
     gettimeofday(&time, NULL);
     double new_time = time.tv_sec*1000. + time.tv_usec/1000.;
-    
+
     double interval = new_time - cur_time;
     cur_time = new_time;
     return interval;
 }
-#endif 
+#endif
 
 void removeAllData()
@@ -1891 +1891 @@
 /*----------------------------------------------------*/
 int 
-main(int argc, char** argv) 
+main(int argc, char** argv)
 {
     char *path;
@@ -1918 +1918 @@
 
     R2FilePath::getInstance()->setWorkingDirectory(argc, (const char**) argv);
-    
+
 #ifdef XINETD
     signal(SIGPIPE,SIG_IGN);
     NvInitService();
 #endif
-    
+
     glutInit(&argc, argv);
     glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA);
-    
+
     glutInitWindowSize(NanoVis::win_width, NanoVis::win_height);
-    
+
     glutInitWindowPosition(10, 10);
     render_window = glutCreateWindow(argv[0]);
     glutDisplayFunc(NanoVis::display);
-    
+
 #ifndef XINETD
     glutMouseFunc(NanoVis::mouse);
@@ -1938 +1938 @@
     glutKeyboardFunc(NanoVis::keyboard);
 #endif
-    
+
     glutIdleFunc(idle);
     glutReshapeFunc(NanoVis::resize_offscreen_buffer);
-    
+
     NanoVis::init(path);
     NanoVis::initGL();
     initTcl();
-    
+
 #ifdef EVENTLOG
     NvInitEventLog();
@@ -1951 +1951 @@
     //event loop
     glutMainLoop();
-    
+
     removeAllData();
-    
+
     NvExit();
-    
+
     return 0;
 }