Changeset 3452 for trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

Timestamp:

Mar 4, 2013 8:57:13 PM (11 years ago)

Author:

ldelgass

Message:

Remove XINETD define from nanovis. We only support server mode now, no glut
interaction loop with mouse/keyboard handlers. Fixes for trace logging to make
output closer to vtkvis: inlcude function name for trace messages, remove
newlines from format strings in macros since newlines get added by syslog.

File:

• trunk/packages/vizservers/nanovis/VolumeRenderer.cpp (modified) (4 diffs)

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -129 +129 @@
     float *z_steps = new float[volumes.size()];
 
-    TRACE("start loop %d\n", volumes.size());
+    TRACE("start loop %d", volumes.size());
     for (size_t i = 0; i < volumes.size(); i++) {
         Volume *volPtr = volumes[i];
@@ -145 +145 @@
         Vector3 volScaling = volPtr->getPhysicalScaling();
 
-        TRACE("VOL POS: %g %g %g\n",
+        TRACE("VOL POS: %g %g %g",
               volPos.x, volPos.y, volPos.z);
-        TRACE("VOL SCALE: %g %g %g\n",
+        TRACE("VOL SCALE: %g %g %g",
               volScaling.x, volScaling.y, volScaling.z);
 
@@ -352 +352 @@
         }
     } //iterate all volumes
-    TRACE("end loop\n");
+    TRACE("end loop");
 
     // We sort all the polygons according to their eye-space depth, from
@@ -401 +401 @@
 
 #ifdef notdef
-        TRACE("shading slice: volume %s addr=%x slice=%d, volume=%d z_step=%g avgSD=%g\n", 
+        TRACE("shading slice: volume %s addr=%x slice=%d, volume=%d z_step=%g avgSD=%g", 
               volPtr->name(), volPtr, slice_index, volume_index, z_step, avgSampleDistance);
 #endif