Changeset 3936


Ignore:
Timestamp:
Sep 18, 2013, 12:49:01 PM (6 years ago)
Author:
ldelgass
Message:

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

Location:
trunk/packages/vizservers/nanovis
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/packages/vizservers/nanovis/Camera.cpp

    r3630 r3936  
    286286    }
    287287
     288    TRACE("near: %g far: %g", _near, _far);
     289
    288290    // Extend the bounds a bit
    289291    _near = 0.99 * _near - (_far - _near) * 0.5;
    290292    _far  = 1.01 * _far  + (_far - _near) * 0.5;
     293
     294    TRACE("after extend: near: %g far: %g", _near, _far);
    291295
    292296    // Ensure near is closer than far
  • trunk/packages/vizservers/nanovis/Camera.h

    r3630 r3936  
    5555    }
    5656
    57     float getDistance() const
     57    double getDistance() const
    5858    {
    5959        return vrmath::Vector3f(_focalPoint - _position).length();
  • trunk/packages/vizservers/nanovis/Flow.cpp

    r3935 r3936  
    300300{
    301301    if (_volume == NULL) {
     302        ERROR("Called with NULL _volume");
    302303        return false;
    303304    }
  • trunk/packages/vizservers/nanovis/Flow.h

    r3935 r3936  
    109109        _volume = makeVolume(unirect, vdata);
    110110        delete [] vdata;
     111        delete unirect;
    111112        initVolume();
    112113        scaleVectorField();
    113         delete unirect;
    114114    }
    115115
  • trunk/packages/vizservers/nanovis/FlowCmd.cpp

    r3935 r3936  
    269269        u2dPtr = new Rappture::Unirect2d(nComponents);
    270270        if (u2dPtr->parseBuffer(interp, buf) != TCL_OK) {
     271            delete unirect;
    271272            delete u2dPtr;
    272273            return TCL_ERROR;
     
    296297    } else {
    297298        TRACE("header is %.14s", buf.bytes());
     299        unirect = new Rappture::Unirect3d(nComponents);
    298300        if (!unirect->importDx(result, nComponents, length, bytes)) {
    299301            Tcl_AppendResult(interp, result.remark(), (char *)NULL);
Note: See TracChangeset for help on using the changeset viewer.