Changeset 1028 for trunk/packages/vizservers/nanovis/Command.cpp

Timestamp:

Jun 9, 2008, 9:08:02 AM (16 years ago)

Author:

gah

Message:

various cleanups

File:

• trunk/packages/vizservers/nanovis/Command.cpp (modified) (121 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -73 +73 @@
 #include <NvLIC.h>
 
-//#define ISO_TEST                1
+#define ISO_TEST                1
 #define PLANE_CMD               0
 #define __TEST_CODE__           0
@@ -143 +143 @@
 #endif
 static Tcl_ObjCmdProc ScreenCmd;
-static Tcl_ObjCmdProc ScreenShotCmd;
+static Tcl_ObjCmdProc SnapshotCmd;
 static Tcl_ObjCmdProc TransfuncCmd;
 static Tcl_ObjCmdProc UniRect2dCmd;
@@ -175 +175 @@
 static int
 GetCullMode(Tcl_Interp *interp, Tcl_Obj *objPtr, 
-            graphics::RenderContext::CullMode *modePtr)
-{
-    char *string = Tcl_GetString(objPtr);
+            graphics::RenderContext::CullMode *modePtr)
+{
+    const char *string = Tcl_GetString(objPtr);
     if (strcmp(string, "none") == 0) {
         *modePtr = graphics::RenderContext::NO_CULL;
@@ -186 +186 @@
     } else {
         Tcl_AppendResult(interp, "invalid cull mode \"", string, 
-                         "\": should be front, back, or none\"", (char *)NULL);
+                         "\": should be front, back, or none\"", (char *)NULL);
         return TCL_ERROR;
     }
@@ -196 +196 @@
                 graphics::RenderContext::ShadingModel *modelPtr)
 {
-    char *string = Tcl_GetString(objPtr);
+    const char *string = Tcl_GetString(objPtr);
+
     if (strcmp(string,"flat") == 0) {
         *modelPtr = graphics::RenderContext::FLAT;
@@ -213 +214 @@
                graphics::RenderContext::PolygonMode *modePtr)
 {
-    char *string = Tcl_GetString(objPtr);
+    const char *string = Tcl_GetString(objPtr);
+
     if (strcmp(string,"wireframe") == 0) {
         *modePtr = graphics::RenderContext::LINE;
@@ -220 +222 @@
     } else {
         Tcl_AppendResult(interp, "invalid polygon mode \"", string, 
-                         "\": should be wireframe or fill\"", (char *)NULL);
+                         "\": should be wireframe or fill\"", (char *)NULL);
         return TCL_ERROR;
     }
@@ -243 +245 @@
 static HeightMap *
 CreateHeightMap(ClientData clientData, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     float xMin, yMin, xMax, yMax;
@@ -250 +252 @@
     if (objc != 7) {
         Tcl_AppendResult(interp, 
-                         "wrong # of values: should be xMin yMin xMax yMax xNum yNum heights",
-                         (char *)NULL);
+        "wrong # of values: should be xMin yMin xMax yMax xNum yNum heights",
+        (char *)NULL);
         return NULL;
     }
@@ -280 +282 @@
     if (heights == NULL) {
         Tcl_AppendResult(interp, "can't allocate array of heights", 
-                         (char *)NULL);
+                         (char *)NULL);
         return NULL;
     }
@@ -317 +319 @@
     if (index < 0) {
         Tcl_AppendResult(interp, "can't have negative index \"", 
-                         Tcl_GetString(objPtr), "\"", (char*)NULL);
+                         Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -347 +349 @@
     if (hmPtr == NULL) {
         Tcl_AppendResult(interp, "no heightmap defined for index \"", 
-                         Tcl_GetString(objPtr), "\"", (char*)NULL);
+                         Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -376 +378 @@
     if (index < 0) {
         Tcl_AppendResult(interp, "can't have negative index \"", 
-                         Tcl_GetString(objPtr), "\"", (char*)NULL);
+                         Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -412 +414 @@
     if (vol == NULL) {
         Tcl_AppendResult(interp, "no volume defined for index \"", 
-                         Tcl_GetString(objPtr), "\"", (char*)NULL);
+                         Tcl_GetString(objPtr), "\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -433 +435 @@
  */
 static int
-GetVolumeIndices(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv,
-                 vector<unsigned int>* vectorPtr)
+GetVolumeIndices(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv,
+                 vector<unsigned int>* vectorPtr)
 {
     if (objc == 0) {
@@ -471 +473 @@
  */
 static int
-GetVolumes(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv,
-           vector<Volume *>* vectorPtr)
+GetVolumes(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv,
+           vector<Volume *>* vectorPtr)
 {
     if (objc == 0) {
@@ -487 +489 @@
                 return TCL_ERROR;
             }
-            vectorPtr->push_back(volPtr);
+            vectorPtr->push_back(volPtr);
         }
     }
@@ -507 +509 @@
  */
 static int
-GetHeightMaps(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv,
-           vector<HeightMap *>* vectorPtr)
+GetHeightMaps(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv,
+           vector<HeightMap *>* vectorPtr)
 {
     if (objc == 0) {
@@ -523 +525 @@
                 return TCL_ERROR;
             }
-            vectorPtr->push_back(hmPtr);
+            vectorPtr->push_back(hmPtr);
         }
     }
@@ -560 +562 @@
     }
     Tcl_AppendResult(interp, "bad axis \"", string,
-                     "\": should be x, y, or z", (char*)NULL);
+                     "\": should be x, y, or z", (char*)NULL);
     return TCL_ERROR;
 }
@@ -593 +595 @@
 GetAxisDirFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *indexPtr, int *dirPtr)
 {
-    char *string = Tcl_GetString(objPtr);
+    const char *string = Tcl_GetString(objPtr);
 
     int sign = 1;
@@ -620 +622 @@
  */
 static int
-GetColor(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv, float *rgbPtr)
+GetColor(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv, float *rgbPtr)
 {
     if (objc < 3) {
         Tcl_AppendResult(interp, "missing color values\": ",
-                         "should list of R G B values 0.0 - 1.0", (char*)NULL);
+                         "should list of R G B values 0.0 - 1.0", (char*)NULL);
         return TCL_ERROR;
     }
@@ -661 +663 @@
         if (ferror(stdin)) {
             Tcl_AppendResult(interp, "while reading data stream: ",
-                             Tcl_PosixError(interp), (char*)NULL);
+                             Tcl_PosixError(interp), (char*)NULL);
             return TCL_ERROR;
         }
         if (feof(stdin)) {
             Tcl_AppendResult(interp, "premature EOF while reading data stream",
-                             (char*)NULL);
+                             (char*)NULL);
             return TCL_ERROR;
         }
