Changeset 1984 for trunk/packages/vizservers/nanovis/FlowCmd.cpp

Timestamp:

Dec 8, 2010, 2:03:02 PM (14 years ago)

Author:

gah

Message:

Clean up debugging/printing traces

File:

• trunk/packages/vizservers/nanovis/FlowCmd.cpp (modified) (20 diffs)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -141 +141 @@
 FlowParticles::Render(void) 
 {
-    Trace("rendering particles %s\n", _name);
-    Trace("rendering particles %s axis=%d\n", _name, _sv.position.axis);
-    Trace("rendering particles %s position=%g\n", _name, _sv.position.value);
-    Trace("rendering particles %s position=%g\n", _name, 
-          FlowCmd::GetRelativePosition(&_sv.position));
+    TRACE("rendering particles %s\n", _name);
+    TRACE("rendering particles %s axis=%d\n", _name, _sv.position.axis);
+    TRACE("rendering particles %s position=%g\n", _name, _sv.position.value);
+    TRACE("rendering particles %s position=%g\n", _name, 
+           FlowCmd::GetRelativePosition(&_sv.position));
 
     _rendererPtr->setPos(FlowCmd::GetRelativePosition(&_sv.position));
@@ -183 +183 @@
 FlowBox::Render(Volume *volPtr)
 {
-    Trace("Rendering box %s\n", _name);
+    TRACE("Rendering box %s\n", _name);
     glColor4d(_sv.color.r, _sv.color.g, _sv.color.b, _sv.color.a);
 
@@ -209 +209 @@
     max = volPtr->getPhysicalBBoxMax();
 
-    Trace("box is %g,%g %g,%g %g,%g\n", 
+    TRACE("box is %g,%g %g,%g %g,%g\n", 
           _sv.corner1.x, _sv.corner2.x,
           _sv.corner1.y, _sv.corner2.y,
-          _sv.corner1.z, _sv.corner2.z);
-    Trace("world is %g,%g %g,%g %g,%g\n", 
-          min.x, max.x, min.y, max.y, min.z, max.z);
+           _sv.corner1.z, _sv.corner2.z);
+    TRACE("world is %g,%g %g,%g %g,%g\n", 
+           min.x, max.x, min.y, max.y, min.z, max.z);
 
     float x0, y0, z0, x1, y1, z1;
@@ -231 +231 @@
         x1 = (_sv.corner2.x - min.x) / (max.x - min.x);
     }
-    Trace("rendering box %g,%g %g,%g %g,%g\n", x0, x1, y0, y1, z0, z1);
+    TRACE("rendering box %g,%g %g,%g %g,%g\n", x0, x1, y0, y1, z0, z1);
 
     glLineWidth(_sv.lineWidth);
@@ -371 +371 @@
         }
     }
-    Trace("in Render before boxes %s\n", _name);
+    TRACE("in Render before boxes %s\n", _name);
     RenderBoxes();
 }
