Changeset 1246 for trunk


Ignore:
Timestamp:
Dec 1, 2008 8:09:50 AM (15 years ago)
Author:
gah
Message:
 
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r1245 r1246  
    88   molvisviewer.  Feature available via mouse and keyboard.
    99 * Fixed pymolproxy to handle non-blocking reads from pymol server where
    10    where previous client command would drain stdout.  The bug appears in
     10   previous client command would drain stdout.  The bug appears in
    1111   64-bit versions.
    1212 * Changed curve object to use a vector to read/parse xy data and then
    13    split into the correspondings x and y vectors.  Rough testing shows
    14    to be 8x faster than scan-ing every line.  This was also done
     13   split into the corresponding x and y vectors.  Rough testing shows
     14   to be 8x faster than split/scan-ing every line.  This was also done
    1515   for fields (points).
    1616 * Added feature to VisViewer base class to disconnect from the render
    … …  
    3838   type can only be used at the end of the command line.
    3939 * Added rappture-csh.env script for c-shell users.
    40  * Fixed lang/matlab/Makefile.in to allow prevent parallel builds of
     40 * Fixed lang/matlab/Makefile.in to prevent parallel builds of
    4141   matlab bindings.  "mex" generates temporary files that collide when
    4242   multiple compilations are using the same directory.

  • trunk/gui/scripts/heightmapviewer.tcl

    r1243 r1246  
    814814# controls for this widget.  Changes the zoom for the current view.
    815815# ----------------------------------------------------------------------
    816 itcl::body Rappture::NanovisViewer::_pan {option x y} {
     816itcl::body Rappture::HeightmapViewer::_pan {option x y} {
    817817    # Experimental stuff
    818818    set w [winfo width $itk_component(3dview)]

  • trunk/gui/scripts/visviewer.tcl

    r1244 r1246  
    3333    # If greater than 0, automatically disconnect from the visualization
    3434    # server when idle timeout is reached.
    35     #private variable idleTimeout_ 3600000; # 1 hour
    36     private variable idleTimeout_ 5000;    # 5 seconds
     35    private variable idleTimeout_ 43200000; # 12 hours
     36    #private variable idleTimeout_ 5000;    # 5 seconds
    3737    #private variable idleTimeout_ 0;       # No timeout
    3838

  • trunk/packages/vizservers/nanovis/RpDX.cpp

    r1188 r1246  
    4747
    4848    if (filename == NULL) {
    49         //resultPtr->AddError("filename is NULL");
     49        resultPtr->AddError("filename is NULL");
    5050        return;
    5151    }
    … …  
    5656    _dxobj = DXImportDX((char*)filename,NULL,NULL,NULL,NULL);
    5757    if (_dxobj == NULL) {
    58         //resultPtr->AddError("can't import DX file \"%s\"", filename);
     58        resultPtr->AddError("can't import DX file \"%s\"", filename);
    5959        return;
    6060    }
    … …  
    6767    dxpos = (Array) DXGetComponentValue((Field) _dxobj, (char *)"positions");
    6868    if (dxpos == NULL) {
    69         //resultPtr->AddError("can't get component value of \"positions\"");
     69        resultPtr->AddError("can't get component value of \"positions\"");
    7070        return;
    7171    }
    … …  
    7474    fprintf(stdout, "_n = %d\n",_n);
    7575    if (type != TYPE_FLOAT) {
    76         //resultPtr->AddError("\"positions\" is not type float (type=%d)\n", type);
     76        resultPtr->AddError("\"positions\" is not type float (type=%d)\n", type);
    7777        return;
    7878    }
    … …  
    8383    pos = (float*) DXGetArrayData(dxpos);
    8484    if (pos == NULL) {
    85         //resultPtr->AddError("DXGetArrayData failed to return positions array");
     85        resultPtr->AddError("DXGetArrayData failed to return positions array");
    8686        return;
    8787    }
    … …  
    9191    if (DXQueryGridConnections(dxgrid, &_numAxis, NULL) == NULL) {
    9292        // raise error, data is not a regular grid and we cannot handle it
    93         //resultPtr->AddError("DX says our grid is not regular, we cannot handle this data");
     93        resultPtr->AddError("DX says our grid is not regular, we cannot handle this data");
    9494        return;
    9595    }
    … …  
    9898    if (_positions == NULL) {
    9999        // malloc failed, raise error
    100         //resultPtr->AddError("malloc of _positions array failed");
     100        resultPtr->AddError("malloc of _positions array failed");
    101101        return;
    102102    }
    … …  
    106106    if (_axisLen == NULL) {
    107107        // malloc failed, raise error
    108         //resultPtr->AddError("malloc of _axisLen array failed");
     108        resultPtr->AddError("malloc of _axisLen array failed");
    109109        return;
    110110    }
    … …  
    113113    _delta = new float[_numAxis*_numAxis];
    114114    if (_delta == NULL) {
    115         //resultPtr->AddError("malloc of _delta array failed");
     115        resultPtr->AddError("malloc of _delta array failed");
    116116        return;
    117117    }
    … …  
    120120    _origin = new float[_numAxis];
    121121    if (_origin == NULL) {
    122         //resultPtr->AddError("malloc of _origin array failed");
     122        resultPtr->AddError("malloc of _origin array failed");
    123123        return;
    124124    }
    … …  
    127127    _max = new float[_numAxis];
    128128    if (_max == NULL) {
    129         //resultPtr->AddError("malloc of _max array failed");
     129        resultPtr->AddError("malloc of _max array failed");
    130130        return;
    131131    }
    … …  
    151151    _data = new float[_n];
    152152    if (_data == NULL) {
    153         //resultPtr->AddError("malloc of _data array failed");
     153        resultPtr->AddError("malloc of _data array failed");
    154154        return;
    155155    }
    … …  
    172172
    173173    default:
    174         //resultPtr->AddError("don't know how to handle data of type %d\n", type);
     174        resultPtr->AddError("don't know how to handle data of type %d\n", type);
    175175        return;
    176176    }
Note: See TracChangeset for help on using the changeset viewer.