@@ -687 +689 @@
 
 static int
-CameraAimOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+CameraAimOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     double x0, y0, z0;
@@ -700 +702 @@
 
 static int
-CameraAngleOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+CameraAngleOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     double xangle, yangle, zangle;
@@ -713 +715 @@
 
 static int
-CameraZoomOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+CameraZoomOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     double zoom;
@@ -744 +746 @@
  */
 static int
-CameraCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+CameraCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nCameraOps, cameraOps, 
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -756 +758 @@
 }
 
-static int
-ScreenShotCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
-              Tcl_Obj *CONST *objv)
-{
-#ifdef XINETD
-    NanoVis::resize_offscreen_buffer(1024, 1024);
-    NanoVis::cam->set_screen_size(30, 90, 1024 - 60, 1024 - 120);
+/*ARGSUSED*/
+static int
+SnapshotCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
+              Tcl_Obj *const *objv)
+{
+    int w, h;
+
+    w = NanoVis::win_width, h = NanoVis::win_height;
+    NanoVis::resize_offscreen_buffer(2048, 2048);
+#ifdef notdef
+    NanoVis::cam->set_screen_size(0, 0, NanoVis::win_width,NanoVis::win_height);
+    NanoVis::cam->set_screen_size(30, 90, 2048 - 60, 2048 - 120);
+#endif
     NanoVis::offscreen_buffer_capture();  //enable offscreen render
     NanoVis::display();
-
-    // INSOO
-    // TBD
-    /*
-      Volume* vol = NanoVis::volume[0];
-      TransferFunction* tf;
-      tf = NanoVis::vol_renderer->get_volume_shading(vol);
-      if (tf != NULL) 
-      {
-      float data[512];
-
-      for (int i=0; i < 256; i++) {
-      data[i] = data[i+256] = (float)(i/255.0);
-      }
-      Texture2D* plane = new Texture2D(256, 2, GL_FLOAT, GL_LINEAR, 1, data);
-      NanoVis::color_table_renderer->render(1024, 1024, plane, tf, vol->wAxis.Min(),
-                vol->wAxis.Max());
-      delete plane;
-    
-      }
-    */
+    NanoVis::read_screen();
+#ifdef notdef
+    glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); 
 #endif
-
+    NanoVis::ppm_write("nv>print -bytes");
+    NanoVis::resize_offscreen_buffer(w, h);
     return TCL_OK;
 }
@@ -793 +784 @@
 static int
 CutplanePositionOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                   Tcl_Obj *CONST *objv)
+                   Tcl_Obj *const *objv)
 {
     float relval;
@@ -825 +816 @@
 static int
 CutplaneStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     bool state;
@@ -877 +868 @@
  */
 static int
-CutplaneCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+CutplaneCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
+            Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nCutplaneOps, cutplaneOps, 
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -901 +893 @@
  */
 static int
-LegendCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+LegendCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     if (objc != 4) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " volIndex width height\"", (char*)NULL);
+            Tcl_GetString(objv[0]), " volIndex width height\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -917 +909 @@
     if (tf == NULL) {
         Tcl_AppendResult(interp, "no transfer function defined for volume \"", 
-                         Tcl_GetString(objv[1]), "\"", (char*)NULL);
-        return TCL_ERROR;
-    }
-    char *label;
+                         Tcl_GetString(objv[1]), "\"", (char*)NULL);
+        return TCL_ERROR;
+    }
+    const char *label;
     label = Tcl_GetString(objv[1]);
 