@@ -522 +522 @@
 {
     if (_volPtr != NULL) {
-        fprintf(stderr, "from ScaleVectorField volId=%s\n", _volPtr->name());
+        TRACE("from ScaleVectorField volId=%s\n", _volPtr->name());
         NanoVis::remove_volume(_volPtr);
         _volPtr = NULL;
@@ -581 +581 @@
             //,volPtr->wAxis.max()
             );
-        Trace("Arrows enabled set to %d\n", _sv.showArrows);
+        TRACE("Arrows enabled set to %d\n", _sv.showArrows);
         NanoVis::velocityArrowsSlice->axis(_sv.slicePos.axis);
         NanoVis::velocityArrowsSlice->slicePos(_sv.slicePos.value);
@@ -601 +601 @@
     FlowBox *boxPtr;
     for (boxPtr = FirstBox(&iter); boxPtr != NULL; boxPtr = NextBox(&iter)) {
-        Trace("found box %s\n", boxPtr->name());
+        TRACE("found box %s\n", boxPtr->name());
         if (boxPtr->visible()) {
             boxPtr->Render(_volPtr);
@@ -655 +655 @@
     Vector3 physicalMin(NanoVis::xMin, NanoVis::yMin, NanoVis::zMin);
     Vector3 physicalMax(NanoVis::xMax, NanoVis::yMax, NanoVis::zMax);
-    Trace("min=%g %g %g max=%g %g %g mag=%g %g\n", 
+    TRACE("min=%g %g %g max=%g %g %g mag=%g %g\n", 
             NanoVis::xMin, NanoVis::yMin, NanoVis::zMin,
             NanoVis::xMax, NanoVis::yMax, NanoVis::zMax,
-            NanoVis::magMin, NanoVis::magMax);
+           NanoVis::magMin, NanoVis::magMax);
     volPtr->setPhysicalBBox(physicalMin, physicalMax);
     //volPtr->set_n_slice(256 - _volIndex);
@@ -677 +677 @@
     volPtr->specular(_sv.specular);
     volPtr->diffuse(_sv.diffuse);
-    Trace("volume is now %d %d\n", _sv.showVolume, volPtr->visible());
+    TRACE("volume is now %d %d\n", _sv.showVolume, volPtr->visible());
     volPtr->visible(_sv.showVolume);
     float dx0 = -0.5;
@@ -696 +696 @@
     const char *fileName;
     fileName = Tcl_GetString(objv[3]);
-    Trace("Flow loading data from file %s\n", fileName);
+    TRACE("Flow loading data from file %s\n", fileName);
 
     int nComponents;
@@ -740 +740 @@
         delete u2dPtr;
     } else {
-        fprintf(stderr, "header is %.14s\n", buf.bytes());
+        TRACE("header is %.14s\n", buf.bytes());
         if (!dataPtr->ImportDx(result, nComponents, length, bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
@@ -767 +767 @@
     Rappture::Outcome result;
 
-    Trace("Flow Data Loading\n");
+    TRACE("Flow Data Loading\n");
 
     int nBytes;
     if (Tcl_GetIntFromObj(interp, objv[3], &nBytes) != TCL_OK) {
-        Trace("Bad nBytes \"%s\"\n", Tcl_GetString(objv[3]));
+        ERROR("Bad nBytes \"%s\"\n", Tcl_GetString(objv[3]));
         return TCL_ERROR;
     }
@@ -777 +777 @@
         Tcl_AppendResult(interp, "bad # bytes request \"", 
                 Tcl_GetString(objv[3]), "\" for \"data follows\"", (char *)NULL);
-        Trace("Bad nbytes %d\n", nBytes);
+        ERROR("Bad nbytes %d\n", nBytes);
         return TCL_ERROR;
     }
     int nComponents;
     if (Tcl_GetIntFromObj(interp, objv[4], &nComponents) != TCL_OK) {
-        Trace("Bad # of components \"%s\"\n", Tcl_GetString(objv[4]));
+        ERROR("Bad # of components \"%s\"\n", Tcl_GetString(objv[4]));
         return TCL_ERROR;
     }
@@ -788 +788 @@
         Tcl_AppendResult(interp, "bad # of components request \"", 
                 Tcl_GetString(objv[4]), "\" for \"data follows\"", (char *)NULL);
-        Trace("Bad # of components %d\n", nComponents);
+        ERROR("Bad # of components %d\n", nComponents);
         return TCL_ERROR;
     }
     Rappture::Buffer buf;
-    Trace("Flow Data Loading %d %d\n", nBytes, nComponents);
+    TRACE("Flow Data Loading %d %d\n", nBytes, nComponents);
     if (GetDataStream(interp, buf, nBytes) != TCL_OK) {
         return TCL_ERROR;
@@ -823 +823 @@
         delete u2dPtr;
     } else {
-        fprintf(stderr, "header is %.14s\n", buf.bytes());
+        TRACE("header is %.14s\n", buf.bytes());
         if (!dataPtr->ImportDx(result, nComponents, length, bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
@@ -991 +991 @@
 {
     flags &= ~MAP_FLOWS;
-    Trace("MapFlows\n");
+    TRACE("MapFlows\n");
 
     /* 
@@ -1036 +1036 @@
         }
     }
-    Trace("MapFlows magMin=%g magMax=%g\n", NanoVis::magMin, NanoVis::magMax);
+    TRACE("MapFlows magMin=%g magMax=%g\n", NanoVis::magMin, NanoVis::magMax);
 
     /* 
@@ -2000 +2000 @@
     oldHeight = NanoVis::win_height;
 
-    Trace("FLOW started\n");
+    TRACE("FLOW started\n");
 
     Rappture::Outcome context;
@@ -2042 +2042 @@
     }
     movie.done(context);
-    Trace("FLOW end\n");
+    TRACE("FLOW end\n");
     if (!canceled) {
         Rappture::Buffer data;