Changeset 2922 for trunk/packages/vizservers

Timestamp:

Apr 1, 2012 10:34:01 PM (12 years ago)

Author:

ldelgass

Message:

style fixes

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (3 diffs)
• FlowCmd.cpp (modified) (6 diffs)
• Unirect.cpp (modified) (10 diffs)
• Unirect.h (modified) (10 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -1670 +1670 @@
     }
     Rappture::Unirect2d data(1);
-    if (data.ParseBuffer(interp, buf) != TCL_OK) {
+    if (data.parseBuffer(interp, buf) != TCL_OK) {
         return TCL_ERROR;
     }
@@ -2299 +2299 @@
     Rappture::Unirect2d *dataPtr = (Rappture::Unirect2d *)clientData;
 
-    return dataPtr->LoadData(interp, objc, objv);
+    return dataPtr->loadData(interp, objc, objv);
 }
 
@@ -2320 +2320 @@
     Rappture::Unirect3d *dataPtr = (Rappture::Unirect3d *)clientData;
 
-    return dataPtr->LoadData(interp, objc, objv);
+    return dataPtr->loadData(interp, objc, objv);
 }
 

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -732 +732 @@
     char *bytes = (char *)buf.bytes();
     if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
-        if (!dataPtr->ImportDx(result, nComponents, length-4, bytes+4)) {
+        if (!dataPtr->importDx(result, nComponents, length-4, bytes+4)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
             delete dataPtr;
@@ -738 +738 @@
         }
     } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