@@ -929 +921 @@
     }
     if (volPtr->update_pending) {
-        NanoVis::SetVolumeRanges();
+        NanoVis::SetVolumeRanges();
     }
     NanoVis::render_legend(tf, Volume::valueMin, Volume::valueMax, w, h, label);
@@ -945 +937 @@
  */
 static int
-ScreenCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+ScreenCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     if (objc != 3) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " width height\"", (char*)NULL);
+                         Tcl_GetString(objv[0]), " width height\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -974 +966 @@
 static int
 TransfuncCmd(ClientData cdata, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *CONST *objv)
+             Tcl_Obj *const *objv)
 {
     if (objc < 2) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
-        return TCL_ERROR;
-    }
-
-    char *string = Tcl_GetString(objv[1]);
+                Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
+        return TCL_ERROR;
+    }
+
+    const char *string = Tcl_GetString(objv[1]);
     char c = string[0];
-    if ((c == 'd') && (strcmp(string, "define") == 0)) 
-    {
+    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\"", 
-                (char*)NULL);
+                Tcl_GetString(objv[0]), " define name colorMap alphaMap\"", 
+                (char*)NULL);
             return TCL_ERROR;
         }
@@ -1005 +996 @@
         if ((cmapc % 4) != 0) {
             Tcl_AppendResult(interp, "wrong # elements is colormap: should be ",
-                "{ v r g b ... }", (char*)NULL);
+                "{ v r g b ... }", (char*)NULL);
             return TCL_ERROR;
         }
@@ -1013 +1004 @@
         if ((wmapc % 2) != 0) {
             Tcl_AppendResult(interp, "wrong # elements in alphamap: should be ",
-                " { v w ... }", (char*)NULL);
+                " { v w ... }", (char*)NULL);
             return TCL_ERROR;
         }
@@ -1026 +1017 @@
                 if ((q[j] < 0.0) || (q[j] > 1.0)) {
                     Tcl_AppendResult(interp, "bad colormap value \"", 
-                        Tcl_GetString(cmapv[i+j]), 
-                        "\": should be in the range 0-1", (char*)NULL);
+                        Tcl_GetString(cmapv[i+j]), 
+                        "\": should be in the range 0-1", (char*)NULL);
                     return TCL_ERROR;
                 }
@@ -1045 +1036 @@
                 if ((q[j] < 0.0) || (q[j] > 1.0)) {
                     Tcl_AppendResult(interp, "bad alphamap value \"", 
-                        Tcl_GetString(wmapv[i+j]),
-                        "\": should be in the range 0-1", (char*)NULL);
+                        Tcl_GetString(wmapv[i+j]),
+                        "\": should be in the range 0-1", (char*)NULL);
                     return TCL_ERROR;
                 }
@@ -1066 +1057 @@
     } else {
         Tcl_AppendResult(interp, "bad option \"", string,
-                "\": should be define", (char*)NULL);
+                "\": should be define", (char*)NULL);
         return TCL_ERROR;
     }
@@ -1082 +1073 @@
  */
 static int
-UpCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+UpCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     if (objc != 2) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " x|y|z|-x|-y|-z\"", (char*)NULL);
+                         Tcl_GetString(objv[0]), " x|y|z|-x|-y|-z\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -1102 +1093 @@
 static int
 VolumeAnimationCaptureOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                         Tcl_Obj *CONST *objv)
+                         Tcl_Obj *const *objv)
 {
     int total;
     if (Tcl_GetIntFromObj(interp, objv[3], &total) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     VolumeInterpolator* interpolator;
@@ -1112 +1103 @@
     interpolator->start();
     if (interpolator->is_started()) {
-        char *fileName = (objc < 5) ? NULL : Tcl_GetString(objv[4]);
-        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);
+        const char *fileName = (objc < 5) ? NULL : Tcl_GetString(objv[4]);
+        for (int frame_num = 0; frame_num < total; ++frame_num) {
+            float fraction;
             
-            NanoVis::bmp_write_to_file(frame_num, fileName);
-        }
+            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);
+        }
     }
     return TCL_OK;
@@ -1136 +1127 @@
 static int
 VolumeAnimationClearOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     NanoVis::vol_renderer->clearAnimatedVolumeInfo();
@@ -1144 +1135 @@
 static int
 VolumeAnimationStartOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     NanoVis::vol_renderer->startVolumeAnimation();
@@ -1152 +1143 @@
 static int
 VolumeAnimationStopOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                      Tcl_Obj *CONST *objv)
+                      Tcl_Obj *const *objv)
 {
     NanoVis::vol_renderer->stopVolumeAnimation();
@@ -1160 +1151 @@
 static int
 VolumeAnimationVolumesOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                         Tcl_Obj *CONST *objv)
