Changeset 1984 for trunk/packages/vizservers/nanovis/NvLIC.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/NvLIC.cpp (modified) (7 diffs)

trunk/packages/vizservers/nanovis/NvLIC.cpp

@@ -153 +153 @@
 NvLIC::make_patterns() 
 { 
-    Trace("begin make_patterns\n");
+    TRACE("begin make_patterns\n");
     if (disListID > 0) {
         glDeleteLists(disListID, Npat);
@@ -159 +159 @@
     disListID = glGenLists(Npat);
     
-    Trace("DisplayList : %d\n", disListID);
+    TRACE("DisplayList : %d\n", disListID);
     
     int lut[256];
@@ -193 +193 @@
     glTexImage2D(GL_TEXTURE_2D, 0, 4, NPN, NPN, 0, 
                  GL_RGBA, GL_UNSIGNED_BYTE, pat);
-    Trace("finish make_patterns\n");
+    TRACE("finish make_patterns\n");
 }
 
@@ -470 +470 @@
 /*
 {
-    //Trace("RENDER LIC\n");
+    //TRACE("RENDER LIC\n");
    //glBindTexture(GL_TEXTURE_2D, pattern_tex);
    glCallList(1 % Npat + disListID);
@@ -505 +505 @@
                       float scaleX, float scaleY, float scaleZ, float max)
 {
-    Trace("NvLIC: vector field is assigned [%d]\n", texID);
+    TRACE("NvLIC: vector field is assigned [%d]\n", texID);
     _vectorFieldId = texID;
     origin = ori;
@@ -524 +524 @@
    int yi = (int) (y*size);
 
-    //Trace("(xi yi) = (%d %d), ", xi, yi);
+    //TRACE("(xi yi) = (%d %d), ", xi, yi);
    vx = slice_vector[4 * (xi+yi*size)];
    vy = slice_vector[4 * (xi+yi*size)+1];
    r  = vx*vx + vy*vy;
 
-    //Trace("(vx vx) = (%f %f), r=%f, ", vx, vy, r);
+    //TRACE("(vx vx) = (%f %f), r=%f, ", vx, vy, r);
    if (r > (dmax*dmax)) { 
       r  = sqrt(r); 
@@ -539 +539 @@
    *py = y + vy;
 
-    //Trace("vel %f %f -> %f %f, (dmax = %f)\n", x, y, *px, *py, dmax);
+    //TRACE("vel %f %f -> %f %f, (dmax = %f)\n", x, y, *px, *py, dmax);
 }