Changeset 3566 for trunk/packages

Timestamp:

Mar 23, 2013 2:49:44 PM (11 years ago)

Author:

ldelgass

Message:

Make flow related methods use camel case convention

Location:

trunk/packages/vizservers/nanovis

Files:

• FlowCmd.cpp (modified) (59 diffs)
• FlowCmd.h (modified) (10 diffs)
• nanovis.cpp (modified) (5 diffs)
• nanovis.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -162 +162 @@
     TRACE("Particles '%s' axis: %d pos: %g rel pos: %g",
           _name, _sv.position.axis, _sv.position.value,
-          FlowCmd::GetRelativePosition(&_sv.position));
-    _rendererPtr->setPos(FlowCmd::GetRelativePosition(&_sv.position));
+          FlowCmd::getRelativePosition(&_sv.position));
+    _rendererPtr->setPos(FlowCmd::getRelativePosition(&_sv.position));
     _rendererPtr->setAxis(_sv.position.axis);
     assert(_rendererPtr->active());
@@ -172 +172 @@
 FlowParticles::configure() 
 {
-    _rendererPtr->setPos(FlowCmd::GetRelativePosition(&_sv.position));
+    _rendererPtr->setPos(FlowCmd::getRelativePosition(&_sv.position));
     _rendererPtr->setColor(Vector4f(_sv.color.r, _sv.color.g, _sv.color.b, 
                                     _sv.color.a));
@@ -269 +269 @@
 
 void 
-FlowBox::Render(Volume *vol)
+FlowBox::render(Volume *vol)
 {
     TRACE("Box: '%s'", _name);
@@ -403 +403 @@
     FlowBox *boxPtr;
     FlowBoxIterator boxIter;
-    for (boxPtr = FirstBox(&boxIter); boxPtr != NULL; 
-         boxPtr = NextBox(&boxIter)) {
+    for (boxPtr = firstBox(&boxIter); boxPtr != NULL; 
+         boxPtr = nextBox(&boxIter)) {
         boxPtr->disconnect();
         delete boxPtr;
@@ -410 +410 @@
     FlowParticles *particlesPtr;
     FlowParticlesIterator partIter;
-    for (particlesPtr = FirstParticles(&partIter); particlesPtr != NULL;
-         particlesPtr = NextParticles(&partIter)) {
+    for (particlesPtr = firstParticles(&partIter); particlesPtr != NULL;
+         particlesPtr = nextParticles(&partIter)) {
         particlesPtr->disconnect();
         delete particlesPtr;
@@ -420 +420 @@
 
 void
-FlowCmd::ResetParticles()
+FlowCmd::resetParticles()
 {
     FlowParticlesIterator iter;
-    for (FlowParticles *particlesPtr = FirstParticles(&iter);
+    for (FlowParticles *particlesPtr = firstParticles(&iter);
          particlesPtr != NULL;
-         particlesPtr = NextParticles(&iter)) {
+         particlesPtr = nextParticles(&iter)) {
         particlesPtr->reset();
     }
@@ -431 +431 @@
 
 void
-FlowCmd::Advect()
-{
-    NvVectorField *fieldPtr = VectorField();
+FlowCmd::advect()
+{
+    NvVectorField *fieldPtr = getVectorField();
     fieldPtr->active(true);
     FlowParticlesIterator iter;
-    for (FlowParticles *particlesPtr = FirstParticles(&iter);
+    for (FlowParticles *particlesPtr = firstParticles(&iter);
          particlesPtr != NULL;
-         particlesPtr = NextParticles(&iter)) {
+         particlesPtr = nextParticles(&iter)) {
         if (particlesPtr->visible()) {
             particlesPtr->advect();
@@ -446 +446 @@
 
 void
-FlowCmd::Render()
+FlowCmd::render()
 {
     _fieldPtr->active(true);
     _fieldPtr->render();
     FlowParticlesIterator iter;
-    for (FlowParticles *particlesPtr = FirstParticles(&iter);
+    for (FlowParticles *particlesPtr = firstParticles(&iter);
          particlesPtr != NULL; 
-         particlesPtr = NextParticles(&iter)) {
+         particlesPtr = nextParticles(&iter)) {
         if (particlesPtr->visible()) {
             particlesPtr->render();
         }
     }
-    RenderBoxes();
+    renderBoxes();
 }
 
 int
-FlowCmd::CreateParticles(Tcl_Interp *interp, Tcl_Obj *objPtr)
+FlowCmd::createParticles(Tcl_Interp *interp, Tcl_Obj *objPtr)
 {
     Tcl_HashEntry *hPtr;
@@ -487 +487 @@
 
 int
-FlowCmd::GetParticles(Tcl_Interp *interp, Tcl_Obj *objPtr, 
+FlowCmd::getParticles(Tcl_Interp *interp, Tcl_Obj *objPtr, 
                       FlowParticles **particlesPtrPtr)
 {
@@ -504 +504 @@
 
 FlowParticles *
-FlowCmd::FirstParticles(FlowParticlesIterator *iterPtr) 
+FlowCmd::firstParticles(FlowParticlesIterator *iterPtr) 
 {
     iterPtr->hashPtr = Tcl_FirstHashEntry(&_particlesTable, 
@@ -515 +515 @@
 
 FlowParticles *
-FlowCmd::NextParticles(FlowParticlesIterator *iterPtr) 
+FlowCmd::nextParticles(FlowParticlesIterator *iterPtr) 
 {
     if (iterPtr->hashPtr == NULL) {
@@ -528 +528 @@
 
 int
-FlowCmd::CreateBox(Tcl_Interp *interp, Tcl_Obj *objPtr)
+FlowCmd::createBox(Tcl_Interp *interp, Tcl_Obj *objPtr)
 {
     Tcl_HashEntry *hPtr;
@@ -553 +553 @@
 
 int
-FlowCmd::GetBox(Tcl_Interp *interp, Tcl_Obj *objPtr, FlowBox **boxPtrPtr)
+FlowCmd::getBox(Tcl_Interp *interp, Tcl_Obj *objPtr, FlowBox **boxPtrPtr)
 {
     Tcl_HashEntry *hPtr;
@@ -570 +570 @@
 
 FlowBox *
-FlowCmd::FirstBox(FlowBoxIterator *iterPtr) 
+FlowCmd::firstBox(FlowBoxIterator *iterPtr) 
 {
     iterPtr->hashPtr = Tcl_FirstHashEntry(&_boxTable, &iterPtr->hashSearch);
@@ -580 +580 @@
 
 FlowBox *
-FlowCmd::NextBox(FlowBoxIterator *iterPtr) 
+FlowCmd::nextBox(FlowBoxIterator *iterPtr) 
 {
     if (iterPtr->hashPtr == NULL) {
@@ -593 +593 @@
 
 void
-FlowCmd::InitializeParticles()
+FlowCmd::initializeParticles()
 {
     FlowParticlesIterator iter;
-    for (FlowParticles *particlesPtr = FirstParticles(&iter);
+    for (FlowParticles *particlesPtr = firstParticles(&iter);
          particlesPtr != NULL;
-         particlesPtr = NextParticles(&iter)) {
+         particlesPtr = nextParticles(&iter)) {
         particlesPtr->initialize();
     }
@@ -604 +604 @@
 
 bool
-FlowCmd::ScaleVectorField()
+FlowCmd::scaleVectorField()
 {
     if (_volPtr != NULL) {
@@ -612 +612 @@
     }
     float *vdata;
-    vdata = GetScaledVector();
+    vdata = getScaledVector();
     if (vdata == NULL) {
         return false;
     }
     Volume *volPtr;
-    volPtr = MakeVolume(vdata);
+    volPtr = makeVolume(vdata);
     delete [] vdata;
     if (volPtr == NULL) {
@@ -651 +651 @@
                            scale.z,
                            _volPtr->wAxis.max());
-        SetCurrentPosition();
-        SetAxis();
-        SetActive();
+        setCurrentPosition();
+        setAxis();
+        setActive();
     }
 
@@ -670 +670 @@
 
     FlowParticlesIterator partIter;
-    for (FlowParticles *particlesPtr = FirstParticles(&partIter);
+    for (FlowParticles *particlesPtr = firstParticles(&partIter);
          particlesPtr != NULL;
-         particlesPtr = NextParticles(&partIter)) {
+         particlesPtr = nextParticles(&partIter)) {
         particlesPtr->setVectorField(_volPtr,
                                      location,
@@ -684 +684 @@
 
 void
-FlowCmd::RenderBoxes()
+FlowCmd::renderBoxes()
 {
     FlowBoxIterator iter;
     FlowBox *boxPtr;
-    for (boxPtr = FirstBox(&iter); boxPtr != NULL; boxPtr = NextBox(&iter)) {
+    for (boxPtr = firstBox(&iter); boxPtr != NULL; boxPtr = nextBox(&iter)) {
         if (boxPtr->visible()) {
-            boxPtr->Render(_volPtr);
+            boxPtr->render(_volPtr);
         }
     }
@@ -696 +696 @@
 
 float *
-FlowCmd::GetScaledVector()
+FlowCmd::getScaledVector()
 {
     assert(_dataPtr->nComponents() == 3);
@@ -728 +728 @@
 
 Volume *
-FlowCmd::MakeVolume(float *data)
+FlowCmd::makeVolume(float *data)
 {
     Volume *volPtr;
@@ -969 +969 @@
 
 float
-FlowCmd::GetRelativePosition(FlowPosition *posPtr)
+FlowCmd::getRelativePosition(FlowPosition *posPtr)
 {
     if (posPtr->flags == RELPOS) {
@@ -989 +989 @@
 
 float
-FlowCmd::GetRelativePosition() 
-{
-    return FlowCmd::GetRelativePosition(&_sv.slicePos);
+FlowCmd::getRelativePosition() 
+{
+    return FlowCmd::getRelativePosition(&_sv.slicePos);
 }
 
@@ -997 +997 @@
 
 void
-NanoVis::InitFlows() 
+NanoVis::initFlows() 
 {
     Tcl_InitHashTable(&flowTable, TCL_STRING_KEYS);
@@ -1003 +1003 @@
 
 FlowCmd *
-NanoVis::FirstFlow(FlowIterator *iterPtr) 
+NanoVis::firstFlow(FlowIterator *iterPtr) 
 {
     iterPtr->hashPtr = Tcl_FirstHashEntry(&flowTable, &iterPtr->hashSearch);
@@ -1013 +1013 @@
 
 FlowCmd *
-NanoVis::NextFlow(FlowIterator *iterPtr) 
+NanoVis::nextFlow(FlowIterator *iterPtr) 
 {
     if (iterPtr->hashPtr == NULL) {
@@ -1026 +1026 @@
 
 int
-NanoVis::GetFlow(Tcl_Interp *interp, Tcl_Obj *objPtr, FlowCmd **flowPtrPtr)
+NanoVis::getFlow(Tcl_Interp *interp, Tcl_Obj *objPtr, FlowCmd **flowPtrPtr)
 {
     Tcl_HashEntry *hPtr;
@@ -1042 +1042 @@
 
 int
-NanoVis::CreateFlow(Tcl_Interp *interp, Tcl_Obj *objPtr)
+NanoVis::createFlow(Tcl_Interp *interp, Tcl_Obj *objPtr)
 {
     Tcl_HashEntry *hPtr;
@@ -1073 +1073 @@
 
 void
-NanoVis::DeleteFlows(Tcl_Interp *interp)
+NanoVis::deleteFlows(Tcl_Interp *interp)
 {
     FlowCmd *flowPtr;
     FlowIterator iter;
-    for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
+    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
+         flowPtr = nextFlow(&iter)) {
         flowPtr->disconnect();                /* Don't disrupt the hash walk */
         Tcl_DeleteCommand(interp, flowPtr->name());
@@ -1086 +1086 @@
 
 bool
-NanoVis::MapFlows()
+NanoVis::mapFlows()
 {
     TRACE("Enter");
@@ -1100 +1100 @@
     FlowCmd *flowPtr;
     FlowIterator iter;
-    for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
+    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
+         flowPtr = nextFlow(&iter)) {
         double min, max;
         if (!flowPtr->isDataLoaded()) {
@@ -1140 +1140 @@
      * Step 2. Generate the vector field from each data set. 
      */
-    for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
+    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
+         flowPtr = nextFlow(&iter)) {
         if (!flowPtr->isDataLoaded()) {
             continue; // Flow exists, but no data has been loaded yet.
         }
         if (flowPtr->visible()) {
-            flowPtr->InitializeParticles();
-        }
-        if (!flowPtr->ScaleVectorField()) {
+            flowPtr->initializeParticles();
+        }
+        if (!flowPtr->scaleVectorField()) {
             return false;
         }
         // FIXME: This doesn't work when there is more than one flow.
-        licRenderer->setOffset(flowPtr->GetRelativePosition());
-        velocityArrowsSlice->slicePos(flowPtr->GetRelativePosition());
-    }
-    AdvectFlows();
+        licRenderer->setOffset(flowPtr->getRelativePosition());
+        velocityArrowsSlice->slicePos(flowPtr->getRelativePosition());
+    }
+    advectFlows();
     return true;
 }
 
 void
-NanoVis::GetFlowBounds(Vector3f& min,
+NanoVis::getFlowBounds(Vector3f& min,
                        Vector3f& max,
                        bool onlyVisible)
@@ -1171 +1171 @@
     FlowCmd *flow;
     FlowIterator iter;
-    for (flow = FirstFlow(&iter); flow != NULL; 
-         flow = NextFlow(&iter)) {
+    for (flow = firstFlow(&iter); flow != NULL; 
+         flow = nextFlow(&iter)) {
         if (onlyVisible && !flow->visible())
             continue;
@@ -1202 +1202 @@
         FlowBox *box;
         FlowBoxIterator iter;
-        for (box = flow->FirstBox(&iter); box != NULL;
-             box = flow->NextBox(&iter)) {
+        for (box = flow->firstBox(&iter); box != NULL;
+             box = flow->nextBox(&iter)) {
             if (!onlyVisible || box->visible()) {
                 Vector3f fbmin, fbmax;
@@ -1232 +1232 @@
 
 void
-NanoVis::RenderFlows()
+NanoVis::renderFlows()
 {
     FlowCmd *flowPtr;
     FlowIterator iter;
-    for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
+    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
+         flowPtr = nextFlow(&iter)) {
         if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
-            flowPtr->Render();
+            flowPtr->render();
         }
     }
@@ -1246 +1246 @@
 
 void
-NanoVis::ResetFlows()
+NanoVis::resetFlows()
 {
     FlowCmd *flowPtr;
@@ -1254 +1254 @@
         NanoVis::licRenderer->reset();
     }
-    for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
+    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
+         flowPtr = nextFlow(&iter)) {
         if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
-            flowPtr->ResetParticles();
+            flowPtr->resetParticles();
         }
     }
@@ -1263 +1263 @@
 
 void
-NanoVis::AdvectFlows()
+NanoVis::advectFlows()
 {
     FlowCmd *flowPtr;
     FlowIterator iter;
-    for (flowPtr = FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NextFlow(&iter)) {
+    for (flowPtr = firstFlow(&iter); flowPtr != NULL; 
+         flowPtr = nextFlow(&iter)) {
         if ((flowPtr->isDataLoaded()) && (flowPtr->visible())) {
-            flowPtr->Advect();
-        }
-    }
-}    
+            flowPtr->advect();
+        }
+    }
+}
 
 /**
@@ -1506 +1506 @@
     FlowCmd *flowPtr = (FlowCmd *)clientData;
 
-    if (flowPtr->ParseSwitches(interp, objc - 2, objv + 2) != TCL_OK) {
+    if (flowPtr->parseSwitches(interp, objc - 2, objv + 2) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -1519 +1519 @@
     FlowCmd *flowPtr = (FlowCmd *)clientData;
 
-    if (flowPtr->CreateParticles(interp, objv[3]) != TCL_OK) {
+    if (flowPtr->createParticles(interp, objv[3]) != TCL_OK) {
         return TCL_ERROR;
     }
     FlowParticles *particlesPtr;
-    if (flowPtr->GetParticles(interp, objv[3], &particlesPtr) != TCL_OK) {
+    if (flowPtr->getParticles(interp, objv[3], &particlesPtr) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -1543 +1543 @@
 
     FlowParticles *particlesPtr;
-    if (flowPtr->GetParticles(interp, objv[3], &particlesPtr) != TCL_OK) {
+    if (flowPtr->getParticles(interp, objv[3], &particlesPtr) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -1563 +1563 @@
         FlowParticles *particlesPtr;
 
-        if (flowPtr->GetParticles(NULL, objv[i], &particlesPtr) == TCL_OK) {
+        if (flowPtr->getParticles(NULL, objv[i], &particlesPtr) == TCL_OK) {
             delete particlesPtr;
         }
@@ -1580 +1580 @@
     FlowParticlesIterator iter;
     FlowParticles *particlesPtr;
-    for (particlesPtr = flowPtr->FirstParticles(&iter); particlesPtr != NULL; 
-         particlesPtr = flowPtr->NextParticles(&iter)) {
+    for (particlesPtr = flowPtr->firstParticles(&iter); particlesPtr != NULL; 
+         particlesPtr = flowPtr->nextParticles(&iter)) {
         Tcl_Obj *objPtr;
 
@@ -1634 +1634 @@
     FlowCmd *flowPtr = (FlowCmd *)clientData;
 
-    if (flowPtr->CreateBox(interp, objv[3]) != TCL_OK) {
+    if (flowPtr->createBox(interp, objv[3]) != TCL_OK) {
         return TCL_ERROR;
     }
     FlowBox *boxPtr;
-    if (flowPtr->GetBox(interp, objv[3], &boxPtr) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (boxPtr->ParseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
+    if (flowPtr->getBox(interp, objv[3], &boxPtr) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (boxPtr->parseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
         delete boxPtr;
         return TCL_ERROR;
@@ -1659 +1659 @@
         FlowBox *boxPtr;
 
-        if (flowPtr->GetBox(NULL, objv[i], &boxPtr) == TCL_OK) {
+        if (flowPtr->getBox(NULL, objv[i], &boxPtr) == TCL_OK) {
             delete boxPtr;
         }
@@ -1676 +1676 @@
     FlowBoxIterator iter;
     FlowBox *boxPtr;
-    for (boxPtr = flowPtr->FirstBox(&iter); boxPtr != NULL; 
-         boxPtr = flowPtr->NextBox(&iter)) {
+    for (boxPtr = flowPtr->firstBox(&iter); boxPtr != NULL; 
+         boxPtr = flowPtr->nextBox(&iter)) {
         Tcl_Obj *objPtr;
 
@@ -1694 +1694 @@
 
     FlowBox *boxPtr;
-    if (flowPtr->GetBox(interp, objv[3], &boxPtr) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (boxPtr->ParseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
+    if (flowPtr->getBox(interp, objv[3], &boxPtr) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (boxPtr->parseSwitches(interp, objc - 4, objv + 4) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -1756 +1756 @@
     const char *string = Tcl_GetString(objv[1]);
     TransferFunction *tf;
-    tf = flowPtr->GetTransferFunction();
+    tf = flowPtr->getTransferFunction();
     if (tf == NULL) {
         Tcl_AppendResult(interp, "unknown transfer function \"", string, "\"",
@@ -1770 +1770 @@
     }
     if (NanoVis::flags & NanoVis::MAP_FLOWS) {
-        NanoVis::MapFlows();
+        NanoVis::mapFlows();
     }
     NanoVis::renderLegend(tf, NanoVis::magMin, NanoVis::magMax, w, h, label);
@@ -1828 +1828 @@
           Tcl_Obj *const *objv)
 {
-    if (NanoVis::CreateFlow(interp, objv[2]) != TCL_OK) {
+    if (NanoVis::createFlow(interp, objv[2]) != TCL_OK) {
         return TCL_ERROR;
     }
     FlowCmd *flowPtr;
-    if (NanoVis::GetFlow(interp, objv[2], &flowPtr) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    if (flowPtr->ParseSwitches(interp, objc - 3, objv + 3) != TCL_OK) {
+    if (NanoVis::getFlow(interp, objv[2], &flowPtr) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (flowPtr->parseSwitches(interp, objc - 3, objv + 3) != TCL_OK) {
         Tcl_DeleteCommand(interp, flowPtr->name());
         return TCL_ERROR;
@@ -1853 +1853 @@
         FlowCmd *flowPtr;
 
-        if (NanoVis::GetFlow(interp, objv[i], &flowPtr) != TCL_OK) {
+        if (NanoVis::getFlow(interp, objv[i], &flowPtr) != TCL_OK) {
             return TCL_ERROR;
         }
@@ -1870 +1870 @@
 
     value = false;
-    if (NanoVis::GetFlow(NULL, objv[2], &flowPtr) == TCL_OK) {
+    if (NanoVis::getFlow(NULL, objv[2], &flowPtr) == TCL_OK) {
         value = true;
     }
@@ -1893 +1893 @@
         return TCL_ERROR;
     }
-    NanoVis::ResetFlows();
+    NanoVis::resetFlows();
     if (NanoVis::flags & NanoVis::MAP_FLOWS) {
-        NanoVis::MapFlows();
+        NanoVis::mapFlows();
     }
     int i;
-    NanoVis::AdvectFlows();
+    NanoVis::advectFlows();
     for (i = 0; i < nSteps; i++) {
         if (NanoVis::licRenderer->active()) {
             NanoVis::licRenderer->convolve();
         }
-        NanoVis::AdvectFlows();
+        NanoVis::advectFlows();
     }
     NanoVis::eventuallyRedraw();
@@ -1917 +1917 @@
     FlowCmd *flowPtr;
     FlowIterator iter;
-    for (flowPtr = NanoVis::FirstFlow(&iter); flowPtr != NULL; 
-         flowPtr = NanoVis::NextFlow(&iter)) {
+    for (flowPtr = NanoVis::firstFlow(&iter); flowPtr != NULL; 
+         flowPtr = NanoVis::nextFlow(&iter)) {
         Tcl_Obj *objPtr;
 
@@ -1934 +1934 @@
     assert(NanoVis::licRenderer != NULL);
     if (NanoVis::flags & NanoVis::MAP_FLOWS) {
-        NanoVis::MapFlows();
+        NanoVis::mapFlows();
     }
     NanoVis::eventuallyRedraw();
     NanoVis::licRenderer->convolve();
-    NanoVis::AdvectFlows();
+    NanoVis::advectFlows();
     return TCL_OK;
 }
@@ -1946 +1946 @@
             Tcl_Obj *const *objv)
 {
-    NanoVis::ResetFlows();
+    NanoVis::resetFlows();
     return TCL_OK;
 }
@@ -2309 +2309 @@
 {
     Tcl_CreateObjCommand(interp, "flow", FlowCmdProc, NULL, NULL);
-    NanoVis::InitFlows();
+    NanoVis::initFlows();
     return TCL_OK;
 }

trunk/packages/vizservers/nanovis/FlowCmd.h

@@ -180 +180 @@
     }
 
-    int ParseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
+    int parseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
     {
         if (Rappture::ParseSwitches(interp, _switches, objc, objv, &_sv, 
@@ -189 +189 @@
     }
 
-    void Render(Volume *volPtr);
+    void render(Volume *volPtr);
 
     const FlowBoxValues *getValues() const
@@ -238 +238 @@
     ~FlowCmd();
 
-    int CreateParticles(Tcl_Interp *interp, Tcl_Obj *objPtr);
-
-    int GetParticles(Tcl_Interp *interp, Tcl_Obj *objPtr,
+    int createParticles(Tcl_Interp *interp, Tcl_Obj *objPtr);
+
+    int getParticles(Tcl_Interp *interp, Tcl_Obj *objPtr,
                      FlowParticles **particlePtrPtr);
 
-    void Render();
-
-    void Advect();
-
-    void ResetParticles();
-
-    void InitializeParticles();
-
-    FlowParticles *FirstParticles(FlowParticlesIterator *iterPtr);
-
-    FlowParticles *NextParticles(FlowParticlesIterator *iterPtr);
-
-    int CreateBox(Tcl_Interp *interp, Tcl_Obj *objPtr);
-
-    int GetBox(Tcl_Interp *interp, Tcl_Obj *objPtr, FlowBox **boxPtrPtr);
-
-    FlowBox *FirstBox(FlowBoxIterator *iterPtr);
-
-    FlowBox *NextBox(FlowBoxIterator *iterPtr);
-
-    float *GetScaledVector();
-
-    Volume *MakeVolume(float *data);
+    void render();
+
+    void advect();
+
+    void resetParticles();
+
+    void initializeParticles();
+
+    FlowParticles *firstParticles(FlowParticlesIterator *iterPtr);
+
+    FlowParticles *nextParticles(FlowParticlesIterator *iterPtr);
+
+    int createBox(Tcl_Interp *interp, Tcl_Obj *objPtr);
+
+    int getBox(Tcl_Interp *interp, Tcl_Obj *objPtr, FlowBox **boxPtrPtr);
+
+    FlowBox *firstBox(FlowBoxIterator *iterPtr);
+
+    FlowBox *nextBox(FlowBoxIterator *iterPtr);
+
+    float *getScaledVector();
+
+    Volume *makeVolume(float *data);
     
-    void InitVectorField();
-
-    NvVectorField *VectorField()
+    void initVectorField();
+
+    NvVectorField *getVectorField()
     {
         return _fieldPtr;
     }
 
-    bool ScaleVectorField();
+    bool scaleVectorField();
 
     bool visible()
@@ -309 +309 @@
     }
 
-    void ActivateSlice()
+    void activateSlice()
     {
         /* Must set axis before offset or position goes to wrong axis. */
@@ -317 +317 @@
     }
 
-    void DeactivateSlice()
+    void ceactivateSlice()
     {
         NanoVis::licRenderer->active(false);
     }
 
-    SliceAxis GetAxis()
+    SliceAxis getAxis()
     {
         return (SliceAxis)_sv.slicePos.axis;
     }
 
-    TransferFunction *GetTransferFunction()
+    TransferFunction *getTransferFunction()
     {
         return _sv.tfPtr;
     }
 
-    float GetRelativePosition();
-
-    void SetAxis()
+    float getRelativePosition();
+
+    void setAxis()
     {
         NanoVis::licRenderer->setAxis(_sv.slicePos.axis);
     }
 
-    void SetAxis(FlowCmd::SliceAxis axis)
+    void setAxis(FlowCmd::SliceAxis axis)
     {
         _sv.slicePos.axis = axis;
@@ -345 +345 @@
     }
 
-    void SetCurrentPosition(float position)
+    void setCurrentPosition(float position)
     {
         _sv.slicePos.value = position;
@@ -351 +351 @@
     }
 
-    void SetCurrentPosition()
+    void setCurrentPosition()
     {
         NanoVis::licRenderer->setOffset(_sv.slicePos.value);
     }
 
-    void SetActive(bool state)
+    void setActive(bool state)
     {
         _sv.sliceVisible = state;
@@ -362 +362 @@
     }
 
-    void SetActive()
+    void setActive()
     {
         NanoVis::licRenderer->active(_sv.sliceVisible);
     }
 
-    void SetVectorField(NvVectorField *fieldPtr)
-    {
-        DeleteVectorField();
+    void setVectorField(NvVectorField *fieldPtr)
+    {
+        deleteVectorField();
         _fieldPtr = fieldPtr;
     }
 
-    void DeleteVectorField()
+    void deleteVectorField()
     {
         if (_fieldPtr != NULL) {
@@ -381 +381 @@
     }
 
-    int ParseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
+    int parseSwitches(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
     {
         if (Rappture::ParseSwitches(interp, _switches, objc, objv, &_sv,
@@ -395 +395 @@
     }
 
-    static float GetRelativePosition(FlowPosition *posPtr);
+    static float getRelativePosition(FlowPosition *posPtr);
 
     static Rappture::SwitchSpec videoSwitches[];
 
 private:
-    void Configure();
-
-    void RenderBoxes();
+    void configure();
+
+    void renderBoxes();
 
     Tcl_Interp *_interp;

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -231 +231 @@
 #endif
     TRACE("Deleting flows");
-    DeleteFlows(interp);
+    deleteFlows(interp);
     if (licRenderer != NULL) {
         TRACE("Deleting licRenderer");
@@ -1567 +1567 @@
 {
     if (flags & MAP_FLOWS) {
-        MapFlows();
+        mapFlows();
         grid->xAxis.setScale(xMin, xMax);
         grid->yAxis.setScale(yMin, yMax);
@@ -1643 +1643 @@
 
     vrmath::Vector3f flowMin, flowMax;
-    GetFlowBounds(flowMin, flowMax, onlyVisible);
+    getFlowBounds(flowMin, flowMax, onlyVisible);
     if (flowMin.x < flowMax.x) {
         if (sceneMin.x > flowMin.x) {
@@ -1694 +1694 @@
         xMax = yMax = zMax = wMax = -FLT_MAX, magMax = -DBL_MAX;
 #endif
-        MapFlows();
+        mapFlows();
         grid->xAxis.setScale(xMin, xMax);
         grid->yAxis.setScale(yMin, yMax);
@@ -1771 +1771 @@
 #endif
         if (flowTable.numEntries > 0) {
-            RenderFlows();
+            renderFlows();
         }
 

trunk/packages/vizservers/nanovis/nanovis.h

@@ -141 +141 @@
     }
 
-    static FlowCmd *FirstFlow(FlowIterator *iterPtr);
-    static FlowCmd *NextFlow(FlowIterator *iterPtr);
-    static void InitFlows();
-    static int GetFlow(Tcl_Interp *interp, Tcl_Obj *objPtr,
+    static FlowCmd *firstFlow(FlowIterator *iterPtr);
+    static FlowCmd *nextFlow(FlowIterator *iterPtr);
+    static void initFlows();
+    static int getFlow(Tcl_Interp *interp, Tcl_Obj *objPtr,
                        FlowCmd **flowPtrPtr);
-    static int CreateFlow(Tcl_Interp *interp, Tcl_Obj *objPtr);
-    static void DeleteFlows(Tcl_Interp *interp);
-    static bool MapFlows();
-    static void GetFlowBounds(vrmath::Vector3f& min,
+    static int createFlow(Tcl_Interp *interp, Tcl_Obj *objPtr);
+    static void deleteFlows(Tcl_Interp *interp);
+    static bool mapFlows();
+    static void getFlowBounds(vrmath::Vector3f& min,
                               vrmath::Vector3f& max,
                               bool onlyVisible = false);
-    static void RenderFlows();
-    static void ResetFlows();
-    static bool UpdateFlows();
-    static void AdvectFlows();
+    static void renderFlows();
+    static void resetFlows();
+    static bool updateFlows();
+    static void advectFlows();
 
     static FILE *stdin, *logfile, *recfile;