+                         Tcl_Obj *const *objv)
 {
     vector<unsigned int> ivol;
     if (GetVolumeIndices(interp, objc - 3, objv + 3, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     Trace("parsing volume index\n");
     vector<unsigned int>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        Trace("index: %d\n", *iter);
-        NanoVis::vol_renderer->addAnimatedVolume(NanoVis::volume[*iter], *iter);
+        Trace("index: %d\n", *iter);
+        NanoVis::vol_renderer->addAnimatedVolume(NanoVis::volume[*iter], *iter);
     }
     return TCL_OK;
@@ -1187 +1178 @@
 static int
 VolumeAnimationOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                  Tcl_Obj *CONST *objv)
+                  Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nVolumeAnimationOps, volumeAnimationOps, 
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1202 +1193 @@
 static int
 VolumeDataFollowsOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                    Tcl_Obj *CONST *objv)
+                    Tcl_Obj *const *objv)
 {
     printf("Data Loading\n");
@@ -1335 +1326 @@
         
         if (Volume::update_pending) {
-            NanoVis::SetVolumeRanges();
+            NanoVis::SetVolumeRanges();
         }
         volPtr = NanoVis::volume[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);
+                Volume::valueMin, Volume::valueMax);
         write(0, info, strlen(info));
     }
@@ -1348 +1339 @@
 static int
 VolumeDataStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                  Tcl_Obj *CONST *objv)
+                  Tcl_Obj *const *objv)
 {
     bool state;
@@ -1380 +1371 @@
 static int
 VolumeDataOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *CONST *objv)
+             Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nVolumeDataOps, volumeDataOps, 
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1394 +1385 @@
 static int
 VolumeOutlineColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                     Tcl_Obj *CONST *objv)
+                     Tcl_Obj *const *objv)
 {
     float rgb[3];
     if (GetColor(interp, objc - 3, objv + 3, rgb) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 6, objv + 6, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        (*iter)->set_outline_color(rgb);
+        (*iter)->set_outline_color(rgb);
     }
     return TCL_OK;
@@ -1413 +1404 @@
 static int
 VolumeOutlineStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                     Tcl_Obj *CONST *objv)
+                     Tcl_Obj *const *objv)
 {
     bool state;
     if (GetBooleanFromObj(interp, objv[3], &state) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (state) {
-        vector<Volume *>::iterator iter;
-        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->enable_outline();
-        }
+        vector<Volume *>::iterator iter;
+        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+            (*iter)->enable_outline();
+        }
     } else {
-        vector<Volume *>::iterator iter;
-        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->disable_outline();
-        }
+        vector<Volume *>::iterator iter;
+        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+            (*iter)->disable_outline();
+        }
     }
     return TCL_OK;
@@ -1447 +1438 @@
 static int
 VolumeOutlineOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nVolumeOutlineOps, volumeOutlineOps, 
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+        Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1461 +1452 @@
 static int
 VolumeShadingDiffuseOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     float diffuse;
     if (GetFloatFromObj(interp, objv[3], &diffuse) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
 
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->set_diffuse(diffuse);
+        (*iter)->set_diffuse(diffuse);
     }
     return TCL_OK;
@@ -1481 +1472 @@
 static int
 VolumeShadingIsosurfaceOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                          Tcl_Obj *CONST *objv)
+                          Tcl_Obj *const *objv)
 {
     bool iso_surface;
     if (GetBooleanFromObj(interp, objv[3], &iso_surface) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        (*iter)->set_isosurface(iso_surface);
+        (*iter)->set_isosurface(iso_surface);
     }
     return TCL_OK;
@@ -1500 +1491 @@
 static int
 VolumeShadingOpacityOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
 
     float opacity;
     if (GetFloatFromObj(interp, objv[3], &opacity) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     printf("set opacity %f\n", opacity);
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        (*iter)->set_opacity_scale(opacity);
+        (*iter)->set_opacity_scale(opacity);
     }
     return TCL_OK;
@@ -1521 +1512 @@
 static int
 VolumeShadingSpecularOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                        Tcl_Obj *CONST *objv)
+                        Tcl_Obj *const *objv)
 {
     float specular;
     if (GetFloatFromObj(interp, objv[3], &specular) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        (*iter)->set_specular(specular);
+        (*iter)->set_specular(specular);
     }
     return TCL_OK;
@@ -1540 +1531 @@
 static int
 VolumeShadingTransFuncOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                         Tcl_Obj *CONST *objv)
+                         Tcl_Obj *const *objv)
 {
     TransferFunction *tf;
-    char *name = Tcl_GetString(objv[3]);
+    const char *name = Tcl_GetString(objv[3]);
     tf = NanoVis::get_transfunc(name);
     if (tf == NULL) {
-        Tcl_AppendResult(interp, "transfer function \"", name,
-                         "\" is not defined", (char*)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "transfer function \"", name,
+                         "\" is not defined", (char*)NULL);
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        NanoVis::vol_renderer->shade_volume(*iter, tf);
+        NanoVis::vol_renderer->shade_volume(*iter, tf);
 #ifdef POINTSET
-        // TBD..
-        // POINTSET
-        if ((*iter)->pointsetIndex != -1) {
-            g_pointSet[(*iter)->pointsetIndex]->updateColor(tf->getData(), 256);
-        }
+        // TBD..
+        // POINTSET
+        if ((*iter)->pointsetIndex != -1) {
+            g_pointSet[(*iter)->pointsetIndex]->updateColor(tf->getData(), 256);
+        }
 #endif /*POINTSET*/
     }
@@ -1579 +1570 @@
 static int
 VolumeShadingOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps, 
-        Rappture::CMDSPEC_ARG2, objc, objv, 0);
+        Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1593 +1584 @@
 static int
 VolumeAxisOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *CONST *objv)
