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

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -37 +37 @@
     const char *path = R2FilePath::getInstance()->getPath("Font.bmp");
     if (path == NULL) {
-        fprintf(stderr, "can't find Font.bmp\n");
+        ERROR("can't find Font.bmp\n");
         assert(path != NULL);
     }
@@ -99 +99 @@
         ani_tf = ani_vol->transferFunction();
 #endif
-        Trace("VOLUME INTERPOLATOR IS STARTED ----------------------------");
+        TRACE("VOLUME INTERPOLATOR IS STARTED ----------------------------");
     }
     // Determine the volumes that are to be rendered.
@@ -126 +126 @@
     size_t* actual_slices = new size_t[volumes.size()]; 
 
-    Trace("start loop %d\n", volumes.size());
+    TRACE("start loop %d\n", volumes.size());
     for (size_t i = 0; i < volumes.size(); i++) {
         Volume* volPtr;
@@ -350 +350 @@
         
     } //iterate all volumes
-    Trace("end loop\n");
+    TRACE("end loop\n");
     
     // We sort all the polygons according to their eye-space depth, from
@@ -388 +388 @@
         
 #ifdef notdef
-        Trace("shading slice: volume %s addr=%x slice=%d, volume=%d\n", 
-              volPtr->name(), volPtr, slice_index, volume_index);
+        TRACE("shading slice: volume %s addr=%x slice=%d, volume=%d\n", 
+               volPtr->name(), volPtr, slice_index, volume_index);
 #endif
         activate_volume_shader(volPtr, false);
@@ -621 +621 @@
     f = fopen(filename, "rb");
     if (f == NULL) {
-        fprintf(stderr, "can't open font file \"%s\"\n", filename);
+        ERROR("can't open font file \"%s\"\n", filename);
         return false;
     }
     
     if (fread(&bfType, sizeof(short int), 1, f) != 1) {
-        fprintf(stderr, "can't read %lu bytes from font file \"%s\"\n", 
-                (unsigned long)sizeof(short int), filename);
+        ERROR("can't read %lu bytes from font file \"%s\"\n", 
+               (unsigned long)sizeof(short int), filename);
         goto error;
     }
@@ -633 +633 @@
     /* check if file is a bitmap */
     if (bfType != 19778) {
-        fprintf(stderr, "not a bmp file.\n");
+        ERROR("not a bmp file.\n");
         goto error;
     }
@@ -643 +643 @@
     /* get the position of the actual bitmap data */
     if (fread(&bfOffBits, sizeof(int), 1, f) != 1) {
-        fprintf(stderr, "error reading file.\n");
+        ERROR("error reading file.\n");
         goto error;
     }
@@ -653 +653 @@
     /* get the width of the bitmap */
     if (fread(&width, sizeof(int), 1, f) != 1) {
-        fprintf(stderr, "error reading file.\n");
+        ERROR("error reading file.\n");
         goto error;
     }
@@ -660 +660 @@
     /* get the height of the bitmap */
     if (fread(&height, sizeof(int), 1, f) != 1) {
-        fprintf(stderr, "error reading file.\n");
+        ERROR("error reading file.\n");
         goto error;
     }
@@ -667 +667 @@
     /* get the number of planes (must be set to 1) */
     if (fread(&biPlanes, sizeof(short int), 1, f) != 1) {
-        fprintf(stderr, "error reading file.\n");
+        ERROR("error reading file.\n");
         goto error;
     }
     if (biPlanes != 1) {
-        fprintf(stderr, "Error: number of Planes not 1!\n");
+        ERROR("number of Planes not 1!\n");
         goto error;
     }
@@ -677 +677 @@
     /* get the number of bits per pixel */
     if (fread(&biBitCount, sizeof(short int), 1, f) != 1) {
-        fprintf(stderr, "error reading file.\n");
+        ERROR("error reading file.\n");
         goto error;
     }
@@ -683 +683 @@
     //printf("Bits per Pixel: %d\n", biBitCount);
     if (biBitCount != 24) {
-        fprintf(stderr, "Bits per Pixel not 24\n");
+        ERROR("Bits per Pixel not 24\n");
         goto error;
     }
@@ -692 +692 @@
     data = (unsigned char*) malloc(biSizeImage);
     if (data == NULL) {
-        fprintf(stderr, "Can't allocate memory for image\n");
+        ERROR("Can't allocate memory for image\n");
         goto error;
     }
@@ -699 +699 @@
     fseek(f, bfOffBits, SEEK_SET);
     if (fread(data, biSizeImage, 1, f) != 1) {
-        fprintf(stderr, "Error loading file!\n");
+        ERROR("Error loading file!\n");
         goto error;
     }