Changeset 1495 for trunk

Timestamp:

Jun 9, 2009 3:53:39 PM (15 years ago)

Author:

gah

Message:

Make GetDataStream? respect data header

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (1 diff)
• VolumeRenderer.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -609 +609 @@
     Rappture::Outcome err;
     unsigned int flags;
-    flags = RPENC_Z|RPENC_B64|RPENC_HDR; 
+    flags = RPENC_Z|RPENC_B64; 
+    Trace("Checking header[%.13s]\n", buf.bytes());
+    if (strncmp (buf.bytes(), "@@RP-ENC:", 9) == 0) {
+        flags = RPENC_HDR;
+    }
     if (!Rappture::encoding::decode(err, buf, flags)) {
         printf("ERROR -- DECODING\n");

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -109 +109 @@
         Volume* volPtr;
         volPtr = (Volume *)Tcl_GetHashValue(hPtr);
-        Trace("volume %s addr=%x\n", volPtr->name(), volPtr);
         if(!volPtr->visible()) {
             continue;                   // Skip this volume
@@ -549 +548 @@
     TransferFunction *tfPtr  = volPtr->transferFunction();
     if (volPtr->volume_type() == Volume::CUBIC) {
-        Trace("regular volume shader: volume=%s tf=%s slice_mode=%d\n",
-              volPtr->name(), tfPtr->name(), slice_mode);
         _regularVolumeShader->bind(tfPtr->id(), volPtr, slice_mode);
     } else if (volPtr->volume_type() == Volume::ZINCBLENDE) {
-        Trace("zincblende volume shader: volume=%s tf=%s slice_mode=%d\n",
-              volPtr->name(), tfPtr->name(), slice_mode);
         _zincBlendeShader->bind(tfPtr->id(), volPtr, slice_mode);
     }