-{
-    char *string = Tcl_GetString(objv[2]);
+             Tcl_Obj *const *objv)
+{
+    const char *string = Tcl_GetString(objv[2]);
     char c;
     c = string[0];
     if ((c == 'l') && (strcmp(string, "label") == 0)) {
-        int axis;
-        if (GetAxisFromObj(interp, objv[3], &axis) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        vector<Volume *> ivol;
-        if (GetVolumes(interp, objc - 5, objv + 5, &ivol) != TCL_OK) {
-            return TCL_ERROR;
-        }
-        vector<Volume *>::iterator iter;
-        char *label;
-        label = Tcl_GetString(objv[4]);
-        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->set_label(axis, label);
-        }
+        int axis;
+        if (GetAxisFromObj(interp, objv[3], &axis) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        vector<Volume *> ivol;
+        if (GetVolumes(interp, objc - 5, objv + 5, &ivol) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        vector<Volume *>::iterator iter;
+        const char *label;
+        label = Tcl_GetString(objv[4]);
+        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+            (*iter)->set_label(axis, label);
+        }
     } else {
-        Tcl_AppendResult(interp, "bad option \"", string, 
-                         "\": should be label", (char*)NULL);
-        return TCL_ERROR;
+        Tcl_AppendResult(interp, "bad option \"", string, 
+                         "\": should be label", (char*)NULL);
+        return TCL_ERROR;
     }
     return TCL_OK;
@@ -1623 +1614 @@
 static int
 VolumeStateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-              Tcl_Obj *CONST *objv)
+              Tcl_Obj *const *objv)
 {
     bool state;
     if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 3, objv + 3, &ivol) != TCL_OK) {
-        return TCL_ERROR;
+        return TCL_ERROR;
     }
     if (state) {
-        vector<Volume *>::iterator iter;
-        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->enable();
-        }
+        vector<Volume *>::iterator iter;
+        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+            (*iter)->enable();
+        }
     } else {
-        vector<Volume *>::iterator iter;
-        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-            (*iter)->disable();
-        }
+        vector<Volume *>::iterator iter;
+        for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+            (*iter)->disable();
+        }
     }
     return TCL_OK;
@@ -1649 +1640 @@
 static int
 VolumeTestOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-             Tcl_Obj *CONST *objv)
+             Tcl_Obj *const *objv)
 {
     NanoVis::volume[1]->disable_data();
@@ -1684 +1675 @@
  */
 static int
-VolumeCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+VolumeCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nVolumeOps, volumeOps, 
-        Rappture::CMDSPEC_ARG1, objc, objv, 0);
+        Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1697 +1688 @@
 
 static int
-FlowCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+FlowCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     Rappture::Outcome err;
@@ -1703 +1694 @@
     if (objc < 2) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                Tcl_GetString(objv[0]), " option ?arg arg?", (char *)NULL);
-        return TCL_ERROR;
-    }
-    char *string = Tcl_GetString(objv[1]);
+                Tcl_GetString(objv[0]), " option ?arg arg?", (char *)NULL);
+        return TCL_ERROR;
+    }
+    const char *string = Tcl_GetString(objv[1]);
     char c = string[0];
     if ((c == 'v') && (strcmp(string, "vectorid") == 0)) {
         if (objc != 3) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                Tcl_GetString(objv[0]), " vectorid volume", (char *)NULL);
+                Tcl_GetString(objv[0]), " vectorid volume", (char *)NULL);
             return TCL_ERROR;
         }
@@ -1720 +1711 @@
         if (NanoVis::particleRenderer != NULL) {
             NanoVis::particleRenderer->setVectorField(volPtr->id, 1.0f, 
-                volPtr->height / (float)volPtr->width,
-                volPtr->depth  / (float)volPtr->width,
-                volPtr->wAxis.Max());
+                volPtr->height / (float)volPtr->width,
+                volPtr->depth  / (float)volPtr->width,
+                volPtr->wAxis.Max());
             NanoVis::initParticle();
         }
         if (NanoVis::licRenderer != NULL) {
             NanoVis::licRenderer->setVectorField(volPtr->id,
-                1.0f / volPtr->aspect_ratio_width,
-                1.0f / volPtr->aspect_ratio_height,
-                1.0f / volPtr->aspect_ratio_depth,
-                volPtr->wAxis.Max());
+                1.0f / volPtr->aspect_ratio_width,
+                1.0f / volPtr->aspect_ratio_height,
+                1.0f / volPtr->aspect_ratio_depth,
+                volPtr->wAxis.Max());
             NanoVis::licRenderer->set_offset(NanoVis::lic_slice_z);
         }