-        if (dataPtr->ParseBuffer(interp, buf) != TCL_OK) {
+        if (dataPtr->parseBuffer(interp, buf) != TCL_OK) {
             delete dataPtr;
             return TCL_ERROR;
@@ -745 +745 @@
         Rappture::Unirect2d *u2dPtr;
         u2dPtr = new Rappture::Unirect2d(nComponents);
-        if (u2dPtr->ParseBuffer(interp, buf) != TCL_OK) {
+        if (u2dPtr->parseBuffer(interp, buf) != TCL_OK) {
             delete u2dPtr;
             return TCL_ERROR;
         }
-        dataPtr->Convert(u2dPtr);
+        dataPtr->convert(u2dPtr);
         delete u2dPtr;
     } else {
         TRACE("header is %.14s\n", buf.bytes());
-        if (!dataPtr->ImportDx(result, nComponents, length, bytes)) {
+        if (!dataPtr->importDx(result, nComponents, length, bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
             delete dataPtr;
@@ -815 +815 @@
     char *bytes = (char *)buf.bytes();
     if ((length > 4) && (strncmp(bytes, "<DX>", 4) == 0)) {
-        if (!dataPtr->ImportDx(result, nComponents, length - 4, bytes + 4)) {
+        if (!dataPtr->importDx(result, nComponents, length - 4, bytes + 4)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
             delete dataPtr;
@@ -821 +821 @@
         }
     } else if ((length > 10) && (strncmp(bytes, "unirect3d ", 10) == 0)) {
-        if (dataPtr->ParseBuffer(interp, buf) != TCL_OK) {
+        if (dataPtr->parseBuffer(interp, buf) != TCL_OK) {
             delete dataPtr;
             return TCL_ERROR;
@@ -828 +828 @@
         Rappture::Unirect2d *u2dPtr;
         u2dPtr = new Rappture::Unirect2d(nComponents);
-        if (u2dPtr->ParseBuffer(interp, buf) != TCL_OK) {
+        if (u2dPtr->parseBuffer(interp, buf) != TCL_OK) {
             delete u2dPtr;
             return TCL_ERROR;
         }
-        dataPtr->Convert(u2dPtr);
+        dataPtr->convert(u2dPtr);
         delete u2dPtr;
     } else {
         TRACE("header is %.14s\n", buf.bytes());
-        if (!dataPtr->ImportDx(result, nComponents, length, bytes)) {
+        if (!dataPtr->importDx(result, nComponents, length, bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
             delete dataPtr;

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -41 +41 @@
 
 int
-Rappture::Unirect2d::ParseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
+Rappture::Unirect2d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
 {
     Tcl_Obj *objPtr;
@@ -51 +51 @@
     }
     int result;
-    result = LoadData(interp, objc, objv);
+    result = loadData(interp, objc, objv);
     Tcl_DecrRefCount(objPtr);
     if ((result != TCL_OK) || (!isInitialized())) {
@@ -60 +60 @@
 
 int
-Rappture::Unirect3d::ParseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
+Rappture::Unirect3d::parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf)
 {
     Tcl_Obj *objPtr;
@@ -70 +70 @@
     }
     int result;
-    result = LoadData(interp, objc, objv);
+    result = loadData(interp, objc, objv);
     Tcl_DecrRefCount(objPtr);
     if ((result != TCL_OK) || (!isInitialized())) {
@@ -79 +79 @@
 
 int 
-Rappture::Unirect3d::LoadData(Tcl_Interp *interp, int objc, 
+Rappture::Unirect3d::loadData(Tcl_Interp *interp, int objc, 
                               Tcl_Obj *const *objv)
 {
@@ -316 +316 @@
 
 int 
-Rappture::Unirect2d::LoadData(Tcl_Interp *interp, int objc, 
+Rappture::Unirect2d::loadData(Tcl_Interp *interp, int objc, 
                               Tcl_Obj *const *objv)
 {
@@ -491 +491 @@
 
 bool
-Rappture::Unirect3d::ImportDx(Rappture::Outcome &result, size_t nComponents,
+Rappture::Unirect3d::importDx(Rappture::Outcome &result, size_t nComponents,
                               size_t length, char *string) 
 {
@@ -636 +636 @@
 
 bool
-Rappture::Unirect3d::Resample(Rappture::Outcome &result, size_t nSamples)
+Rappture::Unirect3d::resample(Rappture::Outcome &result, size_t nSamples)
 {
     Rappture::Mesh1D xgrid(_xMin, _xMax, _xNum);
@@ -714 +714 @@
 
 void
-Rappture::Unirect3d::GetVectorRange()
+Rappture::Unirect3d::getVectorRange()
 {
     assert(_nComponents == 3);
-    TRACE("GetVectorRange\n");
     _magMax = -DBL_MAX, _magMin = DBL_MAX;
     size_t i;
@@ -735 +734 @@
         }
     }
+    TRACE("GetVectorRange %g %g\n", _magMin, _magMax);
 }
 
 bool 
-Rappture::Unirect3d::Convert(Rappture::Unirect2d *dataPtr)
+Rappture::Unirect3d::convert(Rappture::Unirect2d *dataPtr)
 {
     _initialized = false;

trunk/packages/vizservers/nanovis/Unirect.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#ifndef _UNIRECT_H
-#define _UNIRECT_H
+#ifndef UNIRECT_H
+#define UNIRECT_H
 
 #include <float.h>
@@ -55 +55 @@
         if (_values != NULL) {
             free(_values);
-        }
-        if (_xUnits != NULL) {
+        }
+        if (_xUnits != NULL) {
             free(_xUnits);
-        }
-        if (_yUnits != NULL) {
+        }
+        if (_yUnits != NULL) {
             free(_yUnits);
-        }
-        if (_zUnits != NULL) {
+        }
+        if (_zUnits != NULL) {
             free(_zUnits);
-        }
-        if (_vUnits != NULL) {
+        }
+        if (_vUnits != NULL) {
             free(_vUnits);
-        }
+        }
     }
 
@@ -177 +177 @@
     {
         if (_magMin == DBL_MAX) {
-            GetVectorRange();
+            getVectorRange();
         }
         return _magMin;
@@ -185 +185 @@
     {
         if (_magMax == -DBL_MAX) {
-            GetVectorRange();
+            getVectorRange();
         }
         return _magMax;
@@ -204 +204 @@
     }
 
-    int LoadData(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
-
-    int ParseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf);
-
-    bool ImportDx(Rappture::Outcome &result, size_t nComponents, 
-                  size_t length, char *string);
-
-    bool Convert(Unirect2d *dataPtr);
-
-    bool Resample(Rappture::Outcome &context, size_t nSamples = 30);
+    int loadData(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
+
+    int parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf);
+
+    bool importDx(Rappture::Outcome &result, size_t nComponents, 
+                  size_t length, char *string);
+
+    bool convert(Unirect2d *dataPtr);
+
+    bool resample(Rappture::Outcome &context, size_t nSamples = 30);
 
     bool isInitialized()
@@ -221 +221 @@
 
 private:
-    void GetVectorRange();
+    void getVectorRange();
 
     size_t _xNum, _yNum, _zNum;
@@ -230 +230 @@
     float _yValueMin, _yValueMax;
     float _zValueMin, _zValueMax;
-    double _magMin, _magMax;            /* Range of magnitudes of vector
-                                         * data. */
+    double _magMin, _magMax;                /* Range of magnitudes of vector
+                                         * data. */
     char *_xUnits;
     char *_yUnits;
@@ -258 +258 @@
         if (_values != NULL) {
             free(_values);
-        }
+        }
         if (_xUnits != NULL) {
             free(_xUnits);
-        }
+        }
         if (_yUnits != NULL) {
             free(_yUnits);
-        }
+        }
         if (_vUnits != NULL) {
             free(_vUnits);
@@ -359 +359 @@
     }
 
-    int LoadData(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
-    
-    int ParseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf);
-    
+    int loadData(Tcl_Interp *interp, int objc, Tcl_Obj *const *objv);
+
+    int parseBuffer(Tcl_Interp *interp, Rappture::Buffer &buf);
+
     bool isInitialized()
     {
@@ -389 +389 @@
 
 #endif
-