Changeset 1246
- Timestamp:
- Dec 1, 2008, 8:09:50 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r1245 r1246 8 8 molvisviewer. Feature available via mouse and keyboard. 9 9 * Fixed pymolproxy to handle non-blocking reads from pymol server where 10 whereprevious client command would drain stdout. The bug appears in10 previous client command would drain stdout. The bug appears in 11 11 64-bit versions. 12 12 * Changed curve object to use a vector to read/parse xy data and then 13 split into the corresponding sx and y vectors. Rough testing shows14 to be 8x faster than s can-ing every line. This was also done13 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 15 15 for fields (points). 16 16 * Added feature to VisViewer base class to disconnect from the render … … 38 38 type can only be used at the end of the command line. 39 39 * Added rappture-csh.env script for c-shell users. 40 * Fixed lang/matlab/Makefile.in to allowprevent parallel builds of40 * Fixed lang/matlab/Makefile.in to prevent parallel builds of 41 41 matlab bindings. "mex" generates temporary files that collide when 42 42 multiple compilations are using the same directory. -
trunk/gui/scripts/heightmapviewer.tcl
r1243 r1246 814 814 # controls for this widget. Changes the zoom for the current view. 815 815 # ---------------------------------------------------------------------- 816 itcl::body Rappture:: NanovisViewer::_pan {option x y} {816 itcl::body Rappture::HeightmapViewer::_pan {option x y} { 817 817 # Experimental stuff 818 818 set w [winfo width $itk_component(3dview)] -
trunk/gui/scripts/visviewer.tcl
r1244 r1246 33 33 # If greater than 0, automatically disconnect from the visualization 34 34 # server when idle timeout is reached. 35 #private variable idleTimeout_ 3600000; # 1 hour36 private variable idleTimeout_ 5000; # 5 seconds35 private variable idleTimeout_ 43200000; # 12 hours 36 #private variable idleTimeout_ 5000; # 5 seconds 37 37 #private variable idleTimeout_ 0; # No timeout 38 38 -
trunk/packages/vizservers/nanovis/RpDX.cpp
r1188 r1246 47 47 48 48 if (filename == NULL) { 49 //resultPtr->AddError("filename is NULL");49 resultPtr->AddError("filename is NULL"); 50 50 return; 51 51 } … … 56 56 _dxobj = DXImportDX((char*)filename,NULL,NULL,NULL,NULL); 57 57 if (_dxobj == NULL) { 58 //resultPtr->AddError("can't import DX file \"%s\"", filename);58 resultPtr->AddError("can't import DX file \"%s\"", filename); 59 59 return; 60 60 } … … 67 67 dxpos = (Array) DXGetComponentValue((Field) _dxobj, (char *)"positions"); 68 68 if (dxpos == NULL) { 69 //resultPtr->AddError("can't get component value of \"positions\"");69 resultPtr->AddError("can't get component value of \"positions\""); 70 70 return; 71 71 } … … 74 74 fprintf(stdout, "_n = %d\n",_n); 75 75 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); 77 77 return; 78 78 } … … 83 83 pos = (float*) DXGetArrayData(dxpos); 84 84 if (pos == NULL) { 85 //resultPtr->AddError("DXGetArrayData failed to return positions array");85 resultPtr->AddError("DXGetArrayData failed to return positions array"); 86 86 return; 87 87 } … … 91 91 if (DXQueryGridConnections(dxgrid, &_numAxis, NULL) == NULL) { 92 92 // 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"); 94 94 return; 95 95 } … … 98 98 if (_positions == NULL) { 99 99 // malloc failed, raise error 100 //resultPtr->AddError("malloc of _positions array failed");100 resultPtr->AddError("malloc of _positions array failed"); 101 101 return; 102 102 } … … 106 106 if (_axisLen == NULL) { 107 107 // malloc failed, raise error 108 //resultPtr->AddError("malloc of _axisLen array failed");108 resultPtr->AddError("malloc of _axisLen array failed"); 109 109 return; 110 110 } … … 113 113 _delta = new float[_numAxis*_numAxis]; 114 114 if (_delta == NULL) { 115 //resultPtr->AddError("malloc of _delta array failed");115 resultPtr->AddError("malloc of _delta array failed"); 116 116 return; 117 117 } … … 120 120 _origin = new float[_numAxis]; 121 121 if (_origin == NULL) { 122 //resultPtr->AddError("malloc of _origin array failed");122 resultPtr->AddError("malloc of _origin array failed"); 123 123 return; 124 124 } … … 127 127 _max = new float[_numAxis]; 128 128 if (_max == NULL) { 129 //resultPtr->AddError("malloc of _max array failed");129 resultPtr->AddError("malloc of _max array failed"); 130 130 return; 131 131 } … … 151 151 _data = new float[_n]; 152 152 if (_data == NULL) { 153 //resultPtr->AddError("malloc of _data array failed");153 resultPtr->AddError("malloc of _data array failed"); 154 154 return; 155 155 } … … 172 172 173 173 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); 175 175 return; 176 176 }
Note: See TracChangeset
for help on using the changeset viewer.