@@ -1736 +1727 @@
         if (objc != 3) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                             Tcl_GetString(objv[0]), " lic on|off\"", (char*)NULL);
+                             Tcl_GetString(objv[0]), " lic on|off\"", (char*)NULL);
             return TCL_ERROR;
         }
@@ -1747 +1738 @@
         if (objc < 3) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                Tcl_GetString(objv[0]), " particle visible|slice|slicepos arg \"",
-                (char*)NULL);
+                Tcl_GetString(objv[0]), " particle visible|slice|slicepos arg \"",
+                (char*)NULL);
             return TCL_ERROR;
         }
-        char *string = Tcl_GetString(objv[2]);
+        const char *string = Tcl_GetString(objv[2]);
         c = string[0];
         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\"", 
-                                 (char*)NULL);
+                                 Tcl_GetString(objv[0]), " particle visible on|off\"", 
+                                 (char*)NULL);
                 return TCL_ERROR;
             }
@@ -1768 +1759 @@
             if (objc != 4) {
                 Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                                 Tcl_GetString(objv[0]),
-                                 " particle slice volume\"", (char*)NULL);
+                                 Tcl_GetString(objv[0]),
+                                 " particle slice volume\"", (char*)NULL);
                 return TCL_ERROR;
             }
@@ -1780 +1771 @@
             if (objc != 4) {
                 Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                                 Tcl_GetString(objv[0]), " particle slicepos value\"", 
-                                 (char*)NULL);
+                                 Tcl_GetString(objv[0]), " particle slicepos value\"", 
+                                 (char*)NULL);
                 return TCL_ERROR;
             }
@@ -1805 +1796 @@
             }
         } else {
-            Tcl_AppendResult(interp, "unknown option \"",string,"\": should be \"",
-                             Tcl_GetString(objv[0]), " visible, slice, or slicepos\"",
-                             (char *)NULL);
+            Tcl_AppendResult(interp, "unknown option \"", string,
+                "\": should be \"", Tcl_GetString(objv[0]), 
+                " visible, slice, or slicepos\"", (char *)NULL);
             return TCL_ERROR;
         }
@@ -1815 +1806 @@
         if (objc > 4 || objc < 3) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                             Tcl_GetString(objv[0]), " capture numframes [directory]\"", 
-                             (char*)NULL);
+                             Tcl_GetString(objv[0]), " capture numframes [directory]\"", 
+                             (char*)NULL);
             return TCL_ERROR;
         }
@@ -1833 +1824 @@
         //
         Trace("FLOW started\n");
-        char *fileName;
+        const char *fileName;
         fileName = (objc < 4) ? NULL : Tcl_GetString(objv[3]);
         for (int frame_count = 0; frame_count < total_frame_count; 
@@ -1869 +1860 @@
         if (objc < 3) {
             Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                             Tcl_GetString(objv[0]), " data follows ?args?", (char *)NULL);
+                Tcl_GetString(objv[0]), " data follows ?args?", (char *)NULL);
             return TCL_ERROR;
         }
-        char *string = Tcl_GetString(objv[2]);;
+        const char *string = Tcl_GetString(objv[2]);;
         c = string[0];
         if ((c == 'f') && (strcmp(string,"follows") == 0)) {
             if (objc != 4) {
                 Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                                 Tcl_GetString(objv[0]), " data follows length", 
-                                 (char *)NULL);
+                    Tcl_GetString(objv[0]), " data follows length", 
+                    (char *)NULL);
                 return TCL_ERROR;
             }
@@ -1910 +1901 @@
 
                 NanoVis::vol_renderer->add_volume(volPtr, 
-                        NanoVis::get_transfunc("default"));
+                        NanoVis::get_transfunc("default"));
             }
         }
@@ -1922 +1913 @@
 static int
 HeightMapDataFollowsOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     Rappture::Buffer buf;
@@ -1945 +1936 @@
 static int
 HeightMapDataVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     bool visible;
@@ -1957 +1948 @@
     vector<HeightMap *>::iterator iter;
     for (iter = imap.begin(); iter != imap.end(); iter++) {
-        (*iter)->setVisible(visible);
+        (*iter)->setVisible(visible);
     }
     return TCL_OK;
@@ -1970 +1961 @@
 static int 
 HeightMapDataOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nHeightMapDataOps, heightMapDataOps, 
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1985 +1976 @@
 static int
 HeightMapLineContourColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                            Tcl_Obj *CONST *objv)
+                            Tcl_Obj *const *objv)
 {
     float rgb[3];
@@ -1997 +1988 @@
     vector<HeightMap *>::iterator iter;
     for (iter = imap.begin(); iter != imap.end(); iter++) {
-        (*iter)->setLineContourColor(rgb);
+        (*iter)->setLineContourColor(rgb);
     }
     return TCL_OK;
@@ -2004 +1995 @@
 static int
 HeightMapLineContourVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                              Tcl_Obj *CONST *objv)
