Changeset 3564 for trunk

Timestamp:

Mar 23, 2013, 2:18:30 PM (12 years ago)

Author:

ldelgass

Message:

Restore most of the debug traces -- these are still very useful for debugging
data bounds, limits, and camera, for example.

File:

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

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -160 +160 @@
 FlowParticles::render() 
 {
+    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));
     _rendererPtr->setAxis(_sv.position.axis);
@@ -234 +237 @@
     }
 
+    TRACE("Box model bounds: (%g,%g,%g) - (%g,%g,%g)",
+          x0, y0, z0, x1, y1, z1);
+
     Vector3f modelMin(x0, y0, z0);
     Vector3f modelMax(x1, y1, z1);
@@ -256 +262 @@
         if (worldVert.z > bboxMax.z) bboxMax.z = worldVert.z;
     }
+
+    TRACE("Box world bounds: (%g,%g,%g) - (%g,%g,%g)",
+          bboxMin.x, bboxMin.y, bboxMin.z,
+          bboxMax.x, bboxMax.y, bboxMax.z);
 }
 
@@ -261 +271 @@
 FlowBox::Render(Volume *vol)
 {
+    TRACE("Box: '%s'", _name);
+
     glPushAttrib(GL_ENABLE_BIT);
 
@@ -284 +296 @@
     max.z = vol->zAxis.max();
 
+    TRACE("box is %g,%g %g,%g %g,%g",
+          _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",
+          min.x, max.x, min.y, max.y, min.z, max.z);
+
     float x0, y0, z0, x1, y1, z1;
     x0 = y0 = z0 = 0.0f;
@@ -299 +318 @@
         z1 = (_sv.corner2.z - min.z) / (max.z - min.z);
     }
+    TRACE("box bounds: %g,%g %g,%g %g,%g",
+          x0, x1, y0, y1, z0, z1);
+
     glColor4d(_sv.color.r, _sv.color.g, _sv.color.b, _sv.color.a);
     glLineWidth(_sv.lineWidth);
@@ -585 +607 @@
 {
     if (_volPtr != NULL) {
+        TRACE("Removing existing volume: %s", _volPtr->name());
         NanoVis::removeVolume(_volPtr);
         _volPtr = NULL;
@@ -719 +742 @@
     volPtr->zAxis.setRange(_dataPtr->zMin(), _dataPtr->zMax());
 
+    TRACE("min=%g %g %g max=%g %g %g mag=%g %g",
+          NanoVis::xMin, NanoVis::yMin, NanoVis::zMin,
+          NanoVis::xMax, NanoVis::yMax, NanoVis::zMax,
+          NanoVis::magMin, NanoVis::magMax);
+
     volPtr->disableCutplane(0);
     volPtr->disableCutplane(1);
@@ -749 +777 @@
 {
     Rappture::Outcome result;
-    
+
     const char *fileName;
     fileName = Tcl_GetString(objv[3]);
+    TRACE("File: %s", fileName);
 
     int nComponents;
@@ -795 +824 @@
         delete u2dPtr;
     } else {
+        TRACE("header is %.14s", buf.bytes());
         if (!dataPtr->importDx(result, nComponents, length, bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
@@ -821 +851 @@
     Rappture::Outcome result;
 
+    TRACE("Enter");
+
     int nBytes;
     if (Tcl_GetIntFromObj(interp, objv[3], &nBytes) != TCL_OK) {
@@ -844 +876 @@
     }
     Rappture::Buffer buf;
+    TRACE("Flow data loading bytes: %d components: %d", nBytes, nComponents);
     if (GetDataStream(interp, buf, nBytes) != TCL_OK) {
         return TCL_ERROR;
@@ -874 +907 @@
         delete u2dPtr;
     } else {
+        TRACE("header is %.14s", buf.bytes());
         if (!dataPtr->importDx(result, nComponents, length, bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);
@@ -885 +919 @@
         return TCL_ERROR;
     }
+    TRACE("nx = %d ny = %d nz = %d\n", dataPtr->xNum(), dataPtr->yNum(), dataPtr->zNum());
+    TRACE("x0 = %lg y0 = %lg z0 = %lg\n", dataPtr->xMin(), dataPtr->yMin(), dataPtr->zMin());
+    TRACE("lx = %lg ly = %lg lz = %lg\n",
+          dataPtr->xMax() - dataPtr->xMin(),
+          dataPtr->yMax() - dataPtr->yMin(),
+          dataPtr->zMax() - dataPtr->zMin());
+    TRACE("dx = %lg dy = %lg dz = %lg\n",
+          dataPtr->xNum() > 1 ? (dataPtr->xMax() - dataPtr->xMin())/(dataPtr->xNum()-1) : 0,
+          dataPtr->yNum() > 1 ? (dataPtr->yMax() - dataPtr->yMin())/(dataPtr->yNum()-1) : 0,
+          dataPtr->zNum() > 1 ? (dataPtr->zMax() - dataPtr->zMin())/(dataPtr->zNum()-1) : 0);
+    TRACE("magMin = %lg magMax = %lg\n",
+          dataPtr->magMin(), dataPtr->magMax());
     flowPtr->data(dataPtr);
     {
@@ -1040 +1086 @@
 NanoVis::MapFlows()
 {
+    TRACE("Enter");
+
     flags &= ~MAP_FLOWS;
 
@@ -1085 +1133 @@
     }
 
+    TRACE("magMin=%g magMax=%g", NanoVis::magMin, NanoVis::magMax);
+
     /* 
      * Step 2. Generate the vector field from each data set. 
@@ -1112 +1162 @@
                        bool onlyVisible)
 {
+    TRACE("Enter");
+
     min.set(FLT_MAX, FLT_MAX, FLT_MAX);
     max.set(-FLT_MAX, -FLT_MAX, -FLT_MAX);