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

trunk/packages/vizservers/nanovis/Command.cpp

@@ -508 +508 @@
     }
     Rappture::Outcome err;
-    TRACE("Checking header[%.13s]\n", buf.bytes());
+    TRACE("Checking header[%.13s]", buf.bytes());
     if (strncmp (buf.bytes(), "@@RP-ENC:", 9) == 0) {
         /* There's a header on the buffer, use it to decode the data. */
@@ -1064 +1064 @@
 
             fraction = ((float)frame_num) / (total - 1);
-            TRACE("fraction : %f\n", fraction);
+            TRACE("fraction : %f", fraction);
             //interpolator->update(((float)frame_num) / (total - 1));
             interpolator->update(fraction);
@@ -1116 +1116 @@
         return TCL_ERROR;
     }
-    TRACE("parsing volume data identifier\n");
+    TRACE("parsing volume data identifier");
     Tcl_HashSearch iter;
     Tcl_HashEntry *hPtr;
@@ -1156 +1156 @@
                     Tcl_Obj *const *objv)
 {
-    TRACE("Data Loading\n");
+    TRACE("Data Loading");
 
     int nbytes;
@@ -1174 +1174 @@
     nBytes = buf.size();
 
-    TRACE("Checking header[%.20s]\n", bytes);
+    TRACE("Checking header[%.20s]", bytes);
 
     Volume *volPtr = NULL;
 
     if ((nBytes > 5) && (strncmp(bytes, "<HDR>", 5) == 0)) {
-        TRACE("ZincBlende stream is in\n");
+        TRACE("ZincBlende stream is in");
          //std::stringstream fdata(std::ios_base::out|std::ios_base::in|std::ios_base::binary);
         //fdata.write(buf.bytes(),buf.size());
@@ -1189 +1189 @@
             return TCL_ERROR;
         }
-        TRACE("finish loading\n");
+        TRACE("finish loading");
 
         Vector3 scale = volPtr->getPhysicalScaling();
@@ -1212 +1212 @@
             nBytes -= 5;
         }
-        TRACE("DX loading...\n");
+        TRACE("DX loading...");
         std::stringstream fdata;
         fdata.write(bytes, nBytes);
         if (nBytes <= 0) {
-            ERROR("data buffer is empty\n");
+            ERROR("data buffer is empty");
             abort();
         }
@@ -1502 +1502 @@
         return TCL_ERROR;
     }
-    TRACE("set opacity %f\n", opacity);
+    TRACE("set opacity %f", opacity);
     std::vector<Volume *> ivol;
     if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
@@ -1576 +1576 @@
     std::vector<Volume *>::iterator iter;
     for (iter = ivol.begin(); iter != ivol.end(); iter++) {
-        TRACE("setting %s with transfer function %s\n", (*iter)->name(),
+        TRACE("setting %s with transfer function %s", (*iter)->name(),
                tfPtr->name());
         (*iter)->transferFunction(tfPtr);
@@ -1729 +1729 @@
         hmPtr = (HeightMap *)Tcl_GetHashValue(hPtr);
     }
-    TRACE("Number of heightmaps=%d\n", NanoVis::heightmapTable.numEntries);
+    TRACE("Number of heightmaps=%d", NanoVis::heightmapTable.numEntries);
     // Must set units before the heights.
     hmPtr->xAxis.units(data.xUnits());
@@ -1881 +1881 @@
     Tcl_SetStringObj(Tcl_GetObjResult(interp), tag, -1);;
     NanoVis::eventuallyRedraw();
-    TRACE("Number of heightmaps=%d\n", NanoVis::heightmapTable.numEntries);
+    TRACE("Number of heightmaps=%d", NanoVis::heightmapTable.numEntries);
     return TCL_OK;
 }
@@ -2142 +2142 @@
            Tcl_Obj *const *objv)
 {
-    TRACE("load plane for 2D visualization command\n");
+    TRACE("load plane for 2D visualization command");
 
     int index, w, h;
@@ -2187 +2187 @@
             Tcl_Obj *const *objv)
 {
-    TRACE("link the plane to the 2D renderer command\n");
+    TRACE("link the plane to the 2D renderer command");
 
     int plane_index;
@@ -2214 +2214 @@
               Tcl_Obj *const *objv)
 {
-    TRACE("enable a plane so the 2D renderer can render it command\n");
+    TRACE("enable a plane so the 2D renderer can render it command");
 
     if (objc != 3) {
@@ -2340 +2340 @@
     // create a default transfer function
     if (Tcl_Eval(interp, def_transfunc) != TCL_OK) {
-        WARN("bad default transfer function\n%s\n", 
+        WARN("bad default transfer function:\n%s", 
              Tcl_GetStringResult(interp));
     }