+                              Tcl_Obj *const *objv)
 {
     bool visible;
@@ -2016 +2007 @@
     vector<HeightMap *>::iterator iter;
     for (iter = imap.begin(); iter != imap.end(); iter++) {
-        (*iter)->setLineContourVisible(visible);
+        (*iter)->setLineContourVisible(visible);
     }
     return TCL_OK;
@@ -2029 +2020 @@
 static int 
 HeightMapLineContourOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                       Tcl_Obj *CONST *objv)
+                       Tcl_Obj *const *objv)
 {
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nHeightMapLineContourOps, 
-        heightMapLineContourOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);
+        heightMapLineContourOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2043 +2034 @@
 static int
 HeightMapCullOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     graphics::RenderContext::CullMode mode;
@@ -2055 +2046 @@
 static int
 HeightMapCreateOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                  Tcl_Obj *CONST *objv)
+                  Tcl_Obj *const *objv)
 {
     HeightMap *hmPtr;
@@ -2071 +2062 @@
 static int
 HeightMapLegendOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                  Tcl_Obj *CONST *objv)
+                  Tcl_Obj *const *objv)
 {
     HeightMap *hmPtr;
@@ -2081 +2072 @@
     if (tf == NULL) {
         Tcl_AppendResult(interp, "no transfer function defined for heightmap \"", 
-                         Tcl_GetString(objv[2]), "\"", (char*)NULL);
+                         Tcl_GetString(objv[2]), "\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -2090 +2081 @@
     }
     if (HeightMap::update_pending) {
-        NanoVis::SetHeightmapRanges();
+        NanoVis::SetHeightmapRanges();
     }
     NanoVis::render_legend(tf, HeightMap::valueMin, HeightMap::valueMax, w, h, 
-        "label");
+        "label");
     return TCL_OK;
 }
@@ -2099 +2090 @@
 static int
 HeightMapPolygonOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                   Tcl_Obj *CONST *objv)
+                   Tcl_Obj *const *objv)
 {
     graphics::RenderContext::PolygonMode mode;
@@ -2111 +2102 @@
 static int
 HeightMapShadingOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                 Tcl_Obj *CONST *objv)
+                 Tcl_Obj *const *objv)
 {
     graphics::RenderContext::ShadingModel model;
@@ -2123 +2114 @@
 static int
 HeightMapTestOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     srand((unsigned)time(NULL));
@@ -2155 +2146 @@
 static int
 HeightMapTransFuncOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                     Tcl_Obj *CONST *objv)
-{
-    char *name;
+                     Tcl_Obj *const *objv)
+{
+    const char *name;
     name = Tcl_GetString(objv[2]);
     TransferFunction *tf;
@@ -2172 +2163 @@
     vector<HeightMap *>::iterator iter;
     for (iter = imap.begin(); iter != imap.end(); iter++) {
-        (*iter)->setColorMap(tf);
+        (*iter)->setColorMap(tf);
     }
     return TCL_OK;
@@ -2192 +2183 @@
 
 static int 
-HeightMapCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+HeightMapCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 { 
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nHeightMapOps, heightMapOps, 
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2206 +2197 @@
 static int
 GridAxisColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     float r, g, b, a;
@@ -2226 +2217 @@
 static int
 GridAxisNameOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-               Tcl_Obj *CONST *objv)
-{
-    int axisId;
-    if (GetAxisFromObj(interp, objv[2], &axisId) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (NanoVis::grid) {
-#ifdef notdef
-        NanoVis::grid->setAxisName(axisId, Tcl_GetString(objv[3]));
-#endif
+               Tcl_Obj *const *objv)
+{
+    int axis;
+    if (GetAxisFromObj(interp, objv[2], &axis) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (NanoVis::grid != NULL) {
+        Axis *axisPtr;
+
+        switch (axis) {
+        case 0: axisPtr = &NanoVis::grid->xAxis; break;
+        case 1: axisPtr = &NanoVis::grid->yAxis; break;
+        case 2: axisPtr = &NanoVis::grid->zAxis; break;
+        }
+        axisPtr->SetName(Tcl_GetString(objv[3]));
+        axisPtr->SetUnits(Tcl_GetString(objv[4]));
     }
     return TCL_OK;
@@ -2242 +2239 @@
 static int
 GridLineColorOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-                Tcl_Obj *CONST *objv)
+                Tcl_Obj *const *objv)
 {
     float r, g, b, a;
@@ -2261 +2258 @@
 
 static int
-GridVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+GridVisibleOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     bool visible;
@@ -2273 +2270 @@
 static Rappture::CmdSpec gridOps[] = {
     {"axiscolor",  5, GridAxisColorOp,  5, 6, "r g b ?a?",},
-    {"axisname",   5, GridAxisNameOp,   5, 5, "index width height",},
+    {"axisname",   5, GridAxisNameOp,   5, 5, "index title units",},
     {"linecolor",  7, GridLineColorOp,  5, 6, "r g b ?a?",},
     {"visible",    1, GridVisibleOp,    3, 3, "bool",},
@@ -2280 +2277 @@
 
 static int 
-GridCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+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);
+        Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2293 +2290 @@
 
 static int 
-AxisCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+AxisCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     if (objc < 2) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
-        return TCL_ERROR;
-    }
-    char *string = Tcl_GetString(objv[1]);
+                Tcl_GetString(objv[0]), " option arg arg...\"", (char*)NULL);
+        return TCL_ERROR;
+    }
+    const char *string = Tcl_GetString(objv[1]);
     char c = string[0];
     if ((c == 'v') && (strcmp(string, "visible") == 0)) {
@@ -2319 +2316 @@
 #if PLANE_CMD
 static int 
-PlaneNewOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+PlaneNewOp(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     fprintf(stderr, "load plane for 2D visualization command\n");
@@ -2325 +2322 @@
     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;
     }
@@ -2338 +2335 @@
     }
     
-    //Now read w*h*4 bytes. The server expects the plane to be a stream of floats 
+    //Now read w*h*4 bytes. The server expects the plane to be a stream of
+    //floats
     char* tmp = new char[int(w*h*sizeof(float))];
     if (tmp == NULL) {
@@ -2358 +2356 @@
 static int 
 PlaneLinkOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-            Tcl_Obj *CONST *objv)
+            Tcl_Obj *const *objv)
 {
     fprintf(stderr, "link the plane to the 2D renderer command\n");
@@ -2366 +2364 @@
     if (objc != 3) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
-                         Tcl_GetString(objv[0]), " plane_index tf_index \"", (char*)NULL);
+            Tcl_GetString(objv[0]), " plane_index tf_index \"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -2383 +2381 @@
 static int 
 PlaneEnableOp(ClientData cdata, Tcl_Interp *interp, int objc, 
-              Tcl_Obj *CONST *objv)
+              Tcl_Obj *const *objv)
 {
     fprintf(stderr,"enable a plane so the 2D renderer can render it command\n");
@@ -2389 +2387 @@
     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;
     }
