Changeset 3936 for trunk/packages/vizservers

Timestamp:

Sep 18, 2013, 9:49:01 AM (11 years ago)

Author:

ldelgass

Message:

Fix raw DX (no <DX> header> path in flow data loader

Location:

trunk/packages/vizservers/nanovis

Files:

• Camera.cpp (modified) (1 diff)
• Camera.h (modified) (1 diff)
• Flow.cpp (modified) (1 diff)
• Flow.h (modified) (1 diff)
• FlowCmd.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/Camera.cpp

@@ -286 +286 @@
     }
 
+    TRACE("near: %g far: %g", _near, _far);
+
     // Extend the bounds a bit 
     _near = 0.99 * _near - (_far - _near) * 0.5;
     _far  = 1.01 * _far  + (_far - _near) * 0.5;
+
+    TRACE("after extend: near: %g far: %g", _near, _far);
 
     // Ensure near is closer than far

trunk/packages/vizservers/nanovis/Camera.h

@@ -55 +55 @@
     }
 
-    float getDistance() const
+    double getDistance() const
     {
         return vrmath::Vector3f(_focalPoint - _position).length();

trunk/packages/vizservers/nanovis/Flow.cpp

@@ -300 +300 @@
 {
     if (_volume == NULL) {
+        ERROR("Called with NULL _volume");
         return false;
     }

trunk/packages/vizservers/nanovis/Flow.h

@@ -109 +109 @@
         _volume = makeVolume(unirect, vdata);
         delete [] vdata;
+        delete unirect;
         initVolume();
         scaleVectorField();
-        delete unirect;
     }
 

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -269 +269 @@
         u2dPtr = new Rappture::Unirect2d(nComponents);
         if (u2dPtr->parseBuffer(interp, buf) != TCL_OK) {
+            delete unirect;
             delete u2dPtr;
             return TCL_ERROR;
@@ -296 +297 @@
     } else {
         TRACE("header is %.14s", buf.bytes());
+        unirect = new Rappture::Unirect3d(nComponents);
         if (!unirect->importDx(result, nComponents, length, bytes)) {
             Tcl_AppendResult(interp, result.remark(), (char *)NULL);