Changeset 1984 for trunk/packages
- Timestamp:
- Dec 8, 2010, 2:03:02 PM (14 years ago)
- Location:
- trunk/packages/vizservers/nanovis
- Files:
-
- 41 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/nanovis/Command.cpp
r1825 r1984 87 87 // in nanovis.cpp 88 88 extern vector<PointSet*> g_pointSet; 89 extern int debug_flag;90 89 91 90 extern PlaneRenderer* plane_render; … … 584 583 } 585 584 Rappture::Outcome err; 586 T race("Checking header[%.13s]\n", buf.bytes());585 TRACE("Checking header[%.13s]\n", buf.bytes()); 587 586 if (strncmp (buf.bytes(), "@@RP-ENC:", 9) == 0) { 588 587 /* There's a header on the buffer, use it to decode the data. */ … … 1044 1043 1045 1044 fraction = ((float)frame_num) / (total - 1); 1046 T race("fraction : %f\n", fraction);1045 TRACE("fraction : %f\n", fraction); 1047 1046 //interpolator->update(((float)frame_num) / (total - 1)); 1048 1047 interpolator->update(fraction); … … 1093 1092 return TCL_ERROR; 1094 1093 } 1095 T race("parsing volume data identifier\n");1094 TRACE("parsing volume data identifier\n"); 1096 1095 Tcl_HashSearch iter; 1097 1096 Tcl_HashEntry *hPtr; … … 1134 1133 Tcl_Obj *const *objv) 1135 1134 { 1136 printf("Data Loading\n");1135 TRACE("Data Loading\n"); 1137 1136 fflush(stdout); 1138 1137 … … 1159 1158 fp = fopen("/home/nanohub/vrinside/nv/data/HOON/GaAs_AlGaAs_2QD_B4.nd_zc_1_wf", "rb"); 1160 1159 if (fp == NULL) { 1161 printf("cannot open the file\n"); 1162 fflush(stdout); 1160 ERROR("cannot open the file\n"); 1163 1161 return TCL_ERROR; 1164 1162 } … … 1167 1165 fclose(fp); 1168 1166 #endif /*_LOCAL_ZINC_TEST_*/ 1169 T race("Checking header[%.20s]\n", bytes);1167 TRACE("Checking header[%.20s]\n", bytes); 1170 1168 1171 1169 Volume *volPtr; … … 1173 1171 1174 1172 if ((nBytes > 5) && (strncmp(bytes, "<HDR>", 5) == 0)) { 1175 printf("ZincBlende stream is in\n"); 1176 fflush(stdout); 1173 TRACE("ZincBlende stream is in\n"); 1177 1174 //std::stringstream fdata(std::ios_base::out|std::ios_base::in|std::ios_base::binary); 1178 1175 //fdata.write(buf.bytes(),buf.size()); … … 1188 1185 return TCL_ERROR; 1189 1186 } 1190 printf("finish loading\n"); 1191 fflush(stdout); 1192 1187 TRACE("finish loading\n"); 1193 1188 // INSOO 1194 1189 // TBD.. … … 1210 1205 #if __TEST_CODE__ 1211 1206 } else if ((nBytes > 5) && (strncmp(bytes, "<FET>", 5) == 0)) { 1212 printf("FET loading...\n");1207 TRACE("FET loading...\n"); 1213 1208 fflush(stdout); 1214 1209 std::stringstream fdata; … … 1222 1217 #endif /*__TEST_CODE__*/ 1223 1218 } else if ((nBytes > 5) && (strncmp(bytes, "<ODX>", 5) == 0)) { 1224 printf("Loading DX using OpenDX library...\n");1219 TRACE("Loading DX using OpenDX library...\n"); 1225 1220 fflush(stdout); 1226 1221 Rappture::Outcome context; … … 1231 1226 } 1232 1227 } else { 1233 printf("OpenDX loading...\n");1228 TRACE("OpenDX loading...\n"); 1234 1229 fflush(stdout); 1235 1230 std::stringstream fdata; 1236 1231 fdata.write(bytes, nBytes); 1237 1232 if (nBytes <= 0) { 1238 fprintf(stderr,"data buffer is empty\n");1233 ERROR("data buffer is empty\n"); 1239 1234 abort(); 1240 1235 } … … 1507 1502 return TCL_ERROR; 1508 1503 } 1509 printf("set opacity %f\n", opacity);1504 TRACE("set opacity %f\n", opacity); 1510 1505 vector<Volume *> ivol; 1511 1506 if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) { … … 1556 1551 vector<Volume *>::iterator iter; 1557 1552 for (iter = ivol.begin(); iter != ivol.end(); iter++) { 1558 T race("setting %s with transfer function %s\n", (*iter)->name(),1559 tfPtr->name());1553 TRACE("setting %s with transfer function %s\n", (*iter)->name(), 1554 tfPtr->name()); 1560 1555 (*iter)->transferFunction(tfPtr); 1561 1556 #ifdef POINTSET … … 1741 1736 hmPtr = (HeightMap *)Tcl_GetHashValue(hPtr); 1742 1737 } 1738 TRACE("Number of heightmaps=%d\n", NanoVis::heightmapTable.numEntries); 1743 1739 // Must set units before the heights. 1744 1740 hmPtr->xAxis.units(data.xUnits()); … … 1747 1743 hmPtr->wAxis.units(data.yUnits()); 1748 1744 hmPtr->setHeight(data.xMin(), data.yMin(), data.xMax(), data.yMax(), 1749 data.xNum(), data.yNum(), data. acceptValues());1745 data.xNum(), data.yNum(), data.transferValues()); 1750 1746 hmPtr->transferFunction(NanoVis::get_transfunc("default")); 1751 1747 hmPtr->setVisible(true); 1752 1748 hmPtr->setLineContourVisible(true); 1749 NanoVis::EventuallyRedraw(); 1753 1750 return TCL_OK; 1754 1751 } … … 1770 1767 (*iter)->setVisible(visible); 1771 1768 } 1769 NanoVis::EventuallyRedraw(); 1772 1770 return TCL_OK; 1773 1771 } … … 1810 1808 (*iter)->setLineContourColor(rgb); 1811 1809 } 1810 NanoVis::EventuallyRedraw(); 1812 1811 return TCL_OK; 1813 1812 } … … 1829 1828 (*iter)->setLineContourVisible(visible); 1830 1829 } 1830 NanoVis::EventuallyRedraw(); 1831 1831 return TCL_OK; 1832 1832 } … … 1861 1861 } 1862 1862 NanoVis::renderContext->setCullMode(mode); 1863 NanoVis::EventuallyRedraw(); 1863 1864 return TCL_OK; 1864 1865 } … … 1886 1887 Tcl_SetHashValue(hPtr, hmPtr); 1887 1888 Tcl_SetStringObj(Tcl_GetObjResult(interp), tag, -1);; 1889 NanoVis::EventuallyRedraw(); 1890 TRACE("Number of heightmaps=%d\n", NanoVis::heightmapTable.numEntries); 1888 1891 return TCL_OK; 1889 1892 } … … 1928 1931 } 1929 1932 NanoVis::renderContext->setPolygonMode(mode); 1933 NanoVis::EventuallyRedraw(); 1930 1934 return TCL_OK; 1931 1935 } … … 1940 1944 } 1941 1945 NanoVis::renderContext->setShadingModel(model); 1946 NanoVis::EventuallyRedraw(); 1942 1947 return TCL_OK; 1943 1948 } … … 1958 1963 1959 1964 NanoVis::render_2d_contour(heightmap, image_width, image_height); 1960 1965 NanoVis::EventuallyRedraw(); 1961 1966 return TCL_OK; 1962 1967 } … … 2030 2035 (*iter)->transferFunction(tfPtr); 2031 2036 } 2037 NanoVis::EventuallyRedraw(); 2032 2038 return TCL_OK; 2033 2039 } … … 2050 2056 (*iter)->opacity(opacity); 2051 2057 } 2058 NanoVis::EventuallyRedraw(); 2052 2059 return TCL_OK; 2053 2060 } … … 2214 2221 Tcl_Obj *const *objv) 2215 2222 { 2216 fprintf(stderr, "load plane for 2D visualization command\n"); 2223 TRACE("load plane for 2D visualization command\n"); 2224 2217 2225 int index, w, h; 2218 2226 if (objc != 4) { … … 2254 2262 Tcl_Obj *const *objv) 2255 2263 { 2256 fprintf(stderr,"link the plane to the 2D renderer command\n");2264 TRACE("link the plane to the 2D renderer command\n"); 2257 2265 2258 2266 int plane_index, tf_index; … … 2279 2287 Tcl_Obj *const *objv) 2280 2288 { 2281 fprintf(stderr,"enable a plane so the 2D renderer can render it command\n");2289 TRACE("enable a plane so the 2D renderer can render it command\n"); 2282 2290 2283 2291 if (objc != 3) { … … 2404 2412 // create a default transfer function 2405 2413 if (Tcl_Eval(interp, def_transfunc) != TCL_OK) { 2406 fprintf(NanoVis::logfile, "WARNING: bad default transfer function\n");2407 fprintf(NanoVis::logfile, "%s\n",Tcl_GetStringResult(interp));2414 WARN("bad default transfer function\n%s\n", 2415 Tcl_GetStringResult(interp)); 2408 2416 } 2409 2417 return interp; -
trunk/packages/vizservers/nanovis/ContourLineFilter.cpp
r1053 r1984 36 36 37 37 float transtion = (max - min) / (linecount + 1); 38 39 38 float val; 40 int total NumOfPoints = 0, numOfPoints;39 int totalPoints = 0, numPoints; 41 40 for (int i = 1; i <= linecount; ++i) { 42 41 val = min + i * transtion; 43 42 44 43 ContourLine* c = new ContourLine(val); 45 num OfPoints = c->createLine(width, height, vertices, _top);46 if (num OfPoints != 0) {47 total NumOfPoints += numOfPoints;44 numPoints = c->createLine(width, height, vertices, _top); 45 if (numPoints != 0) { 46 totalPoints += numPoints; 48 47 _lines.push_back(c); 49 48 } else { … … 51 50 } 52 51 } 53 54 Vector3* vertexSet = (Vector3*) malloc(sizeof(Vector3) * totalNumOfPoints); 55 Vector3* colorSet = 0; 52 Vector3* vertexSet = (Vector3 *)malloc(sizeof(Vector3) * totalPoints); 53 Vector3* colorSet = NULL; 56 54 if (_colorMap) { 57 colorSet = (Vector3*) malloc(sizeof(Vector3) * totalNumOfPoints); 58 } 59 55 colorSet = (Vector3 *)malloc(sizeof(Vector3) * totalPoints); 56 } 60 57 ContourLineFilter::ContourLineList::iterator iter; 61 58 unsigned int index = 0, colorIndex = 0; … … 72 69 } 73 70 } 74 75 71 R2VertexBuffer* vertexBuffer; 76 vertexBuffer = new R2VertexBuffer(R2VertexBuffer::POSITION3, 77 totalNumOfPoints, 78 totalNumOfPoints * sizeof(Vector3), 79 vertexSet, false); 80 R2VertexBuffer* colorBuffer = 0; 81 R2Geometry* geometry = 0; 72 vertexBuffer = new R2VertexBuffer(R2VertexBuffer::POSITION3, totalPoints, 73 totalPoints * sizeof(Vector3), vertexSet, false); 74 R2VertexBuffer* colorBuffer = NULL; 82 75 if (_colorMap) { 83 colorBuffer = new R2VertexBuffer(R2VertexBuffer::COLOR4, 84 totalNumOfPoints, 85 totalNumOfPoints * sizeof(Vector3), 86 colorSet, false); 87 } 88 76 colorBuffer = new R2VertexBuffer(R2VertexBuffer::COLOR4, totalPoints, 77 totalPoints * sizeof(Vector3), colorSet, false); 78 } 79 R2Geometry* geometry; 89 80 geometry = new R2Geometry(R2Geometry::LINES, vertexBuffer, colorBuffer, 0); 90 81 clear(); … … 101 92 102 93 float val; 103 int total NumOfPoints = 0, numOfPoints;94 int totalPoints = 0, numPoints; 104 95 for (int i = 1; i <= linecount; ++i) { 105 96 val = min + i * transtion; 106 97 107 98 ContourLine* c = new ContourLine(val); 108 num OfPoints = c->createLine(width, height, vertices, _top);109 if (num OfPoints != 0) {110 total NumOfPoints += numOfPoints;99 numPoints = c->createLine(width, height, vertices, _top); 100 if (numPoints != 0) { 101 totalPoints += numPoints; 111 102 _lines.push_back(c); 112 103 } else { … … 114 105 } 115 106 } 116 Vector3* vertexSet = (Vector3 *) malloc(sizeof(Vector3) * totalNumOfPoints);117 Vector3* colorSet = (Vector3*) malloc(sizeof(Vector3) * totalNumOfPoints);107 Vector3* vertexSet = (Vector3 *)malloc(sizeof(Vector3) * totalPoints); 108 Vector3* colorSet = (Vector3 *)malloc(sizeof(Vector3) * totalPoints); 118 109 119 110 ContourLineFilter::ContourLineList::iterator iter; … … 133 124 } 134 125 R2VertexBuffer* vertexBuffer; 135 vertexBuffer = new R2VertexBuffer(R2VertexBuffer::POSITION3, 136 totalNumOfPoints, 137 totalNumOfPoints * sizeof(Vector3), 138 vertexSet, false); 126 vertexBuffer = new R2VertexBuffer(R2VertexBuffer::POSITION3, totalPoints, 127 totalPoints * sizeof(Vector3), vertexSet, false); 139 128 R2VertexBuffer* colorBuffer; 140 colorBuffer = new R2VertexBuffer(R2VertexBuffer::COLOR4, totalNumOfPoints, 141 totalNumOfPoints * sizeof(Vector3), 142 colorSet, false); 129 colorBuffer = new R2VertexBuffer(R2VertexBuffer::COLOR4, totalPoints, 130 totalPoints * sizeof(Vector3), colorSet, false); 143 131 R2Geometry* geometry; 144 132 geometry = new R2Geometry(R2Geometry::LINES, vertexBuffer, colorBuffer, 0); … … 224 212 } 225 213 226 bool227 ContourLineFilter::ContourLine::isValueWithIn(float val1, float Val2)228 {229 return ((_value >= val1 && _value <= Val2) ||230 (_value >= Val2 && _value <= val1));231 }232 214 233 215 void -
trunk/packages/vizservers/nanovis/ContourLineFilter.h
r1000 r1984 10 10 class ContourLineFilter { 11 11 public : 12 class ContourLine { 13 public : 14 float _value; 15 std::list<Vector3> _points; 16 public : 17 ContourLine(float value); 18 19 private : 20 bool isValueWithIn(float Val1, float Val2); 21 void getContourPoint(int vertexIndex1, int vertexIndex2, Vector3* vertices, int width, bool top); 22 void getContourPoint(int vertexIndex1, int vertexIndex2, Vector4* vertices, int width, bool top); 23 public : 24 /** 25 * @brief 26 * @ret Returns the number of points 27 */ 28 int createLine(int width, int height, Vector3* vertices, bool top); 29 int createLine(int width, int height, Vector4* vertices, bool top); 30 }; 31 32 typedef std::list<ContourLine*> ContourLineList; 33 12 class ContourLine { 13 public : 14 float _value; 15 std::list<Vector3> _points; 16 public : 17 ContourLine(float value); 18 19 private : 20 bool isValueWithIn(float v1, float v2) { 21 return ((_value >= v1 && _value <= v2) || 22 (_value >= v2 && _value <= v1)); 23 } 24 void getContourPoint(int vertexIndex1, int vertexIndex2, Vector3* vertices, int width, bool top); 25 void getContourPoint(int vertexIndex1, int vertexIndex2, Vector4* vertices, int width, bool top); 26 public : 27 /** 28 * @brief 29 * @ret Returns the number of points 30 */ 31 int createLine(int width, int height, Vector3* vertices, bool top); 32 int createLine(int width, int height, Vector4* vertices, bool top); 33 }; 34 35 typedef std::list<ContourLine*> ContourLineList; 36 34 37 private : 35 36 38 ContourLineList _lines; 39 Vector3Array* _colorMap; 37 40 bool _top; 38 41 public : 39 40 42 ContourLineFilter(); 43 41 44 private : 42 43 45 void clear(); 46 44 47 public : 45 46 47 48 48 R2Geometry* create(float min, float max, int linecount, Vector3* vertices, int width, int height); 49 R2Geometry* create(float min, float max, int linecount, Vector4* vertices, int width, int height); 50 void setColorMap(Vector3Array* colorMap); 51 49 52 void setHeightTop(bool top) 50 53 { 51 54 _top = top; 52 55 } 53 56 }; -
trunk/packages/vizservers/nanovis/ConvexPolygon.cpp
r978 r1984 15 15 */ 16 16 #include "ConvexPolygon.h" 17 #include "Trace.h" 17 18 #include <GL/gl.h> 18 19 #include <assert.h> … … 54 55 if (uDenom == 0){ 55 56 //plane parallel to line 56 fprintf(stderr,"Unexpected code path: ConvexPolygon.cpp\n");57 ERROR("Unexpected code path: ConvexPolygon.cpp\n"); 57 58 if (uNumer == 0){ 58 59 for (int i = 0; i < 4; i++) … … 97 98 ConvexPolygon::clip(Plane &clipPlane, bool copy_to_texcoord) { 98 99 if (vertices.size() == 0) { 99 // fprintf(stderr,"ConvexPolygon: polygon has no vertices\n");100 //ERROR("ConvexPolygon: polygon has no vertices\n"); 100 101 return; 101 102 } … … 172 173 } 173 174 glVertex4fv((float *)&(vertices[i])); 174 /*175 //debug176 fprintf(stderr, "(%f %f %f %f)",177 vertices[i].x,178 vertices[i].y,179 vertices[i].z,180 vertices[i].w );181 */182 175 } 183 176 } 184 //fprintf(stderr, " ");185 177 } 186 178 -
trunk/packages/vizservers/nanovis/EventPlayer.cpp
r980 r1984 165 165 cur_event++; 166 166 167 fprintf(stderr,"% 6d %.6f\n", len, time_interval);167 TRACE("% 6d %.6f\n", len, time_interval); 168 168 } 169 169 … … 181 181 fscanf(fd, "%d %f %f %f %g\n", &type, param, param+1, param+2, &interval); 182 182 event[i] = new Event(type, param, interval); 183 //fprintf(stderr,"%d %f %f %f\n", type, param[0], param[1], param[2]);183 TRACE("%d %f %f %f\n", type, param[0], param[1], param[2]); 184 184 } 185 185 fclose(fd); … … 187 187 socket_fd = connect_renderer(host, atoi(port), 100); 188 188 if (socket_fd == -1) { 189 fprintf(stderr,"Could not connect to a server.\n");190 return 1;189 ERROR("Could not connect to a server.\n"); 190 return 1; 191 191 } 192 192 … … 194 194 } 195 195 196 void help(const char *argv0) 197 { 198 fprintf(stderr, 199 "Syntax: %s addr port eventfile\n", 200 argv0); 201 exit(1); 196 void 197 help(const char *argv0) 198 { 199 TRACE("Syntax: %s addr port eventfile\n", argv0); 200 exit(1); 202 201 } 203 202 204 203 /* Program entry point */ 205 int main(int argc, char *argv[]) 204 int 205 main(int argc, char *argv[]) 206 206 { 207 207 //parameters: host and port and event file -
trunk/packages/vizservers/nanovis/FlowCmd.cpp
r1899 r1984 141 141 FlowParticles::Render(void) 142 142 { 143 T race("rendering particles %s\n", _name);144 T race("rendering particles %s axis=%d\n", _name, _sv.position.axis);145 T race("rendering particles %s position=%g\n", _name, _sv.position.value);146 T race("rendering particles %s position=%g\n", _name,147 FlowCmd::GetRelativePosition(&_sv.position));143 TRACE("rendering particles %s\n", _name); 144 TRACE("rendering particles %s axis=%d\n", _name, _sv.position.axis); 145 TRACE("rendering particles %s position=%g\n", _name, _sv.position.value); 146 TRACE("rendering particles %s position=%g\n", _name, 147 FlowCmd::GetRelativePosition(&_sv.position)); 148 148 149 149 _rendererPtr->setPos(FlowCmd::GetRelativePosition(&_sv.position)); … … 183 183 FlowBox::Render(Volume *volPtr) 184 184 { 185 T race("Rendering box %s\n", _name);185 TRACE("Rendering box %s\n", _name); 186 186 glColor4d(_sv.color.r, _sv.color.g, _sv.color.b, _sv.color.a); 187 187 … … 209 209 max = volPtr->getPhysicalBBoxMax(); 210 210 211 T race("box is %g,%g %g,%g %g,%g\n",211 TRACE("box is %g,%g %g,%g %g,%g\n", 212 212 _sv.corner1.x, _sv.corner2.x, 213 213 _sv.corner1.y, _sv.corner2.y, 214 _sv.corner1.z, _sv.corner2.z);215 T race("world is %g,%g %g,%g %g,%g\n",216 min.x, max.x, min.y, max.y, min.z, max.z);214 _sv.corner1.z, _sv.corner2.z); 215 TRACE("world is %g,%g %g,%g %g,%g\n", 216 min.x, max.x, min.y, max.y, min.z, max.z); 217 217 218 218 float x0, y0, z0, x1, y1, z1; … … 231 231 x1 = (_sv.corner2.x - min.x) / (max.x - min.x); 232 232 } 233 T race("rendering box %g,%g %g,%g %g,%g\n", x0, x1, y0, y1, z0, z1);233 TRACE("rendering box %g,%g %g,%g %g,%g\n", x0, x1, y0, y1, z0, z1); 234 234 235 235 glLineWidth(_sv.lineWidth); … … 371 371 } 372 372 } 373 T race("in Render before boxes %s\n", _name);373 TRACE("in Render before boxes %s\n", _name); 374 374 RenderBoxes(); 375 375 } … … 522 522 { 523 523 if (_volPtr != NULL) { 524 fprintf(stderr,"from ScaleVectorField volId=%s\n", _volPtr->name());524 TRACE("from ScaleVectorField volId=%s\n", _volPtr->name()); 525 525 NanoVis::remove_volume(_volPtr); 526 526 _volPtr = NULL; … … 581 581 //,volPtr->wAxis.max() 582 582 ); 583 T race("Arrows enabled set to %d\n", _sv.showArrows);583 TRACE("Arrows enabled set to %d\n", _sv.showArrows); 584 584 NanoVis::velocityArrowsSlice->axis(_sv.slicePos.axis); 585 585 NanoVis::velocityArrowsSlice->slicePos(_sv.slicePos.value); … … 601 601 FlowBox *boxPtr; 602 602 for (boxPtr = FirstBox(&iter); boxPtr != NULL; boxPtr = NextBox(&iter)) { 603 T race("found box %s\n", boxPtr->name());603 TRACE("found box %s\n", boxPtr->name()); 604 604 if (boxPtr->visible()) { 605 605 boxPtr->Render(_volPtr); … … 655 655 Vector3 physicalMin(NanoVis::xMin, NanoVis::yMin, NanoVis::zMin); 656 656 Vector3 physicalMax(NanoVis::xMax, NanoVis::yMax, NanoVis::zMax); 657 T race("min=%g %g %g max=%g %g %g mag=%g %g\n",657 TRACE("min=%g %g %g max=%g %g %g mag=%g %g\n", 658 658 NanoVis::xMin, NanoVis::yMin, NanoVis::zMin, 659 659 NanoVis::xMax, NanoVis::yMax, NanoVis::zMax, 660 660 NanoVis::magMin, NanoVis::magMax); 661 661 volPtr->setPhysicalBBox(physicalMin, physicalMax); 662 662 //volPtr->set_n_slice(256 - _volIndex); … … 677 677 volPtr->specular(_sv.specular); 678 678 volPtr->diffuse(_sv.diffuse); 679 T race("volume is now %d %d\n", _sv.showVolume, volPtr->visible());679 TRACE("volume is now %d %d\n", _sv.showVolume, volPtr->visible()); 680 680 volPtr->visible(_sv.showVolume); 681 681 float dx0 = -0.5; … … 696 696 const char *fileName; 697 697 fileName = Tcl_GetString(objv[3]); 698 T race("Flow loading data from file %s\n", fileName);698 TRACE("Flow loading data from file %s\n", fileName); 699 699 700 700 int nComponents; … … 740 740 delete u2dPtr; 741 741 } else { 742 fprintf(stderr,"header is %.14s\n", buf.bytes());742 TRACE("header is %.14s\n", buf.bytes()); 743 743 if (!dataPtr->ImportDx(result, nComponents, length, bytes)) { 744 744 Tcl_AppendResult(interp, result.remark(), (char *)NULL); … … 767 767 Rappture::Outcome result; 768 768 769 T race("Flow Data Loading\n");769 TRACE("Flow Data Loading\n"); 770 770 771 771 int nBytes; 772 772 if (Tcl_GetIntFromObj(interp, objv[3], &nBytes) != TCL_OK) { 773 Trace("Bad nBytes \"%s\"\n", Tcl_GetString(objv[3]));773 ERROR("Bad nBytes \"%s\"\n", Tcl_GetString(objv[3])); 774 774 return TCL_ERROR; 775 775 } … … 777 777 Tcl_AppendResult(interp, "bad # bytes request \"", 778 778 Tcl_GetString(objv[3]), "\" for \"data follows\"", (char *)NULL); 779 Trace("Bad nbytes %d\n", nBytes);779 ERROR("Bad nbytes %d\n", nBytes); 780 780 return TCL_ERROR; 781 781 } 782 782 int nComponents; 783 783 if (Tcl_GetIntFromObj(interp, objv[4], &nComponents) != TCL_OK) { 784 Trace("Bad # of components \"%s\"\n", Tcl_GetString(objv[4]));784 ERROR("Bad # of components \"%s\"\n", Tcl_GetString(objv[4])); 785 785 return TCL_ERROR; 786 786 } … … 788 788 Tcl_AppendResult(interp, "bad # of components request \"", 789 789 Tcl_GetString(objv[4]), "\" for \"data follows\"", (char *)NULL); 790 Trace("Bad # of components %d\n", nComponents);790 ERROR("Bad # of components %d\n", nComponents); 791 791 return TCL_ERROR; 792 792 } 793 793 Rappture::Buffer buf; 794 T race("Flow Data Loading %d %d\n", nBytes, nComponents);794 TRACE("Flow Data Loading %d %d\n", nBytes, nComponents); 795 795 if (GetDataStream(interp, buf, nBytes) != TCL_OK) { 796 796 return TCL_ERROR; … … 823 823 delete u2dPtr; 824 824 } else { 825 fprintf(stderr,"header is %.14s\n", buf.bytes());825 TRACE("header is %.14s\n", buf.bytes()); 826 826 if (!dataPtr->ImportDx(result, nComponents, length, bytes)) { 827 827 Tcl_AppendResult(interp, result.remark(), (char *)NULL); … … 991 991 { 992 992 flags &= ~MAP_FLOWS; 993 T race("MapFlows\n");993 TRACE("MapFlows\n"); 994 994 995 995 /* … … 1036 1036 } 1037 1037 } 1038 T race("MapFlows magMin=%g magMax=%g\n", NanoVis::magMin, NanoVis::magMax);1038 TRACE("MapFlows magMin=%g magMax=%g\n", NanoVis::magMin, NanoVis::magMax); 1039 1039 1040 1040 /* … … 2000 2000 oldHeight = NanoVis::win_height; 2001 2001 2002 T race("FLOW started\n");2002 TRACE("FLOW started\n"); 2003 2003 2004 2004 Rappture::Outcome context; … … 2042 2042 } 2043 2043 movie.done(context); 2044 T race("FLOW end\n");2044 TRACE("FLOW end\n"); 2045 2045 if (!canceled) { 2046 2046 Rappture::Buffer data; -
trunk/packages/vizservers/nanovis/GradientFilter.cpp
r1053 r1984 6 6 #include <string.h> 7 7 #include <stdio.h> 8 #include "Trace.h" 8 9 #include "GradientFilter.h" 9 10 … … 39 40 strlen(floatExt) + 40 41 strlen(GRADIENTS_EXT) + 1))) { 41 fprintf(stderr,"not enough memory for filename\n");42 ERROR("not enough memory for filename\n"); 42 43 exit(1); 43 44 } … … 65 66 if (fwrite(gradients, 3 * sizes[0] * sizes[1] * sizes[2] * sizeof(float), 66 67 1, fp) != 1) { 67 fprintf(stderr,"writing float gradients failed\n");68 ERROR("writing float gradients failed\n"); 68 69 exit(1); 69 70 } … … 119 120 break; 120 121 default: 121 fprintf(stderr,"Unsupported data type\n");122 ERROR("Unsupported data type\n"); 122 123 exit(1); 123 124 break; … … 171 172 }; 172 173 173 fprintf(stderr,"computing gradients ... may take a while\n");174 TRACE("computing gradients ... may take a while\n"); 174 175 175 176 di = 0; … … 294 295 float sum, *filteredGradients, ****filter; 295 296 296 fprintf(stderr,"filtering gradients ... may also take a while\n");297 TRACE("filtering gradients ... may also take a while\n"); 297 298 298 299 if (! (filteredGradients = (float *)malloc(sizes[0] * sizes[1] * sizes[2] 299 300 * 3 * sizeof(float)))) { 300 fprintf(stderr,"not enough memory for filtered gradients\n");301 ERROR("not enough memory for filtered gradients\n"); 301 302 exit(1); 302 303 } … … 305 306 if (! (filter = (float ****)malloc((GRAD_FILTER_SIZE/2 + 1) * 306 307 sizeof(float ***)))) { 307 fprintf(stderr,"failed to allocate gradient filter\n");308 ERROR("failed to allocate gradient filter\n"); 308 309 exit(1); 309 310 } … … 312 313 if (! (filter[i] = (float ***)malloc((GRAD_FILTER_SIZE) * 313 314 sizeof(float **)))) { 314 fprintf(stderr,"failed to allocate gradient filter\n");315 ERROR("failed to allocate gradient filter\n"); 315 316 exit(1); 316 317 } … … 320 321 if (! (filter[i][j] = (float **)malloc((GRAD_FILTER_SIZE) * 321 322 sizeof(float *)))) { 322 fprintf(stderr,"failed to allocate gradient filter\n");323 ERROR("failed to allocate gradient filter\n"); 323 324 exit(1); 324 325 } … … 330 331 if (! (filter[i][j][k] = (float *)malloc((GRAD_FILTER_SIZE) * 331 332 sizeof(float)))) { 332 fprintf(stderr,"failed to allocate gradient filter\n");333 ERROR("failed to allocate gradient filter\n"); 333 334 exit(1); 334 335 } … … 509 510 break; 510 511 default: 511 fprintf(stderr,"unsupported data type\n");512 ERROR("unsupported data type\n"); 512 513 break; 513 514 } … … 535 536 536 537 if (fwrite(gradients, size, 1, fp) != 1) { 537 fprintf(stderr,"writing gradients failed\n");538 ERROR("writing gradients failed\n"); 538 539 exit(1); 539 540 } -
trunk/packages/vizservers/nanovis/HeightMap.cpp
r1546 r1984 40 40 _scale(1.0f, 1.0f, 1.0f), 41 41 _centerPoint(0.0f, 0.0f, 0.0f), 42 heights_(NULL)42 _heights(NULL) 43 43 { 44 44 _shader = new NvShader(); … … 55 55 delete _shader; 56 56 } 57 58 // TMP 59 //if (_tfPtr) delete _tfPtr; 60 } 61 62 void HeightMap::render(graphics::RenderContext* renderContext) 57 if (_heights != NULL) { 58 free(_heights); 59 } 60 } 61 62 void 63 HeightMap::render(graphics::RenderContext* renderContext) 63 64 { 64 65 if (renderContext->getCullMode() == graphics::RenderContext::NO_CULL) { … … 138 139 } 139 140 } 140 141 141 glShadeModel(GL_FLAT); 142 142 glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); … … 173 173 if (_indexBuffer != NULL) { 174 174 delete [] _indexBuffer; 175 _indexBuffer = NULL; 175 176 } 176 177 _indexCount = (xCount - 1) * (zCount - 1) * 6; … … 241 242 if (_vertexBufferObjectID) { 242 243 glDeleteBuffers(1, &_vertexBufferObjectID); 243 _vertexBufferObjectID = 0;244 _vertexBufferObjectID = NULL; 244 245 } 245 246 if (_textureBufferObjectID) { 246 247 glDeleteBuffers(1, &_textureBufferObjectID); 247 _textureBufferObjectID = 0;248 _textureBufferObjectID = NULL; 248 249 } 249 250 if (_contour != NULL) { … … 251 252 _contour = NULL; 252 253 } 254 if (_indexBuffer != NULL) { 255 delete [] _indexBuffer; 256 _indexBuffer = NULL; 257 } 253 258 } 254 259 … … 259 264 reset(); 260 265 261 heights_= (float *)heights;266 _heights = (float *)heights; 262 267 float min, max; 263 268 min = heights[0].y, max = heights[0].y; … … 302 307 delete [] texcoord; 303 308 304 309 if (_contour != NULL) { 310 delete _contour; 311 _contour = NULL; 312 } 305 313 ContourLineFilter lineFilter; 306 314 _contour = lineFilter.create(0.0f, 1.0f, 10, heights, xCount, yCount); … … 319 327 //else 320 328 //{ 321 // printf("ERROR -HeightMap::setHeight\n");329 //ERROR("HeightMap::setHeight\n"); 322 330 //} 323 331 } … … 328 336 { 329 337 _vertexCount = xNum * yNum; 330 xNum_ = xNum, yNum_= yNum;331 heights_= heights;338 _xNum = xNum, _yNum = yNum; 339 _heights = heights; 332 340 reset(); 333 341 … … 377 385 } 378 386 379 Vector3* heightMap = createHeightVertices(xMin, yMin, xMax, yMax, xNum, yNum, heights); 387 Vector3* map = createHeightVertices(xMin, yMin, xMax, yMax, xNum, yNum, 388 heights); 380 389 381 390 glGenBuffers(1, &_vertexBufferObjectID); 382 391 glBindBuffer(GL_ARRAY_BUFFER, _vertexBufferObjectID); 383 glBufferData(GL_ARRAY_BUFFER, _vertexCount * sizeof( Vector3 ), heightMap,392 glBufferData(GL_ARRAY_BUFFER, _vertexCount * sizeof(Vector3), map, 384 393 GL_STATIC_DRAW); 385 394 glGenBuffers(1, &_textureBufferObjectID); … … 392 401 393 402 403 if (_contour != NULL) { 404 delete _contour; 405 _contour = NULL; 406 } 394 407 ContourLineFilter lineFilter; 395 408 //lineFilter.transferFunction(_tfPtr); 396 _contour = lineFilter.create(0.0f, 1.0f, 10, heightMap, xNum, yNum);409 _contour = lineFilter.create(0.0f, 1.0f, 10, map, xNum, yNum); 397 410 398 411 #if TOPCONTOUR 399 412 ContourLineFilter topLineFilter; 400 413 topLineFilter.setHeightTop(true); 401 _topContour = topLineFilter.create(0.0f, 1.0f, 10, heightMap, xNum, yNum); 402 #endif 403 404 405 //if (heightMap) 406 //{ 407 // VertexBuffer* vertexBuffer = new VertexBuffer(VertexBuffer::POSITION3, xNum * yNum, 408 // sizeof(Vector3) * xNum * yNum, heightMap, false); 409 if (_indexBuffer != NULL) { 410 free(_indexBuffer); 411 _indexBuffer = NULL; 412 } 414 _topContour = topLineFilter.create(0.0f, 1.0f, 10, map, xNum, yNum); 415 #endif 413 416 this->createIndexBuffer(xNum, yNum, heights); 414 //} 415 //else 416 //{ 417 //printf("ERROR - HeightMap::setHeight\n"); 418 //} 417 delete [] map; 419 418 #endif 420 419 } … … 424 423 float yMax, int xNum, int yNum, float* height) 425 424 { 426 Vector3* vertices = (Vector3*) malloc(sizeof(Vector3) * xNum * yNum);425 Vector3* vertices = new Vector3[xNum * yNum]; 427 426 428 427 Vector3* dstDataPtr = vertices; … … 450 449 HeightMap::MapToGrid(Grid *gridPtr) 451 450 { 452 int count = xNum_ * yNum_;451 int count = _xNum * _yNum; 453 452 454 453 reset(); … … 461 460 float *p, *q, *pend; 462 461 float *normHeights = new float[count]; 463 for (p = heights_, pend = p + count, q = normHeights; p < pend; p++, q++) {462 for (p = _heights, pend = p + count, q = normHeights; p < pend; p++, q++) { 464 463 *q = (*p - gridPtr->yAxis.min()) * yScale; 465 464 } … … 484 483 485 484 Vector3* vertices; 486 vertices = createHeightVertices(xMin, zMin, xMax, zMax, xNum_, yNum_,485 vertices = createHeightVertices(xMin, zMin, xMax, zMax, _xNum, _yNum, 487 486 normHeights); 488 487 … … 498 497 delete [] texcoord; 499 498 499 if (_contour != NULL) { 500 delete _contour; 501 _contour = NULL; 502 } 500 503 ContourLineFilter lineFilter; 501 504 //lineFilter.transferFunction(_tfPtr); 502 _contour = lineFilter.create(0.0f, 1.0f, 10, vertices, xNum_, yNum_);505 _contour = lineFilter.create(0.0f, 1.0f, 10, vertices, _xNum, _yNum); 503 506 504 507 #if TOPCONTOUR 505 508 ContourLineFilter topLineFilter; 506 509 topLineFilter.setHeightTop(true); 507 _topContour = topLineFilter.create(0.0f, 1.0f, 10, vertices, xNum_, yNum_);508 #endif 509 this->createIndexBuffer( xNum_, yNum_, normHeights);510 _topContour = topLineFilter.create(0.0f, 1.0f, 10, vertices, _xNum, _yNum); 511 #endif 512 this->createIndexBuffer(_xNum, _yNum, normHeights); 510 513 delete [] normHeights; 511 } 512 513 void HeightMap::render_topview(graphics::RenderContext* renderContext, int render_width, int render_height) 514 delete [] vertices; 515 } 516 517 void 518 HeightMap::render_topview(graphics::RenderContext* renderContext, 519 int render_width, int render_height) 514 520 { 515 521 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); -
trunk/packages/vizservers/nanovis/HeightMap.h
r1546 r1984 43 43 Vector3 _scale; 44 44 Vector3 _centerPoint; 45 int xNum_, yNum_; // Number of elements x and y axes in grid.46 float * heights_; // Array of original (unscaled) heights45 int _xNum, _yNum; // Number of elements x and y axes in grid. 46 float *_heights; // Array of original (unscaled) heights 47 47 // (y-values) 48 48 public : … … 54 54 *@brief Constructor 55 55 */ 56 56 HeightMap(); 57 57 /** 58 58 *@brief Destructor 59 59 */ 60 60 ~HeightMap(); 61 61 62 62 private : -
trunk/packages/vizservers/nanovis/Mat4x4.cpp
r1028 r1984 27 27 void 28 28 Mat4x4::print(){ 29 fprintf(stderr,"\n%f %f %f %f\n", m[0], m[1], m[2], m[3]);30 fprintf(stderr,"%f %f %f %f\n", m[4], m[5], m[6], m[7]);31 fprintf(stderr,"%f %f %f %f\n", m[8], m[9], m[10], m[11]);32 fprintf(stderr,"%f %f %f %f\n\n", m[12], m[13], m[14], m[15]);29 TRACE("\n%f %f %f %f\n", m[0], m[1], m[2], m[3]); 30 TRACE("%f %f %f %f\n", m[4], m[5], m[6], m[7]); 31 TRACE("%f %f %f %f\n", m[8], m[9], m[10], m[11]); 32 TRACE("%f %f %f %f\n\n", m[12], m[13], m[14], m[15]); 33 33 } 34 34 … … 70 70 71 71 #if 0 72 fprintf(stderr,"Invert:\n");73 fprintf(stderr," %12.9f %12.9f %12.9f %12.9f\n", m00, m01, m02, m03);74 fprintf(stderr," %12.9f %12.9f %12.9f %12.9f\n", m10, m11, m12, m13);75 fprintf(stderr," %12.9f %12.9f %12.9f %12.9f\n", m20, m21, m22, m23);76 fprintf(stderr," %12.9f %12.9f %12.9f %12.9f\n", m30, m31, m32, m33);72 TRACE("Invert:\n"); 73 TRACE(" %12.9f %12.9f %12.9f %12.9f\n", m00, m01, m02, m03); 74 TRACE(" %12.9f %12.9f %12.9f %12.9f\n", m10, m11, m12, m13); 75 TRACE(" %12.9f %12.9f %12.9f %12.9f\n", m20, m21, m22, m23); 76 TRACE(" %12.9f %12.9f %12.9f %12.9f\n", m30, m31, m32, m33); 77 77 #endif 78 78 -
trunk/packages/vizservers/nanovis/NvCamera.cpp
r1431 r1984 16 16 17 17 #include <stdio.h> 18 #include "Trace.h" 18 19 #include <GL/glu.h> 19 20 #include "NvCamera.h" … … 38 39 NvCamera::initialize() 39 40 { 40 //fprintf(stderr, "camera: %d, %d\n", width, height);41 TRACE("camera: %d, %d\n", width_, height_); 41 42 glViewport(startX_, startY_, width_, height_); 42 43 glMatrixMode(GL_PROJECTION); -
trunk/packages/vizservers/nanovis/NvEventLog.cpp
r1194 r1984 11 11 #include "nanovis.h" 12 12 13 14 #ifdef XINETD15 FILE* xinetd_log;16 #endif17 13 18 14 FILE* event_log; … … 38 34 } 39 35 40 if (!NanoVis::debug_flag) { 41 //open log and map stderr to log file 42 xinetd_log = fopen(logName, "w"); 43 close(2); 44 dup2(fileno(xinetd_log), 2); 45 dup2(2,1); 46 //flush junk 47 fflush(stdout); 48 fflush(stderr); 49 } 36 //open log and map stderr to log file 37 NanoVis::logfile = fopen(logName, "w"); 38 close(2); 39 dup2(fileno(NanoVis::logfile), 2); 40 dup2(2,1); 41 //flush junk 42 fflush(stdout); 43 fflush(stderr); 50 44 51 45 // clean up malloc'd memory … … 58 52 { 59 53 //close log file 60 if ( xinetd_log!= NULL) {61 fclose( xinetd_log);62 xinetd_log= NULL;54 if (NanoVis::logfile != NULL) { 55 fclose(NanoVis::logfile); 56 NanoVis::logfile = NULL; 63 57 } 64 58 } -
trunk/packages/vizservers/nanovis/NvLIC.cpp
r1515 r1984 153 153 NvLIC::make_patterns() 154 154 { 155 T race("begin make_patterns\n");155 TRACE("begin make_patterns\n"); 156 156 if (disListID > 0) { 157 157 glDeleteLists(disListID, Npat); … … 159 159 disListID = glGenLists(Npat); 160 160 161 T race("DisplayList : %d\n", disListID);161 TRACE("DisplayList : %d\n", disListID); 162 162 163 163 int lut[256]; … … 193 193 glTexImage2D(GL_TEXTURE_2D, 0, 4, NPN, NPN, 0, 194 194 GL_RGBA, GL_UNSIGNED_BYTE, pat); 195 T race("finish make_patterns\n");195 TRACE("finish make_patterns\n"); 196 196 } 197 197 … … 470 470 /* 471 471 { 472 //T race("RENDER LIC\n");472 //TRACE("RENDER LIC\n"); 473 473 //glBindTexture(GL_TEXTURE_2D, pattern_tex); 474 474 glCallList(1 % Npat + disListID); … … 505 505 float scaleX, float scaleY, float scaleZ, float max) 506 506 { 507 T race("NvLIC: vector field is assigned [%d]\n", texID);507 TRACE("NvLIC: vector field is assigned [%d]\n", texID); 508 508 _vectorFieldId = texID; 509 509 origin = ori; … … 524 524 int yi = (int) (y*size); 525 525 526 //T race("(xi yi) = (%d %d), ", xi, yi);526 //TRACE("(xi yi) = (%d %d), ", xi, yi); 527 527 vx = slice_vector[4 * (xi+yi*size)]; 528 528 vy = slice_vector[4 * (xi+yi*size)+1]; 529 529 r = vx*vx + vy*vy; 530 530 531 //T race("(vx vx) = (%f %f), r=%f, ", vx, vy, r);531 //TRACE("(vx vx) = (%f %f), r=%f, ", vx, vy, r); 532 532 if (r > (dmax*dmax)) { 533 533 r = sqrt(r); … … 539 539 *py = y + vy; 540 540 541 //T race("vel %f %f -> %f %f, (dmax = %f)\n", x, y, *px, *py, dmax);541 //TRACE("vel %f %f -> %f %f, (dmax = %f)\n", x, y, *px, *py, dmax); 542 542 } 543 543 -
trunk/packages/vizservers/nanovis/NvParticleRenderer.cpp
r1510 r1984 233 233 glBindTexture(GL_TEXTURE_RECTANGLE_NV, 0); 234 234 235 //fprintf(stderr,"init particles\n");235 TRACE("init particles\n"); 236 236 } 237 237 -
trunk/packages/vizservers/nanovis/NvShader.cpp
r1482 r1984 48 48 void NvShader::setErrorCallback(NvCgCallbackFunction callback) 49 49 { 50 printf("NvShader callback\n");50 TRACE("NvShader callback\n"); 51 51 cgSetErrorCallback(callback); 52 52 } -
trunk/packages/vizservers/nanovis/PerfQuery.h
r1510 r1984 20 20 21 21 #include <stdio.h> 22 #include "Trace.h" 22 23 #include <GL/glew.h> 23 24 … … 31 32 &bitsSupported); 32 33 if(bitsSupported == 0) { 33 fprintf(stderr,"occlusion query not supported!\n");34 TRACE("occlusion query not supported!\n"); 34 35 return false; 35 36 } else { 36 fprintf(stderr, "Occlusion query with %d bits supported\n", 37 bitsSupported); 37 TRACE("Occlusion query with %d bits supported\n", bitsSupported); 38 38 return true; 39 39 } -
trunk/packages/vizservers/nanovis/PointSetRenderer.cpp
r1111 r1984 19 19 const char *path = R2FilePath::getInstance()->getPath("particle2.bmp"); 20 20 if (path == NULL) { 21 fprintf(stderr, "ERROR : pointset file not found - %s\n", path); 22 fflush(stdout); 21 ERROR("pointset file not found - %s\n", path); 23 22 return; 24 23 } … … 41 40 4, (float*) image->getImageBuffer()); 42 41 } else { 43 printf("fail to load image [%s]\n", "particles2.bmp");42 ERROR("fail to load image [%s]\n", "particles2.bmp"); 44 43 } 45 44 -
trunk/packages/vizservers/nanovis/RenderVertexArray.cpp
r979 r1984 36 36 */ 37 37 #include "RenderVertexArray.h" 38 #include "Trace.h" 38 39 #include <GL/gl.h> 39 40 #include <stdio.h> … … 53 54 m_bytes_per_component = sizeof(float); break; 54 55 default: 55 fprintf(stderr, "Error:unsupported RenderVertexArray type\n");56 ERROR("unsupported RenderVertexArray type\n"); 56 57 return; 57 58 } … … 73 74 m_format = GL_RGBA; break; 74 75 default: 75 fprintf(stderr, "Error:unsupported RenderVertexArray size\n");76 ERROR("unsupported RenderVertexArray size\n"); 76 77 return; 77 78 } -
trunk/packages/vizservers/nanovis/RpDX.cpp
r1581 r1984 15 15 */ 16 16 #include "RpDX.h" 17 #undef ERROR 18 #include "Trace.h" 17 19 #include <math.h> 18 20 #include <stdio.h> … … 237 239 } 238 240 if (_nzero_min == FLT_MAX) { 239 fprintf(stderr, "could not find a positive minimum value\n"); 240 fflush(stderr); 241 ERROR("could not find a positive minimum value\n"); 241 242 } 242 243 } -
trunk/packages/vizservers/nanovis/ScreenSnapper.cpp
r1510 r1984 18 18 19 19 #include <memory.h> 20 #include "Trace.h" 20 21 #include <assert.h> 21 22 #include "ScreenSnapper.h" … … 98 99 if(data_type == GL_FLOAT){ 99 100 if(n_channels_per_pixel==3) 100 fprintf(stderr, "(%f %f %f) ", 101 ((float*)data)[3*i], 102 ((float*)data)[3*i+1], 103 ((float*)data)[3*i+2]); 101 TRACE("(%f %f %f) ", ((float*)data)[3*i], 102 ((float*)data)[3*i+1], ((float*)data)[3*i+2]); 104 103 else if(n_channels_per_pixel==4) 105 fprintf(stderr, "(%f %f %f %f) ", 106 ((float*)data)[4*i], 107 ((float*)data)[4*i+1], 108 ((float*)data)[4*i+2], 109 ((float*)data)[4*i+3]); 104 TRACE("(%f %f %f %f) ", ((float*)data)[4*i], 105 ((float*)data)[4*i+1], 106 ((float*)data)[4*i+2], 107 ((float*)data)[4*i+3]); 110 108 } 111 109 else if(data_type == GL_UNSIGNED_BYTE){ 112 110 if(n_channels_per_pixel==3) 113 fprintf(stderr,"(%d %d %d) ",111 TRACE("(%d %d %d) ", 114 112 ((unsigned char*)data)[3*i], 115 113 ((unsigned char*)data)[3*i+1], 116 114 ((unsigned char*)data)[3*i+2]); 117 115 else if(n_channels_per_pixel==4) 118 fprintf(stderr,"(%d %d %d %d) ",116 TRACE("(%d %d %d %d) ", 119 117 ((unsigned char*)data)[4*i], 120 118 ((unsigned char*)data)[4*i+1], 121 119 ((unsigned char*)data)[4*i+2], 122 120 ((unsigned char*)data)[4*i+3]); 123 121 } 124 122 } -
trunk/packages/vizservers/nanovis/Sphere.h
r953 r1984 18 18 #define _SPHERE_H_ 19 19 20 #include "Trace.h" 20 21 #include <GL/glut.h> 21 22 -
trunk/packages/vizservers/nanovis/Texture1D.cpp
r1053 r1984 16 16 17 17 #include "Texture1D.h" 18 #include "Trace.h" 18 19 #include <stdio.h> 19 20 #include <assert.h> … … 92 93 93 94 //printf("%d", glGetError()); 94 fprintf(stderr,"max texture size: %d\n", max);95 TRACE("max texture size: %d\n", max); 95 96 } 96 97 … … 99 100 glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &max); 100 101 101 fprintf(stderr,"max texture units: %d.\n", max);102 TRACE("max texture units: %d.\n", max); 102 103 } -
trunk/packages/vizservers/nanovis/Texture2D.cpp
r1053 r1984 16 16 17 17 #include "Texture2D.h" 18 #include "Trace.h" 18 19 #include <stdio.h> 19 20 #include <assert.h> … … 141 142 glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max); 142 143 143 fprintf(stderr,"max texture size: %d\n", max);144 TRACE("max texture size: %d\n", max); 144 145 } 145 146 … … 149 150 glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &max); 150 151 151 fprintf(stderr,"max texture units: %d.\n", max);152 TRACE("max texture units: %d.\n", max); 152 153 } 153 154 -
trunk/packages/vizservers/nanovis/Texture3D.cpp
r1053 r1984 16 16 17 17 #include "Texture3D.h" 18 #include "Trace.h" 18 19 #include <stdio.h> 19 20 #include <assert.h> … … 207 208 208 209 //printf("%d", glGetError()); 209 fprintf(stderr,"max 3d texture size: %d\n", max);210 TRACE("max 3d texture size: %d\n", max); 210 211 } 211 212 … … 214 215 glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &max); 215 216 216 fprintf(stderr,"max texture units: %d.\n", max);217 } 217 TRACE("max texture units: %d.\n", max); 218 } -
trunk/packages/vizservers/nanovis/Trace.cpp
r1526 r1984 1 #include "nanovis.h" 1 2 #include <Trace.h> 2 3 #include <stdio.h> … … 6 7 #include <GL/glut.h> 7 8 8 static bool trace = true;9 static bool trace = false; 9 10 10 11 void 11 Trace(const char* format, ...) 12 PrintMessage(const char *mesg, const char *fileName, int lineNum, 13 const char* format, ...) 12 14 { 13 15 char buff[1024]; 14 16 va_list lst; 15 16 if (trace) { 17 va_start(lst, format); 18 vsnprintf(buff, 1023, format, lst); 19 buff[1023] = '\0'; 20 fprintf(stdout, "%s\n", buff); 21 fflush(stdout); 17 FILE *f; 18 19 f = NanoVis::logfile; 20 if (f == NULL) { 21 f = stderr; 22 22 } 23 va_start(lst, format); 24 vsnprintf(buff, 1023, format, lst); 25 buff[1023] = '\0'; 26 fprintf(f, "%s at line %d of \"%s\": %s\n", mesg, lineNum, fileName, buff); 27 fflush(f); 23 28 } 24 29 … … 52 57 mesg = "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT"; break; 53 58 default: 54 fprintf(stderr,"FB Status: %s: UNKNOWN framebuffer status %u\n",55 59 TRACE("FB Status: %s: UNKNOWN framebuffer status %u\n", 60 prefix, (unsigned int)status); 56 61 return; 57 62 } 58 fprintf(stderr,"FB Status: %s: %s\n", prefix, mesg);63 TRACE("FB Status: %s: %s\n", prefix, mesg); 59 64 } 60 65 … … 82 87 mesg = "GL_INVALID_FRAMEBUFFER_OPERATION_EXT"; break; 83 88 default: 84 fprintf(stderr,"GL Status: %s: Unknown status %d\n", prefix, status);89 TRACE("GL Status: %s: Unknown status %d\n", prefix, status); 85 90 return false; 86 91 } 87 fprintf(stderr,"GL Status: %s: %s\n", prefix, mesg);92 TRACE("GL Status: %s: %s\n", prefix, mesg); 88 93 return false; 89 94 } -
trunk/packages/vizservers/nanovis/Trace.h
r1429 r1984 9 9 #define AT __FILE__ ":" NEWSTRING(__LINE__) 10 10 11 extern void Trace(const char* format, ...); 11 extern void PrintMessage(const char *mesg, const char *fileName, int lineNum, 12 const char* format, ...); 13 14 #define ERROR(...) PrintMessage("Error", __FILE__, __LINE__, __VA_ARGS__) 15 #ifdef WANT_TRACE 16 #define TRACE(...) PrintMessage("Trace", __FILE__, __LINE__, __VA_ARGS__) 17 #else 18 #define TRACE(...) 19 #endif 20 #define WARN(...) PrintMessage("Warning", __FILE__, __LINE__, __VA_ARGS__) 21 #define INFO(...) PrintMessage("Info", __FILE__, __LINE__, __VA_ARGS__) 22 23 12 24 extern bool CheckFBO(GLenum *statusPtr); 13 25 extern void PrintFBOStatus(GLenum status, const char *prefix); -
trunk/packages/vizservers/nanovis/Unirect.cpp
r1529 r1984 174 174 return TCL_ERROR; 175 175 } 176 values = new float[nValues];176 _values = (float *)realloc(_values, sizeof(float) * nValues); 177 177 int j; 178 178 for (j = 0; j < nValues; j++) { 179 if (GetFloatFromObj(interp, vobj[j], values + j)!=TCL_OK) {179 if (GetFloatFromObj(interp, vobj[j], _values + j)!=TCL_OK) { 180 180 return TCL_ERROR; 181 181 } … … 217 217 } 218 218 } 219 if ( values == NULL) {219 if (_values == NULL) { 220 220 Tcl_AppendResult(interp, "missing \"values\" key", (char *)NULL); 221 221 return TCL_ERROR; 222 222 } 223 223 if ((size_t)nValues != (num[0] * num[1] * num[2] * _nComponents)) { 224 T race("num[0]=%d num[1]=%d num[2]=%d ncomponents=%d nValues=%d\n",225 num[0], num[1], num[2], _nComponents, nValues);224 TRACE("num[0]=%d num[1]=%d num[2]=%d ncomponents=%d nValues=%d\n", 225 num[0], num[1], num[2], _nComponents, nValues); 226 226 Tcl_AppendResult(interp, 227 227 "wrong # of values: must be xnum*ynum*znum*extents", … … 259 259 } 260 260 #endif 261 _values = values;262 261 _nValues = nValues; 263 262 if (units[3] != NULL) { 263 if (_vUnits != NULL) { 264 free(_vUnits); 265 } 264 266 _vUnits = strdup(units[3]); 265 267 } … … 268 270 _xNum = num[axis3]; 269 271 if (units[axis3] != NULL) { 272 if (_xUnits != NULL) { 273 free(_xUnits); 274 } 270 275 _xUnits = strdup(units[axis3]); 271 276 } … … 274 279 _yNum = num[axis2]; 275 280 if (units[axis2] != NULL) { 281 if (_yUnits != NULL) { 282 free(_yUnits); 283 } 276 284 _yUnits = strdup(units[axis2]); 277 285 } … … 280 288 _zNum = num[axis1]; 281 289 if (units[axis1] != NULL) { 290 if (_zUnits != NULL) { 291 free(_zUnits); 292 } 282 293 _zUnits = strdup(units[axis1]); 283 294 } … … 329 340 } 330 341 _xUnits = _yUnits = _vUnits = NULL; 331 if (_values != NULL) { 332 delete [] _values; 333 } 334 _values = NULL; 342 _nValues = 0; 335 343 336 344 int i; … … 387 395 int n; 388 396 397 Tcl_IncrRefCount(objv[i+1]); 389 398 if (Tcl_ListObjGetElements(interp, objv[i+1], &n, &vobj) != TCL_OK){ 390 399 return TCL_ERROR; … … 396 405 } 397 406 _nValues = n; 398 _values = new float[_nValues];407 _values = (float *)realloc(_values, sizeof(float) * _nValues); 399 408 size_t j; 400 409 for (j = 0; j < _nValues; j++) { … … 403 412 } 404 413 } 414 Tcl_DecrRefCount(objv[i+1]); 405 415 } else if ((c == 'u') && (strcmp(string, "units") == 0)) { 406 416 _vUnits = strdup(Tcl_GetString(objv[i+1])); … … 441 451 } 442 452 } 443 if (_ values == NULL) {453 if (_nValues == 0) { 444 454 Tcl_AppendResult(interp, "missing \"values\" key", (char *)NULL); 445 455 return TCL_ERROR; … … 453 463 454 464 if ((axis[0] != 1) || (axis[1] != 0)) { 455 fprintf(stderr,"reordering data\n");465 TRACE("reordering data\n"); 456 466 /* Reorder the data into x, y where x varies fastest and so on. */ 457 467 size_t y; 458 float *d ata, *dp;459 460 dp = data = new float[_nValues];468 float *dp; 469 470 dp = _values = (float *)realloc(_values, sizeof(float) * _nValues); 461 471 for (y = 0; y < _yNum; y++) { 462 472 size_t x; … … 473 483 } 474 484 } 475 delete [] _values;476 _values = data;477 485 } 478 486 _initialized = true; … … 559 567 _nComponents = nComponents; 560 568 561 if (_values != NULL) { 562 delete [] _values; 563 } 564 _values = new float[npts * _nComponents]; 569 _values = (float *)realloc(_values, sizeof(float) * npts * _nComponents); 565 570 _nValues = 0; 566 571 for (size_t ix = 0; ix < _xNum; ix++) { … … 605 610 result.addError("inconsistent data: expected %d points" 606 611 " but found %d points", npts, _nValues); 607 delete [] _values;612 free(_values); 608 613 _values = NULL; 609 614 return false; … … 676 681 677 682 size_t n = _nComponents * _xNum * _yNum * _zNum; 678 float *data = new float[n];679 memset( data, 0, sizeof(float) * n);683 _values = (float *)realloc(_values, sizeof(float) * n); 684 memset(_values, 0, sizeof(float) * n); 680 685 681 686 // Generate the uniformly sampled rectangle that we need for a volume 682 float *destPtr = data;687 float *destPtr = _values; 683 688 for (size_t i = 0; i < _zNum; i++) { 684 689 double z; … … 699 704 } 700 705 } 701 delete [] _values;702 _values = data;703 706 _nValues = _xNum * _yNum * _zNum * _nComponents; 704 707 return true; … … 710 713 { 711 714 assert(_nComponents == 3); 712 T race("GetVectorRange\n");715 TRACE("GetVectorRange\n"); 713 716 _magMax = -DBL_MAX, _magMin = DBL_MAX; 714 717 size_t i; … … 750 753 case 1: 751 754 case 3: 752 if (_values != NULL) {753 delete [] _values;754 }755 _values = new float[dataPtr->nValues()];755 _values = (float *)realloc(_values, sizeof(float) * dataPtr->nValues()); 756 if (_values == NULL) { 757 return false; 758 } 756 759 memcpy(_values, dataPtr->values(), dataPtr->nValues()); 757 760 _nValues = dataPtr->nValues(); … … 761 764 float *values; 762 765 _nValues = 3 * _xNum * _yNum * _zNum; 763 if (_values != NULL) { 764 delete [] _values; 765 } 766 _values = new float[_nValues]; 766 _values = (float *)realloc(_values, sizeof(float) * _nValues); 767 767 if (_values == NULL) { 768 768 return false; -
trunk/packages/vizservers/nanovis/Unirect.h
r1510 r1984 65 65 ~Unirect3d(void) { 66 66 if (_values != NULL) { 67 delete [] _values;67 free(_values); 68 68 } 69 69 if (_xUnits != NULL) { … … 147 147 GetVectorRange(); 148 148 } 149 T race("magMin=%g %g\n", _magMin, DBL_MAX);149 TRACE("magMin=%g %g\n", _magMin, DBL_MAX); 150 150 return _magMin; 151 151 } … … 154 154 GetVectorRange(); 155 155 } 156 T race("magMax=%g %g\n", _magMax, -DBL_MAX);156 TRACE("magMax=%g %g\n", _magMax, -DBL_MAX); 157 157 return _magMax; 158 158 } … … 207 207 ~Unirect2d(void) { 208 208 if (_values != NULL) { 209 delete [] _values;209 free(_values); 210 210 } 211 211 if (_xUnits != NULL) { … … 264 264 return _nComponents; 265 265 } 266 float * acceptValues(void) {266 float *transferValues(void) { 267 267 float *values; 268 268 values = _values; -
trunk/packages/vizservers/nanovis/Vector3.cpp
r819 r1984 149 149 150 150 void Vector3::print(){ 151 fprintf(stderr,"x:%f, y:%f, z:%f\n", x, y, z);151 TRACE("x:%f, y:%f, z:%f\n", x, y, z); 152 152 } 153 153 -
trunk/packages/vizservers/nanovis/Vector3.h
r1484 r1984 99 99 } 100 100 void print(void){ 101 fprintf(stderr, "x:%f, y:%f, z:%f\n", x, y, z);101 TRACE("(x:%f, y:%f, z:%f)\n", x, y, z); 102 102 } 103 103 float distance(Vector3 &v) const { -
trunk/packages/vizservers/nanovis/Vector4.cpp
r819 r1984 29 29 30 30 void Vector4::print(){ 31 fprintf(stderr,"Vector4: (%.3f, %.3f, %.3f, %.3f)\n", x, y, z, w);31 TRACE("Vector4: (%.3f, %.3f, %.3f, %.3f)\n", x, y, z, w); 32 32 } 33 33 -
trunk/packages/vizservers/nanovis/Vector4.h
r1028 r1984 18 18 19 19 #include <stdio.h> 20 #include <Trace.h> 20 21 21 22 class Vector4 … … 36 37 37 38 void print(void) { 38 fprintf(stderr,"Vector4: (%.3f, %.3f, %.3f, %.3f)\n", x, y, z, w);39 TRACE("Vector4: (%.3f, %.3f, %.3f, %.3f)\n", x, y, z, w); 39 40 } 40 41 -
trunk/packages/vizservers/nanovis/VelocityArrowsSlice.cpp
r1493 r1984 138 138 _arrowColor.set(1, 1, 0); 139 139 140 printf("test1\n");140 TRACE("test1\n"); 141 141 } 142 142 -
trunk/packages/vizservers/nanovis/Volume.cpp
r1510 r1984 52 52 _data = new float[fcount]; 53 53 if (data != NULL) { 54 T race("data is copied\n");54 TRACE("data is copied\n"); 55 55 memcpy(_data, data, fcount * sizeof(float)); 56 56 _tex->initialize(_data); 57 57 } else { 58 T race("data is null\n");58 TRACE("data is null\n"); 59 59 memset(_data, 0, sizeof(width * height * depth * _n_components * 60 60 sizeof(float))); … … 85 85 label[2] = "Z Label"; 86 86 87 T race("End -- Volume constructor\n");87 TRACE("End -- Volume constructor\n"); 88 88 } 89 89 -
trunk/packages/vizservers/nanovis/VolumeInterpolator.cpp
r1493 r1984 26 26 { 27 27 if (_volumes.size() > 0) { 28 T race("\tVolume Interpolation Started\n");28 TRACE("\tVolume Interpolation Started\n"); 29 29 _started = true; 30 30 } else { 31 T race("\tVolume Interpolation did not get started\n");31 TRACE("\tVolume Interpolation did not get started\n"); 32 32 _started = false; 33 33 } … … 35 35 gettimeofday(&clock, NULL); 36 36 _start_time = clock.tv_sec + clock.tv_usec/1000000.0; 37 T race("End Start - VolumeInterpolator\n");37 TRACE("End Start - VolumeInterpolator\n"); 38 38 } 39 39 … … 99 99 } 100 100 101 T race("n = %d count = %d\n", n, count);101 TRACE("n = %d count = %d\n", n, count); 102 102 if (n >= limit){ 103 103 *key1 = *key2 = limit; … … 157 157 _volume->opacity_scale(refPtr->opacity_scale()); 158 158 _volume->isosurface(0); 159 T race("VOL : location %f %f %f\n\tid : %s\n", loc.x, loc.y, loc.z,160 159 TRACE("VOL : location %f %f %f\n\tid : %s\n", loc.x, loc.y, loc.z, 160 refPtr->name()); 161 161 } 162 162 _volumes.push_back(_volume); 163 T race("a Volume[%s] is added to VolumeInterpolator\n", refPtr->name());163 TRACE("a Volume[%s] is added to VolumeInterpolator\n", refPtr->name()); 164 164 } 165 165 -
trunk/packages/vizservers/nanovis/VolumeRenderer.cpp
r1825 r1984 37 37 const char *path = R2FilePath::getInstance()->getPath("Font.bmp"); 38 38 if (path == NULL) { 39 fprintf(stderr,"can't find Font.bmp\n");39 ERROR("can't find Font.bmp\n"); 40 40 assert(path != NULL); 41 41 } … … 99 99 ani_tf = ani_vol->transferFunction(); 100 100 #endif 101 T race("VOLUME INTERPOLATOR IS STARTED ----------------------------");101 TRACE("VOLUME INTERPOLATOR IS STARTED ----------------------------"); 102 102 } 103 103 // Determine the volumes that are to be rendered. … … 126 126 size_t* actual_slices = new size_t[volumes.size()]; 127 127 128 T race("start loop %d\n", volumes.size());128 TRACE("start loop %d\n", volumes.size()); 129 129 for (size_t i = 0; i < volumes.size(); i++) { 130 130 Volume* volPtr; … … 350 350 351 351 } //iterate all volumes 352 T race("end loop\n");352 TRACE("end loop\n"); 353 353 354 354 // We sort all the polygons according to their eye-space depth, from … … 388 388 389 389 #ifdef notdef 390 T race("shading slice: volume %s addr=%x slice=%d, volume=%d\n",391 volPtr->name(), volPtr, slice_index, volume_index);390 TRACE("shading slice: volume %s addr=%x slice=%d, volume=%d\n", 391 volPtr->name(), volPtr, slice_index, volume_index); 392 392 #endif 393 393 activate_volume_shader(volPtr, false); … … 621 621 f = fopen(filename, "rb"); 622 622 if (f == NULL) { 623 fprintf(stderr,"can't open font file \"%s\"\n", filename);623 ERROR("can't open font file \"%s\"\n", filename); 624 624 return false; 625 625 } 626 626 627 627 if (fread(&bfType, sizeof(short int), 1, f) != 1) { 628 fprintf(stderr,"can't read %lu bytes from font file \"%s\"\n",629 628 ERROR("can't read %lu bytes from font file \"%s\"\n", 629 (unsigned long)sizeof(short int), filename); 630 630 goto error; 631 631 } … … 633 633 /* check if file is a bitmap */ 634 634 if (bfType != 19778) { 635 fprintf(stderr,"not a bmp file.\n");635 ERROR("not a bmp file.\n"); 636 636 goto error; 637 637 } … … 643 643 /* get the position of the actual bitmap data */ 644 644 if (fread(&bfOffBits, sizeof(int), 1, f) != 1) { 645 fprintf(stderr,"error reading file.\n");645 ERROR("error reading file.\n"); 646 646 goto error; 647 647 } … … 653 653 /* get the width of the bitmap */ 654 654 if (fread(&width, sizeof(int), 1, f) != 1) { 655 fprintf(stderr,"error reading file.\n");655 ERROR("error reading file.\n"); 656 656 goto error; 657 657 } … … 660 660 /* get the height of the bitmap */ 661 661 if (fread(&height, sizeof(int), 1, f) != 1) { 662 fprintf(stderr,"error reading file.\n");662 ERROR("error reading file.\n"); 663 663 goto error; 664 664 } … … 667 667 /* get the number of planes (must be set to 1) */ 668 668 if (fread(&biPlanes, sizeof(short int), 1, f) != 1) { 669 fprintf(stderr,"error reading file.\n");669 ERROR("error reading file.\n"); 670 670 goto error; 671 671 } 672 672 if (biPlanes != 1) { 673 fprintf(stderr, "Error:number of Planes not 1!\n");673 ERROR("number of Planes not 1!\n"); 674 674 goto error; 675 675 } … … 677 677 /* get the number of bits per pixel */ 678 678 if (fread(&biBitCount, sizeof(short int), 1, f) != 1) { 679 fprintf(stderr,"error reading file.\n");679 ERROR("error reading file.\n"); 680 680 goto error; 681 681 } … … 683 683 //printf("Bits per Pixel: %d\n", biBitCount); 684 684 if (biBitCount != 24) { 685 fprintf(stderr,"Bits per Pixel not 24\n");685 ERROR("Bits per Pixel not 24\n"); 686 686 goto error; 687 687 } … … 692 692 data = (unsigned char*) malloc(biSizeImage); 693 693 if (data == NULL) { 694 fprintf(stderr,"Can't allocate memory for image\n");694 ERROR("Can't allocate memory for image\n"); 695 695 goto error; 696 696 } … … 699 699 fseek(f, bfOffBits, SEEK_SET); 700 700 if (fread(data, biSizeImage, 1, f) != 1) { 701 fprintf(stderr,"Error loading file!\n");701 ERROR("Error loading file!\n"); 702 702 goto error; 703 703 } -
trunk/packages/vizservers/nanovis/define.h
r1510 r1984 29 29 GLenum status; \ 30 30 status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); \ 31 fprintf(stderr,"%x\n", status); \31 TRACE("%x\n", status); \ 32 32 switch(status) { \ 33 33 case GL_FRAMEBUFFER_COMPLETE_EXT: \ 34 fprintf(stderr,"framebuffer complete!\n"); \34 TRACE("framebuffer complete!\n"); \ 35 35 break; \ 36 36 case GL_FRAMEBUFFER_UNSUPPORTED_EXT: \ 37 fprintf(stderr,"framebuffer GL_FRAMEBUFFER_UNSUPPORTED_EXT\n"); \37 TRACE("framebuffer GL_FRAMEBUFFER_UNSUPPORTED_EXT\n"); \ 38 38 /* you gotta choose different formats */ \ 39 39 assert(0); \ 40 40 break; \ 41 41 case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT: \ 42 fprintf(stderr,"framebuffer INCOMPLETE_ATTACHMENT\n"); \42 TRACE("framebuffer INCOMPLETE_ATTACHMENT\n"); \ 43 43 break; \ 44 44 case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT: \ 45 fprintf(stderr,"framebuffer FRAMEBUFFER_MISSING_ATTACHMENT\n"); \45 TRACE("framebuffer FRAMEBUFFER_MISSING_ATTACHMENT\n"); \ 46 46 break; \ 47 47 case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT: \ 48 fprintf(stderr,"framebuffer FRAMEBUFFER_DIMENSIONS\n");\48 TRACE("framebuffer FRAMEBUFFER_DIMENSIONS\n");\ 49 49 break; \ 50 50 case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT: \ 51 fprintf(stderr,"framebuffer INCOMPLETE_FORMATS\n");\51 TRACE("framebuffer INCOMPLETE_FORMATS\n");\ 52 52 break; \ 53 53 case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT: \ 54 fprintf(stderr,"framebuffer INCOMPLETE_DRAW_BUFFER\n");\54 TRACE("framebuffer INCOMPLETE_DRAW_BUFFER\n");\ 55 55 break; \ 56 56 case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT: \ 57 fprintf(stderr,"framebuffer INCOMPLETE_READ_BUFFER\n");\57 TRACE("framebuffer INCOMPLETE_READ_BUFFER\n");\ 58 58 break; \ 59 59 case GL_FRAMEBUFFER_BINDING_EXT: \ 60 fprintf(stderr,"framebuffer BINDING_EXT\n");\60 TRACE("framebuffer BINDING_EXT\n");\ 61 61 break; \ 62 62 /* 63 63 * case GL_FRAMEBUFFER_STATUS_ERROR_EXT: \ 64 * fprintf(stderr,"framebuffer STATUS_ERROR\n");\64 * TRACE("framebuffer STATUS_ERROR\n");\ 65 65 * break; \ 66 66 * */ \ 67 67 default: \ 68 fprintf(stderr,"unknown framebuffer error %d\n", status);\68 ERROR("unknown framebuffer error %d\n", status);\ 69 69 /* programming error; will fail on all hardware */ \ 70 70 assert(0); \ … … 87 87 default: \ 88 88 /* programming error; will fail on all hardware */ \ 89 fprintf(stderr, "programming error\n"); \89 ERROR(stderr, "programming error\n"); \ 90 90 assert(0); \ 91 91 } \ -
trunk/packages/vizservers/nanovis/dxReader.cpp
r1526 r1984 168 168 } while (!fin.eof()); 169 169 170 fprintf(stderr, "found nx=%d ny=%d, nz=%d, x0=%f, y0=%f, z0=%f\n",171 170 TRACE("found nx=%d ny=%d, nz=%d, x0=%f, y0=%f, z0=%f\n", 171 nx, ny, nz, x0, y0, z0); 172 172 // read data points 173 173 if (fin.eof() && (npts > 0)) { … … 554 554 int nindex = iz*nx*ny + iy*nx + ix; 555 555 field.define(nindex, dval[p]); 556 fflush(stderr);557 556 nread++; 558 557 if (++iz >= nz) { … … 651 650 #ifdef notdef 652 651 for (int i=0; i<nx*ny*nz; i++) { 653 fprintf(stderr,"enddata[%i] = %lg\n",i,data[i]); 654 fflush(stderr); 652 TRACE("enddata[%i] = %lg\n",i,data[i]); 655 653 } 656 654 #endif 657 fprintf(stdout,"nx = %i ny = %i nz = %i\n",nx,ny,nz);658 fprintf(stdout,"dx = %lg dy = %lg dz = %lg\n",dx,dy,dz);659 fprintf(stdout,"dataMin = %lg\tdataMax = %lg\tnzero_min = %lg\n", field.valueMin(),field.valueMax(),nzero_min);660 fflush(stdout);655 TRACE("nx = %i ny = %i nz = %i\n",nx,ny,nz); 656 TRACE("dx = %lg dy = %lg dz = %lg\n",dx,dy,dz); 657 TRACE("dataMin = %lg\tdataMax = %lg\tnzero_min = %lg\n", 658 field.valueMin(),field.valueMax(),nzero_min); 661 659 662 660 volPtr = NanoVis::load_volume(tag, nx, ny, nz, 4, data, … … 985 983 int nindex = iz*nx*ny + iy*nx + ix; 986 984 field.define(nindex, dval[p]); 987 fprintf(stderr,"nindex = %i\tdval[%i] = %lg\n", nindex, p, 988 dval[p]); 989 fflush(stderr); 985 TRACE("nindex = %i\tdval[%i] = %lg\n", nindex, p, dval[p]); 990 986 nread++; 991 987 if (++iz >= nz) { … … 1122 1118 1123 1119 for (int i=0; i<nx*ny*nz; i++) { 1124 fprintf(stderr,"enddata[%i] = %lg\n",i,data[i]); 1125 fflush(stderr); 1120 TRACE("enddata[%i] = %lg\n",i,data[i]); 1126 1121 } 1127 1122 1128 fprintf(stdout,"End Data Stats volDataID = %i\n",volDataID);1129 fprintf(stdout,"nx = %i ny = %i nz = %i\n",nx,ny,nz);1130 fprintf(stdout,"dx = %lg dy = %lg dz = %lg\n",dx,dy,dz);1131 fprintf(stdout,"dataMin = %lg\tdataMax = %lg\tnzero_min = %lg\n", field.valueMin(),field.valueMax(),nzero_min);1132 fflush(stdout);1123 TRACE("End Data Stats volDataID = %i\n",volDataID); 1124 TRACE("nx = %i ny = %i nz = %i\n",nx,ny,nz); 1125 TRACE("dx = %lg dy = %lg dz = %lg\n",dx,dy,dz); 1126 TRACE("dataMin = %lg\tdataMax = %lg\tnzero_min = %lg\n", 1127 field.valueMin(),field.valueMax(),nzero_min); 1133 1128 */ 1134 1129 -
trunk/packages/vizservers/nanovis/dxReader2.cpp
r1493 r1984 1 1 2 2 #include "RpDX.h" 3 #undef ERROR 3 4 #include "dxReaderCommon.h" 4 5 -
trunk/packages/vizservers/nanovis/global.h
r1196 r1984 19 19 #include <GL/glew.h> 20 20 #include <Cg/cgGL.h> 21 21 #include <Trace.h> 22 22 #include <stdio.h> 23 23 … … 27 27 GLenum status; \ 28 28 status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); \ 29 fprintf(stderr, "%x\n", status);\29 TRACE("%x\n", status); \ 30 30 switch(status) { \ 31 31 case GL_FRAMEBUFFER_COMPLETE_EXT: \ 32 fprintf(stderr,"framebuffer complete!\n");\32 TRACE("framebuffer complete!\n"); \ 33 33 break; \ 34 34 case GL_FRAMEBUFFER_UNSUPPORTED_EXT: \ 35 fprintf(stderr,"framebuffer GL_FRAMEBUFFER_UNSUPPORTED_EXT\n");\35 ERROR("framebuffer GL_FRAMEBUFFER_UNSUPPORTED_EXT\n"); \ 36 36 /* you gotta choose different formats */ \ 37 37 assert(0); \ 38 38 break; \ 39 case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT: 40 fprintf(stderr,"framebuffer INCOMPLETE_ATTACHMENT\n");\39 case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT: \ 40 TRACE("framebuffer INCOMPLETE_ATTACHMENT\n"); \ 41 41 break; \ 42 42 case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT: \ 43 fprintf(stderr,"framebuffer FRAMEBUFFER_MISSING_ATTACHMENT\n");\43 TRACE("framebuffer FRAMEBUFFER_MISSING_ATTACHMENT\n"); \ 44 44 break; \ 45 45 case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT: \ 46 fprintf(stderr,"framebuffer FRAMEBUFFER_DIMENSIONS\n");\46 TRACE("framebuffer FRAMEBUFFER_DIMENSIONS\n"); \ 47 47 break; \ 48 48 case GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT: \ 49 fprintf(stderr,"framebuffer INCOMPLETE_DUPLICATE_ATTACHMENT\n");\49 TRACE("framebuffer INCOMPLETE_DUPLICATE_ATTACHMENT\n"); \ 50 50 break; \ 51 51 case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT: \ 52 fprintf(stderr,"framebuffer INCOMPLETE_FORMATS\n");\52 TRACE("framebuffer INCOMPLETE_FORMATS\n"); \ 53 53 break; \ 54 54 case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT: \ 55 fprintf(stderr,"framebuffer INCOMPLETE_DRAW_BUFFER\n");\55 TRACE("framebuffer INCOMPLETE_DRAW_BUFFER\n"); \ 56 56 break; \ 57 57 case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT: \ 58 fprintf(stderr,"framebuffer INCOMPLETE_READ_BUFFER\n");\58 TRACE("framebuffer INCOMPLETE_READ_BUFFER\n"); \ 59 59 break; \ 60 60 case GL_FRAMEBUFFER_BINDING_EXT: \ 61 fprintf(stderr,"framebuffer BINDING_EXT\n");\61 TRACE("framebuffer BINDING_EXT\n"); \ 62 62 break; \ 63 63 /* 64 64 * case GL_FRAMEBUFFER_STATUS_ERROR_EXT: \ 65 * fprintf(stderr,"framebuffer STATUS_ERROR\n");\65 * TRACE("framebuffer STATUS_ERROR\n");\ 66 66 * break; \ 67 67 * */ \ … … 80 80 break; \ 81 81 case GL_FRAMEBUFFER_UNSUPPORTED_EXT: \ 82 /* choose different formats */ \82 ~ /* choose different formats */ \ 83 83 break; \ 84 84 default: \ 85 85 /* programming error; will fail on all hardware */ \ 86 fprintf(stderr,"programming error\n"); \86 ERROR("programming error\n"); \ 87 87 assert(0); \ 88 88 } \ … … 106 106 system_info() 107 107 { 108 fprintf(stderr, 109 "-----------------------------------------------------------\n"); 110 fprintf(stderr, "OpenGL driver: %s %s\n", glGetString(GL_VENDOR), 111 glGetString(GL_VERSION)); 112 fprintf(stderr, "Graphics hardware: %s\n", glGetString(GL_RENDERER)); 113 fprintf(stderr, 114 "-----------------------------------------------------------\n"); 108 TRACE("-----------------------------------------------------------\n"); 109 TRACE("OpenGL driver: %s %s\n", glGetString(GL_VENDOR), 110 glGetString(GL_VERSION)); 111 TRACE("Graphics hardware: %s\n", glGetString(GL_RENDERER)); 112 TRACE("-----------------------------------------------------------\n"); 115 113 } 116 114 -
trunk/packages/vizservers/nanovis/nanovis.cpp
r1899 r1984 391 391 DoExit(int code) 392 392 { 393 if (NanoVis::debug_flag) { 394 fprintf(stderr, "in DoExit\n"); 395 } 393 TRACE("in DoExit\n"); 396 394 removeAllData(); 397 395 NvExit(); … … 409 407 if(lastError) { 410 408 const char *listing = cgGetLastListing(g_context); 411 Trace("\n---------------------------------------------------\n");412 Trace("%s\n\n", cgGetErrorString(lastError));413 Trace("%s\n", listing);414 Trace("-----------------------------------------------------\n");415 Trace("Cg error, exiting...\n");409 ERROR("\n---------------------------------------------------\n"); 410 ERROR("%s\n\n", cgGetErrorString(lastError)); 411 ERROR("%s\n", listing); 412 ERROR("-----------------------------------------------------\n"); 413 ERROR("Cg error, exiting...\n"); 416 414 cgDestroyContext(g_context); 417 415 DoExit(-1); … … 426 424 const char *path = R2FilePath::getInstance()->getPath(fileName); 427 425 if (path == NULL) { 428 fprintf(stderr, "can't find program \"%s\"\n", fileName); 429 Trace("can't find program \"%s\"\n", fileName); 430 } 431 Trace("cg program compiling: %s\n", path); 426 ERROR("can't find program \"%s\"\n", fileName); 427 } 428 TRACE("cg program compiling: %s\n", path); 432 429 fflush(stdout); 433 430 CGprogram program; … … 437 434 CGerror LastError = cgGetError(); 438 435 if (LastError) { 439 printf("Error message: %s\n", cgGetLastListing(context)); 440 Trace("Error message: %s\n", cgGetLastListing(context)); 441 } 442 Trace("successfully compiled program: %s\n", path); 436 ERROR("Error message: %s\n", cgGetLastListing(context)); 437 } 438 TRACE("successfully compiled program: %s\n", path); 443 439 delete [] path; 444 440 return program; … … 452 448 int result; 453 449 454 #ifndef notdef 455 if (NanoVis::debug_flag) { 456 fprintf(stderr, "in ExecuteCommand(%s)\n", Tcl_DStringValue(dsPtr)); 457 } 458 #endif 450 TRACE("in ExecuteCommand(%s)\n", Tcl_DStringValue(dsPtr)); 451 459 452 gettimeofday(&tv, NULL); 460 453 start = CVT2SECS(tv); 461 454 462 Trace("in ExecuteCommand(%s)\n", Tcl_DStringValue(dsPtr));463 #ifndef notdef464 if (NanoVis::logfile != NULL) {465 fprintf(NanoVis::logfile, "%s", Tcl_DStringValue(dsPtr));466 fflush(NanoVis::logfile);467 }468 #endif469 455 if (NanoVis::recfile != NULL) { 470 456 fprintf(NanoVis::recfile, "%s", Tcl_DStringValue(dsPtr)); … … 479 465 stats.cmdTime += finish - start; 480 466 stats.nCommands++; 481 #ifndef notdef 482 if (NanoVis::debug_flag) { 483 fprintf(stderr, "leaving ExecuteCommand status=%d\n", result); 484 } 485 #endif 467 TRACE("leaving ExecuteCommand status=%d\n", result); 486 468 return result; 487 469 } … … 492 474 /* Move the camera and its target by equal amounts along the x and y 493 475 * axes. */ 494 fprintf(stderr, "x=%f, y=%f\n", dx, dy);476 TRACE("pan: x=%f, y=%f\n", dx, dy); 495 477 496 478 cam->x(def_eye_x + dx); 497 479 cam->y(def_eye_y + dy); 498 fprintf(stderr,"set eye to %f %f\n", cam->x(), cam->y());480 TRACE("set eye to %f %f\n", cam->x(), cam->y()); 499 481 500 482 cam->xAim(def_target_x + dx); 501 483 cam->yAim(def_target_y + dy); 502 fprintf(stderr,"set aim to %f %f\n", cam->xAim(), cam->yAim());484 TRACE("set aim to %f %f\n", cam->xAim(), cam->yAim()); 503 485 } 504 486 … … 521 503 if (hPtr != NULL) { 522 504 Volume *volPtr; 523 Trace("volume \"%s\" already exists", name);505 WARN("volume \"%s\" already exists", name); 524 506 volPtr = (Volume *)Tcl_GetHashValue(hPtr); 525 507 remove_volume(volPtr); … … 576 558 int width, int height, const char* volArg) 577 559 { 578 if (debug_flag) { 579 fprintf(stderr, "in render_legend\n"); 580 } 560 TRACE("in render_legend\n"); 561 581 562 int old_width = win_width; 582 563 int old_height = win_height; … … 602 583 //glReadPixels(0, 0, width, height, GL_BGR, GL_UNSIGNED_BYTE, screen_buffer); // INSOO's 603 584 604 if (debug_flag) { 605 fprintf(stderr, "ppm legend image not written (debug mode)\n"); 606 } else { 585 { 607 586 char prefix[200]; 608 587 ssize_t nWritten; 609 588 589 TRACE("ppm legend image"); 610 590 sprintf(prefix, "nv>legend %s %g %g", volArg, min, max); 611 591 ppm_write(prefix); … … 616 596 resize_offscreen_buffer(old_width, old_height); 617 597 618 if (debug_flag) { 619 fprintf(stderr, "leaving render_legend\n"); 620 } 598 TRACE("leaving render_legend\n"); 621 599 delete plane[0]; 622 600 return TCL_OK; … … 627 605 NanoVis::init_offscreen_buffer() 628 606 { 629 if (debug_flag) { 630 fprintf(stderr, "in init_offscreen_buffer\n"); 631 } 607 TRACE("in init_offscreen_buffer\n"); 632 608 // Initialize a fbo for final display. 633 609 glGenFramebuffersEXT(1, &final_fbo); … … 665 641 666 642 //assert(glGetError()==0); 667 if (debug_flag) { 668 fprintf(stderr, "leaving init_offscreen_buffer\n"); 669 } 643 TRACE("leaving init_offscreen_buffer\n"); 670 644 } 671 645 … … 675 649 NanoVis::resize_offscreen_buffer(int w, int h) 676 650 { 677 T race("in resize_offscreen_buffer(%d, %d)\n", w, h);651 TRACE("in resize_offscreen_buffer(%d, %d)\n", w, h); 678 652 if ((w == win_width) && (h == win_height)) { 679 653 return; 680 654 } 681 if (debug_flag) {682 fprintf(stderr, "in resize_offscreen_buffer(%d, %d)\n", w, h);683 }684 685 655 win_width = w; 686 656 win_height = h; … … 689 659 fonts->resize(w, h); 690 660 } 691 //fprintf(stderr, "screen_buffer size: %d\n", sizeof(screen_buffer)); 692 Trace("screen_buffer size: %d %d\n", w, h); 661 TRACE("screen_buffer size: %d %d\n", w, h); 693 662 694 663 if (screen_buffer != NULL) { … … 705 674 glDeleteRenderbuffersEXT(1, &final_depth_rb); 706 675 707 if (debug_flag) { 708 fprintf(stderr, "before deleteframebuffers\n"); 709 } 676 TRACE("before deleteframebuffers\n"); 710 677 glDeleteFramebuffersEXT(1, &final_fbo); 711 678 712 if (debug_flag) { 713 fprintf(stderr, "reinitialize FBO\n"); 714 } 679 TRACE("reinitialize FBO\n"); 715 680 //Reinitialize final fbo for final display 716 681 glGenFramebuffersEXT(1, &final_fbo); … … 728 693 GL_RGB, GL_INT, NULL); 729 694 #endif 730 if (debug_flag) { 731 fprintf(stderr, "before bindframebuffer\n"); 732 } 695 TRACE("before bindframebuffer\n"); 733 696 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, final_fbo); 734 if (debug_flag) { 735 fprintf(stderr, "after bindframebuffer\n"); 736 } 697 TRACE("after bindframebuffer\n"); 737 698 glGenRenderbuffersEXT(1, &final_depth_rb); 738 699 glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, final_depth_rb); … … 751 712 752 713 //CHECK_FRAMEBUFFER_STATUS(); 753 if (debug_flag) { 754 fprintf(stderr, "change camera\n"); 755 } 714 TRACE("change camera\n"); 756 715 //change the camera setting 757 716 cam->set_screen_size(0, 0, win_width, win_height); 758 717 plane_render->set_screen_size(win_width, win_height); 759 718 760 if (debug_flag) { 761 fprintf(stderr, "leaving resize_offscreen_buffer(%d, %d)\n", w, h); 762 } 719 TRACE("leaving resize_offscreen_buffer(%d, %d)\n", w, h); 763 720 } 764 721 … … 812 769 { 813 770 // print system information 814 fprintf(stderr, 815 "-----------------------------------------------------------\n"); 816 fprintf(stderr, "OpenGL driver: %s %s\n", glGetString(GL_VENDOR), 817 glGetString(GL_VERSION)); 818 fprintf(stderr, "Graphics hardware: %s\n", glGetString(GL_RENDERER)); 819 fprintf(stderr, 820 "-----------------------------------------------------------\n"); 771 TRACE("-----------------------------------------------------------\n"); 772 TRACE("OpenGL driver: %s %s\n", glGetString(GL_VENDOR), 773 glGetString(GL_VERSION)); 774 TRACE("Graphics hardware: %s\n", glGetString(GL_RENDERER)); 775 TRACE("-----------------------------------------------------------\n"); 821 776 if (path == NULL) { 822 fprintf(stderr, "No path defined for shaders or resources\n"); 823 fflush(stderr); 777 ERROR("No path defined for shaders or resources\n"); 824 778 DoExit(1); 825 779 } 826 780 GLenum err = glewInit(); 827 781 if (GLEW_OK != err) { 828 fprintf(stderr, "Error:%s\n", glewGetErrorString(err));782 ERROR("%s\n", glewGetErrorString(err)); 829 783 getchar(); 830 784 //assert(false); 831 785 } 832 fprintf(stdout,"Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));786 TRACE("Status: Using GLEW %s\n", glewGetString(GLEW_VERSION)); 833 787 834 788 if (!R2FilePath::getInstance()->setPath(path)) { 835 fprintf(stderr, "can't set file path to %s\n", path); 836 fflush(stderr); 789 ERROR("can't set file path to %s\n", path); 837 790 DoExit(1); 838 791 } … … 874 827 NanoVis::initGL(void) 875 828 { 876 if (debug_flag) { 877 fprintf(stderr, "in initGL\n"); 878 } 829 TRACE("in initGL\n"); 879 830 //buffer to store data read from the screen 880 831 if (screen_buffer) { … … 938 889 //assert(glGetError()==0); 939 890 940 if (debug_flag) { 941 fprintf(stderr, "leaving initGL\n"); 942 } 891 TRACE("leaving initGL\n"); 943 892 } 944 893 … … 1073 1022 sprintf(filename, "/tmp/flow_animation/image%03d.bmp", frame_number); 1074 1023 1075 fprintf(stderr,"Writing %s\n", filename);1024 TRACE("Writing %s\n", filename); 1076 1025 f = fopen(filename, "wb"); 1077 1026 if (f == 0) { 1078 Trace("cannot create file\n");1027 ERROR("cannot create file\n"); 1079 1028 } 1080 1029 } else { 1081 1030 f = fopen("/tmp/image.bmp", "wb"); 1082 1031 if (f == 0) { 1083 Trace("cannot create file\n");1032 ERROR("cannot create file\n"); 1084 1033 } 1085 1034 } 1086 1035 if (fwrite(header, SIZEOF_BMP_HEADER, 1, f) != 1) { 1087 Trace("can't write header: short write\n");1036 ERROR("can't write header: short write\n"); 1088 1037 } 1089 1038 if (fwrite(screen_buffer, (3*win_width+pad)*win_height, 1, f) != 1) { 1090 Trace("can't write data: short write\n");1039 ERROR("can't write data: short write\n"); 1091 1040 } 1092 1041 fclose(f); … … 1196 1145 char header[200]; 1197 1146 1147 TRACE("Enter ppm_write (%dx%d)\n", win_width, win_height); 1198 1148 // Generate the PPM binary file header 1199 1149 sprintf(header, "P6 %d %d %d\n", win_width, win_height, PPM_MAXVAL); … … 1230 1180 } 1231 1181 if (writev(0, iov, nRecs) < 0) { 1232 fprintf(stderr,"write failed: %s\n", strerror(errno));1182 ERROR("write failed: %s\n", strerror(errno)); 1233 1183 } 1234 1184 free(iov); 1235 1185 stats.nFrames++; 1236 1186 stats.nBytes += (bytesPerRow * win_height); 1187 TRACE("Leaving ppm_write (%dx%d)\n", win_width, win_height); 1237 1188 } 1238 1189 … … 1259 1210 size_t nRecs = 2; 1260 1211 1261 struct iovec *iov; 1262 iov = (struct iovec *)malloc(sizeof(struct iovec) * nRecs); 1212 struct iovec *iov = new iovec[nRecs]; 1263 1213 1264 1214 // Write the nanovisviewer command, then the image header and data. … … 1272 1222 iov[1].iov_len = dlen; 1273 1223 if (writev(0, iov, nRecs) < 0) { 1274 fprintf(stderr,"write failed: %s\n", strerror(errno));1275 } 1276 free(iov);1224 ERROR("write failed: %s\n", strerror(errno)); 1225 } 1226 delete [] iov; 1277 1227 // stats.nFrames++; 1278 1228 // stats.nBytes += (bytesPerRow * win_height); … … 1284 1234 NanoVis::idle() 1285 1235 { 1286 if (debug_flag) { 1287 fprintf(stderr, "in idle()\n"); 1288 } 1236 TRACE("in idle()\n"); 1289 1237 glutSetWindow(render_window); 1290 1238 … … 1294 1242 glutPostRedisplay(); 1295 1243 #endif 1296 if (debug_flag) { 1297 fprintf(stderr, "leaving idle()\n"); 1298 } 1244 TRACE("leaving idle()\n"); 1299 1245 } 1300 1246 … … 1302 1248 NanoVis::display_offscreen_buffer() 1303 1249 { 1304 if (debug_flag) { 1305 fprintf(stderr, "in display_offscreen_buffer\n"); 1306 } 1250 TRACE("in display_offscreen_buffer\n"); 1307 1251 glEnable(GL_TEXTURE_2D); 1308 1252 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); … … 1325 1269 } 1326 1270 glEnd(); 1327 if (debug_flag) { 1328 fprintf(stderr, "leaving display_offscreen_buffer\n"); 1329 } 1271 TRACE("leaving display_offscreen_buffer\n"); 1330 1272 } 1331 1273 … … 1514 1456 vol_renderer->_volumeInterpolator->getStartTime(); 1515 1457 1516 Trace("%lf %lf\n", elapsed_time, vol_renderer->_volumeInterpolator->getInterval()); 1458 TRACE("%lf %lf\n", elapsed_time, 1459 vol_renderer->_volumeInterpolator->getInterval()); 1517 1460 float fraction; 1518 1461 float f; … … 1524 1467 fraction = f / vol_renderer->_volumeInterpolator->getInterval(); 1525 1468 } 1526 T race("fraction : %f\n", fraction);1469 TRACE("fraction : %f\n", fraction); 1527 1470 vol_renderer->_volumeInterpolator->update(fraction); 1528 1471 } … … 1534 1477 double xMin, xMax, yMin, yMax, zMin, zMax, wMin, wMax; 1535 1478 1536 if (debug_flag) { 1537 fprintf(stderr, "in SetVolumeRanges\n"); 1538 } 1479 TRACE("in SetVolumeRanges\n"); 1539 1480 xMin = yMin = zMin = wMin = FLT_MAX; 1540 1481 xMax = yMax = zMax = wMax = -FLT_MAX; … … 1585 1526 } 1586 1527 Volume::update_pending = false; 1587 if (debug_flag) { 1588 fprintf(stderr, "leaving SetVolumeRanges\n"); 1589 } 1528 TRACE("leaving SetVolumeRanges\n"); 1590 1529 } 1591 1530 … … 1595 1534 double xMin, xMax, yMin, yMax, zMin, zMax, wMin, wMax; 1596 1535 1597 if (debug_flag) { 1598 fprintf(stderr, "in SetHeightmapRanges\n"); 1599 } 1536 TRACE("in SetHeightmapRanges\n"); 1600 1537 xMin = yMin = zMin = wMin = FLT_MAX; 1601 1538 xMax = yMax = zMax = wMax = -FLT_MAX; … … 1651 1588 } 1652 1589 HeightMap::update_pending = false; 1653 if (debug_flag) { 1654 fprintf(stderr, "leaving SetHeightmapRanges\n"); 1655 } 1590 TRACE("leaving SetHeightmapRanges\n"); 1656 1591 } 1657 1592 … … 1660 1595 NanoVis::display() 1661 1596 { 1662 if (debug_flag) { 1663 fprintf(stderr, "in display\n"); 1664 } 1597 TRACE("in display\n"); 1665 1598 #ifdef notdef 1666 1599 if (flags & MAP_FLOWS) { … … 1682 1615 SetVolumeRanges(); 1683 1616 } 1684 if (debug_flag) { 1685 fprintf(stderr, "in display: glClear\n"); 1686 } 1617 TRACE("in display: glClear\n"); 1687 1618 //start final rendering 1688 1619 glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //clear screen 1689 1620 1690 1621 if (volume_mode) { 1691 if (debug_flag) { 1692 fprintf(stderr, "in display: volume_mode\n"); 1693 } 1622 TRACE("in display: volume_mode\n"); 1694 1623 //3D rendering mode 1695 1624 // TBD.. … … 1760 1689 //perf->enable(); 1761 1690 //perf->disable(); 1762 // fprintf(stderr,"particle pixels: %d\n", perf->get_pixel_count());1691 //TRACE("particle pixels: %d\n", perf->get_pixel_count()); 1763 1692 //perf->reset(); 1764 1693 … … 1767 1696 //perf->disable(); 1768 1697 1769 if (debug_flag) { 1770 fprintf(stderr, "in display: render heightmap\n"); 1771 } 1698 TRACE("in display: render heightmap\n"); 1772 1699 Tcl_HashEntry *hPtr; 1773 1700 Tcl_HashSearch iter; … … 1787 1714 perf->disable(); 1788 1715 } 1716 TRACE("in display: render heightmap\n"); 1789 1717 perf->reset(); 1790 if (debug_flag) { 1791 fprintf(stderr, "leaving display\n"); 1792 } 1793 1794 1718 CHECK_FRAMEBUFFER_STATUS(); 1719 TRACE("leaving display\n"); 1795 1720 } 1796 1721 … … 1810 1735 } 1811 1736 } else { 1812 // fprintf(stderr,"right mouse\n");1737 //TRACE("right mouse\n"); 1813 1738 1814 1739 if(state==GLUT_DOWN){ 1815 // fprintf(stderr,"right mouse down\n");1740 //TRACE("right mouse down\n"); 1816 1741 right_last_x = x; 1817 1742 right_last_y = y; … … 1819 1744 right_down = true; 1820 1745 } else { 1821 // fprintf(stderr,"right mouse up\n");1746 //TRACE("right mouse up\n"); 1822 1747 left_down = false; 1823 1748 right_down = false; … … 2148 2073 update_rot(-delta_y, -delta_x); 2149 2074 } else if (right_down){ 2150 // fprintf(stderr,"right mouse motion (%d,%d)\n", x, y);2075 //TRACE("right mouse motion (%d,%d)\n", x, y); 2151 2076 2152 2077 right_last_x = x; … … 2200 2125 NanoVis::xinetd_listen(void) 2201 2126 { 2202 if (debug_flag) {2203 fprintf(stderr, "in xinetd_listen\n"); 2204 }2127 NanoVis::flags &= ~REDRAW_PENDING; 2128 2129 TRACE("Enter xinetd_listen\n"); 2205 2130 int flags = fcntl(0, F_GETFL, 0); 2206 2131 fcntl(0, F_SETFL, flags & ~O_NONBLOCK); … … 2210 2135 // Read and execute as many commands as we can from stdin... 2211 2136 2137 int nCommands = 0; 2212 2138 bool isComplete = false; 2213 2139 while ((!feof(NanoVis::stdin)) && (status == TCL_OK)) { … … 2221 2147 // here. 2222 2148 // 2223 if (debug_flag) { 2224 fprintf(stderr, "in xinetd_listen: check eof %d\n", 2225 feof(NanoVis::stdin)); 2226 } 2149 TRACE("in xinetd_listen: EOF=%d\n", feof(NanoVis::stdin)); 2227 2150 while (!feof(NanoVis::stdin)) { 2228 2151 int c = fgetc(NanoVis::stdin); … … 2254 2177 fcntl(0, F_SETFL, flags | O_NONBLOCK); 2255 2178 isComplete = false; 2179 nCommands++; 2180 CHECK_FRAMEBUFFER_STATUS(); 2256 2181 } 2257 2182 } … … 2263 2188 2264 2189 string = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY); 2265 T race("errorInfo=(%s)\n", string);2190 TRACE("errorInfo=(%s)\n", string); 2266 2191 nBytes = strlen(string); 2267 2192 struct iovec iov[3]; … … 2273 2198 iov[2].iov_base = (char *)'\n'; 2274 2199 if (writev(0, iov, 3) < 0) { 2275 fprintf(stderr,"write failed: %s\n", strerror(errno));2200 ERROR("write failed: %s\n", strerror(errno)); 2276 2201 } 2277 if (debug_flag) { 2278 fprintf(stderr, "leaving xinetd_listen\n"); 2279 } 2202 TRACE("Leaving xinetd_listen on ERROR\n"); 2280 2203 return; 2281 2204 } … … 2300 2223 do_rle(); 2301 2224 int sizes[2] = { offsets_size*sizeof(offsets[0]), rle_size }; 2302 fprintf(stderr, "Writing %d,%d\n", sizes[0], sizes[1]); fflush(stderr);2225 TRACE("Writing %d,%d\n", sizes[0], sizes[1]); 2303 2226 write(0, &sizes, sizeof(sizes)); 2304 2227 write(0, offsets, offsets_size*sizeof(offsets[0])); 2305 2228 write(0, rle, rle_size); //unsigned byte 2306 2229 #else 2307 if (debug_flag) { 2308 fprintf(stderr, "ppm image not written (debug mode)\n"); 2309 bmp_write_to_file(1, "/tmp"); 2310 } else { 2311 NanoVis::ppm_write("\nnv>image -type image -bytes"); 2312 } 2230 NanoVis::ppm_write("\nnv>image -type image -bytes"); 2313 2231 #endif 2314 2232 if (feof(NanoVis::stdin)) { 2315 2233 DoExit(90); 2316 2234 } 2317 if (debug_flag) { 2318 fprintf(stderr, "leaving xinetd_listen\n"); 2319 } 2235 TRACE("Leaving xinetd_listen OK\n"); 2320 2236 } 2321 2237 … … 2443 2359 } 2444 2360 if (p == NULL) { 2445 fprintf(stderr,"path not specified\n");2361 TRACE("path not specified\n"); 2446 2362 return 1; 2447 2363 }
Note: See TracChangeset
for help on using the changeset viewer.