@@ -2415 +2413 @@
 
 static int 
-PlaneCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+PlaneCmd(ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 { 
     Tcl_ObjCmdProc *proc;
 
     proc = Rappture::GetOpFromObj(interp, nPlaneOps, planeOps, 
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2441 +2439 @@
  */
 static int
-UniRect2dCmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv)
+UniRect2dCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+             Tcl_Obj *const *objv)
 {    
     int xNum, yNum, zNum;
@@ -2449 +2448 @@
     if ((objc & 0x01) == 0) {
         Tcl_AppendResult(interp, Tcl_GetString(objv[0]), ": ", 
-                         "wrong number of arguments: should be key-value pairs", 
-                         (char *)NULL);
+                "wrong number of arguments: should be key-value pairs", 
+                (char *)NULL);
         return TCL_ERROR;
     }
@@ -2458 +2457 @@
     int i;
     for (i = 1; i < objc; i += 2) {
-        char *string;
+        const char *string;
 
         string = Tcl_GetString(objv[i]);
@@ -2510 +2509 @@
         } else {
             Tcl_AppendResult(interp, "unknown key \"", string, 
-                             "\": should be xmin, xmax, xnum, ymin, ymax, ynum, or zvalues",
-                             (char *)NULL);
+                "\": should be xmin, xmax, xnum, ymin, ymax, ynum, or zvalues",
+                (char *)NULL);
             return TCL_ERROR;
         }
@@ -2521 +2520 @@
     if (zNum != (xNum * yNum)) {
         Tcl_AppendResult(interp, "wrong number of z values must be xnum*ynum",
-                         (char *)NULL);
+                (char *)NULL);
         return TCL_ERROR;
     }
@@ -2559 +2558 @@
     Tcl_CreateObjCommand(interp, "legend",      LegendCmd,      NULL, NULL);
     Tcl_CreateObjCommand(interp, "screen",      ScreenCmd,      NULL, NULL);
-    Tcl_CreateObjCommand(interp, "screenshot",  ScreenShotCmd,  NULL, NULL);
+    Tcl_CreateObjCommand(interp, "snapshot",    SnapshotCmd,    NULL, NULL);
     Tcl_CreateObjCommand(interp, "transfunc",   TransfuncCmd,   NULL, NULL);
     Tcl_CreateObjCommand(interp, "unirect2d",   UniRect2dCmd,   NULL, NULL);
@@ -2632 +2631 @@
     if (status != TCL_OK) {
         std::ostringstream errmsg;
-        errmsg << "ERROR: " << Tcl_GetStringResult(interp) << std::endl;
+        errmsg << "NanoVis Server Error: " << Tcl_GetStringResult(interp) << std::endl;
         write(0, errmsg.str().c_str(), errmsg.str().size());
         return;
@@ -2677 +2676 @@
     write(0, rle, rle_size);    //unsigned byte
 #else
-    NanoVis::bmp_write("nv>image -bytes");
+    NanoVis::ppm_write("nv>image -bytes");
 #endif
 }