Changeset 4056

Timestamp:

Nov 14, 2013, 5:39:19 PM (11 years ago)

Author:

ldelgass

Message:

Use nv namespace for internal classes (not Rappture) to make it easier to find
dependencies on the Rappture libraries.

Location:

trunk/packages/vizservers/nanovis

Files:

• CmdProc.cpp (modified) (2 diffs)
• CmdProc.h (modified) (2 diffs)
• Command.cpp (modified) (32 diffs)
• Flow.cpp (modified) (3 diffs)
• Flow.h (modified) (4 diffs)
• FlowBox.cpp (modified) (1 diff)
• FlowBox.h (modified) (2 diffs)
• FlowCmd.cpp (modified) (20 diffs)
• FlowParticles.cpp (modified) (1 diff)
• FlowParticles.h (modified) (2 diffs)
• Switch.cpp (modified) (1 diff)
• Switch.h (modified) (2 diffs)
• Unirect.cpp (modified) (7 diffs)
• Unirect.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/CmdProc.cpp

@@ -10 +10 @@
 #include "CmdProc.h"
 
-using namespace Rappture;
+using namespace nv;
 
 /**
@@ -115 +115 @@
  */
 Tcl_ObjCmdProc *
-Rappture::GetOpFromObj(Tcl_Interp *interp,      /* Interpreter to report errors to */
-                       int nSpecs,              /* Number of specifications in array */
-                       CmdSpec *specs,          /* Op specification array */
-                       int operPos,             /* Position of operation in argument
-                                                 * list. */
-                       int objc,                /* Number of arguments in the argument
-                                                 * vector.  This includes any prefixed
-                                                 * arguments */ 
-                       Tcl_Obj *const *objv,    /* Argument vector */
-                       int flags)
+nv::GetOpFromObj(Tcl_Interp *interp,    /* Interpreter to report errors to */
+                 int nSpecs,            /* Number of specifications in array */
+                 CmdSpec *specs,                /* Op specification array */
+                 int operPos,           /* Position of operation in argument
+                                         * list. */
+                 int objc,              /* Number of arguments in the argument
+                                         * vector.  This includes any prefixed
+                                         * arguments */ 
+                 Tcl_Obj *const *objv,  /* Argument vector */
+                 int flags)
 {
     CmdSpec *specPtr;

trunk/packages/vizservers/nanovis/CmdProc.h

@@ -4 +4 @@
  *
  */
-#ifndef RAPPTURE_CMDPROC_H
-#define RAPPTURE_CMDPROC_H
+#ifndef NV_CMDPROC_H
+#define NV_CMDPROC_H
 
-namespace Rappture {
+namespace nv {
 
 /**
@@ -38 +38 @@
              CmdSpec *specs, int operPos, int objc, Tcl_Obj *const *objv, int flags);
 
-#define NumCmdSpecs(s) (sizeof(s) / sizeof(Rappture::CmdSpec))
+#define NumCmdSpecs(s) (sizeof(s) / sizeof(nv::CmdSpec))
 
 }

trunk/packages/vizservers/nanovis/Command.cpp

@@ -288 +288 @@
         return NULL;
     }
-    if ((nv::GetFloatFromObj(interp, objv[0], &xMin) != TCL_OK) ||
-        (nv::GetFloatFromObj(interp, objv[1], &yMin) != TCL_OK) ||
-        (nv::GetFloatFromObj(interp, objv[2], &xMax) != TCL_OK) ||
-        (nv::GetFloatFromObj(interp, objv[3], &yMax) != TCL_OK) ||
+    if ((GetFloatFromObj(interp, objv[0], &xMin) != TCL_OK) ||
+        (GetFloatFromObj(interp, objv[1], &yMin) != TCL_OK) ||
+        (GetFloatFromObj(interp, objv[2], &xMax) != TCL_OK) ||
+        (GetFloatFromObj(interp, objv[3], &yMax) != TCL_OK) ||
         (Tcl_GetIntFromObj(interp, objv[4], &xNum) != TCL_OK) ||
         (Tcl_GetIntFromObj(interp, objv[5], &yNum) != TCL_OK)) {
@@ -320 +320 @@
     int i;
     for (i = 0; i < nValues; i++) {
-        if (nv::GetFloatFromObj(interp, elem[i], heights + i) != TCL_OK) {
+        if (GetFloatFromObj(interp, elem[i], heights + i) != TCL_OK) {
             delete [] heights;
             return NULL;
@@ -651 +651 @@
 }
 
-static Rappture::CmdSpec cameraOps[] = {
+static CmdSpec cameraOps[] = {
     {"angle",   2, CameraAngleOp,    5, 5, "xAngle yAngle zAngle",},
     {"orient",  1, CameraOrientOp,   6, 6, "qw qx qy qz",},
@@ -667 +667 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nCameraOps, cameraOps,
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    proc = GetOpFromObj(interp, nCameraOps, cameraOps,
+                        CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -786 +786 @@
 }
 
-static Rappture::CmdSpec cutplaneOps[] = {
+static CmdSpec cutplaneOps[] = {
     {"position", 1, CutplanePositionOp, 4, 0, "relval axis ?indices?",},
     {"state",    1, CutplaneStateOp,    4, 0, "bool axis ?indices?",},
@@ -814 +814 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nCutplaneOps, cutplaneOps,
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    proc = GetOpFromObj(interp, nCutplaneOps, cutplaneOps,
+                        CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -851 +851 @@
     /* Use the initial client key value pairs as the parts for a generating
      * a unique file name. */
-    int f = nv::getStatsFile(interp, objv[1]);
+    int f = getStatsFile(interp, objv[1]);
     if (f < 0) {
         Tcl_AppendResult(interp, "can't open stats file: ", 
@@ -887 +887 @@
     /* date */
     Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj("date", 4));
-    strcpy(buf, ctime(&nv::g_stats.start.tv_sec));
+    strcpy(buf, ctime(&g_stats.start.tv_sec));
     buf[strlen(buf) - 1] = '\0';
     Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewStringObj(buf, -1));
@@ -894 +894 @@
                 Tcl_NewStringObj("date_secs", 9));
     Tcl_ListObjAppendElement(interp, listObjPtr, 
-                Tcl_NewLongObj(nv::g_stats.start.tv_sec));
+                Tcl_NewLongObj(g_stats.start.tv_sec));
     /* Client arguments. */
     if (Tcl_ListObjGetElements(interp, objv[1], &numItems, &items) != TCL_OK) {
@@ -907 +907 @@
     Tcl_DStringAppend(&ds, "\n", 1);
 #ifdef KEEPSTATS
-    result = nv::writeToStatsFile(f, Tcl_DStringValue(&ds), 
-                                  Tcl_DStringLength(&ds));
+    result = writeToStatsFile(f, Tcl_DStringValue(&ds), 
+                              Tcl_DStringLength(&ds));
 #else
     TRACE("clientinfo: %s", Tcl_DStringValue(&ds));
@@ -993 +993 @@
 }
 
-static Rappture::CmdSpec screenOps[] = {
+static CmdSpec screenOps[] = {
     {"bgcolor",  1, ScreenBgColorOp,  5, 5, "r g b",},
     {"size",     1, ScreenSizeOp, 4, 4, "width height",},
@@ -1005 +1005 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nScreenOps, screenOps,
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    proc = GetOpFromObj(interp, nScreenOps, screenOps,
+                        CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1182 +1182 @@
              * but screen buffer is now 1 byte aligned for PPM images.
              */
-            nv::writeBMPFile(frameNum, dirName,
-                             NanoVis::screenBuffer,
-                             NanoVis::winWidth, NanoVis::winHeight);
+            writeBMPFile(frameNum, dirName,
+                         NanoVis::screenBuffer,
+                         NanoVis::winWidth, NanoVis::winHeight);
         }
     }
@@ -1231 +1231 @@
 }
 
-static Rappture::CmdSpec volumeAnimationOps[] = {
+static CmdSpec volumeAnimationOps[] = {
     {"capture",   2, VolumeAnimationCaptureOp,  4, 5, "numframes ?filename?",},
     {"clear",     2, VolumeAnimationClearOp,    3, 3, "",},
@@ -1247 +1247 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nVolumeAnimationOps, 
-                volumeAnimationOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    proc = GetOpFromObj(interp, nVolumeAnimationOps, 
+                        volumeAnimationOps, CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1383 +1383 @@
 }
 
-static Rappture::CmdSpec volumeDataOps[] = {
+static CmdSpec volumeDataOps[] = {
     {"follows",   1, VolumeDataFollowsOp, 5, 5, "nbytes tag",},
     {"state",     1, VolumeDataStateOp,   4, 0, "bool ?indices?",},
@@ -1395 +1395 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nVolumeDataOps, volumeDataOps,
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    proc = GetOpFromObj(interp, nVolumeDataOps, volumeDataOps,
+                        CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1487 +1487 @@
 }
 
-static Rappture::CmdSpec volumeOutlineOps[] = {
+static CmdSpec volumeOutlineOps[] = {
     {"color",     1, VolumeOutlineColorOp,  6, 0, "r g b ?indices?",},
     {"state",     1, VolumeOutlineStateOp,  4, 0, "bool ?indices?",},
@@ -1500 +1500 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nVolumeOutlineOps, volumeOutlineOps,
-        Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    proc = GetOpFromObj(interp, nVolumeOutlineOps, volumeOutlineOps,
+                        CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1679 +1679 @@
 }
 
-static Rappture::CmdSpec volumeShadingOps[] = {
+static CmdSpec volumeShadingOps[] = {
     {"ambient",       1, VolumeShadingAmbientOp,     4, 0, "value ?indices?",},
     {"diffuse",       1, VolumeShadingDiffuseOp,     4, 0, "value ?indices?",},
@@ -1697 +1697 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps,
-        Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    proc = GetOpFromObj(interp, nVolumeShadingOps, volumeShadingOps,
+                        CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1724 +1724 @@
 }
 
-static Rappture::CmdSpec volumeOps[] = {
+static CmdSpec volumeOps[] = {
     {"animation", 2, VolumeAnimationOp,   3, 0, "oper ?args?",},
     {"data",      2, VolumeDataOp,        3, 0, "oper ?args?",},
@@ -1742 +1742 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nVolumeOps, volumeOps,
-        Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    proc = GetOpFromObj(interp, nVolumeOps, volumeOps,
+                        CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1764 +1764 @@
         return TCL_ERROR;
     }
-    Rappture::Unirect2d data(1);
+    Unirect2d data(1);
     if (data.parseBuffer(interp, buf) != TCL_OK) {
         return TCL_ERROR;
@@ -1818 +1818 @@
 }
 
-static Rappture::CmdSpec heightMapDataOps[] = {
+static CmdSpec heightMapDataOps[] = {
     {"follows",  1, HeightMapDataFollowsOp, 5, 5, "size heightmapName",},
     {"visible",  1, HeightMapDataVisibleOp, 4, 0, "bool ?heightmapNames...?",},
@@ -1830 +1830 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nHeightMapDataOps, heightMapDataOps,
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    proc = GetOpFromObj(interp, nHeightMapDataOps, heightMapDataOps,
+                        CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1879 +1879 @@
 }
 
-static Rappture::CmdSpec heightMapLineContourOps[] = {
+static CmdSpec heightMapLineContourOps[] = {
     {"color",   1, HeightMapLineContourColorOp,   6, 0, "r g b ?heightmapNames...?",},
     {"visible", 1, HeightMapLineContourVisibleOp, 4, 0, "bool ?heightmapNames...?",},
@@ -1891 +1891 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nHeightMapLineContourOps,
-        heightMapLineContourOps, Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    proc = GetOpFromObj(interp, nHeightMapLineContourOps,
+                        heightMapLineContourOps, CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2034 +2034 @@
 }
 
-static Rappture::CmdSpec heightMapOps[] = {
+static CmdSpec heightMapOps[] = {
     {"create",       2, HeightMapCreateOp,      10, 10, "heightmapName xmin ymin xmax ymax xnum ynum values",},
     {"cull",         2, HeightMapCullOp,        3, 3, "mode",},
@@ -2053 +2053 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nHeightMapOps, heightMapOps,
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    proc = GetOpFromObj(interp, nHeightMapOps, heightMapOps,
+                        CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -2136 +2136 @@
 }
 
-static Rappture::CmdSpec gridOps[] = {
+static CmdSpec gridOps[] = {
     {"axiscolor",  5, GridAxisColorOp,  5, 6, "r g b ?a?",},
     {"axisname",   5, GridAxisNameOp,   5, 5, "index title units",},
@@ -2150 +2150 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nGridOps, gridOps,
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    proc = GetOpFromObj(interp, nGridOps, gridOps,
+                        CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;

trunk/packages/vizservers/nanovis/Flow.cpp

@@ -56 +56 @@
     TRACE("Enter");
 
-    Rappture::FreeSwitches(_switches, &_sv, 0);
+    FreeSwitches(_switches, &_sv, 0);
 
     if (_volume != NULL) {
@@ -336 +336 @@
 
 float *
-Flow::getScaledVector(Rappture::Unirect3d *unirect)
+Flow::getScaledVector(Unirect3d *unirect)
 {
     assert(unirect->nComponents() == 3);
@@ -365 +365 @@
 
 Volume *
-Flow::makeVolume(Rappture::Unirect3d *unirect, float *data)
+Flow::makeVolume(Unirect3d *unirect, float *data)
 {
     Volume *volume =

trunk/packages/vizservers/nanovis/Flow.h

@@ -104 +104 @@
     }
 
-    void data(Rappture::Unirect3d *unirect)
+    void data(Unirect3d *unirect)
     {
         float *vdata = getScaledVector(unirect);
@@ -181 +181 @@
     int parseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
     {
-        if (Rappture::ParseSwitches(interp, _switches, objc, objv, &_sv,
-                                    SWITCH_DEFAULTS) < 0) {
+        if (nv::ParseSwitches(interp, _switches, objc, objv, &_sv,
+                              SWITCH_DEFAULTS) < 0) {
             return TCL_ERROR;
         }
@@ -210 +210 @@
     bool scaleVectorField();
 
-    float *getScaledVector(Rappture::Unirect3d *unirect);
-
-    Volume *makeVolume(Rappture::Unirect3d *unirect, float *data);
+    float *getScaledVector(Unirect3d *unirect);
+
+    Volume *makeVolume(Unirect3d *unirect, float *data);
 
     void renderBoxes();
@@ -251 +251 @@
     FlowValues _sv;
 
-    static Rappture::SwitchSpec _switches[];
+    static SwitchSpec _switches[];
 };
 

trunk/packages/vizservers/nanovis/FlowBox.cpp

@@ -41 +41 @@
 {
     TRACE("Freeing switches");
-    Rappture::FreeSwitches(_switches, &_sv, 0);
+    FreeSwitches(_switches, &_sv, 0);
 }
 

trunk/packages/vizservers/nanovis/FlowBox.h

@@ -49 +49 @@
     int parseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
     {
-        if (Rappture::ParseSwitches(interp, _switches, objc, objv, &_sv, 
-                                    SWITCH_DEFAULTS) < 0) {
+        if (nv::ParseSwitches(interp, _switches, objc, objv, &_sv, 
+                              SWITCH_DEFAULTS) < 0) {
             return TCL_ERROR;
         }
@@ -69 +69 @@
     std::string _name;          ///< Name of this box in the hash table.
     FlowBoxValues _sv;
-    static Rappture::SwitchSpec _switches[];
+    static SwitchSpec _switches[];
 };
 

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -50 +50 @@
 using namespace vrmath;
 
-static Rappture::SwitchParseProc AxisSwitchProc;
-static Rappture::SwitchCustom axisSwitch = {
+static SwitchParseProc AxisSwitchProc;
+static SwitchCustom axisSwitch = {
     AxisSwitchProc, NULL, 0,
 };
 
-static Rappture::SwitchParseProc ColorSwitchProc;
-static Rappture::SwitchCustom colorSwitch = {
+static SwitchParseProc ColorSwitchProc;
+static SwitchCustom colorSwitch = {
     ColorSwitchProc, NULL, 0,
 };
 
-static Rappture::SwitchParseProc PointSwitchProc;
-static Rappture::SwitchCustom pointSwitch = {
+static SwitchParseProc PointSwitchProc;
+static SwitchCustom pointSwitch = {
     PointSwitchProc, NULL, 0,
 };
 
-static Rappture::SwitchParseProc PositionSwitchProc;
-static Rappture::SwitchCustom positionSwitch = {
+static SwitchParseProc PositionSwitchProc;
+static SwitchCustom positionSwitch = {
     PositionSwitchProc, NULL, 0,
 };
 
-static Rappture::SwitchParseProc TransferFunctionSwitchProc;
-static Rappture::SwitchCustom transferFunctionSwitch = {
+static SwitchParseProc TransferFunctionSwitchProc;
+static SwitchCustom transferFunctionSwitch = {
     TransferFunctionSwitchProc, NULL, 0,
 };
 
-Rappture::SwitchSpec Flow::_switches[] = {
-    {Rappture::SWITCH_FLOAT, "-ambient", "value",
+SwitchSpec Flow::_switches[] = {
+    {SWITCH_FLOAT, "-ambient", "value",
      offsetof(FlowValues, ambient), 0},
-    {Rappture::SWITCH_BOOLEAN, "-arrows", "boolean",
+    {SWITCH_BOOLEAN, "-arrows", "boolean",
      offsetof(FlowValues, showArrows), 0},
-    {Rappture::SWITCH_CUSTOM, "-axis", "axis",
+    {SWITCH_CUSTOM, "-axis", "axis",
      offsetof(FlowValues, slicePos.axis), 0, 0, &axisSwitch},
-    {Rappture::SWITCH_FLOAT, "-diffuse", "value",
+    {SWITCH_FLOAT, "-diffuse", "value",
      offsetof(FlowValues, diffuse), 0},
-    {Rappture::SWITCH_BOOLEAN, "-hide", "boolean",
+    {SWITCH_BOOLEAN, "-hide", "boolean",
      offsetof(FlowValues, isHidden), 0},
-    {Rappture::SWITCH_BOOLEAN, "-light2side", "boolean",
+    {SWITCH_BOOLEAN, "-light2side", "boolean",
      offsetof(FlowValues, twoSidedLighting), 0},
-    {Rappture::SWITCH_FLOAT, "-opacity", "value",
+    {SWITCH_FLOAT, "-opacity", "value",
      offsetof(FlowValues, opacity), 0},
-    {Rappture::SWITCH_BOOLEAN, "-outline", "boolean",
+    {SWITCH_BOOLEAN, "-outline", "boolean",
      offsetof(FlowValues, showOutline), 0},
-    {Rappture::SWITCH_CUSTOM, "-position", "number",
+    {SWITCH_CUSTOM, "-position", "number",
      offsetof(FlowValues, slicePos), 0, 0, &positionSwitch},
-    {Rappture::SWITCH_BOOLEAN, "-slice", "boolean",
+    {SWITCH_BOOLEAN, "-slice", "boolean",
      offsetof(FlowValues, sliceVisible), 0},
-    {Rappture::SWITCH_FLOAT, "-specularExp", "value",
+    {SWITCH_FLOAT, "-specularExp", "value",
      offsetof(FlowValues, specularExp), 0},
-    {Rappture::SWITCH_FLOAT, "-specularLevel", "value",
+    {SWITCH_FLOAT, "-specularLevel", "value",
      offsetof(FlowValues, specular), 0},
-    {Rappture::SWITCH_CUSTOM, "-transferfunction", "name",
+    {SWITCH_CUSTOM, "-transferfunction", "name",
      offsetof(FlowValues, transferFunction), 0, 0, &transferFunctionSwitch},
-    {Rappture::SWITCH_BOOLEAN, "-volume", "boolean",
+    {SWITCH_BOOLEAN, "-volume", "boolean",
      offsetof(FlowValues, showVolume), 0},
-    {Rappture::SWITCH_END}
-};
-
-Rappture::SwitchSpec FlowParticles::_switches[] = {
-    {Rappture::SWITCH_CUSTOM, "-axis", "axis",
+    {SWITCH_END}
+};
+
+SwitchSpec FlowParticles::_switches[] = {
+    {SWITCH_CUSTOM, "-axis", "axis",
      offsetof(FlowParticlesValues, position.axis), 0, 0, &axisSwitch},
-    {Rappture::SWITCH_CUSTOM, "-color", "{r g b a}",
+    {SWITCH_CUSTOM, "-color", "{r g b a}",
      offsetof(FlowParticlesValues, color), 0, 0,  &colorSwitch},
-    {Rappture::SWITCH_BOOLEAN, "-hide", "boolean",
+    {SWITCH_BOOLEAN, "-hide", "boolean",
      offsetof(FlowParticlesValues, isHidden), 0},
-    {Rappture::SWITCH_CUSTOM, "-position", "number",
+    {SWITCH_CUSTOM, "-position", "number",
      offsetof(FlowParticlesValues, position), 0, 0, &positionSwitch},
-    {Rappture::SWITCH_FLOAT, "-size", "float",
+    {SWITCH_FLOAT, "-size", "float",
      offsetof(FlowParticlesValues, particleSize), 0},
-    {Rappture::SWITCH_END}
-};
-
-Rappture::SwitchSpec FlowBox::_switches[] = {
-    {Rappture::SWITCH_CUSTOM, "-color", "{r g b a}",
+    {SWITCH_END}
+};
+
+SwitchSpec FlowBox::_switches[] = {
+    {SWITCH_CUSTOM, "-color", "{r g b a}",
      offsetof(FlowBoxValues, color), 0, 0,  &colorSwitch},
-    {Rappture::SWITCH_CUSTOM, "-corner1", "{x y z}",
+    {SWITCH_CUSTOM, "-corner1", "{x y z}",
      offsetof(FlowBoxValues, corner1), 0, 0, &pointSwitch},
-    {Rappture::SWITCH_CUSTOM, "-corner2", "{x y z}",
+    {SWITCH_CUSTOM, "-corner2", "{x y z}",
      offsetof(FlowBoxValues, corner2), 0, 0, &pointSwitch},
-    {Rappture::SWITCH_BOOLEAN, "-hide", "boolean",
+    {SWITCH_BOOLEAN, "-hide", "boolean",
      offsetof(FlowBoxValues, isHidden), 0},
-    {Rappture::SWITCH_FLOAT, "-linewidth", "number",
+    {SWITCH_FLOAT, "-linewidth", "number",
      offsetof(FlowBoxValues, lineWidth), 0},
-    {Rappture::SWITCH_END}
+    {SWITCH_END}
 };
 
@@ -161 +161 @@
     }
 
-    Rappture::Unirect3d *dataPtr;
-    dataPtr = new Rappture::Unirect3d(nComponents);
+    Unirect3d *dataPtr;
+    dataPtr = new Unirect3d(nComponents);
     Flow *flow = (Flow *)clientData;
     size_t length = buf.size();
@@ -178 +178 @@
         }
     } else if ((length > 10) && (strncmp(bytes, "unirect2d ", 10) == 0)) {
-        Rappture::Unirect2d *u2dPtr;
-        u2dPtr = new Rappture::Unirect2d(nComponents);
+        Unirect2d *u2dPtr;
+        u2dPtr = new Unirect2d(nComponents);
         if (u2dPtr->parseBuffer(interp, buf) != TCL_OK) {
             delete u2dPtr;
@@ -247 +247 @@
     size_t length = buf.size();
 
-    Rappture::Unirect3d *unirect = NULL;
+    Unirect3d *unirect = NULL;
     Volume *volume = NULL;
 
     Flow *flow = (Flow *)clientData;
     if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
-        unirect = new Rappture::Unirect3d(nComponents);
+        unirect = new Unirect3d(nComponents);
         if (!unirect->importDx(result, nComponents, length - 4, bytes + 4)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
@@ -259 +259 @@
         }
     } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
-        unirect = new Rappture::Unirect3d(nComponents);
+        unirect = new Unirect3d(nComponents);
         if (unirect->parseBuffer(interp, buf) != TCL_OK) {
             delete unirect;
@@ -265 +265 @@
         }
     } else if ((length > 10) && (strncmp(bytes, "unirect2d ", 10) == 0)) {
-        unirect = new Rappture::Unirect3d(nComponents);
-        Rappture::Unirect2d *u2dPtr;
-        u2dPtr = new Rappture::Unirect2d(nComponents);
+        unirect = new Unirect3d(nComponents);
+        Unirect2d *u2dPtr;
+        u2dPtr = new Unirect2d(nComponents);
         if (u2dPtr->parseBuffer(interp, buf) != TCL_OK) {
             delete unirect;
@@ -297 +297 @@
     } else {
         TRACE("header is %.14s", buf.bytes());
-        unirect = new Rappture::Unirect3d(nComponents);
+        unirect = new Unirect3d(nComponents);
         if (!unirect->importDx(result, nComponents, length, bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
@@ -349 +349 @@
 }
 
-static Rappture::CmdSpec flowDataOps[] = {
+static CmdSpec flowDataOps[] = {
     {"file",    2, FlowDataFileOp,    5, 5, "fileName nComponents",},
     {"follows", 2, FlowDataFollowsOp, 5, 5, "size nComponents",},
@@ -361 +361 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nFlowDataOps, flowDataOps,
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    proc = GetOpFromObj(interp, nFlowDataOps, flowDataOps,
+                        CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -687 +687 @@
 }
 
-static Rappture::CmdSpec flowParticlesOps[] = {
+static CmdSpec flowParticlesOps[] = {
     {"add",        1, FlowParticlesAddOp,        4, 0, "name ?switches?",},
     {"configure",  1, FlowParticlesConfigureOp,  4, 0, "name ?switches?",},
@@ -711 +711 @@
 {
     Tcl_ObjCmdProc *proc;
-    proc = Rappture::GetOpFromObj(interp, nFlowParticlesOps, flowParticlesOps, 
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    proc = GetOpFromObj(interp, nFlowParticlesOps, flowParticlesOps, 
+                        CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -794 +794 @@
 }
 
-static Rappture::CmdSpec flowBoxOps[] = {
+static CmdSpec flowBoxOps[] = {
     {"add",        1, FlowBoxAddOp,        4, 0, "name ?switches?",},
     {"configure",  1, FlowBoxConfigureOp,  4, 0, "name ?switches?",},
@@ -816 +816 @@
 {
     Tcl_ObjCmdProc *proc;
-    proc = Rappture::GetOpFromObj(interp, nFlowBoxOps, flowBoxOps, 
-                                  Rappture::CMDSPEC_ARG2, objc, objv, 0);
+    proc = GetOpFromObj(interp, nFlowBoxOps, flowBoxOps, 
+                        CMDSPEC_ARG2, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -866 +866 @@
 }
 
-static Rappture::CmdSpec flowInstOps[] = {
+static CmdSpec flowInstOps[] = {
     {"box",         1, FlowBoxOp,        2, 0, "oper ?args?"},
     {"configure",   1, FlowConfigureOp,  2, 0, "?switches?"},
@@ -888 +888 @@
 {
     Tcl_ObjCmdProc *proc;
-    proc = Rappture::GetOpFromObj(interp, nFlowInstOps, flowInstOps, 
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    proc = GetOpFromObj(interp, nFlowInstOps, flowInstOps, 
+                        CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;
@@ -1091 +1091 @@
 };
 
-static Rappture::SwitchParseProc VideoFormatSwitchProc;
-static Rappture::SwitchCustom videoFormatSwitch = {
+static SwitchParseProc VideoFormatSwitchProc;
+static SwitchCustom videoFormatSwitch = {
     VideoFormatSwitchProc, NULL, 0,
 };
 
-static Rappture::SwitchSpec flowVideoSwitches[] = {
-    {Rappture::SWITCH_INT, "-bitrate", "value",
+static SwitchSpec flowVideoSwitches[] = {
+    {SWITCH_INT, "-bitrate", "value",
      offsetof(FlowVideoSwitches, bitRate), 0},
-    {Rappture::SWITCH_CUSTOM, "-format", "string",
+    {SWITCH_CUSTOM, "-format", "string",
      offsetof(FlowVideoSwitches, formatObjPtr), 0, 0, &videoFormatSwitch},
-    {Rappture::SWITCH_FLOAT, "-framerate", "value",
+    {SWITCH_FLOAT, "-framerate", "value",
      offsetof(FlowVideoSwitches, frameRate), 0},
-    {Rappture::SWITCH_INT, "-height", "integer",
+    {SWITCH_INT, "-height", "integer",
      offsetof(FlowVideoSwitches, height), 0},
-    {Rappture::SWITCH_INT, "-numframes", "count",
+    {SWITCH_INT, "-numframes", "count",
      offsetof(FlowVideoSwitches, numFrames), 0},
-    {Rappture::SWITCH_INT, "-width", "integer",
+    {SWITCH_INT, "-width", "integer",
      offsetof(FlowVideoSwitches, width), 0},
-    {Rappture::SWITCH_END}
+    {SWITCH_END}
 };
 
@@ -1247 +1247 @@
     switches.formatObjPtr = Tcl_NewStringObj("mpeg1video", 10);
     Tcl_IncrRefCount(switches.formatObjPtr);
-    if (Rappture::ParseSwitches(interp, flowVideoSwitches, 
+    if (ParseSwitches(interp, flowVideoSwitches, 
                 objc - 3, objv + 3, &switches, SWITCH_DEFAULTS) < 0) {
         return TCL_ERROR;
@@ -1299 +1299 @@
     tmpFileName[length] = '\0';
     rmdir(tmpFileName);
-    Rappture::FreeSwitches(flowVideoSwitches, &switches, 0);
+    FreeSwitches(flowVideoSwitches, &switches, 0);
     return result;
 }
@@ -1314 +1314 @@
 #endif /* HAVE_FFMPEG */
 
-static Rappture::CmdSpec flowCmdOps[] = {
+static CmdSpec flowCmdOps[] = {
     {"add",      1, FlowAddOp,     3, 0, "name ?option value...?",},
     {"delete",   1, FlowDeleteOp,  3, 0, "name ?name...?",},
@@ -1332 +1332 @@
     Tcl_ObjCmdProc *proc;
 
-    proc = Rappture::GetOpFromObj(interp, nFlowCmdOps, flowCmdOps, 
-                                  Rappture::CMDSPEC_ARG1, objc, objv, 0);
+    proc = GetOpFromObj(interp, nFlowCmdOps, flowCmdOps, 
+                        CMDSPEC_ARG1, objc, objv, 0);
     if (proc == NULL) {
         return TCL_ERROR;

trunk/packages/vizservers/nanovis/FlowParticles.cpp

@@ -41 +41 @@
     }
     TRACE("Freeing switches");
-    Rappture::FreeSwitches(_switches, &_sv, 0);
+    FreeSwitches(_switches, &_sv, 0);
 }
 

trunk/packages/vizservers/nanovis/FlowParticles.h

@@ -52 +52 @@
     int parseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
     {
-        if (Rappture::ParseSwitches(interp, _switches, objc, objv, &_sv, 
-                                    SWITCH_DEFAULTS) < 0) {
+        if (nv::ParseSwitches(interp, _switches, objc, objv, &_sv, 
+                              SWITCH_DEFAULTS) < 0) {
             return TCL_ERROR;
         }
@@ -97 +97 @@
     FlowParticlesValues _sv;
 
-    static Rappture::SwitchSpec _switches[];
+    static SwitchSpec _switches[];
 };
 

trunk/packages/vizservers/nanovis/Switch.cpp

@@ -36 +36 @@
 #include "Switch.h"
 
-namespace Rappture {
+namespace nv {
 
 static void

trunk/packages/vizservers/nanovis/Switch.h

@@ -28 +28 @@
  */
 
-#ifndef RAPPTURE_SWITCH_H
-#define RAPPTURE_SWITCH_H
+#ifndef NV_SWITCH_H
+#define NV_SWITCH_H
 
 #ifdef HAVE_STDDEF_H
@@ -35 +35 @@
 #endif /* HAVE_STDDEF_H */
 
-namespace Rappture {
+namespace nv {
 
 typedef int (SwitchParseProc)(ClientData clientData, Tcl_Interp *interp, 

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -42 +42 @@
 
 int
-Rappture::Unirect2d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
+nv::Unirect2d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
 {
     Tcl_Obj *objPtr = Tcl_NewStringObj(buf.bytes(), buf.size());
@@ -59 +59 @@
 
 int
-Rappture::Unirect3d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
+nv::Unirect3d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
 {
     Tcl_Obj *objPtr;
@@ -78 +78 @@
 
 int 
-Rappture::Unirect3d::loadData(Tcl_Interp *interp, int objc, 
-                              Tcl_Obj *const *objv)
+nv::Unirect3d::loadData(Tcl_Interp *interp, int objc, 
+                        Tcl_Obj *const *objv)
 {
     int num[3], nValues;
@@ -312 +312 @@
 
 int 
-Rappture::Unirect2d::loadData(Tcl_Interp *interp, int objc, 
-                              Tcl_Obj *const *objv)
+nv::Unirect2d::loadData(Tcl_Interp *interp, int objc, 
+                        Tcl_Obj *const *objv)
 {
     if ((objc & 0x01) == 0) {
@@ -487 +487 @@
 
 bool
-Rappture::Unirect3d::importDx(Rappture::Outcome &result, size_t nComponents,
-                              size_t length, char *string) 
+nv::Unirect3d::importDx(Rappture::Outcome &result, size_t nComponents,
+                        size_t length, char *string) 
 {
     int nx, ny, nz, npts;
@@ -632 +632 @@
 
 void
-Rappture::Unirect3d::getVectorRange()
+nv::Unirect3d::getVectorRange()
 {
     assert(_nComponents == 3);
@@ -656 +656 @@
 
 bool 
-Rappture::Unirect3d::convert(Rappture::Unirect2d *dataPtr)
+nv::Unirect3d::convert(nv::Unirect2d *dataPtr)
 {
     _initialized = false;

trunk/packages/vizservers/nanovis/Unirect.h

@@ -5 +5 @@
  * Author: George A. Howlett <gah@purdue.edu>
  */
-#ifndef RAPPTURE_UNIRECT_H
-#define RAPPTURE_UNIRECT_H
+#ifndef NV_UNIRECT_H
+#define NV_UNIRECT_H
 
 #include <float.h>
@@ -18 +18 @@
 #include "Trace.h"
 
-namespace Rappture {
+namespace nv {
 
 class Unirect2d;